Address parallelism in okta_user_base_schema_property resource

okta/resource_okta_user_base_schema_property.go

@@ -63,6 +63,9 @@ func resourceUserBaseSchemaResourceV0() *schema.Resource {
 }
 
 func resourceUserBaseSchemaCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	oktaMutexKV.Lock(userBaseSchemaProperty)
+	defer oktaMutexKV.Unlock(userBaseSchemaProperty)
+
 	if err := updateUserBaseSubschema(ctx, d, m); err != nil {
 		return err
 	}
@@ -89,6 +92,9 @@ func resourceUserBaseSchemaRead(ctx context.Context, d *schema.ResourceData, m i
 }
 
 func resourceUserBaseSchemaUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	oktaMutexKV.Lock(userBaseSchemaProperty)
+	defer oktaMutexKV.Unlock(userBaseSchemaProperty)
+
 	if err := updateUserBaseSubschema(ctx, d, m); err != nil {
 		return err
 	}

okta/resource_okta_user_base_schema_property_test.go

@@ -146,3 +146,99 @@ func testOktaUserBaseSchemasExists(name string) resource.TestCheckFunc {
 		return nil
 	}
 }
+
+// TestAccOktaUserBaseSchemaLogin_multiple_properties Test for issue 1217 fix.
+// https://github.com/okta/terraform-provider-okta/issues/1217 This test would
+// fail befor the fix was implemented. The fix is to put a calling mutex on
+// create and update for the `okta_user_base_schema_property` resource. The Okta
+// management API ignores parallel calls to `POST
+// /api/v1/meta/schemas/user/{userId}` and our fix is to use a calling mutex in
+// the resource to impose the equivelent of `terraform -parallelism=1`
+func TestAccOktaUserBaseSchemaLogin_multiple_properties(t *testing.T) {
+	config := `
+data "okta_user_type" "user" {
+	name = "user"
+}
+resource "okta_user_base_schema_property" "login" {
+	index       = "login"
+	title       = "Username"
+	type        = "string"
+	required    = true
+	master      = "PROFILE_MASTER"
+	user_type   = "${data.okta_user_type.user.id}"
+	pattern     = ".+"
+	permissions = "%s"
+}
+resource "okta_user_base_schema_property" "firstname" {
+	index       = "firstName"
+	title       = "First name"
+	type        = "string"
+	required    = true
+	master      = "PROFILE_MASTER"
+	user_type   = "${data.okta_user_type.user.id}"
+	permissions = "%s"
+}
+resource "okta_user_base_schema_property" "lastname" {
+	index       = "lastName"
+	title       = "Last name"
+	type        = "string"
+	required    = true
+	master      = "PROFILE_MASTER"
+	user_type   = "${data.okta_user_type.user.id}"
+	permissions = "%s"
+}
+resource "okta_user_base_schema_property" "email" {
+	index       = "email"
+	title       = "Primary email"
+	type        = "string"
+	required    = true
+	master      = "PROFILE_MASTER"
+	user_type   = "${data.okta_user_type.user.id}"
+	permissions = "%s"
+}
+resource "okta_user_base_schema_property" "mobilephone" {
+	index       = "mobilePhone"
+	title       = "Mobile phone"
+	type        = "string"
+	master      = "PROFILE_MASTER"
+	user_type   = "${data.okta_user_type.user.id}"
+	permissions = "%s"
+}`
+	ro := make([]interface{}, 5)
+	for i := 0; i < 5; i++ {
+		ro[i] = "READ_ONLY"
+	}
+	rw := make([]interface{}, 5)
+	for i := 0; i < 5; i++ {
+		rw[i] = "READ_WRITE"
+	}
+	roConfig := fmt.Sprintf(config, ro...)
+	rwConfig := fmt.Sprintf(config, rw...)
+	resource.Test(t, resource.TestCase{
+		PreCheck:          testAccPreCheck(t),
+		ErrorCheck:        testAccErrorChecks(t),
+		ProviderFactories: testAccProvidersFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: roConfig,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.login", "permissions", "READ_ONLY"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.firstname", "permissions", "READ_ONLY"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.lastname", "permissions", "READ_ONLY"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.email", "permissions", "READ_ONLY"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.mobilephone", "permissions", "READ_ONLY"),
+				),
+			},
+			{
+				Config: rwConfig,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.login", "permissions", "READ_WRITE"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.firstname", "permissions", "READ_WRITE"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.lastname", "permissions", "READ_WRITE"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.email", "permissions", "READ_WRITE"),
+					resource.TestCheckResourceAttr("okta_user_base_schema_property.mobilephone", "permissions", "READ_WRITE"),
+				),
+			},
+		},
+	})
+}