pull up branch or tag logic for extractors

DataDog · Sep 4, 2023 · d2a1035 · d2a1035
1 parent c7a2845
commit d2a1035
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 103 deletions.
diff --git a/lib/datadog/ci/ext/environment/extractor.rb b/lib/datadog/ci/ext/environment/extractor.rb
@@ -129,12 +129,20 @@ def ci_env_vars
           end
 
           def git_branch
+            return @branch if defined?(@branch)
+
+            set_branch_and_tag
+            @branch
           end
 
           def git_repository_url
           end
 
           def git_tag
+            return @tag if defined?(@tag)
+
+            set_branch_and_tag
+            @tag
           end
 
           def git_branch_or_tag
@@ -164,7 +172,8 @@ def git_commit_message
           def git_commit_sha
           end
 
-          def branch_or_tag(branch_or_tag_string)
+          def set_branch_and_tag
+            branch_or_tag_string = git_branch_or_tag
             @branch = @tag = nil
             if branch_or_tag_string && branch_or_tag_string.include?("tags/")
               @tag = branch_or_tag_string

diff --git a/lib/datadog/ci/ext/environment/providers/azure.rb b/lib/datadog/ci/ext/environment/providers/azure.rb
@@ -61,18 +61,8 @@ def git_commit_sha
               env["SYSTEM_PULLREQUEST_SOURCECOMMITID"] || env["BUILD_SOURCEVERSION"]
             end
 
-            def git_branch
-              return @branch if defined?(@branch)
-
-              set_branch_and_tag
-              @branch
-            end
-
-            def git_tag
-              return @tag if defined?(@tag)
-
-              set_branch_and_tag
-              @tag
+            def git_branch_or_tag
+              env["SYSTEM_PULLREQUEST_SOURCEBRANCH"] || env["BUILD_SOURCEBRANCH"] || env["BUILD_SOURCEBRANCHNAME"]
             end
 
             def git_commit_author_name
@@ -112,12 +102,6 @@ def team_project_id
             def url_defined?
               !(build_id && team_foundation_server_uri && team_project_id).nil?
             end
-
-            def set_branch_and_tag
-              @branch, @tag = branch_or_tag(
-                env["SYSTEM_PULLREQUEST_SOURCEBRANCH"] || env["BUILD_SOURCEBRANCH"] || env["BUILD_SOURCEBRANCHNAME"]
-              )
-            end
           end
         end
       end

diff --git a/lib/datadog/ci/ext/environment/providers/codefresh.rb b/lib/datadog/ci/ext/environment/providers/codefresh.rb
@@ -33,30 +33,15 @@ def pipeline_url
               env["CF_BUILD_URL"]
             end
 
-            def git_branch
-              return @branch if defined?(@branch)
-
-              set_branch_and_tag
-              @branch
-            end
-
-            def git_tag
-              return @tag if defined?(@tag)
-
-              set_branch_and_tag
-              @tag
+            def git_branch_or_tag
+              env["CF_BRANCH"]
             end
 
             def ci_env_vars
               {
                 "CF_BUILD_ID" => env["CF_BUILD_ID"]
               }.to_json
             end
-
-            # codefresh-specific methods
-            def set_branch_and_tag
-              @branch, @tag = branch_or_tag(env["CF_BRANCH"])
-            end
           end
         end
       end

diff --git a/lib/datadog/ci/ext/environment/providers/github_actions.rb b/lib/datadog/ci/ext/environment/providers/github_actions.rb
@@ -55,18 +55,10 @@ def git_commit_sha
               env["GITHUB_SHA"]
             end
 
-            def git_branch
-              return @branch if defined?(@branch)
-
-              set_branch_and_tag
-              @branch
-            end
-
-            def git_tag
-              return @tag if defined?(@tag)
-
-              set_branch_and_tag
-              @tag
+            def git_branch_or_tag
+              ref = env["GITHUB_HEAD_REF"]
+              ref = env["GITHUB_REF"] if ref.nil? || ref.empty?
+              ref
             end
 
             def ci_env_vars
