From e01bdd4ab0f1aedc6f732a5276834deebdab8680 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie@coreos.com>
Date: Tue, 2 Jun 2015 15:32:28 -0400
Subject: [PATCH 1/2] triggers: metadata.commit_sha -> metadata.commit

This resolves an issue where the custom-git trigger's public facing
schema was not the same as the internal metadata schema. Instead of
breaking users, we rework the internal metadata schema to be the same as
the custom-git JSON schema. This commit also updates everything that
used `metadata.commit_sha` including the test database.
---
 buildman/component/buildcomponent.py          |   2 +-
 endpoints/trigger.py                          |  10 +++++-----
 initdb.py                                     |   2 +-
 .../triggered-build-description.html          |   6 +++---
 .../directives/repo-view/repo-panel-builds.js |   2 +-
 .../ui/triggered-build-description.js         |   4 ++--
 test/data/test.db                             | Bin 774144 -> 778240 bytes
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index a59cb421a..96afc6821 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -139,7 +139,7 @@ class BuildComponent(BaseComponent):
     if build_job.repo_build.trigger.private_key is not None:
       build_arguments['git'] = {
         'url': build_config['trigger_metadata'].get('git_url', ''),
-        'sha': build_config['trigger_metadata'].get('commit_sha', ''),
+        'sha': build_config['trigger_metadata'].get('commit', ''),
         'private_key': build_job.repo_build.trigger.private_key,
       }
 
