Revert "Merge pull request #295 from articulate/feature/user-schema-p…

…attern" This reverts commit b77db1b, reversing changes made to d975caf.
articulate · Oct 4, 2019 · 8c6bec0 · 8c6bec0
1 parent b77db1b
commit 8c6bec0
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 42 deletions.
diff --git a/examples/okta_user_base_schema/username.tf b/examples/okta_user_base_schema/username.tf
diff --git a/okta/resource_okta_app_user_base_schema.go b/okta/resource_okta_app_user_base_schema.go
@@ -82,10 +82,9 @@ func resourceAppUserBaseSchemaDelete(d *schema.ResourceData, m interface{}) erro
 // create or modify a  subschema
 func updateAppUserBaseSubschema(d *schema.ResourceData, m interface{}) error {
 	schema := &sdk.UserSubSchema{
-		Master:  getNullableMaster(d),
-		Title:   d.Get("title").(string),
-		Type:    d.Get("type").(string),
-		Pattern: d.Get("pattern").(string),
+		Master: getNullableMaster(d),
+		Title:  d.Get("title").(string),
+		Type:   d.Get("type").(string),
 		Permissions: []*sdk.UserSchemaPermission{
 			{
 				Action:    d.Get("permissions").(string),

diff --git a/okta/resource_okta_user_base_schema.go b/okta/resource_okta_user_base_schema.go
@@ -79,10 +79,9 @@ func resourceUserBaseSchemaDelete(d *schema.ResourceData, m interface{}) error {
 // create or modify a  subschema
 func updateBaseSubschema(d *schema.ResourceData, m interface{}) error {
 	schema := &sdk.UserSubSchema{
-		Master:  getNullableMaster(d),
-		Title:   d.Get("title").(string),
-		Type:    d.Get("type").(string),
-		Pattern: d.Get("pattern").(string),
+		Master: getNullableMaster(d),
+		Title:  d.Get("title").(string),
+		Type:   d.Get("type").(string),
 		Permissions: []*sdk.UserSchemaPermission{
 			{
 				Action:    d.Get("permissions").(string),

diff --git a/okta/resource_okta_user_base_schema_test.go b/okta/resource_okta_user_base_schema_test.go
@@ -28,9 +28,7 @@ func TestAccOktaUserBaseSchema_crud(t *testing.T) {
 	mgr := newFixtureManager(userBaseSchema)
 	config := mgr.GetFixtures("basic.tf", ri, t)
 	updated := mgr.GetFixtures("updated.tf", ri, t)
-	usernamePattern := mgr.GetFixtures("username.tf", ri, t)
 	resourceName := fmt.Sprintf("%s.%s", userBaseSchema, baseTestProp)
-	loginResourceName := fmt.Sprintf("%s.login", userBaseSchema)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -69,18 +67,6 @@ func TestAccOktaUserBaseSchema_crud(t *testing.T) {
 					return nil
 				},
 			},
-			{
-				Config: usernamePattern,
-				Check: resource.ComposeTestCheckFunc(
-					testOktaUserBaseSchemasExists(loginResourceName),
-					resource.TestCheckResourceAttr(loginResourceName, "index", "login"),
-					resource.TestCheckResourceAttr(loginResourceName, "title", "Username"),
-					resource.TestCheckResourceAttr(loginResourceName, "type", "string"),
-					resource.TestCheckResourceAttr(loginResourceName, "required", "true"),
-					resource.TestCheckResourceAttr(loginResourceName, "permissions", "READ_ONLY"),
-					resource.TestCheckResourceAttr(loginResourceName, "pattern", "[a-z0-9]+"),
-				),
-			},
 		},
 	})
 }

diff --git a/okta/user_schema.go b/okta/user_schema.go
@@ -158,11 +158,6 @@ var (
 			Description:  "Subschema type: string, boolean, number, integer, array, or object",
 			ForceNew:     true,
 		},
-		"pattern": &schema.Schema{
-			Type:        schema.TypeString,
-			Optional:    true,
-			Description: "Restrict the username schema property to a particular regex pattern. Unlike the UI you must use a regex here.",
-		},
 		"permissions": &schema.Schema{
 			Type:         schema.TypeString,
 			Optional:     true,
@@ -225,7 +220,6 @@ func syncBaseUserSchema(d *schema.ResourceData, subschema *sdk.UserSubSchema) {
 	d.Set("title", subschema.Title)
 	d.Set("type", subschema.Type)
 	d.Set("required", subschema.Required)
-	d.Set("pattern", subschema.Pattern)
 
 	if subschema.Master != nil {
 		d.Set("master", subschema.Master.Type)

diff --git a/sdk/user_schema_models.go b/sdk/user_schema_models.go
@@ -52,7 +52,6 @@ type (
 		MinLength    *int                    `json:"minLength,omitempty"`
 		Mutability   string                  `json:"mutability,omitempty"`
 		OneOf        []*UserSchemaEnum       `json:"oneOf,omitempty"`
-		Pattern      string                  `json:"pattern,omitempty"`
 		Permissions  []*UserSchemaPermission `json:"permissions,omitempty"`
 		Required     *bool                   `json:"required,omitempty"`
 		Scope        string                  `json:"scope,omitempty"`

diff --git a/website/docs/r/app_user_base_schema.html.markdown b/website/docs/r/app_user_base_schema.html.markdown
@@ -38,8 +38,6 @@ The following arguments are supported:
 
 * `required` - (Optional) Whether the property is required for this application's users.
 
-* `pattern` - (Optional) Restrict `login` schema property to a particular regex.
-
 * `permissions` - (Optional) Access control permissions for the property. It can be set to `"READ_WRITE"`, `"READ_ONLY"`, `"HIDE"`.
 
 * `master` - (Optional) Master priority for the user schema property. It can be set to `"PROFILE_MASTER"` or `"OKTA"`.

diff --git a/website/docs/r/user_base_schema.html.markdown b/website/docs/r/user_base_schema.html.markdown
@@ -35,8 +35,6 @@ The following arguments are supported:
 
 * `required` - (Optional) Whether the property is required for this application's users.
 
-* `pattern` - (Optional) Restrict `login` schema property to a particular regex.
-
 * `permissions` - (Optional) Access control permissions for the property. It can be set to `"READ_WRITE"`, `"READ_ONLY"`, `"HIDE"`.
 
 * `master` - (Optional) Master priority for the user schema property. It can be set to `"PROFILE_MASTER"` or `"OKTA"`.