Skip to content

Commit 570e285

Browse files
skmcgrailskmcgrail
authored
Update Go dependency version to 1.12 and update docker sandboxes (#432)
1 parent 87c0348 commit 570e285

File tree

9 files changed

+40
-35
lines changed

9 files changed

+40
-35
lines changed

‎CHANGELOG_PENDING.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SDK Features
66

77
SDK Enhancements
88
---
9+
* SDK minimum version requirement has been updated to Go 1.12 ([#432](https://github.com/aws/aws-sdk-go-v2/pull/432))
910

1011
SDK Bugs
1112
---

‎Makefile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,29 +103,29 @@ cleanup-integ-buckets:
103103
###################
104104
# Sandbox Testing #
105105
###################
106-
sandbox-tests: sandbox-test-go1.11 sandbox-test-go1.12 sandbox-test-gotip
106+
sandbox-tests: sandbox-test-go1.12 sandbox-test-go1.13 sandbox-test-gotip
107107

108-
sandbox-build-go1.11:
109-
docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.11 -t "aws-sdk-go-1.11" .
110-
sandbox-go1.11: sandbox-build-go1.11
111-
docker run -i -t aws-sdk-go-1.11 bash
112-
sandbox-test-go1.11: sandbox-build-go1.11
113-
docker run -t aws-sdk-go-1.11
108+
sandbox-build-go1.13:
109+
docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.13 -t "aws-sdk-go-v2-1.13" .
110+
sandbox-go1.13: sandbox-build-go1.13
111+
docker run -i -t aws-sdk-go-v2-1.13 bash
112+
sandbox-test-go1.13: sandbox-build-go1.13
113+
docker run -t aws-sdk-go-v2-1.13
114114

115115
sandbox-build-go1.12:
116-
docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.12 -t "aws-sdk-go-1.12" .
116+
docker build -f ./internal/awstesting/sandbox/Dockerfile.test.go1.12 -t "aws-sdk-go-v2-1.12" .
117117
sandbox-go1.12: sandbox-build-go1.12
118-
docker run -i -t aws-sdk-go-1.12 bash
118+
docker run -i -t aws-sdk-go-v2-1.12 bash
119119
sandbox-test-go1.12: sandbox-build-go1.12
120-
docker run -t aws-sdk-go-1.12
120+
docker run -t aws-sdk-go-v2-1.12
121121

122122
sandbox-build-gotip:
123123
@echo "Run make update-aws-golang-tip, if this test fails because missing aws-golang:tip container"
124-
docker build -f ./internal/awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-tip" .
124+
docker build -f ./internal/awstesting/sandbox/Dockerfile.test.gotip -t "aws-sdk-go-v2-tip" .
125125
sandbox-gotip: sandbox-build-gotip
126-
docker run -i -t aws-sdk-go-tip bash
126+
docker run -i -t aws-sdk-go-v2-tip bash
127127
sandbox-test-gotip: sandbox-build-gotip
128-
docker run -t aws-sdk-go-tip
128+
docker run -t aws-sdk-go-v2-tip
129129

130130
update-aws-golang-tip:
131131
docker build --no-cache=true -f ./internal/awstesting/sandbox/Dockerfile.golang-tip -t "aws-golang:tip" .

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
`aws-sdk-go-v2` is the **Developer Preview** (aka **beta**) for the v2 AWS SDK for the Go programming language. This Developer Preview is provided to receive feedback from the language community on SDK changes prior to the final release. As such users should expect the SDK to release minor version releases that break backwards compatability. The release notes for the breaking change will include information about the breaking change, and how you can migrate to the latest version.
66

7-
Check out the [Issues] and [Projects] for design and updates being made to the SDK. The v2 SDK requires a minimum version of `Go 1.11`.
7+
Check out the [Issues] and [Projects] for design and updates being made to the SDK. The v2 SDK requires a minimum version of `Go 1.12`.
88

99
We'll be expanding out the [Issues] and [Projects] sections with additional changes to the SDK based on your feedback, and SDK's core's improvements. Check the the SDK's [CHANGE_LOG] for information about the latest updates to the SDK.
1010

@@ -29,7 +29,7 @@ The best way to get started working with the SDK is to use `go get` to add the S
2929
go get github.com/aws/aws-sdk-go-v2
3030
```
3131

32-
Without Go Modules, or in a GOPATH with Go 1.11 or 1.12 use the `/...` suffix on the `go get` to retrieve all of the SDK's dependencies.
32+
Without Go Modules, or in a GOPATH use the `/...` suffix on the `go get` to retrieve all of the SDK's dependencies.
3333

3434
```sh
3535
go get github.com/aws/aws-sdk-go-v2/...

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ require (
1111
google.golang.org/appengine v1.2.0 // indirect
1212
)
1313

14-
go 1.11
14+
go 1.12

‎internal/awstesting/sandbox/Dockerfile.golang-tip‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on docker-library's golang 1.6 alpine and wheezy docker files.
22
# https://github.com/docker-library/golang/blob/master/1.6/alpine/Dockerfile
33
# https://github.com/docker-library/golang/blob/master/1.6/wheezy/Dockerfile
4-
FROM buildpack-deps:wheezy-scm
4+
FROM buildpack-deps:buster-scm
55

66
ENV GOLANG_SRC_REPO_URL https://github.com/golang/go
77

@@ -30,7 +30,7 @@ RUN export GOROOT_BOOTSTRAP=$GOLANG_BOOTSTRAP_PATH/go \
3030
&& git clone "$GOLANG_SRC_REPO_URL" /usr/local/go \
3131
&& cd /usr/local/go/src \
3232
&& ./make.bash \
33-
&& rm -rf "$GOLANG_BOOTSTRAP_PATH" /usr/local/go/pkg/bootstrap
33+
&& rm -rf "$GOLANG_BOOTSTRAP_PATH" /usr/local/go/pkg/bootstrap
3434

3535
# Build Go workspace and environment
3636
ENV GOPATH /go

‎internal/awstesting/sandbox/Dockerfile.test.go1.11‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎internal/awstesting/sandbox/Dockerfile.test.go1.12‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM ubuntu:12.04
1+
FROM ubuntu:18.04
22
FROM golang:1.12
33

4-
ADD . /go/src/github.com/aws/aws-sdk-go
4+
ADD . /go/src/github.com/aws/aws-sdk-go-v2
55

66
RUN apt-get update && apt-get install -y --no-install-recommends \
77
vim \
88
&& rm -rf /var/list/apt/lists/*
99

10-
WORKDIR /go/src/github.com/aws/aws-sdk-go
10+
WORKDIR /go/src/github.com/aws/aws-sdk-go-v2
1111
CMD ["make", "unit"]

‎internal/awstesting/sandbox/Dockerfile.test.go1.13‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM ubuntu:18.04
2+
FROM golang:1.13
3+
4+
ENV GOPROXY=direct
5+
6+
ADD . /go/src/github.com/aws/aws-sdk-go-v2
7+
8+
RUN apt-get update && apt-get install -y --no-install-recommends \
9+
vim \
10+
&& rm -rf /var/list/apt/lists/*
11+
12+
WORKDIR /go/src/github.com/aws/aws-sdk-go-v2
13+
CMD ["make", "unit"]

‎internal/awstesting/sandbox/Dockerfile.test.gotip‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
FROM ubuntu:12.04
1+
FROM ubuntu:18.04
22
FROM aws-golang:tip
33

4-
ADD . /go/src/github.com/aws/aws-sdk-go
4+
ENV GOPROXY=direct
5+
6+
ADD . /go/src/github.com/aws/aws-sdk-go-v2
57

68
RUN apt-get update && apt-get install -y --no-install-recommends \
79
vim \
810
&& rm -rf /var/list/apt/lists/*
911

10-
WORKDIR /go/src/github.com/aws/aws-sdk-go
12+
WORKDIR /go/src/github.com/aws/aws-sdk-go-v2
1113
CMD ["make", "unit"]

0 commit comments

Comments
 (0)