fix: Add toUpperCase to provider and region fields in cluster resources (#1837)

Author: andreaangiolillo

internal/service/advancedcluster/common_advanced_cluster.go

@@ -10,6 +10,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/mwielbut/pointy"
@@ -611,3 +613,18 @@ func flattenEndpoints(listEndpoints []matlas.Endpoint) []map[string]any {
 	}
 	return endpoints
 }
+
+func StringIsUppercase() schema.SchemaValidateDiagFunc {
+	return func(v any, p cty.Path) diag.Diagnostics {
+		value := v.(string)
+		var diags diag.Diagnostics
+		if value != strings.ToUpper(value) {
+			diagError := diag.Diagnostic{
+				Severity: diag.Error,
+				Summary:  fmt.Sprintf("The provided string '%q' must be uppercase.", value),
+			}
+			diags = append(diags, diagError)
+		}
+		return diags
+	}
+}

internal/service/advancedcluster/common_advanced_cluster_test.go

@@ -142,6 +142,39 @@ func TestResourceClusterRefreshFunc(t *testing.T) {
 	}
 }
 
+func TestStringIsUppercase(t *testing.T) {
+	testCases := []struct {
+		name          string
+		expectedError bool
+	}{
+		{
+			name:          "AWS",
+			expectedError: false,
+		},
+		{
+			name:          "aws",
+			expectedError: true,
+		},
+		{
+			name:          "",
+			expectedError: false,
+		},
+		{
+			name:          "AwS",
+			expectedError: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			diag := advancedcluster.StringIsUppercase()(tc.name, nil)
+			if diag.HasError() != tc.expectedError {
+				t.Errorf("Case %s: Received unexpected error: %v", tc.name, diag[0].Summary)
+			}
+		})
+	}
+}
+
 func TestResourceListAdvancedRefreshFunc(t *testing.T) {
 	testCases := []struct {
 		mockCluster    *matlas.AdvancedClustersResponse

internal/service/advancedcluster/resource_advanced_cluster.go

@@ -12,9 +12,6 @@ import (
 	"strings"
 	"time"
 
-	matlas "go.mongodb.org/atlas/mongodbatlas"
-	"golang.org/x/exp/slices"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -24,6 +21,8 @@ import (
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	"github.com/mwielbut/pointy"
 	"github.com/spf13/cast"
+	matlas "go.mongodb.org/atlas/mongodbatlas"
+	"golang.org/x/exp/slices"
 )
 
 type acCtxKey string
@@ -260,13 +259,15 @@ func Resource() *schema.Resource {
 										Required: true,
 									},
 									"provider_name": {
-										Type:     schema.TypeString,
-										Required: true,
+										Type:             schema.TypeString,
+										Required:         true,
+										ValidateDiagFunc: StringIsUppercase(),
 									},
 									"read_only_specs": advancedClusterRegionConfigsSpecsSchema(),
 									"region_name": {
-										Type:     schema.TypeString,
-										Required: true,
+										Type:             schema.TypeString,
+										Required:         true,
+										ValidateDiagFunc: StringIsUppercase(),
 									},
 								},
 							},

internal/service/cluster/resource_cluster.go

@@ -12,19 +12,17 @@ import (
 	"strings"
 	"time"
 
-	matlas "go.mongodb.org/atlas/mongodbatlas"
-
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
-	"github.com/mwielbut/pointy"
-	"github.com/spf13/cast"
-
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/constant"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/service/advancedcluster"
+	"github.com/mwielbut/pointy"
+	"github.com/spf13/cast"
+	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 const (
@@ -153,8 +151,9 @@ func Resource() *schema.Resource {
 				Required: true,
 			},
 			"provider_name": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:             schema.TypeString,
+				Required:         true,
+				ValidateDiagFunc: advancedcluster.StringIsUppercase(),
 			},
 			"pit_enabled": {
 				Type:     schema.TypeBool,
@@ -235,8 +234,9 @@ func Resource() *schema.Resource {
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"region_name": {
-										Type:     schema.TypeString,
-										Required: true,
+										Type:             schema.TypeString,
+										Required:         true,
+										ValidateDiagFunc: advancedcluster.StringIsUppercase(),
 									},
 									"electable_nodes": {
 										Type:     schema.TypeInt,

internal/service/cluster/resource_cluster_test.go

@@ -9,18 +9,16 @@ import (
 	"regexp"
 	"testing"
 
-	matlas "go.mongodb.org/atlas/mongodbatlas"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
-	"github.com/mwielbut/pointy"
-
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 	clustersvc "github.com/mongodb/terraform-provider-mongodbatlas/internal/service/cluster"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
+	"github.com/mwielbut/pointy"
+	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
 func TestAccClusterRSCluster_basicAWS_simple(t *testing.T) {