Skip to content

Commit b383c2b

Browse files
arsciarsci
authored
LIB-79: Replace tfenv/tgswitch with mise (#99)
1 parent 90041a8 commit b383c2b

File tree

4 files changed

+121
-78
lines changed

4 files changed

+121
-78
lines changed

‎.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env: &env
99
GOPRIVATE: github.com/gruntwork-io
1010
defaults: &defaults
1111
docker:
12-
- image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.21-tf1.5-tg39.1-pck1.8-ci50.7
12+
- image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.21.9-tf1.5-tg39.1-pck1.8-ci54.0
1313
<<: *env
1414
terrascan: &terrascan
1515
docker:
@@ -97,8 +97,8 @@ jobs:
9797
command: |
9898
mkdir -p /tmp/logs
9999
# Pre-install terraform versions used in the test, before the tests run, to avoid installation racing.
100-
tfenv install $UPGRADE_TEST_TF_BASE_VERSION
101-
tfenv install $UPGRADE_TEST_TF_TARGET_VERSION
100+
mise install terraform@$UPGRADE_TEST_TF_BASE_VERSION
101+
mise install terraform@$UPGRADE_TEST_TF_TARGET_VERSION
102102
# Believe it or not, we've seen the tee command fail when we have too much logging all happening at once.
103103
# To ensure that tee failing doesn't cause the whole test suite to fail, we add an || true.
104104
run-go-tests \

‎.circleci/set-upgrade-test-vars.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ else
1616
fi
1717

1818
# Set these variables so that the CI server pre-installs these versions before the upgrade tests run.
19-
tfBaseVersion="latest:^1.2"
20-
tfTargetVersion="latest:^1.3"
19+
tfBaseVersion="1.2"
20+
tfTargetVersion="1.3"
2121
echo "export UPGRADE_TEST_TF_BASE_VERSION=$tfBaseVersion" >> $BASH_ENV
2222
echo "export UPGRADE_TEST_TF_TARGET_VERSION=$tfTargetVersion" >> $BASH_ENV

‎test/go.mod

+36-26
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ go 1.21.1
55
toolchain go1.21.3
66

77
require (
8-
github.com/gruntwork-io/terraform-aws-ci/test/upgrade-tester v0.0.0-20231019183031-ca057da3e07d
8+
github.com/gruntwork-io/terraform-aws-ci/test/upgrade-tester v0.0.0-20240417193241-8367ff1d958d
99
github.com/gruntwork-io/terratest v0.44.1
10-
github.com/stretchr/testify v1.8.1
10+
github.com/stretchr/testify v1.8.4
1111
)
1212

1313
require (
14-
cloud.google.com/go v0.105.0 // indirect
15-
cloud.google.com/go/compute v1.12.1 // indirect
16-
cloud.google.com/go/compute/metadata v0.2.1 // indirect
17-
cloud.google.com/go/iam v0.7.0 // indirect
18-
cloud.google.com/go/storage v1.27.0 // indirect
14+
cloud.google.com/go v0.112.1 // indirect
15+
cloud.google.com/go/compute v1.24.0 // indirect
16+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
17+
cloud.google.com/go/iam v1.1.7 // indirect
18+
cloud.google.com/go/storage v1.40.0 // indirect
1919
github.com/agext/levenshtein v1.2.3 // indirect
2020
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
2121
github.com/aws/aws-sdk-go v1.44.122 // indirect
@@ -26,21 +26,24 @@ require (
2626
github.com/davecgh/go-spew v1.1.1 // indirect
2727
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2828
github.com/fatih/color v1.9.0 // indirect
29+
github.com/felixge/httpsnoop v1.0.4 // indirect
2930
github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
30-
github.com/go-logr/logr v1.2.3 // indirect
31+
github.com/go-logr/logr v1.4.1 // indirect
32+
github.com/go-logr/stdr v1.2.2 // indirect
3133
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3234
github.com/go-openapi/jsonreference v0.20.1 // indirect
3335
github.com/go-openapi/swag v0.22.3 // indirect
3436
github.com/go-sql-driver/mysql v1.5.0 // indirect
3537
github.com/gogo/protobuf v1.3.2 // indirect
3638
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
37-
github.com/golang/protobuf v1.5.3 // indirect
39+
github.com/golang/protobuf v1.5.4 // indirect
3840
github.com/google/gnostic v0.5.7-v3refs // indirect
39-
github.com/google/go-cmp v0.5.9 // indirect
41+
github.com/google/go-cmp v0.6.0 // indirect
4042
github.com/google/gofuzz v1.1.0 // indirect
41-
github.com/google/uuid v1.3.0 // indirect
42-
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
43-
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
43+
github.com/google/s2a-go v0.1.7 // indirect
44+
github.com/google/uuid v1.6.0 // indirect
45+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
46+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
4447
github.com/gruntwork-io/go-commons v0.12.4 // indirect
4548
github.com/hashicorp/errwrap v1.1.0 // indirect
4649
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -77,19 +80,26 @@ require (
7780
github.com/urfave/cli/v2 v2.3.0 // indirect
7881
github.com/zclconf/go-cty v1.9.1 // indirect
7982
go.opencensus.io v0.24.0 // indirect
80-
golang.org/x/crypto v0.1.0 // indirect
81-
golang.org/x/net v0.8.0 // indirect
82-
golang.org/x/oauth2 v0.1.0 // indirect
83-
golang.org/x/sys v0.6.0 // indirect
84-
golang.org/x/term v0.6.0 // indirect
85-
golang.org/x/text v0.8.0 // indirect
86-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
87-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
88-
google.golang.org/api v0.103.0 // indirect
89-
google.golang.org/appengine v1.6.7 // indirect
90-
google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c // indirect
91-
google.golang.org/grpc v1.51.0 // indirect
92-
google.golang.org/protobuf v1.31.0 // indirect
83+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
85+
go.opentelemetry.io/otel v1.24.0 // indirect
86+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
87+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
88+
golang.org/x/crypto v0.21.0 // indirect
89+
golang.org/x/net v0.22.0 // indirect
90+
golang.org/x/oauth2 v0.18.0 // indirect
91+
golang.org/x/sync v0.6.0 // indirect
92+
golang.org/x/sys v0.18.0 // indirect
93+
golang.org/x/term v0.18.0 // indirect
94+
golang.org/x/text v0.14.0 // indirect
95+
golang.org/x/time v0.5.0 // indirect
96+
google.golang.org/api v0.170.0 // indirect
97+
google.golang.org/appengine v1.6.8 // indirect
98+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
99+
google.golang.org/genproto/googleapis/api v0.0.0-20240314234333-6e1732d8331c // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311132316-a219d84964c2 // indirect
101+
google.golang.org/grpc v1.62.1 // indirect
102+
google.golang.org/protobuf v1.33.0 // indirect
93103
gopkg.in/inf.v0 v0.9.1 // indirect
94104
gopkg.in/yaml.v2 v2.4.0 // indirect
95105
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)