Skip to content

Commit 3bebf06

Browse files
authored
chore: fix checksum and mocks (#226)
* use 2.8.1 instead of 2.8.0 for distribution package because of distribution/distribution#3590 * update the mocks * fix mergify
1 parent a3ced45 commit 3bebf06

File tree

8 files changed

+1170
-1145
lines changed

8 files changed

+1170
-1145
lines changed

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pull_request_rules:
33
conditions:
44
- base~=(mainline|rename-commands)
55
- "#approved-reviews-by>=2"
6-
- approved-reviews-by=@aws/aws-ecs-devx
6+
- approved-reviews-by=@awslabs/developer-experience
77
- -approved-reviews-by~=author
88
- -label~=(WIP|do-not-merge)
99
- -title~=(WIP|wip)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/containernetworking/plugins v0.9.1 // indirect
2929
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
3030
github.com/davecgh/go-spew v1.1.1 // indirect
31-
github.com/docker/distribution v2.8.0+incompatible // indirect
31+
github.com/docker/distribution v2.8.1+incompatible // indirect
3232
github.com/docker/go-connections v0.4.0 // indirect
3333
github.com/docker/go-units v0.4.0 // indirect
3434
github.com/fsnotify/fsnotify v1.5.4 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ github.com/docker/distribution v0.0.0-20181002220433-1cb4180b1a5b/go.mod h1:J2gT
248248
github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
249249
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
250250
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
251-
github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY=
252-
github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
251+
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
252+
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
253253
github.com/docker/docker v0.0.0-20200531234253-77e06fda0c94 h1:YBrOju+pvHeUDXJuZEsIZ6OCxnH1Dwwp/L3Yn6M8H2k=
254254
github.com/docker/docker v0.0.0-20200531234253-77e06fda0c94/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
255255
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=

local-container-endpoints/clients/docker/mock_docker/mock.go

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

local-container-endpoints/clients/iam/mock_iamiface/mock.go

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

local-container-endpoints/clients/sts/mock_stsiface/mock.go

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

local-container-endpoints/handlers/functional_tests/metadata_v2_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,7 @@ func TestV2Handler_ContainerMetadata(t *testing.T) {
306306
func TestV2Handler_TaskMetadata_InvalidURL(t *testing.T) {
307307
ctrl := gomock.NewController(t)
308308
dockerMock := mock_docker.NewMockClient(ctrl)
309-
310-
gomock.InOrder(
311-
dockerMock.EXPECT().ContainerList(gomock.Any()).Return(nil, fmt.Errorf("Some API Error")),
312-
)
313-
309+
314310
metadataService, err := handlers.NewMetadataServiceWithClient(dockerMock, nil, nil)
315311
assert.NoError(t, err, "Unexpected error creating new metadata service")
316312

local-container-endpoints/handlers/functional_tests/metadata_v3_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,6 @@ func TestV3Handler_TaskMetadata_InvalidURL(t *testing.T) {
238238
ctrl := gomock.NewController(t)
239239
dockerMock := mock_docker.NewMockClient(ctrl)
240240

241-
gomock.InOrder(
242-
dockerMock.EXPECT().ContainerList(gomock.Any()).Return(nil, fmt.Errorf("Some API Error")),
243-
)
244-
245241
metadataService, err := handlers.NewMetadataServiceWithClient(dockerMock, nil, nil)
246242
assert.NoError(t, err, "Unexpected error creating new metadata service")
247243

0 commit comments

Comments
 (0)