@@ -77,20 +69,6 @@ def ci_env_vars
                 "GITHUB_RUN_ATTEMPT" => env["GITHUB_RUN_ATTEMPT"]
               }.reject { |_, v| v.nil? }.to_json
             end
-
-            # github-specific methods
-
-            def ref
-              return @ref if defined?(@ref)
-
-              @ref = env["GITHUB_HEAD_REF"]
-              @ref = env["GITHUB_REF"] if @ref.nil? || @ref.empty?
-              @ref
-            end
-
-            def set_branch_and_tag
-              @branch, @tag = branch_or_tag(ref)
-            end
           end
         end
       end

diff --git a/lib/datadog/ci/ext/environment/providers/jenkins.rb b/lib/datadog/ci/ext/environment/providers/jenkins.rb
@@ -57,31 +57,15 @@ def git_commit_sha
               env["GIT_COMMIT"]
             end
 
-            def git_branch
-              return @branch if defined?(@branch)
-
-              set_branch_and_tag
-              @branch
-            end
-
-            def git_tag
-              return @tag if defined?(@tag)
-
-              set_branch_and_tag
-              @tag
+            def git_branch_or_tag
+              env["GIT_BRANCH"]
             end
 
             def ci_env_vars
               {
                 "DD_CUSTOM_TRACE_ID" => env["DD_CUSTOM_TRACE_ID"]
               }.to_json
             end
-
-            # jenkins-specific methods
-
-            def set_branch_and_tag
-              @branch, @tag = branch_or_tag(env["GIT_BRANCH"])
-            end
           end
         end
       end

diff --git a/sig/datadog/ci/ext/environment/extractor.rbs b/sig/datadog/ci/ext/environment/extractor.rbs
@@ -66,7 +66,7 @@ module Datadog
 
           def git_commit_sha: () -> nil
 
-          def branch_or_tag: (String? branch_or_tag_string) -> [String?, String?]
+          def set_branch_and_tag: () -> [String?, String?]
 
           def normalize_ref: (String? name) -> String?
 

diff --git a/sig/datadog/ci/ext/environment/providers/azure.rbs b/sig/datadog/ci/ext/environment/providers/azure.rbs
@@ -31,9 +31,7 @@ module Datadog
 
             def git_commit_sha: () -> String?
 
-            def git_branch: () -> String?
-
-            def git_tag: () -> String?
+            def git_branch_or_tag: () -> String?
 
             def git_commit_author_name: () -> String?
 
@@ -50,8 +48,6 @@ module Datadog
             def team_project_id: () -> String?
 
             def url_defined?: () -> bool
-
-            def set_branch_and_tag: () -> [String?, String?]
           end
         end
       end

diff --git a/sig/datadog/ci/ext/environment/providers/codefresh.rbs b/sig/datadog/ci/ext/environment/providers/codefresh.rbs
@@ -15,13 +15,9 @@ module Datadog
 
             def pipeline_url: () -> String?
 
-            def git_branch: () -> String?
-
-            def git_tag: () -> String?
+            def git_branch_or_tag: () -> String?
 
             def ci_env_vars: () -> String
-
-            def set_branch_and_tag: () -> [String?, String?]
           end
         end
       end

diff --git a/sig/datadog/ci/ext/environment/providers/github_actions.rbs b/sig/datadog/ci/ext/environment/providers/github_actions.rbs
@@ -27,15 +27,9 @@ module Datadog
 
             def git_commit_sha: () -> String?
 
-            def git_branch: () -> String?
-
-            def git_tag: () -> String?
+            def git_branch_or_tag: () -> String?
 
             def ci_env_vars: () -> String?
-
-            def ref: () -> String
-
-            def set_branch_and_tag: () -> [String?, String?]
           end
         end
       end

diff --git a/sig/datadog/ci/ext/environment/providers/jenkins.rbs b/sig/datadog/ci/ext/environment/providers/jenkins.rbs
@@ -25,13 +25,9 @@ module Datadog
 
             def git_commit_sha: () -> String?
 
-            def git_branch: () -> String?
-
-            def git_tag: () -> String?
+            def git_branch_or_tag: () -> String?
 
             def ci_env_vars: () -> String?
-
-            def set_branch_and_tag: () -> [String?, String?]
           end
         end
       end