From c5cc26df73480c060d25bf9f51bbf5e7efbe0259 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 16 Mar 2022 10:54:24 -0400 Subject: [PATCH 1/3] Bump Go module compatibility to Go 1.17 This will match the README documentation, especially now that Go 1.18 is released. Updated via: ``` go mod edit -go=1.17 go mod tidy ``` --- go.mod | 27 ++++++++++++++++++++++++++- go.sum | 1 - 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index e3be9961..c51ce30f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/terraform-exec -go 1.14 +go 1.17 require ( github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f @@ -13,3 +13,28 @@ require ( github.com/zclconf/go-cty v1.10.0 github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b ) + +require ( + github.com/Microsoft/go-winio v0.4.16 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect + github.com/acomagu/bufpipe v1.0.3 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.3.1 // indirect + github.com/go-git/go-git/v5 v5.4.2 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/xanzy/ssh-agent v0.3.0 // indirect + golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect + golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect + golang.org/x/text v0.3.5 // indirect + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) diff --git a/go.sum b/go.sum index fac7443d..bada2799 100644 --- a/go.sum +++ b/go.sum @@ -19,7 +19,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= -github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= From 12fb3b2a704bf8cc161291df06a74d67cec7ebc1 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 16 Mar 2022 11:31:29 -0400 Subject: [PATCH 2/3] .circleci: Update Go versions to 1.17 and 1.18 --- .circleci/config.yml | 102 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f5a773b..574b13dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,15 +57,15 @@ jobs: - go_e2e_test # previous stable Go version - go116_build: + go117_build: docker: - - image: circleci/golang:1.16 + - image: circleci/golang:1.17 steps: - checkout - go_build - go116_test: + go117_test: docker: - - image: circleci/golang:1.16 + - image: circleci/golang:1.17 parameters: test_results: type: string @@ -75,15 +75,15 @@ jobs: - go_unit_test # latest stable Go version - go117_build: + go118_build: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.18 steps: - checkout - go_build - go117_test: + go118_test: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.18 parameters: test_results: type: string @@ -91,11 +91,11 @@ jobs: steps: - checkout - go_unit_test - go117_test_main: + go118_test_main: environment: TFEXEC_E2ETEST_VERSIONS: refs/heads/main docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.18 parameters: test_results: type: string @@ -104,21 +104,21 @@ jobs: - checkout - go_unit_test - go_e2e_test - go117_vet: + go118_vet: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.18 steps: - checkout - run: go vet ./... - go117_fmt: + go118_fmt: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.18 steps: - checkout - run: gofmt -s -l . - go117_release: + go118_release: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.18 steps: - add_ssh_keys: fingerprints: @@ -133,23 +133,23 @@ workflows: - winbuildtest - macosbuildtest - - go116_build - - go116_test: - requires: - - go116_build - go117_build - go117_test: requires: - go117_build - - go117_test_main: + - go118_build + - go118_test: requires: - - go117_build - - go117_vet: + - go118_build + - go118_test_main: requires: - - go117_build - - go117_fmt: + - go118_build + - go118_vet: requires: - - go117_build + - go118_build + - go118_fmt: + requires: + - go118_build release: jobs: - winbuildtest: @@ -162,49 +162,49 @@ workflows: branches: only: - main - - go116_build: + - go117_build: filters: branches: only: - main - - go116_test: + - go117_test: requires: - - go116_build + - go117_build filters: branches: only: - main - - go117_build: + - go118_build: filters: branches: only: - main - - go117_test: + - go118_test: requires: - - go117_build + - go118_build filters: branches: only: - main - - go117_test_main: + - go118_test_main: requires: - - go117_build + - go118_build filters: branches: only: - main - - go117_vet: + - go118_vet: requires: - - go117_build + - go118_build filters: branches: only: - main - - go117_fmt: + - go118_fmt: requires: - - go117_build + - go118_build filters: branches: only: @@ -217,16 +217,16 @@ workflows: - main type: approval - - go117_release: + - go118_release: filters: branches: only: - main requires: - trigger-release - - go117_test_main - - go117_vet - - go117_fmt + - go118_test_main + - go118_vet + - go118_fmt - winbuildtest - macosbuildtest nightly: @@ -244,31 +244,31 @@ workflows: - slack/notify: event: fail template: basic_fail_1 - - go116_build: + - go117_build: post-steps: - slack/notify: event: fail template: basic_fail_1 - - go116_test: + - go117_test: post-steps: - slack/notify: event: fail template: basic_fail_1 requires: - - go116_build - - go117_build: + - go117_build + - go118_build: post-steps: - slack/notify: event: fail template: basic_fail_1 - - go117_test: + - go118_test: post-steps: - slack/notify: event: fail template: basic_fail_1 requires: - - go117_build - - go117_test_main: + - go118_build + - go118_test_main: post-steps: - slack/notify: event: fail @@ -291,8 +291,8 @@ workflows: ] } requires: - - go116_build - - go116_test - go117_build + - go117_test + - go118_build - winbuildtest - macosbuildtest From 7b3002b90708f69b4f4ca20d015b5f76a6077277 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Wed, 16 Mar 2022 12:26:31 -0400 Subject: [PATCH 3/3] .circleci: Revert 1.18 changes as its not available yet --- .circleci/config.yml | 102 +++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 574b13dd..4f5a773b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,15 +57,15 @@ jobs: - go_e2e_test # previous stable Go version - go117_build: + go116_build: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.16 steps: - checkout - go_build - go117_test: + go116_test: docker: - - image: circleci/golang:1.17 + - image: circleci/golang:1.16 parameters: test_results: type: string @@ -75,15 +75,15 @@ jobs: - go_unit_test # latest stable Go version - go118_build: + go117_build: docker: - - image: circleci/golang:1.18 + - image: circleci/golang:1.17 steps: - checkout - go_build - go118_test: + go117_test: docker: - - image: circleci/golang:1.18 + - image: circleci/golang:1.17 parameters: test_results: type: string @@ -91,11 +91,11 @@ jobs: steps: - checkout - go_unit_test - go118_test_main: + go117_test_main: environment: TFEXEC_E2ETEST_VERSIONS: refs/heads/main docker: - - image: circleci/golang:1.18 + - image: circleci/golang:1.17 parameters: test_results: type: string @@ -104,21 +104,21 @@ jobs: - checkout - go_unit_test - go_e2e_test - go118_vet: + go117_vet: docker: - - image: circleci/golang:1.18 + - image: circleci/golang:1.17 steps: - checkout - run: go vet ./... - go118_fmt: + go117_fmt: docker: - - image: circleci/golang:1.18 + - image: circleci/golang:1.17 steps: - checkout - run: gofmt -s -l . - go118_release: + go117_release: docker: - - image: circleci/golang:1.18 + - image: circleci/golang:1.17 steps: - add_ssh_keys: fingerprints: @@ -133,23 +133,23 @@ workflows: - winbuildtest - macosbuildtest + - go116_build + - go116_test: + requires: + - go116_build - go117_build - go117_test: requires: - go117_build - - go118_build - - go118_test: - requires: - - go118_build - - go118_test_main: + - go117_test_main: requires: - - go118_build - - go118_vet: + - go117_build + - go117_vet: requires: - - go118_build - - go118_fmt: + - go117_build + - go117_fmt: requires: - - go118_build + - go117_build release: jobs: - winbuildtest: @@ -162,49 +162,49 @@ workflows: branches: only: - main - - go117_build: + - go116_build: filters: branches: only: - main - - go117_test: + - go116_test: requires: - - go117_build + - go116_build filters: branches: only: - main - - go118_build: + - go117_build: filters: branches: only: - main - - go118_test: + - go117_test: requires: - - go118_build + - go117_build filters: branches: only: - main - - go118_test_main: + - go117_test_main: requires: - - go118_build + - go117_build filters: branches: only: - main - - go118_vet: + - go117_vet: requires: - - go118_build + - go117_build filters: branches: only: - main - - go118_fmt: + - go117_fmt: requires: - - go118_build + - go117_build filters: branches: only: @@ -217,16 +217,16 @@ workflows: - main type: approval - - go118_release: + - go117_release: filters: branches: only: - main requires: - trigger-release - - go118_test_main - - go118_vet - - go118_fmt + - go117_test_main + - go117_vet + - go117_fmt - winbuildtest - macosbuildtest nightly: @@ -244,31 +244,31 @@ workflows: - slack/notify: event: fail template: basic_fail_1 - - go117_build: + - go116_build: post-steps: - slack/notify: event: fail template: basic_fail_1 - - go117_test: + - go116_test: post-steps: - slack/notify: event: fail template: basic_fail_1 requires: - - go117_build - - go118_build: + - go116_build + - go117_build: post-steps: - slack/notify: event: fail template: basic_fail_1 - - go118_test: + - go117_test: post-steps: - slack/notify: event: fail template: basic_fail_1 requires: - - go118_build - - go118_test_main: + - go117_build + - go117_test_main: post-steps: - slack/notify: event: fail @@ -291,8 +291,8 @@ workflows: ] } requires: + - go116_build + - go116_test - go117_build - - go117_test - - go118_build - winbuildtest - macosbuildtest