Skip to content

Commit

Permalink
Remove SDK's vendored dependencies (#3118)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jasdel authored Feb 10, 2020
1 parent 0c60235 commit 3ed1b54
Show file tree
Hide file tree
Showing 62 changed files with 90 additions and 8,504 deletions.
36 changes: 20 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ os:
- linux
- osx
go:
- 1.5.x
- 1.6.x
- 1.7.x
- 1.8.x
Expand All @@ -25,37 +26,40 @@ matrix:
# https://github.com/travis-ci/travis-ci/issues/10309
- go: 1.6.x
os: osx
- go: 1.5.x
os: osx
include:
- os: windows
go: 1.12.x
- os: windows
go: 1.13.x
- os: windows
go: tip
- os: linux
go: 1.5.x
# Use Go 1.5's vendoring experiment for 1.5 tests.
env: GO15VENDOREXPERIMENT=1

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

script:
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then
- if [ -z $(go env GOMOD) ]; then
if [ "$TRAVIS_GO_VERSION" == "1.12.x" ] ||
[ "$TRAVIS_GO_VERSION" == "1.11.x" ] ||
[ "$TRAVIS_GO_VERSION" == "1.10.x" ]; then
make get-deps-x-tests;
fi;
make get-deps;
make unit-no-verify;
else
if [ $TRAVIS_GO_VERSION == "1.10.x" ] ||
[ $TRAVIS_GO_VERSION == "1.11.x" ] ||
[ $TRAVIS_GO_VERSION == "1.12.x" ] ||
[ $TRAVIS_GO_VERSION == "1.13.x" ] ||
[ $TRAVIS_GO_VERSION == "tip" ]; then
make get-deps;
make ci-test;
fi;
if [ "$TRAVIS_GO_VERSION" == "tip" ] ||
[ "$TRAVIS_GO_VERSION" == "1.13.x" ] ||
[ "$TRAVIS_GO_VERSION" == "1.12.x" ]; then

if [ "$TRAVIS_OS_NAME" = "windows" ]; then
make unit-no-verify;
else
make get-deps-tests;
make unit-old-go-race-cover;
make get-deps-verify;
make ci-test;
fi
else
make unit-old-go-race-cover;
fi

branches:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG_PENDING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
### SDK Features
* Remove SDK's `vendor` directory of vendored dependencies
* 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.
* Deletes 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.

### SDK Enhancements

Expand Down
18 changes: 3 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@ sandbox-go1.5: sandbox-build-go1.5
sandbox-test-go1.5: sandbox-build-go1.5
docker run -t aws-sdk-go-1.5

sandbox-build-go1.5-novendorexp:
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.5-novendorexp -t "aws-sdk-go-1.5-novendorexp" .
sandbox-go1.5-novendorexp: sandbox-build-go1.5-novendorexp
docker run -i -t aws-sdk-go-1.5-novendorexp bash
sandbox-test-go1.5-novendorexp: sandbox-build-go1.5-novendorexp
docker run -t aws-sdk-go-1.5-novendorexp

sandbox-build-go1.6:
docker build -f ./awstesting/sandbox/Dockerfile.test.go1.6 -t "aws-sdk-go-1.6" .
sandbox-go1.6: sandbox-build-go1.6
Expand Down Expand Up @@ -208,19 +201,14 @@ vet:
################
# Dependencies #
################
get-deps: get-deps-tests get-deps-x-tests get-deps-codegen get-deps-verify

get-deps-tests:
@echo "go get SDK testing dependencies"
get-deps:
@echo "getting pre go module dependnecies"
go get github.com/jmespath/go-jmespath

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

get-deps-codegen: get-deps-x-tests
@echo "go get SDK codegen dependencies"
go get golang.org/x/net/html

get-deps-verify:
@echo "go get SDK verification utilities"
go get golang.org/x/lint/golint
Expand Down
19 changes: 0 additions & 19 deletions awsmigrate/awsmigrate-renamer/Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions awsmigrate/awsmigrate-renamer/Godeps/Readme

This file was deleted.

200 changes: 0 additions & 200 deletions awsmigrate/awsmigrate-renamer/gen/gen.go

This file was deleted.

Loading

0 comments on commit 3ed1b54

Please sign in to comment.