Substituted some of the internal SDK methods with official ones (#567)

* Substituted some of the internal SDK methods with official ones

* Updating deps to official okta-sdk-golang release.

Co-authored-by: Mike Mondragon <mikemondragon@gmail.com>

go.mod

@@ -12,5 +12,5 @@ require (
 	github.com/hashicorp/go-hclog v0.16.2
 	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.7.0
-	github.com/okta/okta-sdk-golang/v2 v2.5.1-0.20210803213055-ae6539a1c446
+	github.com/okta/okta-sdk-golang/v2 v2.5.1
 )

go.sum

@@ -344,8 +344,8 @@ github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k
 github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod h1:uFMI8w+ref4v2r9jz+c9i1IfIttS/OkmLfrk1jne5hs=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/okta/okta-sdk-golang/v2 v2.5.1-0.20210803213055-ae6539a1c446 h1:v7zP2d7ei2kc38Xcv4UgBzEYniGghtlMxCTAEkeSWwg=
-github.com/okta/okta-sdk-golang/v2 v2.5.1-0.20210803213055-ae6539a1c446/go.mod h1:UY2OaLNwWhzvJFaHqNCxeQuhvecn5FXq+5Hey+TbFJ0=
+github.com/okta/okta-sdk-golang/v2 v2.5.1 h1:h4Y/rFe/UFagmh9kVhfYjuBRU+zysCqrNcUc8p4ka/E=
+github.com/okta/okta-sdk-golang/v2 v2.5.1/go.mod h1:sFYVmxjkHV4GDSA1W+vN8zIbI7fg9DGlbwiO4ejM0x0=
 github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 h1:pSCLCl6joCFRnjpeojzOpEYs4q7Vditq8fySFG5ap3Y=
 github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -419,10 +419,10 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -524,7 +524,6 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -545,9 +544,9 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79 h1:RX8C8PRZc2hTIod4ds8ij+/4RQX3AqhYj3uOHmyaz4E=
 golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

okta/config.go

@@ -93,7 +93,7 @@ func (c *Config) loadAndValidate() error {
 		okta.WithRateLimitMaxBackOff(int64(c.maxWait)),
 		okta.WithRequestTimeout(int64(c.requestTimeout)),
 		okta.WithRateLimitMaxRetries(int32(c.retryCount)),
-		okta.WithUserAgentExtra("okta-terraform/3.12.0"),
+		okta.WithUserAgentExtra("okta-terraform/3.13.1"),
 	}
 	if c.apiToken == "" {
 		setters = append(setters, okta.WithAuthorizationMode("PrivateKey"))

okta/provider_sweeper_test.go

@@ -35,8 +35,7 @@ func TestMain(m *testing.M) {
 	setupSweeper(groupRule, sweepGroupRules)
 	setupSweeper(oktaGroup, sweepGroups)
 	setupSweeper(oktaUser, sweepUsers)
-	setupSweeper(userSchemaProperty, sweepUserSchema)
-	setupSweeper(userBaseSchemaProperty, sweepUserBaseSchema)
+	setupSweeper(userSchemaProperty, sweepUserCustomSchema)
 	setupSweeper(networkZone, sweepNetworkZones)
 	setupSweeper(inlineHook, sweepInlineHooks)
 	setupSweeper(userType, sweepUserTypes)

okta/resource_okta_app_saml.go

@@ -518,7 +518,7 @@ func buildSamlApp(d *schema.ResourceData) (*okta.SamlApplication, error) {
 	hideMobile := d.Get("hide_ios").(bool)
 	hideWeb := d.Get("hide_web").(bool)
 	a11ySelfService := d.Get("accessibility_self_service").(bool)
-	app.Settings = okta.NewSamlApplicationSettings()
+	app.Settings = &okta.SamlApplicationSettings{}
 	app.Visibility = &okta.ApplicationVisibility{
 		AutoSubmitToolbar: &autoSubmit,
 		Hide: &okta.ApplicationVisibilityHide{

okta/resource_okta_app_user_base_schema_property.go

@@ -69,11 +69,11 @@ func resourceAppUserBaseSchemaCreate(ctx context.Context, d *schema.ResourceData
 }
 
 func resourceAppUserBaseSchemaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	us, _, err := getSupplementFromMetadata(m).GetAppUserSchema(ctx, d.Get("app_id").(string))
+	us, _, err := getOktaClientFromMetadata(m).UserSchema.GetApplicationUserSchema(ctx, d.Get("app_id").(string))
 	if err != nil {
 		return diag.Errorf("failed to get app user base schema: %v", err)
 	}
-	subschema := getBaseProperty(us, d.Get("index").(string))
+	subschema := userSchemaBaseAttribute(us, d.Get("index").(string))
 	if subschema == nil {
 		d.SetId("")
 		return nil
@@ -100,12 +100,9 @@ func resourceAppUserBaseSchemaDelete(context.Context, *schema.ResourceData, inte
 
 // create or modify a subschema
 func updateAppUserBaseSubschema(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	_, _, err := getSupplementFromMetadata(m).UpdateBaseAppUserSchemaProperty(
-		ctx,
-		d.Get("index").(string),
-		d.Get("app_id").(string),
-		userBasedSubSchema(d),
-	)
+	base := buildBaseUserSchema(d.Get("index").(string), buildUserBaseSchemaAttribute(d))
+	_, _, err := getOktaClientFromMetadata(m).UserSchema.
+		UpdateApplicationUserProfile(ctx, d.Get("app_id").(string), *base)
 	if err != nil {
 		return diag.Errorf("failed to update application user base schema: %v", err)
 	}

okta/resource_okta_app_user_schema_property.go → okta/resource_okta_app_user_custom_schema_property.go

@@ -133,16 +133,16 @@ func resourceAppUserSchemaCreate(ctx context.Context, d *schema.ResourceData, m
 }
 
 func resourceAppUserSchemaRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	us, resp, err := getSupplementFromMetadata(m).GetAppUserSchema(ctx, d.Get("app_id").(string))
+	us, resp, err := getOktaClientFromMetadata(m).UserSchema.GetApplicationUserSchema(ctx, d.Get("app_id").(string))
 	if err := suppressErrorOn404(resp, err); err != nil {
-		return diag.Errorf("failed to get app user schema: %v", err)
+		return diag.Errorf("failed to get application user schema property: %v", err)
 	}
-	subschema := getCustomProperty(us, d.Get("index").(string))
+	subschema := userSchemaCustomAttribute(us, d.Get("index").(string))
 	if subschema == nil {
 		d.SetId("")
 		return nil
 	}
-	err = syncUserSchema(d, subschema)
+	err = syncCustomUserSchema(d, subschema)
 	if subschema.Union != "" {
 		if subschema.Union == "DISABLE" {
 			_ = d.Set("union", false)
@@ -151,7 +151,7 @@ func resourceAppUserSchemaRead(ctx context.Context, d *schema.ResourceData, m in
 		}
 	}
 	if err != nil {
-		return diag.Errorf("failed to set user schema properties: %v", err)
+		return diag.Errorf("failed to set application user schema properties: %v", err)
 	}
 	return nil
 }
@@ -181,30 +181,29 @@ func resourceAppUserSchemaUpdate(ctx context.Context, d *schema.ResourceData, m
 }
 
 func resourceAppUserSchemaDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	_, err := getSupplementFromMetadata(m).DeleteAppUserSchemaProperty(ctx, d.Get("index").(string), d.Get("app_id").(string))
+	custom := buildCustomUserSchema(d.Get("index").(string), nil)
+	_, _, err := getOktaClientFromMetadata(m).UserSchema.
+		UpdateApplicationUserProfile(ctx, d.Get("app_id").(string), *custom)
 	if err != nil {
-		return diag.Errorf("failed to delete user schema property")
+		return diag.Errorf("failed to delete application user schema property")
 	}
 	return nil
 }
 
 func updateAppUserSubschema(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	subSchema := userSubSchema(d)
+	subSchema := buildUserCustomSchemaAttribute(d)
 	if d.Get("union").(bool) {
 		subSchema.Union = "ENABLE"
 	} else {
 		subSchema.Union = "DISABLE"
 	}
+	custom := buildCustomUserSchema(d.Get("index").(string), subSchema)
 	bOff := backoff.NewExponentialBackOff()
 	bOff.MaxElapsedTime = time.Second * 10
 	bOff.InitialInterval = time.Second
 	err := backoff.Retry(func() error {
-		_, _, err := getSupplementFromMetadata(m).UpdateCustomAppUserSchemaProperty(
-			ctx,
-			d.Get("index").(string),
-			d.Get("app_id").(string),
-			subSchema,
-		)
+		_, _, err := getOktaClientFromMetadata(m).UserSchema.
+			UpdateApplicationUserProfile(ctx, d.Get("app_id").(string), *custom)
 		if err != nil {
 			var oktaErr *okta.Error
 			if errors.As(err, &oktaErr) {

okta/resource_okta_app_user_schema_property_test.go → okta/resource_okta_app_user_custom_schema_property_test.go

@@ -78,18 +78,17 @@ func testAppUserSchemasExists(name string) resource.TestCheckFunc {
 
 func testAppUserSchemaExists(index string) (bool, error) {
 	ids := strings.Split(index, "/")
-	client := getSupplementFromMetadata(testAccProvider.Meta())
-	schema, resp, err := client.GetAppUserSchema(context.Background(), ids[0])
+	schema, resp, err := getOktaClientFromMetadata(testAccProvider.Meta()).UserSchema.
+		GetApplicationUserSchema(context.Background(), ids[0])
 	if err != nil {
 		if resp != nil && resp.StatusCode == 404 {
 			return false, nil
 		}
-		return false, fmt.Errorf("error Listing App User Schema in Okta: %v", err)
+		return false, fmt.Errorf("failed to get application user schema: %v", err)
 	}
-	cu := getCustomProperty(schema, ids[1])
+	cu := userSchemaCustomAttribute(schema, ids[1])
 	if cu != nil {
 		return true, nil
 	}
-
 	return false, nil
 }

okta/resource_okta_auth_server_policy.go

@@ -94,9 +94,9 @@ func resourceAuthServerPolicyUpdate(ctx context.Context, d *schema.ResourceData,
 	oldStatus, newStatus := d.GetChange("status")
 	if oldStatus != newStatus {
 		if newStatus == statusActive {
-			_, err = getSupplementFromMetadata(m).ActivateAuthorizationServerPolicy(ctx, d.Get("auth_server_id").(string), d.Id())
+			_, err = getOktaClientFromMetadata(m).AuthorizationServer.ActivateAuthorizationServerPolicy(ctx, d.Get("auth_server_id").(string), d.Id())
 		} else {
-			_, err = getSupplementFromMetadata(m).DeactivateAuthorizationServerPolicy(ctx, d.Get("auth_server_id").(string), d.Id())
+			_, err = getOktaClientFromMetadata(m).AuthorizationServer.DeactivateAuthorizationServerPolicy(ctx, d.Get("auth_server_id").(string), d.Id())
 		}
 		if err != nil {
 			return diag.Errorf("failed to change authorization server policy status: %v", err)

okta/resource_okta_auth_server_policy_rule.go

@@ -187,19 +187,20 @@ func resourceAuthServerPolicyRuleUpdate(ctx context.Context, d *schema.ResourceD
 }
 
 func handleAuthServerPolicyRuleLifecycle(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	client := getSupplementFromMetadata(m)
-	if d.Get("status").(string) == statusActive {
-		_, err := client.ActivateAuthorizationServerPolicyRule(ctx, d.Get("auth_server_id").(string),
-			d.Get("policy_id").(string), d.Id())
-		if err != nil {
-			return diag.Errorf("failed to activate authorization server: %v", err)
-		}
+	var err error
+	oldStatus, newStatus := d.GetChange("status")
+	if oldStatus == newStatus {
 		return nil
 	}
-	_, err := client.DeactivateAuthorizationServerPolicyRule(ctx, d.Get("auth_server_id").(string),
-		d.Get("policy_id").(string), d.Id())
+	if newStatus == statusActive {
+		_, err = getOktaClientFromMetadata(m).AuthorizationServer.ActivateAuthorizationServerPolicyRule(ctx, d.Get("auth_server_id").(string),
+			d.Get("policy_id").(string), d.Id())
+	} else {
+		_, err = getOktaClientFromMetadata(m).AuthorizationServer.DeactivateAuthorizationServerPolicyRule(ctx, d.Get("auth_server_id").(string),
+			d.Get("policy_id").(string), d.Id())
+	}
 	if err != nil {
-		return diag.Errorf("failed to deactivate authorization server: %v", err)
+		return diag.Errorf("failed to change authorization server policy status: %v", err)
 	}
 	return nil
 }

okta/resource_okta_domain.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/okta/terraform-provider-okta/sdk"
+	"github.com/okta/okta-sdk-golang/v2/okta"
 )
 
 func resourceDomain() *schema.Resource {
@@ -71,13 +71,13 @@ func resourceDomain() *schema.Resource {
 }
 
 func resourceDomainCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	domain, _, err := getSupplementFromMetadata(m).CreateDomain(ctx, buildDomain(d))
+	domain, _, err := getOktaClientFromMetadata(m).Domain.CreateDomain(ctx, buildDomain(d))
 	if err != nil {
 		return diag.Errorf("failed to create domain: %v", err)
 	}
-	d.SetId(domain.ID)
+	d.SetId(domain.Id)
 	if d.Get("verify").(bool) {
-		_, _, err := getSupplementFromMetadata(m).VerifyDomain(ctx, domain.ID)
+		_, _, err := getOktaClientFromMetadata(m).Domain.VerifyDomain(ctx, domain.Id)
 		if err != nil {
 			return diag.Errorf("failed to verify domain: %v", err)
 		}
@@ -86,7 +86,7 @@ func resourceDomainCreate(ctx context.Context, d *schema.ResourceData, m interfa
 }
 
 func resourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	domain, resp, err := getSupplementFromMetadata(m).GetDomain(ctx, d.Id())
+	domain, resp, err := getOktaClientFromMetadata(m).Domain.GetDomain(ctx, d.Id())
 	if err := suppressErrorOn404(resp, err); err != nil {
 		return diag.Errorf("failed to get domain: %v", err)
 	}
@@ -103,13 +103,13 @@ func resourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface
 	} else {
 		_ = d.Set("validation_status", domain.ValidationStatus)
 	}
-	arr := make([]map[string]interface{}, len(domain.DNSRecords))
-	for i := range domain.DNSRecords {
+	arr := make([]map[string]interface{}, len(domain.DnsRecords))
+	for i := range domain.DnsRecords {
 		arr[i] = map[string]interface{}{
-			"expiration":  domain.DNSRecords[i].Expiration,
-			"fqdn":        domain.DNSRecords[i].Fqdn,
-			"record_type": domain.DNSRecords[i].RecordType,
-			"values":      convertStringArrToInterface(domain.DNSRecords[i].Values),
+			"expiration":  domain.DnsRecords[i].Expiration,
+			"fqdn":        domain.DnsRecords[i].Fqdn,
+			"record_type": domain.DnsRecords[i].RecordType,
+			"values":      convertStringArrToInterface(domain.DnsRecords[i].Values),
 		}
 	}
 	err = setNonPrimitives(d, map[string]interface{}{"dns_records": arr})
@@ -120,7 +120,7 @@ func resourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface
 		return nil
 	}
 	if d.Get("verify").(bool) {
-		_, _, err := getSupplementFromMetadata(m).VerifyDomain(ctx, d.Id())
+		_, _, err := getOktaClientFromMetadata(m).Domain.VerifyDomain(ctx, d.Id())
 		if err != nil {
 			return diag.Errorf("failed to verify domain: %v", err)
 		}
@@ -131,7 +131,7 @@ func resourceDomainRead(ctx context.Context, d *schema.ResourceData, m interface
 
 func resourceDomainDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	logger(m).Info("deleting domain", "id", d.Id())
-	_, err := getSupplementFromMetadata(m).DeleteDomain(ctx, d.Id())
+	_, err := getOktaClientFromMetadata(m).Domain.DeleteDomain(ctx, d.Id())
 	if err != nil {
 		return diag.Errorf("failed to delete domain: %v", err)
 	}
@@ -146,22 +146,22 @@ func resourceDomainUpdate(ctx context.Context, d *schema.ResourceData, m interfa
 	return resourceDomainRead(ctx, d, m)
 }
 
-func validateDomain(ctx context.Context, d *schema.ResourceData, m interface{}, validationStatus string) (*sdk.Domain, error) {
+func validateDomain(ctx context.Context, d *schema.ResourceData, m interface{}, validationStatus string) (*okta.Domain, error) {
 	if validationStatus == "IN_PROGRESS" || validationStatus == "VERIFIED" || validationStatus == "COMPLETED" {
 		return nil, nil
 	}
 	if !d.Get("verify").(bool) {
 		return nil, nil
 	}
-	domain, _, err := getSupplementFromMetadata(m).VerifyDomain(ctx, d.Id())
+	domain, _, err := getOktaClientFromMetadata(m).Domain.VerifyDomain(ctx, d.Id())
 	if err != nil {
 		return nil, fmt.Errorf("failed to verify domain: %v", err)
 	}
 	return domain, nil
 }
 
-func buildDomain(d *schema.ResourceData) sdk.Domain {
-	return sdk.Domain{
+func buildDomain(d *schema.ResourceData) okta.Domain {
+	return okta.Domain{
 		Domain:                d.Get("name").(string),
 		CertificateSourceType: "MANUAL",
 	}

okta/resource_okta_domain_test.go

@@ -33,7 +33,7 @@ func TestAccOktaDomain(t *testing.T) {
 }
 
 func domainExists(id string) (bool, error) {
-	domain, resp, err := getSupplementFromMetadata(testAccProvider.Meta()).GetDomain(context.Background(), id)
+	domain, resp, err := getOktaClientFromMetadata(testAccProvider.Meta()).Domain.GetDomain(context.Background(), id)
 	if err := suppressErrorOn404(resp, err); err != nil {
 		return false, err
 	}