Merge pull request #32417 from hashicorp/td-tfsdk2fw-dependabot

Adds `dependabot` rule for `tfsdk2fw` tool
hashicorp · Jul 7, 2023 · 42bfa9c · 42bfa9c
2 parents 5399ae0 + 4651f35
commit 42bfa9c
Show file tree

Hide file tree

Showing 4 changed files with 345 additions and 326 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -55,6 +55,18 @@ updates:
     schedule:
       interval: "daily"
 
+  - directory: "/tools/tfsdk2fw"
+    package-ecosystem: "gomod"
+    allow:
+      - dependency-type: direct
+    ignore:
+      # terraform-plugin-sdk/v2 should only be updated via terraform-provider-aws
+      - dependency-name: "github.com/hashicorp/terraform-plugin-sdk/v2"
+      - dependency-name: "golang.org/x/tools"
+      - dependency-name: "google.golang.org/grpc"
+    schedule:
+      interval: "daily"
+
   - directory: "/infrastructure/repository"
     package-ecosystem: "terraform"
     schedule:

diff --git a/.github/workflows/tfsdk2fw.yml b/.github/workflows/tfsdk2fw.yml
@@ -0,0 +1,31 @@
+name: tfsdk2fw Checks
+
+on:
+  push:
+    branches:
+      - main
+      - 'release/**'
+  pull_request:
+    paths:
+      - go.mod
+      - go.sum
+      - internal/generate/common/**
+      - internal/provider/**
+      - tools/tfsdk2fw/**
+
+jobs:
+  tfsdk2fw_go_mod:
+    name: go mod
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
+      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+        with:
+          go-version-file: tools/tfsdk2fw/go.mod
+      - name: go mod
+        run: |
+          cd tools/tfsdk2fw/
+          echo "==> Checking tfsdk2fw with go mod tidy..."
+          go mod tidy
+          git diff --exit-code -- go.mod go.sum || \
+            (echo; echo "Unexpected difference in tools/tfsdk2fw/go.mod or tools/tfsdk2fw/go.sum files. Run 'go mod tidy' command or revert any go.mod/go.sum changes and commit."; exit 1)
diff --git a/tools/tfsdk2fw/go.mod b/tools/tfsdk2fw/go.mod
@@ -3,114 +3,123 @@ module github.com/hashicorp/terraform-provider-aws/tools/tfsdk2fw
 go 1.20
 
 require (
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.26.1
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.27.0
 	github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220322001452-8f7a597d0c24
-	golang.org/x/exp v0.0.0-20230206171751-46f607a40771
+	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
 )
 
 require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230201104953-d1d05f4e2bfb // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 // indirect
-	github.com/aws/aws-sdk-go v1.44.280 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
+	github.com/aws/aws-sdk-go v1.44.297 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.18.1 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
-	github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/account v1.10.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/acm v1.17.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/auditmanager v1.24.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.1.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.11.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.21.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/comprehend v1.24.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.24.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/directoryservice v1.17.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.1.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.99.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/finspace v1.10.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/fis v1.14.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/glacier v1.14.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/healthlake v1.16.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/iam v1.20.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.14.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ivschat v1.4.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/kendra v1.40.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/lambda v1.35.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/lightsail v1.26.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/medialive v1.31.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/oam v1.1.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.2.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/pipes v1.2.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/rbin v1.8.12 // indirect
-	github.com/aws/aws-sdk-go-v2/service/rds v1.45.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.2.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.2.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/route53domains v1.14.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3control v1.31.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/securitylake v1.4.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sesv2 v1.18.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.36.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.15.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.21.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/swf v1.15.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/transcribe v1.26.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/vpclattice v1.0.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/xray v1.16.11 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.18.27 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.26 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 // indirect
+	github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.19.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/account v1.10.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/acm v1.17.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/appconfig v1.17.11 // indirect
+	github.com/aws/aws-sdk-go-v2/service/auditmanager v1.25.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/cleanrooms v1.2.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.11.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.21.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/comprehend v1.24.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.24.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/directoryservice v1.17.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.1.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.103.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/finspace v1.10.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/fis v1.14.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/glacier v1.14.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/healthlake v1.16.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/iam v1.21.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/identitystore v1.16.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.15.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.28 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internetmonitor v1.3.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ivschat v1.4.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kendra v1.41.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/keyspaces v1.3.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/lambda v1.37.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/lightsail v1.27.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/medialive v1.31.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/oam v1.1.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/opensearchserverless v1.2.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/pipes v1.2.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/pricing v1.20.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/qldb v1.15.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/rbin v1.8.14 // indirect
+	github.com/aws/aws-sdk-go-v2/service/rds v1.46.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.2.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.2.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/route53domains v1.15.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3control v1.31.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/scheduler v1.1.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/securitylake v1.4.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sesv2 v1.18.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.36.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssmcontacts v1.15.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssmincidents v1.21.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/swf v1.15.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.17.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/transcribe v1.26.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.0.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/vpclattice v1.0.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/workspaces v1.28.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/xray v1.16.13 // indirect
 	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/beevik/etree v1.2.0 // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
-	github.com/fatih/color v1.14.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.20.0 // indirect
-	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.29 // indirect
-	github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.30 // indirect
+	github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.21.0 // indirect
+	github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.31 // indirect
+	github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.32 // indirect
 	github.com/hashicorp/awspolicyequivalence v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.4.9 // indirect
+	github.com/hashicorp/go-plugin v1.4.10 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hc-install v0.5.0 // indirect
-	github.com/hashicorp/hcl/v2 v2.16.2 // indirect
+	github.com/hashicorp/hc-install v0.5.2 // indirect
+	github.com/hashicorp/hcl/v2 v2.17.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/terraform-exec v0.18.1 // indirect
-	github.com/hashicorp/terraform-json v0.16.0 // indirect
-	github.com/hashicorp/terraform-plugin-framework v1.3.0 // indirect
-	github.com/hashicorp/terraform-plugin-framework-timeouts v0.3.1 // indirect
+	github.com/hashicorp/terraform-json v0.17.0 // indirect
+	github.com/hashicorp/terraform-plugin-framework v1.3.2 // indirect
+	github.com/hashicorp/terraform-plugin-framework-timeouts v0.4.1 // indirect
 	github.com/hashicorp/terraform-plugin-framework-validators v0.10.0 // indirect
-	github.com/hashicorp/terraform-plugin-go v0.15.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.18.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
-	github.com/hashicorp/terraform-plugin-mux v0.10.0 // indirect
-	github.com/hashicorp/terraform-plugin-testing v1.2.0 // indirect
-	github.com/hashicorp/terraform-registry-address v0.2.0 // indirect
-	github.com/hashicorp/terraform-svchost v0.1.0 // indirect
+	github.com/hashicorp/terraform-plugin-mux v0.11.1 // indirect
+	github.com/hashicorp/terraform-plugin-testing v1.3.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.1 // indirect
+	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
@@ -132,18 +141,18 @@ require (
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	github.com/zclconf/go-cty v1.13.1 // indirect
-	go.opentelemetry.io/otel v1.15.1 // indirect
-	go.opentelemetry.io/otel/trace v1.15.1 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
-	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	github.com/zclconf/go-cty v1.13.2 // indirect
+	go.opentelemetry.io/otel v1.16.0 // indirect
+	go.opentelemetry.io/otel/trace v1.16.0 // indirect
+	golang.org/x/crypto v0.11.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.11.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )