Marked colab notebook execution tests that rely on dataform as min_version beta (#13003) (#21310)

[upstream:96f6489eecaabf8faa6a0d819a540dc4a1031df4]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/13003.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google/services/colab/resource_colab_notebook_execution_generated_test.go

@@ -140,245 +140,6 @@ resource "google_colab_notebook_execution" "notebook-execution" {
 `, context)
 }
 
-func TestAccColabNotebookExecution_colabNotebookExecutionFullExample(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"project_id":      envvar.GetTestProjectFromEnv(),
-		"service_account": envvar.GetTestServiceAccountFromEnv(t),
-		"random_suffix":   acctest.RandString(t, 10),
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckColabNotebookExecutionDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccColabNotebookExecution_colabNotebookExecutionFullExample(context),
-			},
-			{
-				ResourceName:            "google_colab_notebook_execution.notebook-execution",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"direct_notebook_source", "location", "notebook_execution_job_id"},
-			},
-		},
-	})
-}
-
-func testAccColabNotebookExecution_colabNotebookExecutionFullExample(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_colab_runtime_template" "my_runtime_template" {
-  name = "tf-test-runtime-template-name%{random_suffix}"
-  display_name = "Runtime template"
-  location = "us-central1"
-
-  machine_spec {
-    machine_type     = "e2-standard-4"
-  }
-
-  network_spec {
-    enable_internet_access = true
-  }
-}
-
-resource "google_storage_bucket" "output_bucket" {
-  name          = "tf_test_my_bucket%{random_suffix}"
-  location      = "US"
-  force_destroy = true
-  uniform_bucket_level_access = true
-}
-
-resource "google_storage_bucket_object" "notebook" {
-  name   = "hello_world.ipynb"
-  bucket = google_storage_bucket.output_bucket.name
-  content = <<EOF
-    {
-      "cells": [
-        {
-          "cell_type": "code",
-          "execution_count": null,
-          "metadata": {},
-          "outputs": [],
-          "source": [
-            "print(\"Hello, World!\")"
-          ]
-        }
-      ],
-      "metadata": {
-        "kernelspec": {
-          "display_name": "Python 3",
-          "language": "python",
-          "name": "python3"
-        },
-        "language_info": {
-          "codemirror_mode": {
-            "name": "ipython",
-            "version": 3
-          },
-          "file_extension": ".py",
-          "mimetype": "text/x-python",
-          "name": "python",
-          "nbconvert_exporter": "python",
-          "pygments_lexer": "ipython3",
-          "version": "3.8.5"
-        }
-      },
-      "nbformat": 4,
-      "nbformat_minor": 4
-    }
-    EOF
-}
-
-resource "google_colab_notebook_execution" "notebook-execution" {
-  notebook_execution_job_id = "tf-test-colab-notebook-execution%{random_suffix}"
-  display_name = "Notebook execution full"
-  location = "us-central1"
-
-  execution_timeout = "86400s"
-  gcs_notebook_source {
-  uri = "gs://${google_storage_bucket_object.notebook.bucket}/${google_storage_bucket_object.notebook.name}"
-  generation = google_storage_bucket_object.notebook.generation
-  }
-  
-  service_account = "%{service_account}"
-
-  gcs_output_uri = "gs://${google_storage_bucket.output_bucket.name}"
-  notebook_runtime_template_resource_name = "projects/${google_colab_runtime_template.my_runtime_template.project}/locations/${google_colab_runtime_template.my_runtime_template.location}/notebookRuntimeTemplates/${google_colab_runtime_template.my_runtime_template.name}"
-
-  depends_on = [
-    google_storage_bucket_object.notebook,
-    google_storage_bucket.output_bucket,
-    google_colab_runtime_template.my_runtime_template,
-  ]
-  
-}
-`, context)
-}
-
-func TestAccColabNotebookExecution_colabNotebookExecutionDataformExample(t *testing.T) {
-	t.Parallel()
-	acctest.BootstrapIamMembers(t, []acctest.IamMember{
-		{
-			Member: "serviceAccount:service-{project_number}@gcp-sa-dataform.iam.gserviceaccount.com",
-			Role:   "roles/cloudkms.cryptoKeyEncrypterDecrypter",
-		},
-	})
-
-	context := map[string]interface{}{
-		"project_id":      envvar.GetTestProjectFromEnv(),
-		"service_account": envvar.GetTestServiceAccountFromEnv(t),
-		"key_name":        acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name,
-		"random_suffix":   acctest.RandString(t, 10),
-	}
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckColabNotebookExecutionDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccColabNotebookExecution_colabNotebookExecutionDataformExample(context),
-			},
-			{
-				ResourceName:            "google_colab_notebook_execution.notebook-execution",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"direct_notebook_source", "location", "notebook_execution_job_id"},
-			},
-		},
-	})
-}
-
-func testAccColabNotebookExecution_colabNotebookExecutionDataformExample(context map[string]interface{}) string {
-	return acctest.Nprintf(`
-resource "google_colab_runtime_template" "my_runtime_template" {
-  name = "tf-test-runtime-template-name%{random_suffix}"
-  display_name = "Runtime template"
-  location = "us-central1"
-
-  machine_spec {
-    machine_type     = "e2-standard-4"
-  }
-
-  network_spec {
-    enable_internet_access = true
-  }
-}
-
-resource "google_storage_bucket" "output_bucket" {
-  name          = "tf_test_my_bucket%{random_suffix}"
-  location      = "US"
-  force_destroy = true
-  uniform_bucket_level_access = true
-}
-
-resource "google_secret_manager_secret" "secret" {
-  secret_id = "secret%{random_suffix}"
-
-  replication {
-    auto {}
-  }
-}
-
-resource "google_secret_manager_secret_version" "secret_version" {
-  secret = google_secret_manager_secret.secret.id
-
-  secret_data = "secret-data"
-}
-
-resource "google_dataform_repository" "dataform_repository" {
-  name = "tf-test-dataform-repository%{random_suffix}"
-  display_name = "dataform_repository"
-  npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
-  kms_key_name = "%{key_name}"
-
-  labels = {
-    label_foo1 = "label-bar1"
-  }
-
-  git_remote_settings {
-      url = "https://github.com/OWNER/REPOSITORY.git"
-      default_branch = "main"
-      authentication_token_secret_version = google_secret_manager_secret_version.secret_version.id
-  }
-
-  workspace_compilation_overrides {
-    default_database = "database"
-    schema_suffix = "_suffix"
-    table_prefix = "prefix_"
-  }
-
-}
-
-resource "google_colab_notebook_execution" "notebook-execution" {
-  display_name = "Notebook execution Dataform"
-  location = "us-central1"
-
-  dataform_repository_source {
-  commit_sha = "randomsha123"
-  dataform_repository_resource_name = "projects/${google_colab_runtime_template.my_runtime_template.project}/locations/${google_colab_runtime_template.my_runtime_template.location}/repositories/${google_dataform_repository.dataform_repository.name}"
-  }
- 
-  notebook_runtime_template_resource_name = "projects/${google_colab_runtime_template.my_runtime_template.project}/locations/${google_colab_runtime_template.my_runtime_template.location}/notebookRuntimeTemplates/${google_colab_runtime_template.my_runtime_template.name}"
-  
-  gcs_output_uri = "gs://${google_storage_bucket.output_bucket.name}"
-  
-  service_account = "%{service_account}"
-
-  depends_on = [
-    google_colab_runtime_template.my_runtime_template,
-    google_storage_bucket.output_bucket,
-    google_secret_manager_secret_version.secret_version,
-    google_dataform_repository.dataform_repository,
-    google_secret_manager_secret.secret,
-  ]
-  
-}
-`, context)
-}
-
 func testAccCheckColabNotebookExecutionDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

