r/aws_db_proxy: Change auth from TypeList to TypeSet

.changelog/35819.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_db_proxy: Change `auth` from `TypeList` to `TypeSet` as order is not significant
+```

.teamcity/scripts/provider_tests/acceptance_tests.sh

@@ -49,7 +49,7 @@ TF_ACC=1 go test \
     ./internal/maps/... \
     ./internal/provider/... \
     ./internal/retry/... \
-    ./internal/sdktypes/... \
+    ./internal/sdkv2/... \
     ./internal/slices/... \
     ./internal/sweep/... \
     ./internal/tags/... \

.teamcity/scripts/provider_tests/unit_tests.sh

@@ -21,7 +21,7 @@ go test \
     ./internal/maps/... \
     ./internal/provider/... \
     ./internal/retry/... \
-    ./internal/sdktypes/... \
+    ./internal/sdkv2/... \
     ./internal/slices/... \
     ./internal/sweep/... \
     ./internal/tags/... \

internal/sdkv2/README.md

@@ -0,0 +1,3 @@
+# Terraform Plugin SDK v2
+
+This package and its subpackages contain [Terraform Plugin SDK v2](https://developer.hashicorp.com/terraform/plugin/sdkv2) functionality.

internal/sdkv2/set.go

@@ -0,0 +1,38 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package sdkv2
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-provider-aws/internal/create"
+)
+
+// SimpleSchemaSetFunc returns a schema.SchemaSetFunc that hashes the given keys values.
+func SimpleSchemaSetFunc(keys ...string) schema.SchemaSetFunc {
+	return func(v interface{}) int {
+		var str strings.Builder
+
+		m := v.(map[string]interface{})
+		for _, key := range keys {
+			if v, ok := m[key]; ok {
+				switch v := v.(type) {
+				case bool:
+					str.WriteRune('-')
+					str.WriteString(strconv.FormatBool(v))
+				case int:
+					str.WriteRune('-')
+					str.WriteString(strconv.Itoa(v))
+				case string:
+					str.WriteRune('-')
+					str.WriteString(v)
+				}
+			}
+		}
+
+		return create.StringHashcode(str.String())
+	}
+}

internal/sdkv2/set_test.go

@@ -0,0 +1,39 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package sdkv2
+
+import (
+	"testing"
+)
+
+func TestSimpleSchemaSetFunc(t *testing.T) {
+	t.Parallel()
+
+	v1 := map[string]interface{}{
+		"key1": "value1",
+		"key2": "value2",
+		"key3": 3,
+		"key4": true,
+	}
+	v2 := map[string]interface{}{
+		"key1": "value1",
+		"key2": "value2-new",
+		"key3": 3,
+		"key4": true,
+	}
+	v3 := map[string]interface{}{
+		"key1": "value1",
+		"key2": "value2",
+		"key3": 4,
+		"key4": true,
+	}
+	f := SimpleSchemaSetFunc("key1", "key3", "key4")
+
+	if f(v1) != f(v2) {
+		t.Errorf("expected equal")
+	}
+	if f(v1) == f(v3) {
+		t.Errorf("expected not equal")
+	}
+}

internal/sdktypes/README.md → internal/sdkv2/types/README.md

@@ -1,3 +1,3 @@
-# Terraform Plugin SDK Provider-Defined Types
+# Terraform Plugin SDK v2 Provider-Defined Types
 
-This package contains provider-defined types for Terraform Plugin SDK.
+This package contains provider-defined types for Terraform Plugin SDK v2.

internal/sdktypes/duration.go → internal/sdkv2/types/duration.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package sdktypes
+package types
 
 import (
 	"time"

internal/sdktypes/duration_test.go → internal/sdkv2/types/duration_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package sdktypes
+package types
 
 import (
 	"testing"

internal/sdktypes/rfc3339_duration.go → internal/sdkv2/types/rfc3339_duration.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package sdktypes
+package types
 
 import (
 	"github.com/hashicorp/go-cty/cty"

internal/sdktypes/testing_test.go → internal/sdkv2/types/testing_test.go

@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
 
-package sdktypes
+package types
 
 import (
 	"regexp"

internal/service/acm/certificate.go

@@ -30,7 +30,7 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
-	"github.com/hashicorp/terraform-provider-aws/internal/sdktypes"
+	sdktypes "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/types/duration"

internal/service/elasticbeanstalk/environment.go

@@ -25,7 +25,7 @@ import ( // nosemgrep:ci.semgrep.aws.multiple-service-imports
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/create"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
-	"github.com/hashicorp/terraform-provider-aws/internal/sdktypes"
+	sdktypes "github.com/hashicorp/terraform-provider-aws/internal/sdkv2/types"
 	tfec2 "github.com/hashicorp/terraform-provider-aws/internal/service/ec2"
 	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"

internal/service/rds/consts.go

@@ -116,10 +116,10 @@ const (
 )
 
 const (
-	EventSubscriptionStatusActive    = "active"
-	EventSubscriptionStatusCreating  = "creating"
-	EventSubscriptionStatusDeleting  = "deleting"
-	EventSubscriptionStatusModifying = "modifying"
+	eventSubscriptionStatusActive    = "active"
+	eventSubscriptionStatusCreating  = "creating"
+	eventSubscriptionStatusDeleting  = "deleting"
+	eventSubscriptionStatusModifying = "modifying"
 )
 
 const (

internal/service/rds/errors.go

@@ -4,6 +4,7 @@
 package rds
 
 const (
+	errCodeInvalidAction               = "InvalidAction"
 	errCodeInvalidParameterCombination = "InvalidParameterCombination"
 	errCodeInvalidParameterValue       = "InvalidParameterValue"
 	errCodeValidationError             = "ValidationError"