Merge branch 'master' into feature/unlock-user

CHANGELOG.md

@@ -49,3 +49,7 @@ For Release v3.0.9
 For Release v3.0.10
 
 * Add okta_network_zone resource 
+
+For Release v3.0.11
+
+* Fix ocassional panic when creating a user schema see https://github.com/articulate/terraform-provider-okta/issues/144

examples/okta_user/all_attributes.tf

@@ -3,7 +3,7 @@ resource "okta_user" "testAcc_replace_with_uuid" {
   first_name         = "TestAcc"
   last_name          = "Smith"
   login              = "[email protected]"
-  email              = "test1[email protected]"
+  email              = "test-acc[email protected]"
   city               = "New York"
   cost_center        = "10"
   country_code       = "US"

okta/resource_user_schema.go

@@ -2,6 +2,7 @@ package okta
 
 import (
 	"fmt"
+	"time"
 
 	articulateOkta "github.com/articulate/oktasdk-go/okta"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -122,26 +123,28 @@ func resourceUserSchemaCreate(d *schema.ResourceData, m interface{}) error {
 }
 
 func resourceUserSchemaExists(d *schema.ResourceData, m interface{}) (bool, error) {
-	client := getClientFromMetadata(m)
-	schema, _, err := client.Schemas.GetUserSchema()
-	if err != nil {
-		return false, err
-	}
-
-	subschema := getSubSchema(schema.Definitions.Custom.Properties, d.Id())
+	subschema, err := getSubSchema(d, m)
 
-	return subschema != nil, nil
+	return subschema != nil, err
 }
 
 func resourceUserSchemaRead(d *schema.ResourceData, m interface{}) error {
-	client := getClientFromMetadata(m)
-	schema, _, err := client.Schemas.GetUserSchema()
+	subschema, err := getSubSchema(d, m)
 	if err != nil {
 		return err
+	} else if subschema == nil {
+		// See https://github.com/articulate/terraform-provider-okta/issues/144
+		// Occassionally a schema prop would be created and the read would not find it.
+		// There appears to be a delay of availability on the Okta side, thus the backoff.
+		fmt.Println("Could not find an existence subschema property, backing off and retrying. Known timing issue")
+		time.Sleep(time.Second * 3)
+
+		subschema, err = getSubSchema(d, m)
+		if err != nil {
+			return err
+		}
 	}
 
-	subschema := getSubSchema(schema.Definitions.Custom.Properties, d.Id())
-
 	d.Set("array_type", subschema.Items.Type)
 	d.Set("title", subschema.Title)
 	d.Set("type", subschema.Type)
@@ -171,13 +174,24 @@ func resourceUserSchemaRead(d *schema.ResourceData, m interface{}) error {
 	})
 }
 
-func getSubSchema(props []articulateOkta.CustomSubSchema, id string) *articulateOkta.CustomSubSchema {
-	for _, schema := range props {
-		if schema.Index == id {
-			return &schema
+func getSubSchema(d *schema.ResourceData, m interface{}) (subschema *articulateOkta.CustomSubSchema, err error) {
+	var schema *articulateOkta.Schema
+	id := d.Id()
+
+	client := getClientFromMetadata(m)
+	schema, _, err = client.Schemas.GetUserSchema()
+	if err != nil {
+		return
+	}
+
+	for _, part := range schema.Definitions.Custom.Properties {
+		if part.Index == id {
+			subschema = &part
+			return
 		}
 	}
-	return nil
+
+	return
 }
 
 func resourceUserSchemaUpdate(d *schema.ResourceData, m interface{}) error {

okta/resource_user_test.go

@@ -204,7 +204,7 @@ func TestAccOktaUser_updateAllAttributes(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "first_name", "TestAcc"),
 					resource.TestCheckResourceAttr(resourceName, "last_name", "Smith"),
 					resource.TestCheckResourceAttr(resourceName, "login", email),
-					resource.TestCheckResourceAttr(resourceName, "email", fmt.Sprintf("test1-%[email protected]", ri)),
+					resource.TestCheckResourceAttr(resourceName, "email", email),
 					resource.TestCheckResourceAttr(resourceName, "admin_roles.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "city", "New York"),
 					resource.TestCheckResourceAttr(resourceName, "cost_center", "10"),