Transport::Api - pull up request method

DataDog · Oct 24, 2023 · 2bfd58e · 2bfd58e
1 parent 6ba15b6
commit 2bfd58e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/lib/datadog/ci/transport/api/base.rb b/lib/datadog/ci/transport/api/base.rb
@@ -5,7 +5,15 @@ module CI
     module Transport
       module Api
         class Base
+          attr_reader :http
+
           def request(path:, payload:, verb: "post")
+            http.request(
+              path: path,
+              payload: payload,
+              verb: verb,
+              headers: headers
+            )
           end
 
           private

diff --git a/lib/datadog/ci/transport/api/ci_test_cycle.rb b/lib/datadog/ci/transport/api/ci_test_cycle.rb
@@ -8,7 +8,7 @@ module CI
     module Transport
       module Api
         class CiTestCycle < Base
-          attr_reader :api_key, :http
+          attr_reader :api_key
 
           def initialize(api_key:, url:)
             @api_key = api_key
@@ -24,15 +24,6 @@ def initialize(api_key:, url:)
             )
           end
 
-          def request(path:, payload:, verb: "post")
-            http.request(
-              path: path,
-              payload: payload,
-              verb: verb,
-              headers: headers
-            )
-          end
-
           private
 
           def headers

diff --git a/lib/datadog/ci/transport/api/evp_proxy.rb b/lib/datadog/ci/transport/api/evp_proxy.rb
@@ -8,8 +8,6 @@ module CI
     module Transport
       module Api
         class EvpProxy < Base
-          attr_reader :http
-
           def initialize(host:, port:, ssl:, timeout:)
             @http = Datadog::CI::Transport::HTTP.new(
               host: host,
@@ -23,11 +21,10 @@ def initialize(host:, port:, ssl:, timeout:)
           def request(path:, payload:, verb: "post")
             path = "#{Ext::Transport::EVP_PROXY_PATH_PREFIX}#{path.sub(/^\//, "")}"
 
-            http.request(
+            super(
               path: path,
               payload: payload,
-              verb: verb,
-              headers: headers
+              verb: verb
             )
           end
 

diff --git a/sig/datadog/ci/transport/api/base.rbs b/sig/datadog/ci/transport/api/base.rbs
@@ -3,6 +3,8 @@ module Datadog
     module Transport
       module Api
         class Base
+          attr_reader http: Datadog::CI::Transport::HTTP
+
           def request: (path: String, payload: String, ?verb: ::String) -> untyped
 
           private