Added make test-gcp for verifying GCP functionality on Google Cloud through common integration tests

Author: nfx

Makefile

@@ -58,14 +58,18 @@ test-mws: install
 	@echo "✓ Running acceptance Tests for Multiple Workspace APIs on AWS..."
 	@/bin/bash scripts/run.sh mws '^TestMwsAcc' --debug --tee
 
-test-gcp-accounts: install
-	@echo "✓ Running acceptance Tests for Multiple Workspace APIs on GCP..."
-	@/bin/bash scripts/run.sh gcp-accounts '^TestGcpAcc' --debug --tee
-
 test-awsmt: install
 	@echo "✓ Running Terraform Acceptance Tests for AWS MT..."
 	@/bin/bash scripts/run.sh awsmt '^(TestAcc|TestAwsAcc)' --debug --tee
 
+test-gcp-accounts: install
+	@echo "✓ Running acceptance Tests for Multiple Workspace APIs on GCP..."
+	@/bin/bash scripts/run.sh gcp-accounts '^TestGcpaAcc' --debug --tee
+
+test-gcp: install
+	@echo "✓ Running acceptance Tests for GCP..."
+	@/bin/bash scripts/run.sh gcp '^(TestAcc|TestGcpAcc)' --debug --tee
+
 test-preview: install
 	@echo "✓ Running acceptance Tests for Preview features..."
 	@/bin/bash scripts/run.sh preview '^TestPreviewAcc' --debug --tee

mws/acceptance/workspace_test.go

@@ -60,7 +60,7 @@ func TestMwsAccWorkspaces(t *testing.T) {
 	})
 }
 
-func TestGcpAccWorkspaces(t *testing.T) {
+func TestGcpAccaWorkspaces(t *testing.T) {
 	cloudEnv := os.Getenv("CLOUD_ENV")
 	if cloudEnv != "gcp-accounts" {
 		t.Skip("Acceptance tests skipped unless CLOUD_ENV=gcp-accounts is set")

mws/resource_workspace_test.go

@@ -27,7 +27,7 @@ func TestMwsAccWorkspace(t *testing.T) {
 	t.Log(workspaceList)
 }
 
-func TestGcpAccWorkspace(t *testing.T) {
+func TestGcpaAccWorkspace(t *testing.T) {
 	acctID := qa.GetEnvOrSkipTest(t, "DATABRICKS_ACCOUNT_ID")
 	client := common.CommonEnvironmentClient()
 	workspacesAPI := NewWorkspacesAPI(context.Background(), client)

scripts/gcp-integration/README.md

@@ -0,0 +1,6 @@
+make test-gcp
+---
+
+Used for running integration tests on GCP.
+
+* `DATABRICKS_GOOGLE_SERVICE_ACCOUNT` is the account created through [this module](../gcp-accounts-integration/service-account/main.tf).

scripts/gcp-integration/main.tf

@@ -0,0 +1,81 @@
+terraform {
+  required_providers {
+    databricks = {
+      source = "databrickslabs/databricks"
+    }
+  }
+}
+
+locals {
+  username   = replace(split("@", data.google_client_openid_userinfo.me.email)[0], ".", "_")
+  prefix     = "${local.username}-${random_string.naming.result}"
+  account_id = data.external.env.result.DATABRICKS_ACCOUNT_ID
+}
+
+data "external" "env" {
+  program = ["python", "-c", "import sys,os,json;json.dump(dict(os.environ), sys.stdout)"]
+}
+
+resource "random_string" "naming" {
+  special = false
+  upper   = false
+  length  = 6
+}
+
+// configured via env
+provider "google" {}
+
+// account_id & google_service_account configured via env
+provider "databricks" {
+  alias = "accounts"
+  host  = "https://accounts.gcp.databricks.com"
+}
+
+data "google_client_config" "current" {}
+
+resource "databricks_mws_workspaces" "this" {
+  provider       = databricks.accounts
+  account_id     = local.account_id
+  workspace_name = local.prefix
+  location       = data.google_client_config.current.region
+  cloud_resource_bucket {
+    gcp {
+      project_id = data.google_client_config.current.project
+    }
+  }
+}
+
+// google_service_account configured via env
+provider "databricks" {
+  alias = "workspace"
+  host  = databricks_mws_workspaces.this.workspace_url
+}
+
+data "google_client_openid_userinfo" "me" {}
+
+data "databricks_group" "admins" {
+  depends_on   = [databricks_mws_workspaces.this]
+  provider     = databricks.workspace
+  display_name = "admins"
+}
+
+resource "databricks_user" "me" {
+  depends_on = [databricks_mws_workspaces.this]
+  provider   = databricks.workspace
+  user_name  = data.google_client_openid_userinfo.me.email
+}
+
+resource "databricks_group_member" "allow_me_to_admin" {
+  depends_on = [databricks_mws_workspaces.this]
+  provider   = databricks.workspace
+  group_id   = data.databricks_group.admins.id
+  member_id  = databricks_user.me.id
+}
+
+output "databricks_host" {
+  value = databricks_mws_workspaces.this.workspace_url
+}
+
+output "cloud_env" {
+  value = "gcp"
+}

scripts/gcp-integration/require_env

@@ -0,0 +1,5 @@
+DATABRICKS_ACCOUNT_ID
+DATABRICKS_GOOGLE_SERVICE_ACCOUNT
+GOOGLE_PROJECT
+GOOGLE_REGION
+GOOGLE_ZONE