lib/codebuild-notifier/current_build.rb in codebuild-notifier-0.2.0 vs lib/codebuild-notifier/current_build.rb in codebuild-notifier-0.3.0

@@ -16,28 +16,42 @@
 # along with codebuild-notifier.  If not, see <http://www.gnu.org/licenses/>.
 
 module CodeBuildNotifier
   class CurrentBuild
     attr_reader :build_id, :commit_hash, :git_repo_url, :status_code, :trigger
+    attr_accessor :previous_build
 
     # Default values are extracted from CODEBUILD_* ENV vars present in each
     # CodeBuild # job container.
     def initialize(
       build_id: ENV['CODEBUILD_BUILD_ID'],
       commit_hash: ENV['CODEBUILD_RESOLVED_SOURCE_VERSION'],
       git_repo: ENV['CODEBUILD_SOURCE_REPO_URL'],
+      head_ref: ENV['CODEBUILD_WEBHOOK_HEAD_REF'],
       status_code: ENV['CODEBUILD_BUILD_SUCCEEDING'],
       trigger: ENV['CODEBUILD_WEBHOOK_TRIGGER']
     )
       @build_id = build_id
       @commit_hash = commit_hash
       # Handle repos specified with and without optional .git suffix.
       @git_repo_url = git_repo.to_s.gsub(/\.git\z/, '')
+      @head_ref = head_ref
       @status_code = status_code
       @trigger = trigger
     end
 
+    # If launched via retry, the webhook head ref env var is blank,
+    # but if the previous build for this branch has been located,
+    # the branch_name of that build is the same as for this build
+    def branch_name
+      if launched_by_retry?
+        previous_build&.branch_name
+      else
+        @head_ref.to_s.gsub(%r{^refs/heads/}, '')
+      end
+    end
+
     def status
       status_code.to_s == '1' ? 'SUCCEEDED' : 'FAILED'
     end
 
     def project_code
@@ -61,9 +75,27 @@
     #   my-app_ruby2-3:pr/4056
     # project_code forms part of the key to support having repos with
     # multiple projects, for example, with different buildspec files for
     # different ruby versions, or for rspec vs cucumber.
     def source_id
-      "#{project_code}:#{trigger}"
+      # If launched via retry, trigger is blank, but if the previous
+      # build for this branch has been located, the source_id of that
+      # build is the same as for this build
+      if launched_by_retry?
+        previous_build&.source_id
+      else
+        "#{project_code}:#{trigger}"
+      end
+    end
+
+    def source_ref
+      # If launched via retry, trigger is blank, but if the previous
+      # build for this branch has been located, the source_ref of that
+      # build is the same as for this build
+      if launched_by_retry?
+        previous_build&.source_ref
+      else
+        trigger
+      end
     end
   end
 end