Skip to content

Commit b03f962

Browse files
sullivtrsullivtr
authored
Merge pull request #60 from sullivtr/upgrade-to-go117
upgrade to go version 1.17
2 parents 3ef3f56 + 6c63de1 commit b03f962

File tree

14 files changed

+211
-214
lines changed

14 files changed

+211
-214
lines changed

‎.github/workflows/acceptance.yml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,37 @@ name: acceptance tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
1317

14-
- name: Checkout
15-
uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0
18+
- name: Set up Go
19+
uses: actions/setup-go@v2
20+
with:
21+
go-version: 1.17
1822

19-
- name: Set up Go
20-
uses: actions/setup-go@v2
21-
with:
22-
go-version: 1.16
23+
- name: Set up Terraform
24+
uses: hashicorp/setup-terraform@v1
25+
with:
26+
terraform_version: 1.0.5
27+
terraform_wrapper: false
2328

24-
- name: Set up Terraform
25-
uses: hashicorp/setup-terraform@v1
26-
with:
27-
terraform_version: 1.0.5
28-
terraform_wrapper: false
29+
- name: Run test
30+
run: go test -v ./... | awk '!/\[no test files\]/ {print}'
2931

30-
- name: Run test
31-
run: go test -v ./... | awk '!/\[no test files\]/ {print}'
32-
33-
- name: Upload coverage to Codecov
34-
uses: codecov/codecov-action@v1
35-
with:
36-
token: ${{ secrets.CODECOV_TOKEN }}
37-
file: ./cp.out
38-
name: codecov-umbrella
39-
fail_ci_if_error: false
32+
- name: Upload coverage to Codecov
33+
uses: codecov/codecov-action@v1
34+
with:
35+
token: ${{ secrets.CODECOV_TOKEN }}
36+
file: ./cp.out
37+
name: codecov-umbrella
38+
fail_ci_if_error: false

‎.github/workflows/build.yml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,34 @@ name: build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
goreleaser:
1111
runs-on: ubuntu-latest
1212
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
1317

14-
- name: Checkout
15-
uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0
18+
- name: Set up Go
19+
uses: actions/setup-go@v2
20+
with:
21+
go-version: 1.17
1822

19-
- name: Set up Go
20-
uses: actions/setup-go@v2
21-
with:
22-
go-version: 1.14
23-
24-
- name: Import GPG key
25-
id: import_gpg
26-
uses: crazy-max/ghaction-import-gpg@v2
27-
env:
28-
GPG_PRIVATE_KEY: ${{ secrets.GPG_SECRET }}
29-
30-
- name: Build
31-
uses: goreleaser/[email protected]
32-
with:
33-
version: latest
34-
args: release --snapshot --skip-validate --skip-publish
35-
env:
36-
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
23+
- name: Import GPG key
24+
id: import_gpg
25+
uses: crazy-max/ghaction-import-gpg@v2
26+
env:
27+
GPG_PRIVATE_KEY: ${{ secrets.GPG_SECRET }}
3728

29+
- name: Build
30+
uses: goreleaser/goreleaser-action@v2
31+
with:
32+
version: latest
33+
args: release --snapshot --skip-validate --skip-publish
34+
env:
35+
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

‎.github/workflows/e2e.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,35 @@ name: e2e tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
1317

14-
- name: Checkout
15-
uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0
18+
- name: Set up Go
19+
uses: actions/setup-go@v2
20+
with:
21+
go-version: 1.17
1822

19-
- name: Set up Go
20-
uses: actions/setup-go@v2
21-
with:
22-
go-version: 1.16
23+
- name: Set up Terraform
24+
uses: hashicorp/setup-terraform@v1
25+
with:
26+
terraform_version: 1.0.5
27+
terraform_wrapper: false
2328

24-
- name: Set up Terraform
25-
uses: hashicorp/setup-terraform@v1
26-
with:
27-
terraform_version: 1.0.5
28-
terraform_wrapper: false
29+
- name: Build
30+
uses: goreleaser/goreleaser-action@v2
31+
with:
32+
version: latest
33+
args: release --snapshot --skip-validate --skip-publish --skip-sign -f .goreleaser-e2e-build.yml
2934

30-
- name: Build
31-
uses: goreleaser/[email protected]
32-
with:
33-
version: latest
34-
args: release --snapshot --skip-validate --skip-publish --skip-sign -f .goreleaser-e2e-build.yml
35-
36-
- name: Run test
37-
run: make test
35+
- name: Run test
36+
run: make test

‎.github/workflows/release.yml

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,33 @@ name: release
33
on:
44
push:
55
tags:
6-
- 'v*.*.*'
6+
- "v*.*.*"
77

88
jobs:
99
goreleaser:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
1216

13-
- name: Checkout
14-
uses: actions/checkout@v2
15-
with:
16-
fetch-depth: 0
17+
- name: Set up Go
18+
uses: actions/setup-go@v2
19+
with:
20+
go-version: 1.17
1721

18-
- name: Set up Go
19-
uses: actions/setup-go@v2
20-
with:
21-
go-version: 1.14
22+
- name: Import GPG key
23+
id: import_gpg
24+
uses: crazy-max/ghaction-import-gpg@v2
25+
env:
26+
GPG_PRIVATE_KEY: ${{ secrets.GPG_SECRET }}
2227

