Convert to new-style fixture applies and list resources in alphabetic…

…al order
databricks · May 30, 2022 · ef954da · ef954da
1 parent 05ef3ed
commit ef954da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/aws/resource_service_principal_role_test.go b/aws/resource_service_principal_role_test.go
@@ -7,11 +7,10 @@ import (
 	"github.com/databrickslabs/terraform-provider-databricks/scim"
 
 	"github.com/databrickslabs/terraform-provider-databricks/qa"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestResourceServicePrincipalRoleCreate(t *testing.T) {
-	d, err := qa.ResourceFixture{
+	qa.ResourceFixture{
 		Fixtures: []qa.HTTPFixture{
 			{
 				Method:   "PATCH",
@@ -45,13 +44,11 @@ func TestResourceServicePrincipalRoleCreate(t *testing.T) {
 			"role":                 "arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile",
 		},
 		Create: true,
-	}.Apply(t)
-	assert.NoError(t, err, err)
-	assert.Equal(t, "abc|arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile", d.Id())
+	}.ApplyAndExpectData(t, map[string]interface{}{"id": "abc|arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile"})
 }
 
 func TestResourceServicePrincipalRoleCreate_Error(t *testing.T) {
-	d, err := qa.ResourceFixture{
+	qa.ResourceFixture{
 		Fixtures: []qa.HTTPFixture{
 			{
 				Method:   "PATCH",
@@ -69,13 +66,11 @@ func TestResourceServicePrincipalRoleCreate_Error(t *testing.T) {
 			"role":                 "arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile",
 		},
 		Create: true,
-	}.Apply(t)
-	qa.AssertErrorStartsWith(t, err, "Internal error happened")
-	assert.Equal(t, "", d.Id(), "Id should be empty for error creates")
+	}.ExpectError(t, "Internal error happened")
 }
 
 func TestResourceServicePrincipalRoleRead(t *testing.T) {
-	d, err := qa.ResourceFixture{
+	qa.ResourceFixture{
 		Fixtures: []qa.HTTPFixture{
 			{
 				Method:   "GET",
@@ -95,9 +90,7 @@ func TestResourceServicePrincipalRoleRead(t *testing.T) {
 		Resource: ResourceServicePrincipalRole(),
 		Read:     true,
 		ID:       "abc|arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile",
-	}.Apply(t)
-	assert.NoError(t, err, err)
-	assert.Equal(t, "abc|arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile", d.Id(), "Id should not be empty")
+	}.ApplyAndExpectData(t, map[string]interface{}{"id": "abc|arn:aws:iam::999999999999:instance-profile/my-fake-instance-profile"})
 }
 
 func TestResourceServicePrincipalRoleRead_NoRole(t *testing.T) {

diff --git a/provider/provider.go b/provider/provider.go
@@ -103,6 +103,7 @@ func DatabricksProvider() *schema.Provider {
 			"databricks_secret_scope":                secrets.ResourceSecretScope(),
 			"databricks_secret_acl":                  secrets.ResourceSecretACL(),
 			"databricks_service_principal":           scim.ResourceServicePrincipal(),
+			"databricks_service_principal_role":      aws.ResourceServicePrincipalRole(),
 			"databricks_sql_dashboard":               sql.ResourceDashboard(),
 			"databricks_sql_endpoint":                sql.ResourceSQLEndpoint(),
 			"databricks_sql_global_config":           sql.ResourceSQLGlobalConfig(),
@@ -116,7 +117,6 @@ func DatabricksProvider() *schema.Provider {
 			"databricks_user":                        scim.ResourceUser(),
 			"databricks_user_instance_profile":       aws.ResourceUserInstanceProfile(),
 			"databricks_user_role":                   aws.ResourceUserRole(),
-			"databricks_service_principal_role":      aws.ResourceServicePrincipalRole(),
 			"databricks_workspace_conf":              workspace.ResourceWorkspaceConf(),
 		},
 		Schema: providerSchema(),