From 6ba15b61008795c361b8b8270378be20a16e0146 Mon Sep 17 00:00:00 2001 From: Andrey Marchenko Date: Tue, 24 Oct 2023 12:21:04 +0200 Subject: [PATCH] rename EVPProxy to EvpProxy --- lib/datadog/ci/transport/api/builder.rb | 2 +- lib/datadog/ci/transport/api/evp_proxy.rb | 2 +- sig/datadog/ci/transport/api/builder.rbs | 2 +- sig/datadog/ci/transport/api/evp_proxy.rbs | 2 +- spec/datadog/ci/configuration/components_spec.rb | 2 +- spec/datadog/ci/transport/api/builder_spec.rb | 4 ++-- spec/datadog/ci/transport/api/evp_proxy_spec.rb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/datadog/ci/transport/api/builder.rb b/lib/datadog/ci/transport/api/builder.rb index 6dac9291..7bfa9fe3 100644 --- a/lib/datadog/ci/transport/api/builder.rb +++ b/lib/datadog/ci/transport/api/builder.rb @@ -17,7 +17,7 @@ def self.build_ci_test_cycle_api(settings) end def self.build_evp_proxy_api(agent_settings) - EVPProxy.new( + EvpProxy.new( host: agent_settings.hostname, port: agent_settings.port, ssl: agent_settings.ssl, diff --git a/lib/datadog/ci/transport/api/evp_proxy.rb b/lib/datadog/ci/transport/api/evp_proxy.rb index 34ffb1bd..f8dde07c 100644 --- a/lib/datadog/ci/transport/api/evp_proxy.rb +++ b/lib/datadog/ci/transport/api/evp_proxy.rb @@ -7,7 +7,7 @@ module Datadog module CI module Transport module Api - class EVPProxy < Base + class EvpProxy < Base attr_reader :http def initialize(host:, port:, ssl:, timeout:) diff --git a/sig/datadog/ci/transport/api/builder.rbs b/sig/datadog/ci/transport/api/builder.rbs index 967236b0..52217995 100644 --- a/sig/datadog/ci/transport/api/builder.rbs +++ b/sig/datadog/ci/transport/api/builder.rbs @@ -4,7 +4,7 @@ module Datadog module Api module Builder def self.build_ci_test_cycle_api: (untyped settings) -> Datadog::CI::Transport::Api::CiTestCycle - def self.build_evp_proxy_api: (untyped agent_settings) -> Datadog::CI::Transport::Api::EVPProxy + def self.build_evp_proxy_api: (untyped agent_settings) -> Datadog::CI::Transport::Api::EvpProxy end end end diff --git a/sig/datadog/ci/transport/api/evp_proxy.rbs b/sig/datadog/ci/transport/api/evp_proxy.rbs index 52bf2c0b..61ba52c0 100644 --- a/sig/datadog/ci/transport/api/evp_proxy.rbs +++ b/sig/datadog/ci/transport/api/evp_proxy.rbs @@ -2,7 +2,7 @@ module Datadog module CI module Transport module Api - class EVPProxy < Base + class EvpProxy < Base @http: Datadog::CI::Transport::HTTP @container_id: String? diff --git a/spec/datadog/ci/configuration/components_spec.rb b/spec/datadog/ci/configuration/components_spec.rb index 730ed93f..426baf99 100644 --- a/spec/datadog/ci/configuration/components_spec.rb +++ b/spec/datadog/ci/configuration/components_spec.rb @@ -108,7 +108,7 @@ expect(settings.tracing.test_mode).to have_received(:writer_options=) do |options| expect(options[:transport]).to be_kind_of(Datadog::CI::TestVisibility::Transport) - expect(options[:transport].api).to be_kind_of(Datadog::CI::Transport::Api::EVPProxy) + expect(options[:transport].api).to be_kind_of(Datadog::CI::Transport::Api::EvpProxy) expect(options[:shutdown_timeout]).to eq(60) end end diff --git a/spec/datadog/ci/transport/api/builder_spec.rb b/spec/datadog/ci/transport/api/builder_spec.rb index 07584a22..54b75b99 100644 --- a/spec/datadog/ci/transport/api/builder_spec.rb +++ b/spec/datadog/ci/transport/api/builder_spec.rb @@ -79,8 +79,8 @@ ) end - it "creates EVPProxy" do - expect(Datadog::CI::Transport::Api::EVPProxy).to receive(:new).with( + it "creates EvpProxy" do + expect(Datadog::CI::Transport::Api::EvpProxy).to receive(:new).with( host: "localhost", port: 5555, ssl: false, diff --git a/spec/datadog/ci/transport/api/evp_proxy_spec.rb b/spec/datadog/ci/transport/api/evp_proxy_spec.rb index 735f416c..cf4ee4b8 100644 --- a/spec/datadog/ci/transport/api/evp_proxy_spec.rb +++ b/spec/datadog/ci/transport/api/evp_proxy_spec.rb @@ -1,6 +1,6 @@ require_relative "../../../../../lib/datadog/ci/transport/api/evp_proxy" -RSpec.describe Datadog::CI::Transport::Api::EVPProxy do +RSpec.describe Datadog::CI::Transport::Api::EvpProxy do subject do described_class.new( host: host,