Remove tests for databricks_azure_adls_gen1_mount (#1461)

nfx · web-flow · commit 35c78567abc2 · 2022-07-20T17:31:26.000+02:00
* Remove tests for `databricks_azure_adls_gen1_mount`
* Renamed `TEST_AWS_ACCOUNT_ID` to `AWS_ACCOUNT_ID`
diff --git a/mws/acceptance/mws_private_access_settings_test.go b/mws/acceptance/mws_private_access_settings_test.go
@@ -18,7 +18,7 @@ func TestMwsAccPrivateAccessSettings(t *testing.T) {
 			resource "databricks_mws_private_access_settings" "this" {
 				account_id = "{env.DATABRICKS_ACCOUNT_ID}"
 				private_access_settings_name = "tf-{var.RANDOM}"
-				region = "{env.TEST_REGION}"
+				region = "{env.AWS_REGION}"
 			}`,
 		},
 	})
diff --git a/mws/acceptance/mws_vpc_endpoint_test.go b/mws/acceptance/mws_vpc_endpoint_test.go
@@ -18,9 +18,9 @@ func TestMwsAccVpcEndpoint(t *testing.T) {
 				resource "databricks_mws_vpc_endpoint" "this" {
 					account_id = "{env.DATABRICKS_ACCOUNT_ID}"
 					vpc_endpoint_name = "tf-{var.RANDOM}"
-					region = "{env.TEST_REGION}"
+					region = "{env.AWS_REGION}"
 					aws_vpc_endpoint_id = "{env.TEST_RELAY_VPC_ENDPOINT}"
-					aws_account_id = "{env.TEST_AWS_ACCOUNT_ID}"
+					aws_account_id = "{env.AWS_ACCOUNT_ID}"
 				}`,
 		},
 	})
