Merge pull request #263 from articulate/feature/set-app-schema-scope

Expose scope property on user schema
articulate · Aug 27, 2019 · ccfd6ab · ccfd6ab
2 parents db58a12 + 337f04a
commit ccfd6ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/examples/okta_app_user_schema/updated.tf b/examples/okta_app_user_schema/updated.tf
@@ -14,4 +14,5 @@ resource okta_app_user_schema test {
   description = "terraform acceptance test updated"
   required    = true
   master      = "OKTA"
+  scope       = "SELF"
 }
diff --git a/okta/resource_app_user_schema_test.go b/okta/resource_app_user_schema_test.go
@@ -53,6 +53,7 @@ func TestAccAppUserSchemas_crud(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "description", "terraform acceptance test updated"),
 					resource.TestCheckResourceAttr(resourceName, "required", "true"),
 					resource.TestCheckResourceAttr(resourceName, "master", "OKTA"),
+					resource.TestCheckResourceAttr(resourceName, "scope", "SELF"),
 				),
 			},
 		},

diff --git a/okta/user_schema.go b/okta/user_schema.go
@@ -62,6 +62,12 @@ var (
 			Description: "Custom Subschema enumerated value of the property. see: developer.okta.com/docs/api/resources/schemas#user-profile-schema-property-object",
 			Elem:        &schema.Schema{Type: schema.TypeString},
 		},
+		"scope": &schema.Schema{
+			Type:         schema.TypeString,
+			Optional:     true,
+			Default:      "NONE",
+			ValidateFunc: validation.StringInSlice([]string{"SELF", "NONE", ""}, false),
+		},
 		"one_of": &schema.Schema{
 			Type:        schema.TypeList,
 			ForceNew:    true,
@@ -154,6 +160,7 @@ func syncUserSchema(d *schema.ResourceData, subschema *sdk.UserSubSchema) error
 	d.Set("required", subschema.Required)
 	d.Set("min_length", subschema.MinLength)
 	d.Set("max_length", subschema.MaxLength)
+	d.Set("scope", subschema.Scope)
 
 	if subschema.Items != nil {
 		d.Set("array_type", subschema.Items.Type)
@@ -254,6 +261,7 @@ func getUserSubSchema(d *schema.ResourceData) *sdk.UserSubSchema {
 				Principal: "SELF",
 			},
 		},
+		Scope:     d.Get("scope").(string),
 		Enum:      convertInterfaceToStringArrNullable(d.Get("enum")),
 		Master:    getNullableItem(d, "master"),
 		Items:     getNullableItem(d, "array_type"),