Clean up test configs and v3 okta-sdk-golang usage.

okta · Sep 6, 2023 · 98e3d2b · 98e3d2b
1 parent a41919a
commit 98e3d2b
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 69 deletions.
diff --git a/examples/okta_app_signon_policy_assignment/basic.tf b/examples/okta_app_signon_policy_assignment/basic.tf
@@ -5,7 +5,7 @@ resource "okta_app_oauth" "test" {
   redirect_uris              = ["http://d.com/"]
   response_types             = ["code"]
   client_basic_secret        = "something_from_somewhere"
-  client_id                  = "something_from_somewhere"
+  client_id                  = "cid_replace_with_uuid"
   token_endpoint_auth_method = "client_secret_basic"
   consent_method             = "TRUSTED"
   wildcard_redirect          = "DISABLED"

diff --git a/...signon_policy_assignment/basic_updated.tf → ...a_app_signon_policy_assignment/updated.tf b/...signon_policy_assignment/basic_updated.tf → ...a_app_signon_policy_assignment/updated.tf
@@ -5,7 +5,7 @@ resource "okta_app_oauth" "test" {
   redirect_uris              = ["http://d.com/"]
   response_types             = ["code"]
   client_basic_secret        = "something_from_somewhere"
-  client_id                  = "something_from_somewhere"
+  client_id                  = "cid_replace_with_uuid"
   token_endpoint_auth_method = "client_secret_basic"
   consent_method             = "TRUSTED"
   wildcard_redirect          = "DISABLED"

diff --git a/okta/resource_okta_app_signon_policy_assignment.go b/okta/resource_okta_app_signon_policy_assignment.go
@@ -203,7 +203,6 @@ func (r *appSignonPolicyAssignmentResource) Update(ctx context.Context, req reso
 	}
 
 	// find the app
-	//appInnerResp, err := r.findAppSDKInnerResponse(ctx, state.AppID.ValueString())
 	_, err := r.findAppSDKInnerResponse(ctx, state.ID.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError(
@@ -249,78 +248,68 @@ func concreteAppID(src *okta.ListApplications200ResponseInner) (string, error) {
 	if src == nil {
 		return "", errors.New("list application inner response is nil")
 	}
-
-	if src.AutoLoginApplication != nil {
-		return *src.AutoLoginApplication.Id, nil
-	}
-
-	if src.BasicAuthApplication != nil {
-		return *src.BasicAuthApplication.Id, nil
-	}
-
-	if src.BookmarkApplication != nil {
-		return *src.BookmarkApplication.Id, nil
-	}
-
-	if src.BrowserPluginApplication != nil {
-		return *src.BrowserPluginApplication.Id, nil
-	}
-
-	if src.OpenIdConnectApplication != nil {
-		return *src.OpenIdConnectApplication.Id, nil
-	}
-
-	if src.SamlApplication != nil {
-		return *src.SamlApplication.Id, nil
-	}
-
-	if src.SecurePasswordStoreApplication != nil {
-		return *src.SecurePasswordStoreApplication.Id, nil
-	}
-
-	if src.WsFederationApplication != nil {
-		return *src.WsFederationApplication.Id, nil
-	}
-
-	return "", errors.New("list application inner response does not contain a concrete app")
+	app := src.GetActualInstance()
+	if app == nil {
+		return "", errors.New("okta list applications response does not contain a concrete app")
+	}
+
+	switch v := app.(type) {
+	case *okta.AutoLoginApplication:
+		return v.GetId(), nil
+	case *okta.BasicAuthApplication:
+		return v.GetId(), nil
+	case *okta.BookmarkApplication:
+		return v.GetId(), nil
+	case *okta.BrowserPluginApplication:
+		return v.GetId(), nil
+	case *okta.OpenIdConnectApplication:
+		return v.GetId(), nil
+	case *okta.SamlApplication:
+		return v.GetId(), nil
+	case *okta.SecurePasswordStoreApplication:
+		return v.GetId(), nil
+	case *okta.WsFederationApplication:
+		return v.GetId(), nil
+	}
+
+	return "", fmt.Errorf("list application inner response does not contain a concrete app type %T", src)
 }
 
-func concreteAppLinks(src *okta.ListApplications200ResponseInner) (*okta.ApplicationLinks, error) {
+func concreteAppLinks(src *okta.ListApplications200ResponseInner) (links *okta.ApplicationLinks, err error) {
 	if src == nil {
 		return nil, errors.New("list application inner response is nil")
 	}
-
-	if src.AutoLoginApplication != nil {
-		return src.AutoLoginApplication.Links, nil
-	}
-
-	if src.BasicAuthApplication != nil {
-		return src.BasicAuthApplication.Links, nil
-	}
-
-	if src.BookmarkApplication != nil {
-		return src.BookmarkApplication.Links, nil
-	}
-
-	if src.BrowserPluginApplication != nil {
-		return src.BrowserPluginApplication.Links, nil
+	app := src.GetActualInstance()
+	if app == nil {
+		return nil, errors.New("okta list applications response does not contain a concrete app")
 	}
 
-	if src.OpenIdConnectApplication != nil {
-		return src.OpenIdConnectApplication.Links, nil
-	}
-
-	if src.SamlApplication != nil {
-		return src.SamlApplication.Links, nil
-	}
-
-	if src.SecurePasswordStoreApplication != nil {
-		return src.SecurePasswordStoreApplication.Links, nil
-	}
-
-	if src.WsFederationApplication != nil {
-		return src.WsFederationApplication.Links, nil
+	switch v := app.(type) {
+	case *okta.AutoLoginApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.BasicAuthApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.BookmarkApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.BrowserPluginApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.OpenIdConnectApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.SamlApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.SecurePasswordStoreApplication:
+		links, _ = v.GetLinksOk()
+		return
+	case *okta.WsFederationApplication:
+		links, _ = v.GetLinksOk()
+		return
 	}
 
-	return nil, errors.New("list application inner response does not contain a concrete app")
+	return nil, fmt.Errorf("list application inner response does not contain a concrete app type %T", src)
 }
diff --git a/okta/resource_okta_app_signon_policy_assignment_test.go b/okta/resource_okta_app_signon_policy_assignment_test.go
@@ -13,7 +13,7 @@ func TestAccResourceOktaAppSignonPolicyAssignment(t *testing.T) {
 	_resource := "okta_app_signon_policy_assignment"
 	mgr := newFixtureManager(_resource, t.Name())
 	config := mgr.GetFixtures("basic.tf", t)
-	updated := mgr.GetFixtures("basic_updated.tf", t)
+	updated := mgr.GetFixtures("updated.tf", t)
 	resourceName := fmt.Sprintf("%s.test", _resource)
 	oktaResourceTest(t, resource.TestCase{
 		ProtoV5ProviderFactories: testAccMergeProvidersFactories,