Skip to content

Commit 1231939

Browse files
authored
Dual stack EC2 client (#4658)
1 parent a3614f7 commit 1231939

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

agent/app/agent.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,11 @@ func newAgent(blackholeEC2Metadata bool, acceptInsecureCert *bool) (agent, error
210210
cfg.NoIID = true
211211
}
212212

213-
ec2Client, err := ec2.NewClientImpl(cfg.AWSRegion)
213+
ec2ClientDualStackEndpointState := aws.DualStackEndpointStateDisabled
214+
if cfg.InstanceIPCompatibility.IsIPv6Only() {
215+
ec2ClientDualStackEndpointState = aws.DualStackEndpointStateEnabled
216+
}
217+
ec2Client, err := ec2.NewClientImpl(cfg.AWSRegion, ec2ClientDualStackEndpointState)
214218
if err != nil {
215219
logger.Critical("Error creating EC2 client", logger.Fields{
216220
field.Error: err,

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/ec2/ec2_client.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ecs-agent/ec2/ec2_client.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ type ClientImpl struct {
5454
client ClientSDK
5555
}
5656

57-
func NewClientImpl(awsRegion string) (Client, error) {
57+
func NewClientImpl(
58+
awsRegion string,
59+
dualStackEndpointState aws.DualStackEndpointState,
60+
) (Client, error) {
5861
credentialsProvider := providers.NewInstanceCredentialsCache(
5962
false,
6063
providers.NewRotatingSharedCredentialsProviderV2(),
@@ -65,6 +68,7 @@ func NewClientImpl(awsRegion string) (Client, error) {
6568
config.WithRegion(awsRegion),
6669
config.WithCredentialsProvider(credentialsProvider),
6770
config.WithRetryMaxAttempts(clientRetriesNum),
71+
config.WithUseDualStackEndpoint(dualStackEndpointState),
6872
)
6973
if err != nil {
7074
return nil, err

ecs-agent/ec2/ec2_client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestCreateTags(t *testing.T) {
3434
defer ctrl.Finish()
3535

3636
mockClientSDK := mock_ec2.NewMockClientSDK(ctrl)
37-
testClient, err := ec2.NewClientImpl("us-west-2")
37+
testClient, err := ec2.NewClientImpl("us-west-2", aws.DualStackEndpointStateDisabled)
3838
assert.NoError(t, err)
3939
testClient.(*ec2.ClientImpl).SetClientSDK(mockClientSDK)
4040

@@ -54,7 +54,7 @@ func TestDescribeECSTagsForInstance(t *testing.T) {
5454

5555
instanceID := "iid"
5656
mockClientSDK := mock_ec2.NewMockClientSDK(ctrl)
57-
testClient, err := ec2.NewClientImpl("us-west-2")
57+
testClient, err := ec2.NewClientImpl("us-west-2", aws.DualStackEndpointStateDisabled)
5858
assert.NoError(t, err)
5959
testClient.(*ec2.ClientImpl).SetClientSDK(mockClientSDK)
6060

0 commit comments

Comments
 (0)