do not allow to skip dd_env parameter anywhere

DataDog · Apr 15, 2024 · f3cd615 · f3cd615
1 parent 631ecb6
commit f3cd615
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/lib/datadog/ci/configuration/components.rb b/lib/datadog/ci/configuration/components.rb
@@ -97,6 +97,7 @@ def activate_ci!(settings)
 
           itr = ITR::Runner.new(
             api: test_visibility_api,
+            dd_env: settings.env,
             coverage_writer: coverage_writer,
             enabled: settings.ci.enabled && settings.ci.itr_enabled
           )

diff --git a/lib/datadog/ci/itr/runner.rb b/lib/datadog/ci/itr/runner.rb
@@ -22,12 +22,14 @@ class Runner
         attr_reader :correlation_id, :skippable_tests
 
         def initialize(
+          dd_env:,
           api: nil,
           coverage_writer: nil,
           enabled: false
         )
           @enabled = enabled
           @api = api
+          @dd_env = dd_env
 
           @test_skipping_enabled = false
           @code_coverage_enabled = false
@@ -147,7 +149,7 @@ def fetch_skippable_tests(test_session:, git_tree_upload_worker:)
           # we can only request skippable tests if git metadata is already uploaded
           git_tree_upload_worker.wait_until_done
 
-          skippable_response = Skippable.new(api: @api).fetch_skippable_tests(test_session)
+          skippable_response = Skippable.new(api: @api, dd_env: @dd_env).fetch_skippable_tests(test_session)
           @correlation_id = skippable_response.correlation_id
           @skippable_tests = skippable_response.tests
 

diff --git a/lib/datadog/ci/itr/skippable.rb b/lib/datadog/ci/itr/skippable.rb
@@ -65,7 +65,7 @@ def payload
           end
         end
 
-        def initialize(api: nil, dd_env: nil)
+        def initialize(dd_env:, api: nil)
           @api = api
           @dd_env = dd_env
         end

diff --git a/lib/datadog/ci/test_visibility/transport.rb b/lib/datadog/ci/test_visibility/transport.rb
@@ -14,7 +14,7 @@ class Transport < Datadog::CI::Transport::EventPlatformTransport
 
         def initialize(
           api:,
-          dd_env: nil,
+          dd_env:,
           serializers_factory: Datadog::CI::TestVisibility::Serializers::Factories::TestLevel,
           max_payload_size: DEFAULT_MAX_PAYLOAD_SIZE
         )

diff --git a/lib/datadog/ci/transport/remote_settings_api.rb b/lib/datadog/ci/transport/remote_settings_api.rb
@@ -51,7 +51,7 @@ def default_payload
           end
         end
 
-        def initialize(api: nil, dd_env: nil)
+        def initialize(dd_env:, api: nil)
           @api = api
           @dd_env = dd_env
         end

diff --git a/sig/datadog/ci/itr/runner.rbs b/sig/datadog/ci/itr/runner.rbs
@@ -10,8 +10,9 @@ module Datadog
         @coverage_writer: Datadog::CI::ITR::Coverage::Writer?
 
         @api: Datadog::CI::Transport::Api::Base?
+        @dd_env: String?
 
-        def initialize: (?enabled: bool, coverage_writer: Datadog::CI::ITR::Coverage::Writer?, api: Datadog::CI::Transport::Api::Base?) -> void
+        def initialize: (dd_env: String?, ?enabled: bool, coverage_writer: Datadog::CI::ITR::Coverage::Writer?, api: Datadog::CI::Transport::Api::Base?) -> void
 
         def configure: (Hash[String, untyped] remote_configuration, test_session: Datadog::CI::TestSession, git_tree_upload_worker: Datadog::CI::Worker) -> void
 

diff --git a/sig/datadog/ci/itr/skippable.rbs b/sig/datadog/ci/itr/skippable.rbs
@@ -34,7 +34,7 @@ module Datadog
           def payload: () -> Hash[String, untyped]
         end
 
-        def initialize: (?api: Datadog::CI::Transport::Api::Base?, ?dd_env: String?) -> void
+        def initialize: (?api: Datadog::CI::Transport::Api::Base?, dd_env: String?) -> void
 
         def fetch_skippable_tests: (Datadog::CI::TestSession test_session) -> Response
 

diff --git a/sig/datadog/ci/test_visibility/transport.rbs b/sig/datadog/ci/test_visibility/transport.rbs
@@ -10,7 +10,7 @@ module Datadog
 
         def initialize: (
           api: Datadog::CI::Transport::Api::Base,
-          ?dd_env: ::String?,
+          dd_env: ::String?,
           ?serializers_factory: singleton(Datadog::CI::TestVisibility::Serializers::Factories::TestLevel) | singleton(Datadog::CI::TestVisibility::Serializers::Factories::TestSuiteLevel),
           ?max_payload_size: Integer
         ) -> void

diff --git a/sig/datadog/ci/transport/remote_settings_api.rbs b/sig/datadog/ci/transport/remote_settings_api.rbs
@@ -22,7 +22,7 @@ module Datadog
         @api: Datadog::CI::Transport::Api::Base?
         @dd_env: String?
 
-        def initialize: (?api: Datadog::CI::Transport::Api::Base?, ?dd_env: String?) -> void
+        def initialize: (?api: Datadog::CI::Transport::Api::Base?, dd_env: String?) -> void
 
         def fetch_library_settings: (Datadog::CI::TestSession test_session) -> Response
 

diff --git a/spec/datadog/ci/itr/runner_spec.rb b/spec/datadog/ci/itr/runner_spec.rb
@@ -11,7 +11,7 @@
   let(:tracer_span) { Datadog::Tracing::SpanOperation.new("session") }
   let(:test_session) { Datadog::CI::TestSession.new(tracer_span) }
 
-  subject(:runner) { described_class.new(coverage_writer: writer, enabled: itr_enabled) }
+  subject(:runner) { described_class.new(dd_env: "dd_env", coverage_writer: writer, enabled: itr_enabled) }
 
   before do
     allow(writer).to receive(:write)