Fixes #2396: Updates implementation for func StrMaxLength (#2398)

Author: aditya-okta

examples/resources/okta_group_rule/basic_group_rule_name_length_fail.tf

@@ -0,0 +1,11 @@
+resource "okta_group" "test" {
+  name = "あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもらりるれろ"
+}
+
+resource "okta_group_rule" "test" {
+  name              = "ABCDEFGHIJKLMNOPQRSTUVWXYZあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもらりるれろ"
+  status            = "ACTIVE"
+  group_assignments = [okta_group.test.id]
+  expression_type   = "urn:okta:expression:1.0"
+  expression_value  = "String.startsWith(user.firstName,\"andy\")"
+}

examples/resources/okta_group_rule/basic_group_rule_name_length_verify.tf

@@ -0,0 +1,11 @@
+resource "okta_group" "test" {
+  name = "[xx]ZZZ_ああああ_yyyyyyあいうえおかきくけ1ww1"
+}
+
+resource "okta_group_rule" "test" {
+  name              = "[xx]ZZZ_ああああ_yyyyyyあいうw1w1えおかきくけ1"
+  status            = "ACTIVE"
+  group_assignments = [okta_group.test.id]
+  expression_type   = "urn:okta:expression:1.0"
+  expression_value  = "String.startsWith(user.firstName,\"andy\")"
+}

okta/services/idaas/resource_okta_group_rule_test.go

@@ -197,3 +197,28 @@ func TestAccResourceOktaGroupRule_statusIsInvalidDiffFn(t *testing.T) {
 		})
 	}
 }
+
+func TestAccResourceOktaGroupRule_nameLengthVerification_Issue2396(t *testing.T) {
+	resourceName := fmt.Sprintf("%s.test", resources.OktaIDaaSGroupRule)
+	mgr := newFixtureManager("resources", "okta_group_rule", t.Name())
+	config := mgr.GetFixtures("basic_group_rule_name_length_verify.tf", t)
+	failConfig := mgr.GetFixtures("basic_group_rule_name_length_fail.tf", t)
+	acctest.OktaResourceTest(t, resource.TestCase{
+		PreCheck:                 acctest.AccPreCheck(t),
+		ErrorCheck:               testAccErrorChecks(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactoriesForTestAcc(t),
+		CheckDestroy:             checkResourceDestroy(resources.OktaIDaaSGroupRule, doesGroupRuleExist),
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "name", "[xx]ZZZ_ああああ_yyyyyyあいうw1w1えおかきくけ1"),
+				),
+			},
+			{
+				Config:      failConfig,
+				ExpectError: regexp.MustCompile(`\[\{\{\} name\}\] cannot be longer than 50 runes`),
+			},
+		},
+	})
+}

okta/utils/utils.go

@@ -715,14 +715,18 @@ func LinksValue(links interface{}, keys ...string) string {
 	return LinksValue(l[keys[0]], keys[1:]...)
 }
 
+// StrMaxLength validates that the string is not longer than the specified maximum length.
 func StrMaxLength(max int) schema.SchemaValidateDiagFunc {
 	return func(i interface{}, k cty.Path) diag.Diagnostics {
 		v, ok := i.(string)
 		if !ok {
 			return diag.Errorf("expected type of %s to be string", k)
 		}
-		if len(v) > max {
-			return diag.Errorf("%s cannot be longer than %d characters", k, max)
+
+		// https://github.com/okta/terraform-provider-okta/issues/2396
+		runes := []rune(v)
+		if len(runes) > max {
+			return diag.Errorf("%s cannot be longer than %d runes", k, max)
 		}
 		return nil
 	}

okta/utils/utils_test.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"encoding/json"
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"log"
 	"reflect"
 	"strings"
@@ -474,3 +476,56 @@ func TestLinksValue(t *testing.T) {
 		})
 	}
 }
+
+func TestStrMaxLength(t *testing.T) {
+	tests := []struct {
+		name        string
+		input       interface{}
+		max         int
+		expectError bool
+	}{
+		{
+			name:        "valid ascii under max",
+			input:       "hello world",
+			max:         50,
+			expectError: false,
+		},
+		{
+			name:        "valid multibyte under max",
+			input:       "こんにちは世界", // 7 runes
+			max:         50,
+			expectError: false,
+		},
+		{
+			name:        "ascii over max",
+			input:       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+			max:         50, // 52 runes
+			expectError: true,
+		},
+		{
+			name:        "multibyte over max",
+			input:       "あいうえおかきくけこさしすせそたちつてと", // 20 runes
+			max:         10,
+			expectError: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			validator := StrMaxLength(tt.max)
+			path := cty.Path{cty.GetAttrStep{Name: "name"}}
+			diags := validator(tt.input, path)
+
+			gotError := false
+			for _, d := range diags {
+				if d.Severity == diag.Error {
+					gotError = true
+					break
+				}
+			}
+			if gotError != tt.expectError {
+				t.Errorf("expected error: %v, got: %v, input: %#v", tt.expectError, gotError, tt.input)
+			}
+		})
+	}
+}