diff --git a/endpoints/trigger.py b/endpoints/trigger.py
index 692c23990..89a74cb2f 100644
--- a/endpoints/trigger.py
+++ b/endpoints/trigger.py
@@ -478,7 +478,7 @@ class BitbucketBuildTrigger(BuildTriggerHandler):
           }
 
     metadata = {
-      'commit_sha': commit_sha,
+      'commit': commit_sha,
       'ref': ref,
       'default_branch': default_branch,
       'git_url': 'git@bitbucket.org:%s/%s.git' % (namespace, name),
@@ -822,7 +822,7 @@ class GithubBuildTrigger(BuildTriggerHandler):
 
     # Build and set the metadata.
     metadata = {
-      'commit_sha': commit_sha,
+      'commit': commit_sha,
       'ref': ref,
       'default_branch': repo.default_branch,
       'git_url': repo.ssh_url,
@@ -936,7 +936,7 @@ class CustomBuildTrigger(BuildTriggerHandler):
       'commit': {
         'type': 'string',
         'description': 'first 7 characters of the SHA-1 identifier for a git commit',
-        'pattern': '^([A-Fa-f0-9]{7})$',
+        'pattern': '^([A-Fa-f0-9]{7,})$',
       },
       'ref': {
         'type': 'string',
@@ -1057,7 +1057,7 @@ class CustomBuildTrigger(BuildTriggerHandler):
 
     config = self.config
     metadata = {
-      'commit_sha': commit_sha,
+      'commit': commit_sha,
       'git_url': config['build_source'],
     }
 
@@ -1307,7 +1307,7 @@ class GitLabBuildTrigger(BuildTriggerHandler):
       author = None
 
     metadata = {
-      'commit_sha': commit['id'],
+      'commit': commit['id'],
       'ref': ref,
       'default_branch': repo['default_branch'],
       'git_url': repo['ssh_url_to_repo'],
diff --git a/initdb.py b/initdb.py
index b67d0440e..81d1fc978 100644
--- a/initdb.py
+++ b/initdb.py
@@ -439,7 +439,7 @@ def populate_database():
     'docker_tags': ['latest'],
     'build_subdir': '',
     'trigger_metadata': {
-      'commit_sha': '3482adc5822c498e8f7db2e361e8d57b3d77ddd9',
+      'commit': '3482adc5822c498e8f7db2e361e8d57b3d77ddd9',
       'ref': 'refs/heads/master',
       'default_branch': 'master'
     }
diff --git a/static/directives/triggered-build-description.html b/static/directives/triggered-build-description.html
index d645bb3e4..0ca5af364 100644
--- a/static/directives/triggered-build-description.html
+++ b/static/directives/triggered-build-description.html
@@ -21,14 +21,14 @@
     <div class="tbd-content" ng-switch-when="commitsha">
       Triggered by commit
       <span class="source-commit-link"
-            commit-sha="build.trigger_metadata.commit_sha"></span>
+            commit-sha="build.trigger_metadata.commit"></span>
     </div>
 
     <!-- Full Commit Information -->
     <div class="tbd-content" ng-switch-when="fullcommit">
       <div class="commit-message">
         <span class="anchor" is-only-text="!TriggerService.getFullLinkTemplate(build, 'commit')"
-              target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', build.trigger_metadata.commit_sha) }}">
+              target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', build.trigger_metadata.commit) }}">
           {{ build.trigger_metadata.commit_info.message }}
         </span>
       </div>
@@ -46,7 +46,7 @@
           </span>
         </span>
         <span class="source-commit-link"
-              commit-sha="build.trigger_metadata.commit_sha"
+              commit-sha="build.trigger_metadata.commit"
               url-template="TriggerService.getFullLinkTemplate(build, 'commit')"></span>
         <span class="source-ref-link"
               ref="build.trigger_metadata.ref"
diff --git a/static/js/directives/repo-view/repo-panel-builds.js b/static/js/directives/repo-view/repo-panel-builds.js
index 72b3c05f5..c98895a36 100644
--- a/static/js/directives/repo-view/repo-panel-builds.js
+++ b/static/js/directives/repo-view/repo-panel-builds.js
@@ -45,7 +45,7 @@ angular.module('quay').directive('repoPanelBuilds', function () {
           var commit_sha = null;
 
           if (build_info.trigger_metadata) {
-            commit_sha = build_info.trigger_metadata.commit_sha;
+            commit_sha = build_info.trigger_metadata.commit;
           }
 
           return $.extend(build_info, {
diff --git a/static/js/directives/ui/triggered-build-description.js b/static/js/directives/ui/triggered-build-description.js
index 8c23569b0..10aa87005 100644
--- a/static/js/directives/ui/triggered-build-description.js
+++ b/static/js/directives/ui/triggered-build-description.js
@@ -33,7 +33,7 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
           return;
         }
 
-        if (build.trigger && build.trigger.build_source && triggerMetadata.commit_sha) {
+        if (build.trigger && build.trigger.build_source && triggerMetadata.commit) {
           $scope.infoDisplay = 'commitsha';
           return;
         }
@@ -43,4 +43,4 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
     }
   };
   return directiveDefinitionObject;
-});
\ No newline at end of file
+});
diff --git a/test/data/test.db b/test/data/test.db
index c90d531f0beab5ca51e9be0a70010338563e1ade..ad88374b682db7930da395ccac95d669a7efc776 100644
GIT binary patch
delta 13414
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

delta 13027
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
OEyYmxHT~z7=l?I5URiel


From 7f4dd7d42f9fc8bd1687c938b879e09154d93a49 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie@coreos.com>
Date: Tue, 2 Jun 2015 15:43:55 -0400
Subject: [PATCH 2/2] triggers: backwards compatible schema for metadata

---
 buildman/component/buildcomponent.py                   | 10 +++++++++-
 static/directives/triggered-build-description.html     |  6 +++---
 static/js/directives/repo-view/repo-panel-builds.js    |  2 +-
 static/js/directives/ui/triggered-build-description.js |  2 +-
 static/js/services/trigger-service.js                  |  4 ++++
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index 96afc6821..c4c8544d1 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -139,7 +139,7 @@ class BuildComponent(BaseComponent):
     if build_job.repo_build.trigger.private_key is not None:
       build_arguments['git'] = {
         'url': build_config['trigger_metadata'].get('git_url', ''),
-        'sha': build_config['trigger_metadata'].get('commit', ''),
+        'sha': BuildComponent._commit_sha(build_config),
         'private_key': build_job.repo_build.trigger.private_key,
       }
 
@@ -149,6 +149,14 @@ class BuildComponent(BaseComponent):
 
     self.call("io.quay.builder.build", **build_arguments).add_done_callback(self._build_complete)
 
+  @staticmethod
+  def _commit_sha(build_config):
+    """ Determines whether the metadata is using an old schema or not and returns the commit. """
+    commit_sha = build_config['trigger_metadata'].get('commit', '')
+    old_commit_sha = build_config['trigger_metadata'].get('commit_sha', '')
+    return commit_sha or old_commit_sha
+
+
   @staticmethod
   def _total_completion(statuses, total_images):
     """ Returns the current amount completion relative to the total completion of a build. """
diff --git a/static/directives/triggered-build-description.html b/static/directives/triggered-build-description.html
index 0ca5af364..1339df82b 100644
--- a/static/directives/triggered-build-description.html
+++ b/static/directives/triggered-build-description.html
@@ -21,14 +21,14 @@
     <div class="tbd-content" ng-switch-when="commitsha">
       Triggered by commit
       <span class="source-commit-link"
-            commit-sha="build.trigger_metadata.commit"></span>
+            commit-sha="TriggerService.getCommitSHA(build.trigger_metadata)"></span>
     </div>
 
     <!-- Full Commit Information -->
     <div class="tbd-content" ng-switch-when="fullcommit">
       <div class="commit-message">
         <span class="anchor" is-only-text="!TriggerService.getFullLinkTemplate(build, 'commit')"
-              target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', build.trigger_metadata.commit) }}">
+              target="_blank" href="{{ TriggerService.getFullLinkTemplate(build, 'commit').replace('{sha}', TriggerService.getCommitSHA(build.trigger_metadata)) }}">
           {{ build.trigger_metadata.commit_info.message }}
         </span>
       </div>
@@ -46,7 +46,7 @@
           </span>
         </span>
         <span class="source-commit-link"
-              commit-sha="build.trigger_metadata.commit"
+              commit-sha="TriggerService.getCommitSHA(build.trigger_metadata)"
               url-template="TriggerService.getFullLinkTemplate(build, 'commit')"></span>
         <span class="source-ref-link"
               ref="build.trigger_metadata.ref"
diff --git a/static/js/directives/repo-view/repo-panel-builds.js b/static/js/directives/repo-view/repo-panel-builds.js
index c98895a36..c6d24a6bf 100644
--- a/static/js/directives/repo-view/repo-panel-builds.js
+++ b/static/js/directives/repo-view/repo-panel-builds.js
@@ -45,7 +45,7 @@ angular.module('quay').directive('repoPanelBuilds', function () {
           var commit_sha = null;
 
           if (build_info.trigger_metadata) {
-            commit_sha = build_info.trigger_metadata.commit;
+            commit_sha = TriggerService.getCommitSHA(build_info.trigger_metadata);
           }
 
           return $.extend(build_info, {
diff --git a/static/js/directives/ui/triggered-build-description.js b/static/js/directives/ui/triggered-build-description.js
index 10aa87005..3b53a1a33 100644
--- a/static/js/directives/ui/triggered-build-description.js
+++ b/static/js/directives/ui/triggered-build-description.js
@@ -33,7 +33,7 @@ angular.module('quay').directive('triggeredBuildDescription', function () {
           return;
         }
 
-        if (build.trigger && build.trigger.build_source && triggerMetadata.commit) {
+        if (build.trigger && build.trigger.build_source && TriggerService.getCommitSHA(triggerMetadata)) {
           $scope.infoDisplay = 'commitsha';
           return;
         }
diff --git a/static/js/services/trigger-service.js b/static/js/services/trigger-service.js
index fd35b26e6..b5566aa18 100644
--- a/static/js/services/trigger-service.js
+++ b/static/js/services/trigger-service.js
@@ -252,6 +252,10 @@ angular.module('quay').factory('TriggerService', ['UtilService', '$sanitize', 'K
     return desc;
   };
 
+  triggerService.getCommitSHA = function(metadata) {
+    return metadata.commit || metadata.commit_sha;
+  };
+
   triggerService.getMetadata = function(name) {
     return triggerTypes[name];
   };