23-
- name: Import GPG key
24-
id: import_gpg
25-
uses: crazy-max/ghaction-import-gpg@v2
26-
env:
27-
GPG_PRIVATE_KEY: ${{ secrets.GPG_SECRET }}
28-
29-
- name: Release
30-
uses: goreleaser/[email protected]
31-
with:
32-
version: latest
33-
args: release --rm-dist
34-
env:
35-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36-
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
37-
28+
- name: Release
29+
uses: goreleaser/goreleaser-action@v2
30+
with:
31+
version: latest
32+
args: release --rm-dist
33+
env:
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

‎.goreleaser.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,40 @@ before:
55
hooks:
66
- go mod download
77
builds:
8-
- env:
9-
# goreleaser does not work with CGO, it could also complicate
10-
# usage by users in CI/CD systems like Terraform Cloud where
11-
# they are unable to install libraries.
12-
- CGO_ENABLED=0
13-
mod_timestamp: '{{ .CommitTimestamp }}'
14-
flags:
15-
- -trimpath
16-
ldflags:
17-
- '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
18-
goos:
19-
- freebsd
20-
- windows
21-
- linux
22-
- darwin
23-
goarch:
24-
- amd64
25-
- '386'
26-
- arm
27-
- arm64
28-
ignore:
29-
- goos: darwin
30-
goarch: '386'
31-
binary: '{{ .ProjectName }}_{{ .Version }}'
8+
- env:
9+
# goreleaser does not work with CGO, it could also complicate
10+
# usage by users in CI/CD systems like Terraform Cloud where
11+
# they are unable to install libraries.
12+
- CGO_ENABLED=0
13+
mod_timestamp: "{{ .CommitTimestamp }}"
14+
flags:
15+
- -trimpath
16+
ldflags:
17+
- "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}"
18+
goos:
19+
- freebsd
20+
- windows
21+
- linux
22+
- darwin
23+
goarch:
24+
- amd64
25+
- "386"
26+
- arm
27+
- arm64
28+
ignore:
29+
- goos: darwin
30+
goarch: "386"
31+
binary: "{{ .ProjectName }}_{{ .Version }}"
3232
archives:
33-
- format: zip
34-
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
33+
- format: zip
34+
name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
3535
checksum:
36-
name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS'
36+
name_template: "{{ .ProjectName }}_{{ .Version }}_SHA256SUMS"
3737
algorithm: sha256
3838
signs:
3939
- artifacts: checksum
4040
args:
41-
# if you are using this is a GitHub action or some other automated pipeline, you
41+
# if you are using this is a GitHub action or some other automated pipeline, you
4242
# need to pass the batch flag to indicate its not interactive.
4343
- "--batch"
4444
- "--local-user"
@@ -56,6 +56,6 @@ changelog:
5656
sort: asc
5757
filters:
5858
exclude:
59-
- '^docs:'
60-
- '^test:'
61-
- '^lint:'
59+
- "^docs:"
60+
- "^test:"
61+
- "^lint:"

‎docsite/docs/resource_graphql_mutation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ mutation deleteUser($userID: String!) {
213213
### Read Query Example
214214
```hcl
215215
mutation getUserByEmail($email: String!) {
216-
deleteUser(userInput: {
216+
getUserByEmail(userInput: {
217217
email: $email
218218
}) {
219219
id,

‎docsite/website/build/terraform-provider-graphql-gh-pages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit d13164ca72584e7f342d429b9c3437840a28e8b6
1+
Subproject commit cf2e4400b11c81f451bf31d282b06a493caafda2

‎e2e/go.mod

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
11
module github.com/sullivtr/terraform-provider-graphql/e2e
22

3-
go 1.16
3+
go 1.17
44

55
require (
66
github.com/gruntwork-io/terratest v0.37.6
77
github.com/stretchr/testify v1.6.1
88
)
9+
10+
require (
11+
github.com/agext/levenshtein v1.2.1 // indirect
12+
github.com/apparentlymart/go-textseg v1.0.0 // indirect
13+
github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
14+
github.com/davecgh/go-spew v1.1.1 // indirect
15+
github.com/hashicorp/errwrap v1.0.0 // indirect
16+
github.com/hashicorp/go-multierror v1.1.0 // indirect
17+
github.com/hashicorp/hcl/v2 v2.8.2 // indirect
18+
github.com/hashicorp/terraform-json v0.12.0 // indirect
19+
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect
20+
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
21+
github.com/pmezard/go-difflib v1.0.0 // indirect
22+
github.com/zclconf/go-cty v1.2.1 // indirect
23+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
24+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
25+
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
26+
golang.org/x/text v0.3.3 // indirect
27+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
28+
)

‎e2e/go.sum

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ golang.org/x/tools v0.0.0-20201110201400-7099162a900a/go.mod h1:emZCQorbCU4vsT4f
525525
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
526526
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
527527
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
528-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
529528
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
530529
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
531530
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=

‎e2e/gql-server/go.mod

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
module github.com/sullivtr/terraform-provider-graphql/gql-server
22

3-
go 1.14
3+
go 1.17
44

55
require (
66
github.com/99designs/gqlgen v0.11.3
77
github.com/vektah/gqlparser/v2 v2.0.1
88
)
9+
10+
require (
11+
github.com/agnivade/levenshtein v1.0.3 // indirect
12+
github.com/gorilla/websocket v1.2.0 // indirect
13+
github.com/hashicorp/golang-lru v0.5.0 // indirect
14+
github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047 // indirect
15+
)

0 commit comments

Comments
 (0)