chore(deps): Update HashiCorp terraform libraries (#452)

Author: mkilchhofer

.github/workflows/tests.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Run linters
       uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
       with:
-        version: v1.51.2
+        version: v1.59.1
 
     - name: Generate
       run: make generate

argocd/schema_application_test.go

@@ -556,6 +556,7 @@ func TestUpgradeSchemaApplication_V3V4(t *testing.T) {
 			if err != nil {
 				t.Fatalf("error migrating state: %s", err)
 			}
+
 			if !reflect.DeepEqual(actualState, tc.expectedState) {
 				t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", tc.expectedState, actualState)
 			}

argocd/schema_project_test.go

@@ -137,6 +137,7 @@ func TestResourceArgoCDProjectStateUpgradeV0(t *testing.T) {
 			if err != nil {
 				t.Fatalf("error migrating state: %s", err)
 			}
+
 			if !reflect.DeepEqual(actualState, tc.expectedState) {
 				t.Fatalf("\n\nexpected:\n\n%#v\n\ngot:\n\n%#v\n\n", tc.expectedState, actualState)
 			}

argocd/structure_application.go

@@ -31,7 +31,7 @@ func expandApplicationSpec(s map[string]interface{}) (spec application.Applicati
 	if v, ok := s["info"]; ok {
 		spec.Info, err = expandApplicationInfo(v.(*schema.Set))
 		if err != nil {
-			return
+			return spec, err
 		}
 	}
 
@@ -42,7 +42,7 @@ func expandApplicationSpec(s map[string]interface{}) (spec application.Applicati
 	if v, ok := s["sync_policy"].([]interface{}); ok && len(v) > 0 {
 		spec.SyncPolicy, err = expandApplicationSyncPolicy(v[0])
 		if err != nil {
-			return
+			return spec, err
 		}
 	}
 

argocd/structure_application_set.go

@@ -25,7 +25,7 @@ func expandApplicationSetSpec(d *schema.ResourceData, featureMultipleApplication
 	if v, ok := s["generator"].([]interface{}); ok && len(v) > 0 {
 		spec.Generators, err = expandApplicationSetGenerators(v, featureMultipleApplicationSourcesSupported)
 		if err != nil {
-			return
+			return spec, err
 		}
 	}
 
@@ -41,7 +41,7 @@ func expandApplicationSetSpec(d *schema.ResourceData, featureMultipleApplication
 	if v, ok := s["strategy"].([]interface{}); ok && len(v) > 0 {
 		spec.Strategy, err = expandApplicationSetStrategy(v[0].(map[string]interface{}))
 		if err != nil {
-			return
+			return spec, err
 		}
 	}
 
@@ -56,7 +56,7 @@ func expandApplicationSetSpec(d *schema.ResourceData, featureMultipleApplication
 	if v, ok := s["template"].([]interface{}); ok && len(v) > 0 {
 		spec.Template, err = expandApplicationSetTemplate(v[0], featureMultipleApplicationSourcesSupported)
 		if err != nil {
-			return
+			return spec, err
 		}
 	}
 
@@ -822,7 +822,7 @@ func expandApplicationSetTemplate(temp interface{}, featureMultipleApplicationSo
 	if v, ok := t["metadata"]; ok {
 		template.ApplicationSetTemplateMeta, err = expandApplicationSetTemplateMeta(v.([]interface{})[0])
 		if err != nil {
-			return
+			return template, err
 		}
 	}
 
@@ -831,7 +831,7 @@ func expandApplicationSetTemplate(temp interface{}, featureMultipleApplicationSo
 
 		template.Spec, err = expandApplicationSpec(s)
 		if err != nil {
-			return
+			return template, err
 		}
 
 		l := len(template.Spec.Sources)
@@ -851,7 +851,7 @@ func expandApplicationSetTemplate(temp interface{}, featureMultipleApplicationSo
 
 func expandApplicationSetTemplateMeta(meta interface{}) (metadata application.ApplicationSetTemplateMeta, err error) {
 	if meta == nil {
-		return
+		return metadata, err
 	}
 
 	m, ok := meta.(map[string]interface{})
@@ -884,7 +884,7 @@ func expandApplicationSetTemplateMeta(meta interface{}) (metadata application.Ap
 
 func expandApplicationSetIgnoreDifferences(ids []interface{}, featureApplicationSetIgnoreApplicationDifferences bool) (result []application.ApplicationSetResourceIgnoreDifferences) {
 	if !featureApplicationSetIgnoreApplicationDifferences {
-		return
+		return result
 	}
 
 	for _, _id := range ids {
@@ -913,7 +913,7 @@ func expandApplicationSetIgnoreDifferences(ids []interface{}, featureApplication
 		result = append(result, elem)
 	}
 
-	return //nolint:nakedret // overriding as function follows pattern in rest of file
+	return result
 }
 func flattenApplicationSet(as *application.ApplicationSet, d *schema.ResourceData) error {
 	fMetadata := flattenMetadata(as.ObjectMeta, d)

argocd/structure_metadata_test.go

@@ -31,6 +31,7 @@ func TestMetadataIsInternalKey(t *testing.T) {
 			if tc.Expected && isInternal != tc.Expected {
 				t.Fatalf("Expected %q to be internal", tc.Key)
 			}
+
 			if !tc.Expected && isInternal != tc.Expected {
 				t.Fatalf("Expected %q not to be internal", tc.Key)
 			}

go.mod

@@ -1,6 +1,6 @@
 module github.com/oboukili/terraform-provider-argocd
 
-go 1.20
+go 1.21
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
@@ -12,23 +12,23 @@ require (
 	github.com/elliotchance/pie/v2 v2.8.0
 	github.com/golang/protobuf v1.5.4
 	github.com/hashicorp/terraform-plugin-docs v0.16.0
-	github.com/hashicorp/terraform-plugin-framework v1.4.2
-	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
-	github.com/hashicorp/terraform-plugin-go v0.19.1
+	github.com/hashicorp/terraform-plugin-framework v1.10.0
+	github.com/hashicorp/terraform-plugin-framework-validators v0.13.0
+	github.com/hashicorp/terraform-plugin-go v0.23.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
-	github.com/hashicorp/terraform-plugin-mux v0.12.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.30.0
-	github.com/hashicorp/terraform-plugin-testing v1.6.0
+	github.com/hashicorp/terraform-plugin-mux v0.16.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
+	github.com/hashicorp/terraform-plugin-testing v1.10.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/stretchr/testify v1.8.4
-	golang.org/x/crypto v0.21.0
+	github.com/stretchr/testify v1.9.0
+	golang.org/x/crypto v0.26.0
 	k8s.io/apiextensions-apiserver v0.24.17
 	k8s.io/apimachinery v0.24.17
 	k8s.io/client-go v0.24.17
 )
 
 require (
-	cloud.google.com/go/compute v1.23.0 // indirect
+	cloud.google.com/go/compute v1.24.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -44,7 +44,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/PagerDuty/go-pagerduty v1.7.0 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
+	github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
 	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
 	github.com/RocketChat/Rocket.Chat.Go.SDK v0.0.0-20210112200207-10ab4d695d60 // indirect
 	github.com/agext/levenshtein v1.2.2 // indirect
@@ -88,14 +88,14 @@ require (
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
-	github.com/go-git/go-git/v5 v5.11.0 // indirect
+	github.com/go-git/go-git/v5 v5.12.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-openapi/analysis v0.21.4 // indirect
 	github.com/go-openapi/errors v0.20.3 // indirect
@@ -124,7 +124,7 @@ require (
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/gregdel/pushover v1.2.1 // indirect
@@ -138,18 +138,18 @@ require (
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.5.2 // indirect
+	github.com/hashicorp/go-plugin v1.6.0 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.7 // 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.6.1 // indirect
-	github.com/hashicorp/hcl/v2 v2.19.1 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/hc-install v0.8.0 // indirect
+	github.com/hashicorp/hcl/v2 v2.21.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
-	github.com/hashicorp/terraform-exec v0.19.0 // indirect
-	github.com/hashicorp/terraform-json v0.18.0 // indirect
+	github.com/hashicorp/terraform-exec v0.21.0 // indirect
+	github.com/hashicorp/terraform-json v0.22.1 // indirect
 	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
-	github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
@@ -199,7 +199,7 @@ require (
 	github.com/redis/go-redis/v9 v9.0.5 // indirect
 	github.com/rs/cors v1.8.0 // indirect
 	github.com/russross/blackfriday v1.6.0 // indirect
-	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.2.2 // indirect
@@ -221,31 +221,31 @@ require (
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect
 	github.com/yuin/gopher-lua v1.1.0 // indirect
-	github.com/zclconf/go-cty v1.14.1 // indirect
+	github.com/zclconf/go-cty v1.15.0 // indirect
 	go.mongodb.org/mongo-driver v1.11.3 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
-	go.opentelemetry.io/otel v1.20.0 // indirect
-	go.opentelemetry.io/otel/metric v1.20.0 // indirect
-	go.opentelemetry.io/otel/trace v1.20.0 // indirect
+	go.opentelemetry.io/otel v1.22.0 // indirect
+	go.opentelemetry.io/otel/metric v1.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.22.0 // indirect
 	go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
 	golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
-	golang.org/x/mod v0.13.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.11.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/oauth2 v0.17.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.23.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.13.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gomodules.xyz/envconfig v1.3.1-0.20190308184047-426f31af0d45 // indirect
 	gomodules.xyz/notify v0.1.1 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect