fix(tests): updates tests to pass FusionAuth client by value.

FusionAuth · May 5, 2022 · e436067 · e436067
1 parent d1aaefb
commit e436067
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/fusionauth/provider_test.go b/fusionauth/provider_test.go
@@ -43,7 +43,7 @@ func init() {
 }
 
 // fusionauthClient extracts the underlying client from a configured provider
-func fusionauthClient() *fusionauth.FusionAuthClient {
+func fusionauthClient() fusionauth.FusionAuthClient {
 	provider, err := testAccProviderFactories[providerFusionauth]()
 	if err != nil {
 		log.Println("[ERROR] error getting Fusionauth Provider")

diff --git a/fusionauth/resource_fusionauth_generic_connector_test.go b/fusionauth/resource_fusionauth_generic_connector_test.go
@@ -114,7 +114,7 @@ func testAccCheckGenericConnectorExists(resourceName string) resource.TestCheckF
 			return fmt.Errorf("no resource id is set")
 		}
 
-		connector, faErrs, err := RetrieveConnector(*fusionauthClient(), rs.Primary.ID)
+		connector, faErrs, err := RetrieveConnector(fusionauthClient(), rs.Primary.ID)
 		if errs := checkFusionauthErrors(faErrs, err); errs != nil {
 			return err
 		}
@@ -136,7 +136,7 @@ func testAccCheckGenericConnectorDestroy(s *terraform.State) error {
 
 		// Ensure we retry for eventual consistency in HA setups.
 		err := resource.RetryContext(context.Background(), retryTimeout, func() *resource.RetryError {
-			connector, faErrs, err := RetrieveConnector(*fusionauthClient(), rs.Primary.ID)
+			connector, faErrs, err := RetrieveConnector(fusionauthClient(), rs.Primary.ID)
 			if errs := checkFusionauthRetryErrors(faErrs, err); errs != nil {
 				return errs
 			}

diff --git a/fusionauth/resource_fusionauth_key_test.go b/fusionauth/resource_fusionauth_key_test.go
@@ -141,7 +141,8 @@ func testAccCheckFusionauthKeyExists(resourceName string) resource.TestCheckFunc
 			return fmt.Errorf("no resource id is set")
 		}
 
-		key, faErrs, err := fusionauthClient().RetrieveKey(rs.Primary.ID)
+		faClient := fusionauthClient()
+		key, faErrs, err := faClient.RetrieveKey(rs.Primary.ID)
 		if errs := checkFusionauthErrors(faErrs, err); errs != nil {
 			return err
 		}

diff --git a/fusionauth/resource_fusionauth_tenant_test.go b/fusionauth/resource_fusionauth_tenant_test.go
@@ -278,7 +278,8 @@ func testAccCheckFusionauthTenantExists(resourceName string) resource.TestCheckF
 			return fmt.Errorf("no resource id is set")
 		}
 
-		tenant, faErrs, err := fusionauthClient().RetrieveTenant(rs.Primary.ID)
+		faClient := fusionauthClient()
+		tenant, faErrs, err := faClient.RetrieveTenant(rs.Primary.ID)
 		if errs := checkFusionauthErrors(faErrs, err); errs != nil {
 			return err
 		}

diff --git a/fusionauth/resource_fusionauth_themes_test.go b/fusionauth/resource_fusionauth_themes_test.go
@@ -125,7 +125,8 @@ func testAccCheckFusionauthThemeExists(resourceName string) resource.TestCheckFu
 			return fmt.Errorf("no resource id is set")
 		}
 
-		theme, faErrs, err := fusionauthClient().RetrieveTheme(rs.Primary.ID)
+		faClient := fusionauthClient()
+		theme, faErrs, err := faClient.RetrieveTheme(rs.Primary.ID)
 		if errs := checkFusionauthErrors(faErrs, err); errs != nil {
 			return err
 		}
@@ -212,8 +213,8 @@ func generateFusionAuthTemplate() fusionauth.Templates {
 		Unauthorized:                              randString20(),
 
 		// TODO(themes): test for deprecated properties
-		//EmailSend:        randString20(),
-		//RegistrationSend: randString20(),
+		// EmailSend:        randString20(),
+		// RegistrationSend: randString20(),
 	}
 }
 

diff --git a/fusionauth/resource_fusionauth_user_test.go b/fusionauth/resource_fusionauth_user_test.go
@@ -338,7 +338,8 @@ func testAccCheckFusionauthUserExists(resourceName string) resource.TestCheckFun
 			return fmt.Errorf("no resource id is set")
 		}
 
-		user, faErrs, err := fusionauthClient().RetrieveUser(rs.Primary.ID)
+		faClient := fusionauthClient()
+		user, faErrs, err := faClient.RetrieveUser(rs.Primary.ID)
 		if err != nil {
 			// low-level error performing api request
 			return fmt.Errorf("retrieveuser error: %#+v", err)