Exit/warn if a component ref does not contain the shabenbrown/warn-sha-not-in-ref

2 files changed, 32 insertions, 1 deletions

diff --git a/ybd/cache.py b/ybd/cache.py
index b12d0f3..b4ff08e 100644
--- a/ybd/cache.py
+++ b/ybd/cache.py
@@ -23,7 +23,7 @@ import shutil
 from subprocess import call
 
 import app
-from repos import get_repo_url, get_tree
+from repos import ensure_ref_contains_sha, get_repo_url, get_tree
 import utils
 import tempfile
 import yaml
@@ -57,6 +57,7 @@ def cache_key(dn):
         if dn.get('repo'):
             if not dn.get('tree'):
                 dn['tree'], dn['sha'] = get_tree(dn)
+                ensure_ref_contains_sha(dn, dn['ref'], dn['sha'])
             if not dn.get('repourl'):
                 dn['repourl'] = get_repo_url(dn.get('repo'))
         factors = hash_factors(dn)
diff --git a/ybd/repos.py b/ybd/repos.py
index 65cdd12..cc9d22e 100644
--- a/ybd/repos.py
+++ b/ybd/repos.py
@@ -103,6 +103,36 @@ def tracking_branch(dn):
     return (isinstance(track, list) and dn['path'] in track) or track
 
 
+def ensure_ref_contains_sha(dn, ref, sha):
+    check = app.config.get('check-definitions')
+    if check == 'ignore' or tracking_branch(dn):
+        return
+
+    gitdir = get_transport_info(dn['repo'])['dir']
+    with app.chdir(gitdir), open(os.devnull, "w") as fnull:
+        ref = dn['ref']
+        if ref == sha:
+            return
+
+        def sha_in_ref():
+            return check_output(['git', 'for-each-ref', '--contains',
+                                 sha, 'refs/*/' + ref], stderr=fnull,
+                                universal_newlines=True).strip()
+
+        if not sha_in_ref():
+            # The sha may currently exist in another branch,
+            # force an update of the provided ref.
+            repo_url = get_repo_url(dn['repo'])
+            call(['git', 'fetch', repo_url,
+                  '+refs/*/{0}:refs/*/{0}'.format(ref)],
+                 stdout=fnull, stderr=fnull)
+
+        if not sha_in_ref():
+            exit = check == 'exit'
+            app.log(dn, 'WARNING: unable to find %s within' %
+                    sha, ref, exit=exit)
+
+
 def get_tree(dn):
     info = get_transport_info(dn['repo'])
     track = tracking_branch(dn)