supply provider class to Extractor

DataDog · Sep 6, 2023 · 0837f35 · 0837f35
1 parent b600726
commit 0837f35
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/lib/datadog/ci/ext/environment.rb b/lib/datadog/ci/ext/environment.rb
@@ -2,8 +2,6 @@
 
 require_relative "git"
 require_relative "environment/extractor"
-require_relative "environment/providers/local_git"
-require_relative "environment/providers/user_defined_tags"
 
 module Datadog
   module CI
@@ -33,11 +31,11 @@ def tags(env)
 
           # If user defined metadata is defined, overwrite
           tags.merge!(
-            Environment::Extractor.new(env, provider: Providers::UserDefinedTags.new(env)).tags
+            Environment::Extractor.new(env, provider_klass: Providers::UserDefinedTags).tags
           )
 
           # Fill out tags from local git as fallback
-          local_git_tags = Environment::Extractor.new(env, provider: Providers::LocalGit.new(env)).tags
+          local_git_tags = Environment::Extractor.new(env, provider_klass: Providers::LocalGit).tags
           local_git_tags.each do |key, value|
             tags[key] ||= value
           end

diff --git a/lib/datadog/ci/ext/environment/extractor.rb b/lib/datadog/ci/ext/environment/extractor.rb
@@ -13,9 +13,9 @@ module Environment
         # Extractor is responsible for detecting where pipeline is being executed based on environment vars
         # and return the specific extractor that is able to return environment- and git-specific tags
         class Extractor
-          def initialize(env, provider: nil)
+          def initialize(env, provider_klass: nil)
             @env = env
-            @provider = provider || Providers.for_environment(env)
+            @provider = provider_klass ? provider_klass.new(env) : Providers.for_environment(env)
           end
 
           def tags

diff --git a/lib/datadog/ci/ext/environment/providers.rb b/lib/datadog/ci/ext/environment/providers.rb
@@ -15,6 +15,9 @@
 require_relative "providers/teamcity"
 require_relative "providers/travis"
 
+require_relative "providers/local_git"
+require_relative "providers/user_defined_tags"
+
 module Datadog
   module CI
     module Ext

diff --git a/sig/datadog/ci/ext/environment/extractor.rbs b/sig/datadog/ci/ext/environment/extractor.rbs
@@ -7,7 +7,7 @@ module Datadog
           @provider: Providers::Base
           @tags: Hash[String, untyped]
 
-          def initialize: (Hash[String, String?] env, ?provider: Providers::Base?) -> void
+          def initialize: (Hash[String, String?] env, ?provider_klass: singleton(Providers::Base)?) -> void
 
           def tags: () -> Hash[String, untyped]
 

diff --git a/spec/support/provider_test_helpers.rb b/spec/support/provider_test_helpers.rb
@@ -1,11 +1,7 @@
 shared_context "extract tags from environment with given provider and use a subject" do |git_fixture|
-  let(:provider) do
-    described_class.new(env)
-  end
-
   subject(:extracted_tags) do
     ClimateControl.modify(environment_variables) do
-      ::Datadog::CI::Ext::Environment::Extractor.new(env, provider: provider).tags
+      ::Datadog::CI::Ext::Environment::Extractor.new(env, provider_klass: described_class).tags
     end
   end