Tune integration tests for databricks_mws_* (#1483)

Author: nfx

README.md

@@ -73,6 +73,8 @@
 | [databricks_sql_permissions](docs/resources/sql_permissions.md)
 | [databricks_sql_query](docs/resources/sql_query.md)
 | [databricks_sql_visualization](docs/resources/sql_visualization.md)
+| [databricks_sql_warehouse](docs/data-sources/sql_warehouse.md) data
+| [databricks_sql_warehouses](docs/data-sources/sql_warehouses.md) data
 | [databricks_sql_widget](docs/resources/sql_widget.md)
 | [databricks_storage_credential](docs/resources/storage_credential.md)
 | [databricks_table](docs/resources/table.md)

mws/acceptance/mws_credentials_test.go

@@ -23,7 +23,7 @@ func TestMwsAccCredentials(t *testing.T) {
 			resource "databricks_mws_credentials" "this" {
 				account_id       = "{env.DATABRICKS_ACCOUNT_ID}"
 				credentials_name = "creds-test-{var.RANDOM}"
-				role_arn         = "arn:aws:iam::999999999999:role/tf-test-{var.RANDOM}"
+				role_arn         = "{env.TEST_CROSSACCOUNT_ARN}"
 			}`,
 		},
 	})

mws/acceptance/mws_customer_managed_keys_test.go

@@ -22,8 +22,8 @@ func TestMwsAccCustomerManagedKeys(t *testing.T) {
 			resource "databricks_mws_customer_managed_keys" "this" {
 				account_id   = "{env.DATABRICKS_ACCOUNT_ID}"
 				aws_key_info {
-					key_arn   = "{env.TEST_KMS_KEY_ARN}"
-					key_alias = "{env.TEST_KMS_KEY_ALIAS}"
+					key_arn   = "{env.TEST_MANAGED_KMS_KEY_ARN}"
+					key_alias = "{env.TEST_MANAGED_KMS_KEY_ALIAS}"
 				}
 				use_cases = ["MANAGED_SERVICES"]
 			}`,

mws/acceptance/mws_private_access_settings_test.go

@@ -8,6 +8,7 @@ import (
 )
 
 func TestMwsAccPrivateAccessSettings(t *testing.T) {
+	t.SkipNow()
 	cloudEnv := os.Getenv("CLOUD_ENV")
 	if cloudEnv != "MWS" {
 		t.Skip("Cannot run test on non-MWS environment")
@@ -19,6 +20,7 @@ func TestMwsAccPrivateAccessSettings(t *testing.T) {
 				account_id = "{env.DATABRICKS_ACCOUNT_ID}"
 				private_access_settings_name = "tf-{var.RANDOM}"
 				region = "{env.AWS_REGION}"
+				public_access_enabled = true
 			}`,
 		},
 	})

mws/acceptance/mws_vpc_endpoint_test.go

@@ -8,6 +8,7 @@ import (
 )
 
 func TestMwsAccVpcEndpoint(t *testing.T) {
+	t.SkipNow()
 	cloudEnv := os.Getenv("CLOUD_ENV")
 	if cloudEnv != "MWS" {
 		t.Skip("Cannot run test on non-MWS environment")

mws/acceptance/mws_workspaces_test.go

@@ -23,10 +23,10 @@ func TestMwsAccWorkspaces(t *testing.T) {
 			resource "databricks_mws_customer_managed_keys" "this" {
 				account_id   = "{env.DATABRICKS_ACCOUNT_ID}"
 				aws_key_info {
-					key_arn   = "{env.TEST_KMS_KEY_ARN}"
-					key_alias = "{env.TEST_KMS_KEY_ALIAS}"
+					key_arn   = "{env.TEST_MANAGED_KMS_KEY_ARN}"
+					key_alias = "{env.TEST_MANAGED_KMS_KEY_ALIAS}"
 				}
-                use_cases = ["STORAGE", "MANAGED_SERVICES"]
+                use_cases = ["MANAGED_SERVICES"]
 			}
 			resource "databricks_mws_storage_configurations" "this" {
 				account_id                 = "{env.DATABRICKS_ACCOUNT_ID}"
@@ -48,13 +48,12 @@ func TestMwsAccWorkspaces(t *testing.T) {
 			resource "databricks_mws_workspaces" "this" {
 				account_id      = "{env.DATABRICKS_ACCOUNT_ID}"
 				workspace_name  = "terra-{var.RANDOM}"
-				deployment_name = "terra-{var.RANDOM}"
 				aws_region      = "{env.AWS_REGION}"
 		
+				network_id = databricks_mws_networks.this.network_id
 				credentials_id = databricks_mws_credentials.this.credentials_id
 				storage_configuration_id = databricks_mws_storage_configurations.this.storage_configuration_id
 				managed_services_customer_managed_key_id = databricks_mws_customer_managed_keys.this.customer_managed_key_id
-				network_id = databricks_mws_networks.this.network_id
 
 				token {
 					comment = "Test {var.RANDOM}"

mws/resource_mws_credentials_test.go

@@ -22,7 +22,9 @@ func TestMwsAccCreds(t *testing.T) {
 	assert.NoError(t, err, err)
 	t.Log(credsList)
 
-	myCreds, err := credsAPI.Create(acctID, "sri-mws-terraform-automation-role", "arn:aws:iam::997819999999:role/sri-e2-terraform-automation-role")
+	myCreds, err := credsAPI.Create(acctID, 
+		qa.RandomName("tf-test"), 
+		qa.GetEnvOrSkipTest(t, "TEST_CROSSACCOUNT_ARN"))
 	assert.NoError(t, err, err)
 
 	myCredsFull, err := credsAPI.Read(acctID, myCreds.CredentialsID)

mws/resource_mws_customer_managed_keys_test.go

@@ -10,13 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+// TODO: move to `acceptance`
 func TestMwsAccCustomerManagedKeys(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode.")
-	}
 	acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")
-	kmsKeyArn := qa.GetEnvOrSkipTest(t, "TEST_KMS_KEY_ARN")
-	kmsKeyAlias := qa.GetEnvOrSkipTest(t, "TEST_KMS_KEY_ALIAS")
+	kmsKeyArn := qa.GetEnvOrSkipTest(t, "TEST_MANAGED_KMS_KEY_ARN")
+	kmsKeyAlias := qa.GetEnvOrSkipTest(t, "TEST_MANAGED_KMS_KEY_ALIAS")
 	client := common.CommonEnvironmentClient()
 	cmkAPI := NewCustomerManagedKeysAPI(context.Background(), client)
 	cmkList, err := cmkAPI.List(acctID)

mws/resource_mws_private_access_settings_test.go

@@ -13,9 +13,7 @@ import (
 )
 
 func TestMwsAccPAS(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode.")
-	}
+	t.SkipNow()
 	acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")
 	awsRegion := qa.GetEnvOrSkipTest(t, "AWS_REGION")
 	client := common.CommonEnvironmentClient()

mws/resource_mws_vpc_endpoint_test.go

@@ -14,6 +14,7 @@ import (
 )
 
 func TestMwsAccVPCEndpointIntegration(t *testing.T) {
+	t.SkipNow()
 	cloudEnv := os.Getenv("CLOUD_ENV")
 	if cloudEnv != "MWS" {
 		t.Skip("Cannot run test on non-MWS environment")