Skip to content

Commit ce93940

Browse files
committed
Migrate internal/aws/k8s to aws-sdk-for-go-v2
1 parent 61f8c78 commit ce93940

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

internal/aws/k8s/go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8
33
go 1.23.0
44

55
require (
6-
github.com/aws/aws-sdk-go v1.55.7
6+
github.com/aws/aws-sdk-go-v2 v1.36.3
77
github.com/stretchr/testify v1.10.0
88
go.uber.org/goleak v1.3.0
99
go.uber.org/zap v1.27.0
@@ -13,6 +13,7 @@ require (
1313
)
1414

1515
require (
16+
github.com/aws/smithy-go v1.22.2 // indirect
1617
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1718
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1819
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -26,7 +27,6 @@ require (
2627
github.com/google/go-cmp v0.6.0 // indirect
2728
github.com/google/gofuzz v1.2.0 // indirect
2829
github.com/google/uuid v1.6.0 // indirect
29-
github.com/jmespath/go-jmespath v0.4.0 // indirect
3030
github.com/josharian/intern v1.0.0 // indirect
3131
github.com/json-iterator/go v1.1.12 // indirect
3232
github.com/mailru/easyjson v0.7.7 // indirect
@@ -47,7 +47,6 @@ require (
4747
google.golang.org/protobuf v1.36.5 // indirect
4848
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4949
gopkg.in/inf.v0 v0.9.1 // indirect
50-
gopkg.in/yaml.v2 v2.4.0 // indirect
5150
gopkg.in/yaml.v3 v3.0.1 // indirect
5251
k8s.io/klog/v2 v2.130.1 // indirect
5352
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect

internal/aws/k8s/go.sum

Lines changed: 4 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/aws/k8s/k8sclient/endpoint_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/aws/aws-sdk-go/aws"
13-
"github.com/aws/aws-sdk-go/aws/awsutil"
12+
"github.com/aws/aws-sdk-go-v2/aws"
1413
"github.com/stretchr/testify/assert"
1514
"go.uber.org/zap"
1615
v1 "k8s.io/api/core/v1"
@@ -377,7 +376,7 @@ func TestEpClient_PodKeyToServiceNames(t *testing.T) {
377376
"namespace:default,podName:guestbook-qbdv8": {"guestbook"},
378377
}
379378
resultMap := client.PodKeyToServiceNames()
380-
log.Printf("PodKeyToServiceNames (len=%v): %v", len(resultMap), awsutil.Prettify(resultMap))
379+
log.Printf("PodKeyToServiceNames (len=%v): %v", len(resultMap), resultMap)
381380
assert.Equal(t, expectedMap, resultMap)
382381
}
383382

@@ -393,7 +392,7 @@ func TestEpClient_ServiceNameToPodNum(t *testing.T) {
393392
NewService("guestbook", "default"): 3,
394393
}
395394
resultMap := client.ServiceToPodNum()
396-
log.Printf("ServiceNameToPodNum (len=%v): %v", len(resultMap), awsutil.Prettify(resultMap))
395+
log.Printf("ServiceNameToPodNum (len=%v): %v", len(resultMap), resultMap)
397396
assert.Equal(t, expectedMap, resultMap)
398397
client.shutdown()
399398
time.Sleep(2 * time.Millisecond)

internal/aws/k8s/k8sclient/pod_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"log"
88
"testing"
99

10-
"github.com/aws/aws-sdk-go/aws/awsutil"
1110
"github.com/stretchr/testify/assert"
1211
"go.uber.org/zap"
1312
v1 "k8s.io/api/core/v1"
@@ -180,7 +179,7 @@ func TestPodClient_NamespaceToRunningPodNum(t *testing.T) {
180179
"default": 7,
181180
}
182181
resultMap := client.NamespaceToRunningPodNum()
183-
log.Printf("NamespaceToRunningPodNum (len=%v): %v", len(resultMap), awsutil.Prettify(resultMap))
182+
log.Printf("NamespaceToRunningPodNum (len=%v): %v", len(resultMap), resultMap)
184183
assert.Equal(t, expectedMap, resultMap)
185184
client.shutdown()
186185
assert.True(t, client.stopped)

0 commit comments

Comments
 (0)