Upgraded to go 1.17

Upgraded go dependencies and go tools

Signed-off-by: Sergey Ivanov <[email protected]>

.gitignore

@@ -1 +1,2 @@
 terraform-provider-gpg*
+/dist/

.tool-versions

@@ -0,0 +1,5 @@
+# For use with ASDF: https://asdf-vm.com/
+
+golang 1.17.6
+golangci-lint 1.44.0
+goreleaser 1.3.1

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - '1.15'
+  - '1.17'
   - master
 
 git:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.11-alpine
+FROM golang:1.17-alpine
 
 # Enable go modules
 ENV GO111MODULE=on
@@ -7,17 +7,17 @@ ENV GO111MODULE=on
 RUN apk add curl git build-base
 
 # Install linter
-RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $HOME/bin v1.16.0
+RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $HOME/bin v1.44.0
 
 # Copy go mod files first and install dependencies to cache this layer
 ADD ./go.mod ./go.sum /go/src/terraform-provider-gpg/
 WORKDIR /go/src/terraform-provider-gpg
-RUN go get
+RUN go mod download
 
 # Add source code
 ADD . /go/src/terraform-provider-gpg
 
 # Build, test and lint
 RUN go build -v && \
-    go test && \
+    go test ./... && \
     $HOME/bin/golangci-lint run

Makefile

@@ -13,7 +13,7 @@ GOBUILD=CGO_ENABLED=$(CGO_ENABLED) $(GOCMD) build -v -buildmode=exe -ldflags $(L
 GO_PACKAGES=./...
 GO_TESTS=^.*$
 
-GOLANGCI_LINT_VERSION=v1.30.0
+GOLANGCI_LINT_VERSION=v1.44.0
 DISABLED_LINTERS=gci,goerr113
 
 BIN_PATH=$$HOME/bin

README.md

@@ -23,6 +23,9 @@ For local builds, run `make` which will build the binary, run unit tests and lin
 
 ## Releasing
 
+> Go 1.16 or later is required to build for newer architectures, such as `darwin-arm64`.
+> Go 1.17 is recommended.
+
 This project use `goreleaser` for releasing. To release new version, follow the following steps:
 
 * Add a changelog for new release to CHANGELOG.md file.

docs/index.md

@@ -11,7 +11,7 @@ Managing GPG keyring or signing files is currently not implemented.
 ```hcl
 terraform {
   required_providers {
-    sshcommand = {
+    gpg = {
       source  = "invidian/gpg"
       version = "0.3.0"
     }

go.mod

@@ -1,37 +1,79 @@
 module github.com/invidian/terraform-provider-gpg
 
-go 1.15
+go 1.17
+
+require (
+	github.com/hashicorp/terraform-plugin-sdk v1.15.0
+	golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8
+)
 
 require (
 	cloud.google.com/go v0.63.0 // indirect
+	cloud.google.com/go/storage v1.10.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-cidr v1.1.0 // indirect
+	github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
+	github.com/armon/go-radix v1.0.0 // indirect
 	github.com/aws/aws-sdk-go v1.34.7 // indirect
+	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
+	github.com/bgentry/speakeasy v0.1.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.9.0 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/google/go-cmp v0.5.1 // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
 	github.com/hashicorp/go-getter v1.4.1 // indirect
 	github.com/hashicorp/go-hclog v0.14.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/hashicorp/go-plugin v1.3.0 // indirect
+	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.2.1 // indirect
+	github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f // indirect
 	github.com/hashicorp/hcl/v2 v2.6.0 // indirect
-	github.com/hashicorp/terraform-plugin-sdk v1.15.0
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8 // indirect
+	github.com/hashicorp/terraform-exec v0.1.1 // indirect
+	github.com/hashicorp/terraform-json v0.5.0 // indirect
+	github.com/hashicorp/terraform-plugin-test v1.4.3 // indirect
 	github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
 	github.com/hashicorp/yamux v0.0.0-20200609203250-aecfd211c9ce // indirect
+	github.com/jmespath/go-jmespath v0.3.0 // indirect
+	github.com/jstemmer/go-junit-report v0.9.1 // indirect
 	github.com/mattn/go-colorable v0.1.7 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
 	github.com/mitchellh/cli v1.1.1 // indirect
+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.3.3 // indirect
+	github.com/mitchellh/reflectwalk v1.0.1 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/spf13/afero v1.3.4 // indirect
 	github.com/ulikunitz/xz v0.5.7 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
 	github.com/zclconf/go-cty v1.5.1 // indirect
 	github.com/zclconf/go-cty-yaml v1.0.2 // indirect
-	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
-	golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
-	golang.org/x/sys v0.0.0-20200817155316-9781c653f443 // indirect
+	go.opencensus.io v0.22.4 // indirect
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
+	golang.org/x/mod v0.3.0 // indirect
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/tools v0.0.0-20200818005847-188abfa75333 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.30.0 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
 	google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70 // indirect
+	google.golang.org/grpc v1.31.0 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
 )