fix linting and better naming and typing

DataDog · Sep 1, 2023 · c6d0401 · c6d0401
1 parent ba85509
commit c6d0401
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/lib/datadog/ci/ext/environment/extractor.rb b/lib/datadog/ci/ext/environment/extractor.rb
@@ -18,7 +18,7 @@ class Extractor
           require_relative "providers/buddy"
           require_relative "providers/buildkite"
 
-          EXTRACTORS = [
+          PROVIDERS = [
             ["APPVEYOR", Providers::Appveyor],
             ["TF_BUILD", Providers::Azure],
             ["BITBUCKET_COMMIT", Providers::Bitbucket],
@@ -27,7 +27,7 @@ class Extractor
           ]
 
           def self.for_environment(env)
-            _, extractor_klass = EXTRACTORS.find { |provider_env_var, _| env.key?(provider_env_var) }
+            _, extractor_klass = PROVIDERS.find { |provider_env_var, _| env.key?(provider_env_var) }
             extractor_klass = Providers::Default if extractor_klass.nil?
 
             extractor_klass.new(env)

diff --git a/lib/datadog/ci/ext/environment/providers/buildkite.rb b/lib/datadog/ci/ext/environment/providers/buildkite.rb
@@ -90,7 +90,6 @@ def ci_env_vars
             end
 
             # buildkite-specific methods
-
           end
         end
       end

diff --git a/sig/datadog/ci/ext/environment/extractor.rbs b/sig/datadog/ci/ext/environment/extractor.rbs
@@ -4,7 +4,7 @@ module Datadog
       module Environment
         class Extractor
 
-          EXTRACTORS: ::Array[::Array[String | untyped]]
+          PROVIDERS: ::Array[[String, singleton(Extractor)]]
           @branch: String?
           @tag: String?