Skip to content

Commit 0f0a7cb

Browse files
committed
cleanup unnecessary handling for POST case
1 parent f478585 commit 0f0a7cb

File tree

2 files changed

+6
-15
lines changed
  • resources/aws
    • lib/opentelemetry/resource/detector/aws
    • test/opentelemetry/resource/detector/aws

2 files changed

+6
-15
lines changed

resources/aws/lib/opentelemetry/resource/detector/aws/eks.rb

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def k8s_cred_value
103103
def eks?(cred_value)
104104
# Just try to to access the aws-auth configmap
105105
# If it exists and we can access it, we're on EKS
106-
aws_http_request('GET', AWS_AUTH_PATH, cred_value)
106+
aws_http_request(AWS_AUTH_PATH, cred_value)
107107
true
108108
rescue StandardError
109109
false
@@ -115,7 +115,7 @@ def eks?(cred_value)
115115
# @return [String] Cluster name or empty string if not found
116116
def cluster_name(cred_value)
117117
begin
118-
response = aws_http_request('GET', CLUSTER_INFO_PATH, cred_value)
118+
response = aws_http_request(CLUSTER_INFO_PATH, cred_value)
119119
cluster_info = JSON.parse(response)
120120
return cluster_info['data']['cluster.name'] if cluster_info['data'] && cluster_info['data']['cluster.name']
121121
rescue StandardError => e
@@ -142,14 +142,13 @@ def container_id
142142
''
143143
end
144144

145-
# Make HTTP request to K8s API
145+
# Make HTTP GET request to K8s API
146146
#
147-
# @param method [String] HTTP method
148147
# @param path [String] API path
149148
# @param cred_value [String] Authorization header value
150149
# @return [String] Response body
151150
# @raise [StandardError] if request fails
152-
def aws_http_request(method, path, cred_value)
151+
def aws_http_request(path, cred_value)
153152
uri = URI.parse("https://kubernetes.default.svc#{path}")
154153
http = Net::HTTP.new(uri.host, uri.port)
155154
http.use_ssl = true
@@ -158,15 +157,7 @@ def aws_http_request(method, path, cred_value)
158157
http.open_timeout = HTTP_TIMEOUT
159158
http.read_timeout = HTTP_TIMEOUT
160159

161-
request = case method.upcase
162-
when 'GET'
163-
Net::HTTP::Get.new(uri)
164-
when 'POST'
165-
Net::HTTP::Post.new(uri)
166-
else
167-
raise "Unsupported HTTP method: #{method}"
168-
end
169-
160+
request = Net::HTTP::Get.new(uri)
170161
request['Authorization'] = cred_value
171162

172163
OpenTelemetry::Common::Utilities.untraced do

resources/aws/test/opentelemetry/resource/detector/aws/eks_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
# Mock cluster name retrieval
139139
detector.stub :cluster_name, ->(_) { mock_cluster_name } do
140140
# Mock HTTP requests
141-
detector.stub :aws_http_request, lambda { |_method, path, _auth|
141+
detector.stub :aws_http_request, lambda { |path, _auth|
142142
if path == aws_auth_path
143143
mock_aws_auth_response
144144
elsif path == cluster_info_path

0 commit comments

Comments
 (0)