Skip to content

Commit 6422290

Browse files
prateekchaudhryprateekchaudhry
authored
Revert "Migrate ECR Client to AWS SDK Go V2 (aws#4512)" (aws#4539)
This reverts commit b90cd31.
1 parent ba6e6da commit 6422290

File tree

95 files changed

+736
-39353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+736
-39353
lines changed

‎agent/dockerclient/dockerapi/docker_client_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ import (
3636
mock_sdkclient "github.com/aws/amazon-ecs-agent/agent/dockerclient/sdkclient/mocks"
3737
mock_sdkclientfactory "github.com/aws/amazon-ecs-agent/agent/dockerclient/sdkclientfactory/mocks"
3838
mock_ecr "github.com/aws/amazon-ecs-agent/agent/ecr/mocks"
39+
ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
3940
apicontainerstatus "github.com/aws/amazon-ecs-agent/ecs-agent/api/container/status"
4041
apierrors "github.com/aws/amazon-ecs-agent/ecs-agent/api/errors"
4142
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
4243
"github.com/aws/amazon-ecs-agent/ecs-agent/ec2"
4344
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/retry"
4445
mock_ttime "github.com/aws/amazon-ecs-agent/ecs-agent/utils/ttime/mocks"
46+
"github.com/opencontainers/go-digest"
47+
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4548

46-
"github.com/aws/aws-sdk-go-v2/aws"
47-
ecr_types "github.com/aws/aws-sdk-go-v2/service/ecr/types"
49+
"github.com/aws/aws-sdk-go/aws"
4850
"github.com/docker/docker/api/types"
4951
dockercontainer "github.com/docker/docker/api/types/container"
5052
"github.com/docker/docker/api/types/events"
@@ -54,8 +56,6 @@ import (
5456
"github.com/docker/docker/api/types/volume"
5557
"github.com/docker/go-connections/nat"
5658
"github.com/golang/mock/gomock"
57-
"github.com/opencontainers/go-digest"
58-
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
5959
"github.com/stretchr/testify/assert"
6060
"github.com/stretchr/testify/require"
6161
)
@@ -282,7 +282,7 @@ func TestPullImageECRSuccess(t *testing.T) {
282282

283283
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil)
284284
ecrClient.EXPECT().GetAuthorizationToken(registryID).Return(
285-
&ecr_types.AuthorizationData{
285+
&ecrapi.AuthorizationData{
286286
ProxyEndpoint: aws.String("https://" + imageEndpoint),
287287
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
288288
}, nil)
@@ -1020,7 +1020,7 @@ func TestContainerEvents(t *testing.T) {
10201020
anEvent := <-dockerEvents
10211021
assert.True(t, anEvent.DockerID == "cid30" || anEvent.DockerID == "cid31", "Wrong container id: "+anEvent.DockerID)
10221022
assert.Equal(t, anEvent.Status, apicontainerstatus.ContainerStopped, "Should be stopped")
1023-
assert.Equal(t, aws.ToInt(anEvent.ExitCode), 20, "Incorrect exit code")
1023+
assert.Equal(t, aws.IntValue(anEvent.ExitCode), 20, "Incorrect exit code")
10241024
}
10251025

10261026
containerWithHealthInfo := types.ContainerJSON{
@@ -1771,7 +1771,7 @@ func TestECRAuthCacheWithoutExecutionRole(t *testing.T) {
17711771

17721772
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil).Times(1)
17731773
ecrClient.EXPECT().GetAuthorizationToken(registryID).Return(
1774-
&ecr_types.AuthorizationData{
1774+
&ecrapi.AuthorizationData{
17751775
ProxyEndpoint: aws.String("https://" + imageEndpoint),
17761776
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
17771777
ExpiresAt: aws.Time(time.Now().Add(10 * time.Hour)),
@@ -1827,7 +1827,7 @@ func TestECRAuthCacheForDifferentRegistry(t *testing.T) {
18271827

18281828
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil).Times(1)
18291829
ecrClient.EXPECT().GetAuthorizationToken(registryID).Return(
1830-
&ecr_types.AuthorizationData{
1830+
&ecrapi.AuthorizationData{
18311831
ProxyEndpoint: aws.String("https://" + imageEndpoint),
18321832
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
18331833
ExpiresAt: aws.Time(time.Now().Add(10 * time.Hour)),
@@ -1846,7 +1846,7 @@ func TestECRAuthCacheForDifferentRegistry(t *testing.T) {
18461846
authData.ECRAuthData.RegistryID = "another"
18471847
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil).Times(1)
18481848
ecrClient.EXPECT().GetAuthorizationToken("another").Return(
1849-
&ecr_types.AuthorizationData{
1849+
&ecrapi.AuthorizationData{
18501850
ProxyEndpoint: aws.String("https://" + imageEndpoint),
18511851
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
18521852
ExpiresAt: aws.Time(time.Now().Add(10 * time.Hour)),
@@ -1886,7 +1886,7 @@ func TestECRAuthCacheWithSameExecutionRole(t *testing.T) {
18861886

18871887
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil).Times(1)
18881888
ecrClient.EXPECT().GetAuthorizationToken(registryID).Return(
1889-
&ecr_types.AuthorizationData{
1889+
&ecrapi.AuthorizationData{
18901890
ProxyEndpoint: aws.String("https://" + imageEndpoint),
18911891
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
18921892
ExpiresAt: aws.Time(time.Now().Add(10 * time.Hour)),
@@ -1941,7 +1941,7 @@ func TestECRAuthCacheWithDifferentExecutionRole(t *testing.T) {
19411941

19421942
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil).Times(1)
19431943
ecrClient.EXPECT().GetAuthorizationToken(registryID).Return(
1944-
&ecr_types.AuthorizationData{
1944+
&ecrapi.AuthorizationData{
19451945
ProxyEndpoint: aws.String("https://" + imageEndpoint),
19461946
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
19471947
ExpiresAt: aws.Time(time.Now().Add(10 * time.Hour)),
@@ -1962,7 +1962,7 @@ func TestECRAuthCacheWithDifferentExecutionRole(t *testing.T) {
19621962
})
19631963
ecrClientFactory.EXPECT().GetClient(authData.ECRAuthData).Return(ecrClient, nil).Times(1)
19641964
ecrClient.EXPECT().GetAuthorizationToken(registryID).Return(
1965-
&ecr_types.AuthorizationData{
1965+
&ecrapi.AuthorizationData{
19661966
ProxyEndpoint: aws.String("https://" + imageEndpoint),
19671967
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
19681968
ExpiresAt: aws.Time(time.Now().Add(10 * time.Hour)),

‎agent/dockerclient/dockerauth/ecr.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import (
2121

2222
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
2323
"github.com/aws/amazon-ecs-agent/agent/ecr"
24+
ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
2425
"github.com/aws/amazon-ecs-agent/ecs-agent/async"
2526
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
2627
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
2728
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
2829
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/retry"
29-
30-
"github.com/aws/aws-sdk-go-v2/aws"
31-
"github.com/aws/aws-sdk-go-v2/service/ecr/types"
30+
"github.com/aws/aws-sdk-go/aws"
3231
log "github.com/cihub/seelog"
3332
"github.com/docker/docker/api/types/registry"
3433
)
@@ -116,7 +115,7 @@ func (authProvider *ecrAuthProvider) getAuthConfigFromCache(key cacheKey) *regis
116115
return nil
117116
}
118117

119-
cachedToken, ok := token.(*types.AuthorizationData)
118+
cachedToken, ok := token.(*ecrapi.AuthorizationData)
120119
if !ok {
121120
log.Warnf("Reading ECR credentials from cache failed")
122121
return nil
@@ -164,7 +163,7 @@ func (authProvider *ecrAuthProvider) getAuthConfigFromECR(image string, key cach
164163

165164
// Verify the auth data has the correct format for ECR
166165
if ecrAuthData.ProxyEndpoint != nil &&
167-
strings.HasPrefix(proxyEndpointScheme+image, aws.ToString(ecrAuthData.ProxyEndpoint)) &&
166+
strings.HasPrefix(proxyEndpointScheme+image, aws.StringValue(ecrAuthData.ProxyEndpoint)) &&
168167
ecrAuthData.AuthorizationToken != nil {
169168

170169
// Cache the new token
@@ -174,27 +173,27 @@ func (authProvider *ecrAuthProvider) getAuthConfigFromECR(image string, key cach
174173
return registry.AuthConfig{}, fmt.Errorf("ecr auth: AuthorizationData is malformed for %s", image)
175174
}
176175

177-
func extractToken(authData *types.AuthorizationData) (registry.AuthConfig, error) {
178-
decodedToken, err := base64.StdEncoding.DecodeString(aws.ToString(authData.AuthorizationToken))
176+
func extractToken(authData *ecrapi.AuthorizationData) (registry.AuthConfig, error) {
177+
decodedToken, err := base64.StdEncoding.DecodeString(aws.StringValue(authData.AuthorizationToken))
179178
if err != nil {
180179
return registry.AuthConfig{}, err
181180
}
182181
parts := strings.SplitN(string(decodedToken), ":", 2)
183182
return registry.AuthConfig{
184183
Username: parts[0],
185184
Password: parts[1],
186-
ServerAddress: aws.ToString(authData.ProxyEndpoint),
185+
ServerAddress: aws.StringValue(authData.ProxyEndpoint),
187186
}, nil
188187
}
189188

190189
// IsTokenValid checks the token is still within it's expiration window. We early expire to allow
191190
// for timing in calls and add jitter to avoid refreshing all of the tokens at once.
192-
func (authProvider *ecrAuthProvider) IsTokenValid(authData *types.AuthorizationData) bool {
191+
func (authProvider *ecrAuthProvider) IsTokenValid(authData *ecrapi.AuthorizationData) bool {
193192
if authData == nil || authData.ExpiresAt == nil {
194193
return false
195194
}
196195

197-
refreshTime := aws.ToTime(authData.ExpiresAt).
196+
refreshTime := aws.TimeValue(authData.ExpiresAt).
198197
Add(-1 * retry.AddJitter(MinimumJitterDuration, MinimumJitterDuration))
199198

200199
return time.Now().Before(refreshTime)

‎agent/dockerclient/dockerauth/ecr_test.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ import (
2525

2626
apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
2727
mock_ecr "github.com/aws/amazon-ecs-agent/agent/ecr/mocks"
28+
ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
2829
"github.com/aws/amazon-ecs-agent/ecs-agent/async"
2930
mock_async "github.com/aws/amazon-ecs-agent/ecs-agent/async/mocks"
3031
"github.com/aws/amazon-ecs-agent/ecs-agent/credentials"
31-
32-
"github.com/aws/aws-sdk-go-v2/aws"
33-
"github.com/aws/aws-sdk-go-v2/service/ecr/types"
32+
"github.com/aws/aws-sdk-go/aws"
3433
"github.com/docker/docker/api/types/registry"
3534
"github.com/golang/mock/gomock"
3635
"github.com/stretchr/testify/assert"
@@ -79,7 +78,7 @@ func TestGetAuthConfigSuccess(t *testing.T) {
7978
}
8079

8180
factory.EXPECT().GetClient(authData).Return(client, nil)
82-
client.EXPECT().GetAuthorizationToken(authData.RegistryID).Return(&types.AuthorizationData{
81+
client.EXPECT().GetAuthorizationToken(authData.RegistryID).Return(&ecrapi.AuthorizationData{
8382
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
8483
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
8584
}, nil)
@@ -116,7 +115,7 @@ func TestGetAuthConfigNoMatchAuthorizationToken(t *testing.T) {
116115
}
117116

118117
factory.EXPECT().GetClient(authData).Return(client, nil)
119-
client.EXPECT().GetAuthorizationToken(authData.RegistryID).Return(&types.AuthorizationData{
118+
client.EXPECT().GetAuthorizationToken(authData.RegistryID).Return(&ecrapi.AuthorizationData{
120119
ProxyEndpoint: aws.String(proxyEndpointScheme + "notproxy"),
121120
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
122121
}, nil)
@@ -151,7 +150,7 @@ func TestGetAuthConfigBadBase64(t *testing.T) {
151150
}
152151

153152
factory.EXPECT().GetClient(authData).Return(client, nil)
154-
client.EXPECT().GetAuthorizationToken(authData.RegistryID).Return(&types.AuthorizationData{
153+
client.EXPECT().GetAuthorizationToken(authData.RegistryID).Return(&ecrapi.AuthorizationData{
155154
ProxyEndpoint: aws.String(proxyEndpointScheme + "notproxy"),
156155
AuthorizationToken: aws.String((username + ":" + password)),
157156
}, nil)
@@ -254,7 +253,7 @@ func TestIsTokenValid(t *testing.T) {
254253
}
255254

256255
for _, testCase := range testAuthTimes {
257-
testAuthData := &types.AuthorizationData{
256+
testAuthData := &ecrapi.AuthorizationData{
258257
ProxyEndpoint: aws.String(testProxyEndpoint),
259258
AuthorizationToken: aws.String(testToken),
260259
ExpiresAt: aws.Time(time.Now().Add(testCase.expireIn)),
@@ -301,7 +300,7 @@ func TestAuthorizationTokenCacheMiss(t *testing.T) {
301300
endpointOverride: authData.EndpointOverride,
302301
}
303302

304-
dockerAuthData := &types.AuthorizationData{
303+
dockerAuthData := &ecrapi.AuthorizationData{
305304
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
306305
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
307306
}
@@ -331,7 +330,7 @@ func TestAuthorizationTokenCacheHit(t *testing.T) {
331330
password := "test_passwd"
332331

333332
proxyEndpoint := "proxy"
334-
testAuthData := &types.AuthorizationData{
333+
testAuthData := &ecrapi.AuthorizationData{
335334
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
336335
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
337336
ExpiresAt: aws.Time(time.Now().Add(12 * time.Hour)),
@@ -373,7 +372,7 @@ func TestAuthorizationTokenCacheWithCredentialsHit(t *testing.T) {
373372
password := "test_passwd"
374373

375374
proxyEndpoint := "proxy"
376-
testAuthData := &types.AuthorizationData{
375+
testAuthData := &ecrapi.AuthorizationData{
377376
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
378377
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
379378
ExpiresAt: aws.Time(time.Now().Add(12 * time.Hour)),
@@ -420,7 +419,7 @@ func TestAuthorizationTokenCacheHitExpired(t *testing.T) {
420419
password := "test_passwd"
421420

422421
proxyEndpoint := "proxy"
423-
testAuthData := &types.AuthorizationData{
422+
testAuthData := &ecrapi.AuthorizationData{
424423
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
425424
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
426425
ExpiresAt: aws.Time(time.Now()),
@@ -445,7 +444,7 @@ func TestAuthorizationTokenCacheHitExpired(t *testing.T) {
445444
endpointOverride: authData.EndpointOverride,
446445
}
447446

448-
dockerAuthData := &types.AuthorizationData{
447+
dockerAuthData := &ecrapi.AuthorizationData{
449448
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
450449
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
451450
}
@@ -477,7 +476,7 @@ func TestExtractECRTokenError(t *testing.T) {
477476
password := "test_passwd"
478477

479478
proxyEndpoint := "proxy"
480-
testAuthData := &types.AuthorizationData{
479+
testAuthData := &ecrapi.AuthorizationData{
481480
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
482481
// This will makes the extract fail
483482
AuthorizationToken: aws.String("-"),
@@ -503,7 +502,7 @@ func TestExtractECRTokenError(t *testing.T) {
503502
endpointOverride: authData.EndpointOverride,
504503
}
505504

506-
dockerAuthData := &types.AuthorizationData{
505+
dockerAuthData := &ecrapi.AuthorizationData{
507506
ProxyEndpoint: aws.String(proxyEndpointScheme + proxyEndpoint),
508507
AuthorizationToken: aws.String(base64.StdEncoding.EncodeToString([]byte(username + ":" + password))),
509508
}

‎agent/ecr/client.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
package ecr
1515

1616
import (
17-
"context"
1817
"fmt"
1918
"time"
2019

21-
ecrservice "github.com/aws/aws-sdk-go-v2/service/ecr"
22-
"github.com/aws/aws-sdk-go-v2/service/ecr/types"
20+
ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
21+
"github.com/aws/aws-sdk-go/aws"
2322
log "github.com/cihub/seelog"
2423
)
2524

@@ -30,14 +29,14 @@ const (
3029

3130
// ECRClient wrapper interface for mocking
3231
type ECRClient interface {
33-
GetAuthorizationToken(registryId string) (*types.AuthorizationData, error)
32+
GetAuthorizationToken(registryId string) (*ecrapi.AuthorizationData, error)
3433
}
3534

3635
// ECRSDK is an interface that specifies the subset of the AWS Go SDK's ECR
3736
// client that the Agent uses. This interface is meant to allow injecting a
3837
// mock for testing.
3938
type ECRSDK interface {
40-
GetAuthorizationToken(context.Context, *ecrservice.GetAuthorizationTokenInput, ...func(*ecrservice.Options)) (*ecrservice.GetAuthorizationTokenOutput, error)
39+
GetAuthorizationToken(*ecrapi.GetAuthorizationTokenInput) (*ecrapi.GetAuthorizationTokenOutput, error)
4140
}
4241

4342
type ecrClient struct {
@@ -52,11 +51,11 @@ func NewECRClient(sdkClient ECRSDK) ECRClient {
5251
}
5352

5453
// GetAuthorizationToken calls the ecr api to get the docker auth for the specified registry
55-
func (client *ecrClient) GetAuthorizationToken(registryId string) (*types.AuthorizationData, error) {
54+
func (client *ecrClient) GetAuthorizationToken(registryId string) (*ecrapi.AuthorizationData, error) {
5655
log.Debugf("Calling GetAuthorizationToken for %q", registryId)
5756

58-
output, err := client.sdkClient.GetAuthorizationToken(context.TODO(), &ecrservice.GetAuthorizationTokenInput{
59-
RegistryIds: []string{registryId},
57+
output, err := client.sdkClient.GetAuthorizationToken(&ecrapi.GetAuthorizationTokenInput{
58+
RegistryIds: []*string{aws.String(registryId)},
6059
})
6160

6261
if err != nil {
@@ -66,5 +65,5 @@ func (client *ecrClient) GetAuthorizationToken(registryId string) (*types.Author
6665
if len(output.AuthorizationData) != 1 {
6766
return nil, fmt.Errorf("unexpected number of results in AuthorizationData (%d)", len(output.AuthorizationData))
6867
}
69-
return &output.AuthorizationData[0], nil
68+
return output.AuthorizationData[0], nil
7069
}

‎agent/ecr/client_test.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
package ecr_test
1919

2020
import (
21-
"context"
2221
"errors"
2322
"testing"
2423

2524
"github.com/aws/amazon-ecs-agent/agent/ecr"
2625
mock_ecr "github.com/aws/amazon-ecs-agent/agent/ecr/mocks"
27-
ecrservice "github.com/aws/aws-sdk-go-v2/service/ecr"
28-
"github.com/aws/aws-sdk-go-v2/service/ecr/types"
26+
ecrapi "github.com/aws/amazon-ecs-agent/agent/ecr/model/ecr"
27+
"github.com/aws/aws-sdk-go/aws"
2928
"github.com/golang/mock/gomock"
3029
"github.com/stretchr/testify/assert"
3130
"github.com/stretchr/testify/suite"
@@ -58,11 +57,10 @@ func (suite *GetAuthorizationTokenTestSuite) TeardownTest() {
5857

5958
func (suite *GetAuthorizationTokenTestSuite) TestGetAuthorizationTokenMissingAuthData() {
6059
suite.mockClient.EXPECT().GetAuthorizationToken(
61-
context.TODO(),
62-
&ecrservice.GetAuthorizationTokenInput{
63-
RegistryIds: []string{testRegistryId},
64-
}).Return(&ecrservice.GetAuthorizationTokenOutput{
65-
AuthorizationData: []types.AuthorizationData{},
60+
&ecrapi.GetAuthorizationTokenInput{
61+
RegistryIds: []*string{aws.String(testRegistryId)},
62+
}).Return(&ecrapi.GetAuthorizationTokenOutput{
63+
AuthorizationData: []*ecrapi.AuthorizationData{},
6664
}, nil)
6765

6866
authorizationData, err := suite.ecrClient.GetAuthorizationToken(testRegistryId)
@@ -72,9 +70,8 @@ func (suite *GetAuthorizationTokenTestSuite) TestGetAuthorizationTokenMissingAut
7270

7371
func (suite *GetAuthorizationTokenTestSuite) TestGetAuthorizationTokenError() {
7472
suite.mockClient.EXPECT().GetAuthorizationToken(
75-
context.TODO(),
76-
&ecrservice.GetAuthorizationTokenInput{
77-
RegistryIds: []string{testRegistryId},
73+
&ecrapi.GetAuthorizationTokenInput{
74+
RegistryIds: []*string{aws.String(testRegistryId)},
7875
}).Return(nil, errors.New("Nope Nope Nope"))
7976

8077
authorizationData, err := suite.ecrClient.GetAuthorizationToken(testRegistryId)

0 commit comments

Comments
 (0)