website/docs/r/colab_notebook_execution.html.markdown

@@ -115,6 +115,7 @@ resource "google_colab_notebook_execution" "notebook-execution" {
 
 ```hcl
 resource "google_colab_runtime_template" "my_runtime_template" {
+  provider = google-beta
   name = "runtime-template-name"
   display_name = "Runtime template"
   location = "us-central1"
@@ -129,13 +130,15 @@ resource "google_colab_runtime_template" "my_runtime_template" {
 }
 
 resource "google_storage_bucket" "output_bucket" {
+  provider = google-beta
   name          = "my_bucket"
   location      = "US"
   force_destroy = true
   uniform_bucket_level_access = true
 }
 
 resource "google_storage_bucket_object" "notebook" {
+  provider = google-beta
   name   = "hello_world.ipynb"
   bucket = google_storage_bucket.output_bucket.name
   content = <<EOF
@@ -177,6 +180,7 @@ resource "google_storage_bucket_object" "notebook" {
 }
 
 resource "google_colab_notebook_execution" "notebook-execution" {
+  provider = google-beta
   notebook_execution_job_id = "colab-notebook-execution"
   display_name = "Notebook execution full"
   location = "us-central1"
@@ -205,6 +209,7 @@ resource "google_colab_notebook_execution" "notebook-execution" {
 
 ```hcl
 resource "google_colab_runtime_template" "my_runtime_template" {
+  provider = google-beta
   name = "runtime-template-name"
   display_name = "Runtime template"
   location = "us-central1"
@@ -219,13 +224,15 @@ resource "google_colab_runtime_template" "my_runtime_template" {
 }
 
 resource "google_storage_bucket" "output_bucket" {
+  provider = google-beta
   name          = "my_bucket"
   location      = "US"
   force_destroy = true
   uniform_bucket_level_access = true
 }
 
 resource "google_secret_manager_secret" "secret" {
+  provider = google-beta
   secret_id = "secret"
 
   replication {
@@ -234,12 +241,14 @@ resource "google_secret_manager_secret" "secret" {
 }
 
 resource "google_secret_manager_secret_version" "secret_version" {
+  provider = google-beta
   secret = google_secret_manager_secret.secret.id
 
   secret_data = "secret-data"
 }
 
 resource "google_dataform_repository" "dataform_repository" {
+  provider = google-beta
   name = "dataform-repository"
   display_name = "dataform_repository"
   npmrc_environment_variables_secret_version = google_secret_manager_secret_version.secret_version.id
@@ -264,6 +273,7 @@ resource "google_dataform_repository" "dataform_repository" {
 }
 
 resource "google_colab_notebook_execution" "notebook-execution" {
+  provider = google-beta
   display_name = "Notebook execution Dataform"
   location = "us-central1"