diff --git a/mws/acceptance/mws_workspaces_test.go b/mws/acceptance/mws_workspaces_test.go
@@ -49,7 +49,7 @@ func TestMwsAccWorkspaces(t *testing.T) {
 				account_id      = "{env.DATABRICKS_ACCOUNT_ID}"
 				workspace_name  = "terra-{var.RANDOM}"
 				deployment_name = "terra-{var.RANDOM}"
-				aws_region      = "{env.TEST_REGION}"
+				aws_region      = "{env.AWS_REGION}"
 		
 				credentials_id = databricks_mws_credentials.this.credentials_id
 				storage_configuration_id = databricks_mws_storage_configurations.this.storage_configuration_id
diff --git a/mws/resource_mws_private_access_settings_test.go b/mws/resource_mws_private_access_settings_test.go
@@ -17,7 +17,7 @@ func TestMwsAccPAS(t *testing.T) {
 		t.Skip("skipping integration test in short mode.")
 	}
 	acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")
-	awsRegion := qa.GetEnvOrSkipTest(t, "TEST_REGION")
+	awsRegion := qa.GetEnvOrSkipTest(t, "AWS_REGION")
 	client := common.CommonEnvironmentClient()
 	ctx := context.Background()
 	pasAPI := NewPrivateAccessSettingsAPI(ctx, client)
diff --git a/mws/resource_mws_vpc_endpoint_test.go b/mws/resource_mws_vpc_endpoint_test.go
@@ -20,7 +20,7 @@ func TestMwsAccVPCEndpointIntegration(t *testing.T) {
 	}
 	acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")
 	awsvreID := qa.GetEnvOrSkipTest(t, "TEST_REST_API_VPC_ENDPOINT")
-	awsRegion := qa.GetEnvOrSkipTest(t, "TEST_REGION")
+	awsRegion := qa.GetEnvOrSkipTest(t, "AWS_REGION")
 	client := common.CommonEnvironmentClient()
 	ctx := context.Background()
 	vpcEndpointAPI := NewVPCEndpointAPI(ctx, client)
diff --git a/scripts/README.md b/scripts/README.md
@@ -11,7 +11,7 @@ By default, we don't encourage creation/destruction of infrastructure multiple t
 * `azcli` - Azure authenticated with `az login` command. No `require_env` file needed. Runnable test name prefixes are `TestAcc` and `TestAzureAcc`. By far, the simplest way to develop provider's functionality.
 * `azsp` - Azure authenticated with Service Principal's ID/Secret pairs. Runnable test name prefixes are `TestAcc` and `TestAzureAcc`. Service pricipal must have `Storage Blob Data Contributor` role on ADLS account used. `ARM_SUBSCRIPTION_ID`, `ARM_CLIENT_SECRET`, `ARM_CLIENT_ID`, `ARM_TENANT_ID`, `OWNER` environment vars required. Note that these integration tests will use service principal based auth. Even though it is using a service principal, it will still be generating a personal access token to perform creation of resources.
 
-* `mws` - AWS with Databricks Multiworkspace API. Runnable test name prefix is `TestMws`. Please [check if you're able to use it](https://docs.databricks.com/administration-guide/multiworkspace/new-workspace-aws.html). Required variables are `DATABRICKS_ACCOUNT_ID`, `DATABRICKS_USERNAME`, `DATABRICKS_PASSWORD` (something you use for https://accounts.cloud.databricks.com/), `TEST_REGION`, `TEST_CIDR`, `OWNER`. Only multiworkspace resources are tested.
+* `mws` - AWS with Databricks Multiworkspace API. Runnable test name prefix is `TestMws`. Please [check if you're able to use it](https://docs.databricks.com/administration-guide/multiworkspace/new-workspace-aws.html). Required variables are `DATABRICKS_ACCOUNT_ID`, `DATABRICKS_USERNAME`, `DATABRICKS_PASSWORD` (something you use for https://accounts.cloud.databricks.com/), `AWS_REGION`, `TEST_CIDR`, `OWNER`. Only multiworkspace resources are tested.
 * `awsst` - `DATABRICKS_CONFIG_PROFILE` (section within Databricks CLI `~/.databrickscfg` file) & `CLOUD_ENV=AWS`. In case you want to test provider on existing development single-tenant shard. Runnable test name prefixes are `TestAcc` and `TestAwsAcc`.
 * `awsmt` - AWS with Databricks Multitenant Workspace. Currently work in progress and the test environment cannot be fully started.
 * most of the tests should aim to be cloud-agnostic. Though, in case of specific branching needed, you can check `CLOUD_ENV` value (possible values are `Azure`, `AWS` & `MWS`).
diff --git a/scripts/awsmt-integration/main.tf b/scripts/awsmt-integration/main.tf
@@ -12,7 +12,7 @@ locals {
   // dltp - databricks labs terraform provider
   prefix     = "dltp${random_string.naming.result}"
   cidr_block = data.external.env.result.TEST_CIDR
-  region     = data.external.env.result.TEST_REGION
+  region     = data.external.env.result.AWS_REGION
   account_id = data.external.env.result.DATABRICKS_ACCOUNT_ID
   tags = {
     Environment = "Testing"
diff --git a/scripts/awsmt-integration/require_env b/scripts/awsmt-integration/require_env
@@ -1,6 +1,6 @@
 DATABRICKS_ACCOUNT_ID
 DATABRICKS_USERNAME
 DATABRICKS_PASSWORD
-TEST_REGION
+AWS_REGION
 TEST_CIDR
 OWNER
diff --git a/scripts/mws-integration/main.tf b/scripts/mws-integration/main.tf
@@ -14,7 +14,7 @@ resource "random_string" "naming" {
 locals {
   // dltp - databricks labs terraform provider
   prefix = "dltp${random_string.naming.result}"
-  region = data.external.env.result.TEST_REGION
+  region = data.external.env.result.AWS_REGION
   cidr = data.external.env.result.TEST_CIDR
   tags = {
     Environment = "Testing"
@@ -238,10 +238,14 @@ resource "aws_kms_alias" "customer_managed_key_alias" {
 
 data "aws_caller_identity" "current" {}
 
-output "test_aws_account_id" {
+output "aws_account_id" {
   value = data.aws_caller_identity.current.account_id
 }
 
+output "aws_region" {
+  value = local.region
+}
+
 output "test_rest_api_vpc_endpoint" {
   value = aws_vpc_endpoint.rest_api.id
 }
@@ -291,10 +295,6 @@ output "test_prefix" {
   value = local.prefix
 }
 
-output "test_region" {
-  value = local.region
-}
-
 output "databricks_account_id" {
   value     = data.external.env.result.DATABRICKS_ACCOUNT_ID
   sensitive = true
diff --git a/scripts/mws-integration/require_env b/scripts/mws-integration/require_env
@@ -1,6 +1,6 @@
 DATABRICKS_ACCOUNT_ID
 DATABRICKS_USERNAME
 DATABRICKS_PASSWORD
-TEST_REGION
+AWS_REGION
 TEST_CIDR
 OWNER
diff --git a/scripts/nightly/main.tf b/scripts/nightly/main.tf
@@ -1,7 +1,7 @@
 locals {
   prefix     = "dltp${random_string.naming.result}"
   cidr_block = data.external.env.result.TEST_CIDR
-  region     = data.external.env.result.TEST_REGION
+  region     = data.external.env.result.AWS_REGION
   account_id = data.external.env.result.DATABRICKS_ACCOUNT_ID
   tags       = azurerm_resource_group.this.tags
 }
diff --git a/storage/acceptance/azure_adls_gen1_mount_test.go b/storage/acceptance/azure_adls_gen1_mount_test.go
diff --git a/storage/acceptance/mount_test.go b/storage/acceptance/mount_test.go
@@ -50,27 +50,6 @@ func TestAwsAccS3MountGeneric(t *testing.T) {
 	})
 }
 
-func TestAzureAccADLSv1MountGeneric(t *testing.T) {
-	client, mp := mountPointThroughReusedCluster(t)
-	if !client.IsAzureClientSecretSet() {
-		t.Skip("Test is meant only for client-secret conf Azure")
-	}
-	storageResource := qa.GetEnvOrSkipTest(t, "TEST_DATA_LAKE_STORE_NAME")
-	testWithNewSecretScope(t, func(scope, key string) {
-		testMounting(t, mp,
-			storage.GenericMount{
-				Adl: &storage.AzureADLSGen1MountGeneric{
-					ClientID:        client.AzureClientID,
-					TenantID:        client.AzureTenantID,
-					PrefixType:      "dfs.adls",
-					StorageResource: storageResource,
-					Directory:       "/",
-					SecretScope:     scope,
-					SecretKey:       key,
-				}})
-	}, client, mp.Name, client.AzureClientSecret)
-}
-
 func TestAzureAccADLSv2MountGeneric(t *testing.T) {
 	client, mp := mountPointThroughReusedCluster(t)
 	if !client.IsAzureClientSecretSet() {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ func TestMwsAccPAS(t *testing.T) {`
`17`	`17`	`t.Skip("skipping integration test in short mode.")`
`18`	`18`	`}`
`19`	`19`	`acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")`
`20`		`- awsRegion := qa.GetEnvOrSkipTest(t, "TEST_REGION")`
	`20`	`+ awsRegion := qa.GetEnvOrSkipTest(t, "AWS_REGION")`
`21`	`21`	`client := common.CommonEnvironmentClient()`
`22`	`22`	`ctx := context.Background()`
`23`	`23`	`pasAPI := NewPrivateAccessSettingsAPI(ctx, client)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func TestMwsAccVPCEndpointIntegration(t *testing.T) {`
`20`	`20`	`}`
`21`	`21`	`acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")`
`22`	`22`	`awsvreID := qa.GetEnvOrSkipTest(t, "TEST_REST_API_VPC_ENDPOINT")`
`23`		`- awsRegion := qa.GetEnvOrSkipTest(t, "TEST_REGION")`
	`23`	`+ awsRegion := qa.GetEnvOrSkipTest(t, "AWS_REGION")`
`24`	`24`	`client := common.CommonEnvironmentClient()`
`25`	`25`	`ctx := context.Background()`
`26`	`26`	`vpcEndpointAPI := NewVPCEndpointAPI(ctx, client)`