diff --git a/.go-version b/.go-version index b50dd27d..42cf0675 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.13.1 +1.15.2 diff --git a/.travis.yml b/.travis.yml index c1c22985..7fb165c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ matrix: - os: linux name: "Acceptance tests" dist: bionic - go: "1.13.x" + go: "1.15.x" services: - docker sudo: required @@ -51,7 +51,7 @@ matrix: - os: linux name: "Build (golang current amd64)" dist: bionic - go: "1.13.x" + go: "1.15.x" script: - make compile @@ -68,7 +68,7 @@ matrix: - os: linux name: "Unit-tests, vet, and website" dist: bionic - go: "1.13.x" + go: "1.15.x" script: - make vet - make test @@ -79,7 +79,7 @@ matrix: #################################### - os: osx name: "Build (golang current)" - go: "1.13.x" + go: "1.15.x" script: - XC_OS=darwin make compile @@ -89,7 +89,7 @@ matrix: - os: windows name: "Build (golang current)" # name: "Acceptance tests" - go: "1.13.x" + go: "1.15.x" # services: # - docker script: diff --git a/README.md b/README.md index c19d2452..10712a99 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ Terraform Provider Requirements ------------ -- [Terraform](https://www.terraform.io/downloads.html) 0.10.x -- [Go](https://golang.org/doc/install) 1.13.x (to build the provider plugin) +- [Terraform](https://www.terraform.io/downloads.html) 0.12.x +- [Go](https://golang.org/doc/install) 1.15.x (to build the provider plugin) Building The Provider --------------------- @@ -37,7 +37,7 @@ Using the provider Developing the Provider --------------------------- -If you wish to work on the provider, you'll first need the latest version of [Go](http://www.golang.org) installed on your machine (currently 1.13). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH` (note that we typically test older versions of golang as long as they are supported upstream, though we recommend new development to happen on the latest release). +If you wish to work on the provider, you'll first need the latest version of [Go](http://www.golang.org) installed on your machine (currently 1.15). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH` (note that we typically test older versions of golang as long as they are supported upstream, though we recommend new development to happen on the latest release). To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory. diff --git a/go.mod b/go.mod index 6e331cb5..ade4195f 100644 --- a/go.mod +++ b/go.mod @@ -18,4 +18,4 @@ require ( github.com/opencontainers/runc v0.1.1 // indirect ) -go 1.13 +go 1.15 diff --git a/vendor/github.com/docker/cli/cli/command/image/build/context.go b/vendor/github.com/docker/cli/cli/command/image/build/context.go index e9af9bd3..24a9d525 100644 --- a/vendor/github.com/docker/cli/cli/command/image/build/context.go +++ b/vendor/github.com/docker/cli/cli/command/image/build/context.go @@ -232,6 +232,7 @@ func GetContextFromURL(out io.Writer, remoteURL, dockerfileName string) (io.Read // getWithStatusError does an http.Get() and returns an error if the // status code is 4xx or 5xx. func getWithStatusError(url string) (resp *http.Response, err error) { + // #nosec G107 if resp, err = http.Get(url); err != nil { return nil, err } @@ -242,9 +243,9 @@ func getWithStatusError(url string) (resp *http.Response, err error) { body, err := ioutil.ReadAll(resp.Body) resp.Body.Close() if err != nil { - return nil, errors.Wrapf(err, msg+": error reading body") + return nil, errors.Wrapf(err, "%s: error reading body", msg) } - return nil, errors.Errorf(msg+": %s", bytes.TrimSpace(body)) + return nil, errors.Errorf("%s: %s", msg, bytes.TrimSpace(body)) } // GetContextFromLocalDir uses the given local directory as context for a @@ -344,7 +345,6 @@ func getDockerfileRelPath(absContextDir, givenDockerfile string) (string, error) absDockerfile, err = filepath.EvalSymlinks(absDockerfile) if err != nil { return "", errors.Errorf("unable to evaluate symlinks in Dockerfile path: %v", err) - } } diff --git a/vendor/modules.txt b/vendor/modules.txt index c1cb11d4..683ce5be 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -7,12 +7,14 @@ cloud.google.com/go/internal/trace cloud.google.com/go/internal/version cloud.google.com/go/storage # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 +## explicit github.com/Azure/go-ansiterm github.com/Azure/go-ansiterm/winterm # github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 github.com/Microsoft/go-winio github.com/Microsoft/go-winio/pkg/guid # github.com/Microsoft/hcsshim v0.8.9 +## explicit github.com/Microsoft/hcsshim/osversion # github.com/agext/levenshtein v1.2.2 github.com/agext/levenshtein @@ -63,25 +65,28 @@ github.com/bgentry/go-netrc/netrc # github.com/bgentry/speakeasy v0.1.0 github.com/bgentry/speakeasy # github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe +## explicit github.com/containerd/continuity/fs github.com/containerd/continuity/pathdriver github.com/containerd/continuity/sysx # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew # github.com/docker/cli v0.0.0-20200303215952-eb310fca4956 +## explicit +github.com/docker/cli/cli/command/image/build github.com/docker/cli/cli/config/configfile github.com/docker/cli/cli/config/credentials github.com/docker/cli/cli/config/types -# github.com/docker/cli v0.0.0-20190524120722-0f337f1dfe57 -github.com/docker/cli/cli/command/image/build github.com/docker/cli/cli/connhelper github.com/docker/cli/cli/connhelper/commandconn github.com/docker/cli/cli/connhelper/ssh # github.com/docker/distribution v0.0.0-20180522175653-f0cc92778478 +## explicit github.com/docker/distribution/digestset github.com/docker/distribution/reference github.com/docker/distribution/registry/api/errcode # github.com/docker/docker v0.7.3-0.20190525203055-f25e0c6f3093 +## explicit github.com/docker/docker/api github.com/docker/docker/api/types github.com/docker/docker/api/types/blkiodev @@ -102,7 +107,6 @@ github.com/docker/docker/builder/dockerignore github.com/docker/docker/builder/remotecontext/git github.com/docker/docker/client github.com/docker/docker/errdefs -# github.com/docker/docker-credential-helpers v0.6.3 github.com/docker/docker/pkg/archive github.com/docker/docker/pkg/fileutils github.com/docker/docker/pkg/idtools @@ -119,14 +123,17 @@ github.com/docker/docker/pkg/system github.com/docker/docker/pkg/term github.com/docker/docker/pkg/term/windows github.com/docker/docker/pkg/urlutil -# github.com/docker/docker-credential-helpers v0.6.2 +# github.com/docker/docker-credential-helpers v0.6.3 +## explicit github.com/docker/docker-credential-helpers/client github.com/docker/docker-credential-helpers/credentials # github.com/docker/go-connections v0.4.0 +## explicit github.com/docker/go-connections/nat github.com/docker/go-connections/sockets github.com/docker/go-connections/tlsconfig # github.com/docker/go-units v0.4.0 +## explicit github.com/docker/go-units # github.com/fatih/color v1.7.0 github.com/fatih/color @@ -149,6 +156,8 @@ github.com/google/go-cmp/cmp/internal/value github.com/google/uuid # github.com/googleapis/gax-go/v2 v2.0.5 github.com/googleapis/gax-go/v2 +# github.com/gorilla/mux v1.7.2 +## explicit # github.com/hashicorp/errwrap v1.0.0 github.com/hashicorp/errwrap # github.com/hashicorp/go-cleanhttp v0.5.1 @@ -199,6 +208,7 @@ github.com/hashicorp/logutils # github.com/hashicorp/terraform-config-inspect v0.0.0-20190821133035-82a99dc22ef4 github.com/hashicorp/terraform-config-inspect/tfconfig # github.com/hashicorp/terraform-plugin-sdk v1.0.0 +## explicit github.com/hashicorp/terraform-plugin-sdk/helper/hashcode github.com/hashicorp/terraform-plugin-sdk/helper/logging github.com/hashicorp/terraform-plugin-sdk/helper/resource @@ -258,6 +268,7 @@ github.com/mitchellh/colorstring # github.com/mitchellh/copystructure v1.0.0 github.com/mitchellh/copystructure # github.com/mitchellh/go-homedir v1.1.0 +## explicit github.com/mitchellh/go-homedir # github.com/mitchellh/go-testing-interface v1.0.0 github.com/mitchellh/go-testing-interface @@ -268,15 +279,18 @@ github.com/mitchellh/mapstructure # github.com/mitchellh/reflectwalk v1.0.1 github.com/mitchellh/reflectwalk # github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c +## explicit github.com/morikuni/aec # github.com/oklog/run v1.0.0 github.com/oklog/run # github.com/opencontainers/go-digest v1.0.0-rc1 github.com/opencontainers/go-digest # github.com/opencontainers/image-spec v0.0.0-20171125024018-577479e4dc27 +## explicit github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 # github.com/opencontainers/runc v0.1.1 +## explicit github.com/opencontainers/runc/libcontainer/system github.com/opencontainers/runc/libcontainer/user # github.com/pkg/errors v0.8.1