Skip to content

Commit 3ed1b54

Browse files
authored
Remove SDK's vendored dependencies (#3118)
Updates the SDK's Go module definition to enumerate all dependencies of the SDK and its components. SDK's repository root package has been updated to refer to runtime dependencies like `go-jmespath` for `go get` the SDK with Go without modules. * Remove deprecated `awsmigrate` utility. Removes the deprecated `awsmigrate` utility from the SDK's repository. This utility is no longer relevant. The utility allowed users the beta pre-release v0 SDK to update to the v1.0 released version of the SDK.
1 parent 0c60235 commit 3ed1b54

Some content is hidden

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

62 files changed

+90
-8504
lines changed

.travis.yml

+20-16
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ os:
66
- linux
77
- osx
88
go:
9+
- 1.5.x
910
- 1.6.x
1011
- 1.7.x
1112
- 1.8.x
@@ -25,37 +26,40 @@ matrix:
2526
# https://github.com/travis-ci/travis-ci/issues/10309
2627
- go: 1.6.x
2728
os: osx
29+
- go: 1.5.x
30+
os: osx
2831
include:
2932
- os: windows
3033
go: 1.12.x
3134
- os: windows
3235
go: 1.13.x
3336
- os: windows
3437
go: tip
35-
- os: linux
36-
go: 1.5.x
37-
# Use Go 1.5's vendoring experiment for 1.5 tests.
38-
env: GO15VENDOREXPERIMENT=1
3938

4039
before_install:
4140
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install make; fi
4241

4342
script:
44-
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then
43+
- if [ -z $(go env GOMOD) ]; then
44+
if [ "$TRAVIS_GO_VERSION" == "1.12.x" ] ||
45+
[ "$TRAVIS_GO_VERSION" == "1.11.x" ] ||
46+
[ "$TRAVIS_GO_VERSION" == "1.10.x" ]; then
47+
make get-deps-x-tests;
48+
fi;
4549
make get-deps;
46-
make unit-no-verify;
47-
else
48-
if [ $TRAVIS_GO_VERSION == "1.10.x" ] ||
49-
[ $TRAVIS_GO_VERSION == "1.11.x" ] ||
50-
[ $TRAVIS_GO_VERSION == "1.12.x" ] ||
51-
[ $TRAVIS_GO_VERSION == "1.13.x" ] ||
52-
[ $TRAVIS_GO_VERSION == "tip" ]; then
53-
make get-deps;
54-
make ci-test;
50+
fi;
51+
if [ "$TRAVIS_GO_VERSION" == "tip" ] ||
52+
[ "$TRAVIS_GO_VERSION" == "1.13.x" ] ||
53+
[ "$TRAVIS_GO_VERSION" == "1.12.x" ]; then
54+
55+
if [ "$TRAVIS_OS_NAME" = "windows" ]; then
56+
make unit-no-verify;
5557
else
56-
make get-deps-tests;
57-
make unit-old-go-race-cover;
58+
make get-deps-verify;
59+
make ci-test;
5860
fi
61+
else
62+
make unit-old-go-race-cover;
5963
fi
6064

6165
branches:

CHANGELOG_PENDING.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
### SDK Features
2+
* Remove SDK's `vendor` directory of vendored dependencies
3+
* Updates the SDK's Go module definition to enumerate all dependencies of the SDK and its components.
4+
* SDK's repository root package has been updated to refer to runtime dependencies like `go-jmespath` for `go get` the SDK with Go without modules.
5+
* Deletes the deprecated `awsmigrate` utility from the SDK's repository.
6+
* This utility is no longer relevant. The utility allowed users the beta pre-release v0 SDK to update to the v1.0 released version of the SDK.
27

38
### SDK Enhancements
49

Makefile

+3-15
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,6 @@ sandbox-go1.5: sandbox-build-go1.5
116116
sandbox-test-go1.5: sandbox-build-go1.5
117117
docker run -t aws-sdk-go-1.5
118118

119-
sandbox-build-go1.5-novendorexp:
120-
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
121-
sandbox-go1.5-novendorexp: sandbox-build-go1.5-novendorexp
122-
docker run -i -t aws-sdk-go-1.5-novendorexp bash
123-
sandbox-test-go1.5-novendorexp: sandbox-build-go1.5-novendorexp
124-
docker run -t aws-sdk-go-1.5-novendorexp
125-
126119
sandbox-build-go1.6:
127120
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
128121
sandbox-go1.6: sandbox-build-go1.6
@@ -208,19 +201,14 @@ vet:
208201
################
209202
# Dependencies #
210203
################
211-
get-deps: get-deps-tests get-deps-x-tests get-deps-codegen get-deps-verify
212-
213-
get-deps-tests:
214-
@echo "go get SDK testing dependencies"
204+
get-deps:
205+
@echo "getting pre go module dependnecies"
206+
go get github.com/jmespath/go-jmespath
215207

216208
get-deps-x-tests:
217209
@echo "go get SDK testing golang.org/x dependencies"
218210
go get golang.org/x/net/http2
219211

220-
get-deps-codegen: get-deps-x-tests
221-
@echo "go get SDK codegen dependencies"
222-
go get golang.org/x/net/html
223-
224212
get-deps-verify:
225213
@echo "go get SDK verification utilities"
226214
go get golang.org/x/lint/golint

awsmigrate/awsmigrate-renamer/Godeps/Godeps.json

-19
This file was deleted.

awsmigrate/awsmigrate-renamer/Godeps/Readme

-5
This file was deleted.

awsmigrate/awsmigrate-renamer/gen/gen.go

-200
This file was deleted.

0 commit comments

Comments
 (0)