this all seems to work; except …

we're getting messages that (eg)
ad5d369d1c80c22434890a49b84a2381b143a7da2db00ffcdf6404540a201eb6
somehow doesn't match
ad5d369d1c80c22434890a49b84a2381b143a7da2db00ffcdf6404540a201eb6

hrm

Author: jettero

hubblestack/extmods/fileserver/gitfs.py

@@ -65,8 +65,8 @@
 AUTH_PARAMS = ('user', 'password', 'pubkey', 'privkey', 'passphrase',
                'insecure_auth')
 
-# Import salt libs
-import salt.utils.gitfs
+from hubblestack.utils.signing import find_wrapf
+from hubblestack.extmods.utils.gitfs import GitFS
 from salt.exceptions import FileserverConfigError
 
 log = logging.getLogger(__name__)
@@ -76,45 +76,42 @@
 
 
 def _gitfs(init_remotes=True):
-    return salt.utils.gitfs.GitFS(
-        __opts__,
-        __opts__['gitfs_remotes'],
+    return GitFS( __opts__, __opts__['gitfs_remotes'],
         per_remote_overrides=PER_REMOTE_OVERRIDES,
         per_remote_only=PER_REMOTE_ONLY,
         init_remotes=init_remotes)
 
-
 def __virtual__():
     '''
     Only load if the desired provider module is present and gitfs is enabled
     properly in the master config file.
     '''
     if __virtualname__ not in __opts__['fileserver_backend']:
+        log.info("no fileserver_backend configs, skipping gitfs")
         return False
     try:
         _gitfs(init_remotes=False)
         # Initialization of the GitFS object did not fail, so we know we have
         # valid configuration syntax and that a valid provider was detected.
+        log.error("have fileserver_backend configs and GitFS object loads: success loading %s", __virtualname__)
         return __virtualname__
     except FileserverConfigError:
         pass
+    log.error("something went wrong loading GitFS object, claiming to not have gitfs")
     return False
 
-
 def clear_cache():
     '''
     Completely clear gitfs cache
     '''
     return _gitfs(init_remotes=False).clear_cache()
 
-
 def clear_lock(remote=None, lock_type='update'):
     '''
     Clear update.lk
     '''
     return _gitfs().clear_lock(remote=remote, lock_type=lock_type)
 
-
 def lock(remote=None):
     '''
     Place an update.lk
@@ -125,81 +122,71 @@ def lock(remote=None):
     '''
     return _gitfs().lock(remote=remote)
 
-
 def update(remotes=None):
     '''
     Execute a git fetch on all of the repos
     '''
     _gitfs().update(remotes)
 
-
 def update_intervals():
     '''
     Returns the update intervals for each configured remote
     '''
     return _gitfs().update_intervals()
 
-
 def envs(ignore_cache=False):
     '''
     Return a list of refs that can be used as environments
     '''
     return _gitfs().envs(ignore_cache=ignore_cache)
 
-
+@find_wrapf(not_found={'rel': '', 'path': ''}, real_path='path')
 def find_file(path, tgt_env='base', **kwargs):  # pylint: disable=W0613
     '''
     Find the first file to match the path and ref, read the file out of git
     and send the path to the newly cached file
     '''
     return _gitfs().find_file(path, tgt_env=tgt_env, **kwargs)
 
-
 def init():
     '''
     Initialize remotes. This is only used by the master's pre-flight checks,
     and is not invoked by GitFS.
     '''
     _gitfs()
 
-
 def serve_file(load, fnd):
     '''
     Return a chunk from a file based on the data received
     '''
     return _gitfs().serve_file(load, fnd)
 
-
 def file_hash(load, fnd):
     '''
     Return a file hash, the hash type is set in the master config file
     '''
     return _gitfs().file_hash(load, fnd)
 
-
 def file_list(load):
     '''
     Return a list of all files on the file server in a specified
     environment (specified as a key within the load dict).
     '''
     return _gitfs().file_list(load)
 
-
 def file_list_emptydirs(load):  # pylint: disable=W0613
     '''
     Return a list of all empty directories on the master
     '''
     # Cannot have empty dirs in git
     return []
 
-
 def dir_list(load):
     '''
     Return a list of all directories on the master
     '''
     return _gitfs().dir_list(load)
 
-
 def symlink_list(load):
     '''
     Return a dict of all symlinks based on a given path in the repo