From dd7a97503ca116384055db29e048db186377b52a Mon Sep 17 00:00:00 2001 From: Sathija Silva Date: Wed, 8 Apr 2026 21:50:33 +0000 Subject: [PATCH 1/2] Initial change to promote Dataform folder to GA --- mmv1/products/dataform/Folder.yaml | 7 ------- .../terraform/examples/dataform_folder_basic.tf.tmpl | 1 - .../terraform/examples/dataform_folder_full.tf.tmpl | 2 -- ...older_test.go.tmpl => resource_dataform_folder_test.go} | 6 +----- 4 files changed, 1 insertion(+), 15 deletions(-) rename mmv1/third_party/terraform/services/dataform/{resource_dataform_folder_test.go.tmpl => resource_dataform_folder_test.go} (90%) diff --git a/mmv1/products/dataform/Folder.yaml b/mmv1/products/dataform/Folder.yaml index 04e451d5225a..c89fd5bc4eca 100644 --- a/mmv1/products/dataform/Folder.yaml +++ b/mmv1/products/dataform/Folder.yaml @@ -15,7 +15,6 @@ name: 'Folder' description: | A resource represents a Dataform folder -min_version: beta references: guides: 'Official Documentation': 'https://cloud.google.com/dataform/docs/' @@ -34,7 +33,6 @@ parameters: - name: 'region' type: String description: 'A reference to the region' - min_version: 'beta' required: true url_param_only: true immutable: true @@ -42,7 +40,6 @@ properties: - name: 'name' type: String description: The Folder's name. - min_version: 'beta' output: true immutable: true - name: 'folder_id' @@ -55,18 +52,14 @@ properties: - name: 'displayName' type: String description: Required. The Folder's user-friendly name. - min_version: 'beta' required: true - name: 'containingFolder' type: String description: |- Optional. The containing Folder resource name. Format: `projects/*/locations/*/folders/*` or `projects/*/locations/*/teamFolders/*`. - min_version: 'beta' examples: - name: 'dataform_folder_basic' primary_resource_id: 'dataform_folder_basic' - min_version: 'beta' - name: 'dataform_folder_full' primary_resource_id: 'dataform_folder_full' - min_version: 'beta' diff --git a/mmv1/templates/terraform/examples/dataform_folder_basic.tf.tmpl b/mmv1/templates/terraform/examples/dataform_folder_basic.tf.tmpl index 9750498975c5..ce4528e518fd 100644 --- a/mmv1/templates/terraform/examples/dataform_folder_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/dataform_folder_basic.tf.tmpl @@ -1,5 +1,4 @@ resource "google_dataform_folder" "{{$.PrimaryResourceId}}" { - provider = google-beta region = "us-central1" display_name = "Basic Folder-%{random_suffix}" } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/dataform_folder_full.tf.tmpl b/mmv1/templates/terraform/examples/dataform_folder_full.tf.tmpl index bc9385d5ec26..8738b56e3c5a 100644 --- a/mmv1/templates/terraform/examples/dataform_folder_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/dataform_folder_full.tf.tmpl @@ -1,11 +1,9 @@ resource "google_dataform_folder" "dataform_folder_root" { - provider = google-beta region = "us-central1" display_name = "Root Folder" } resource "google_dataform_folder" {{$.PrimaryResourceId}} { - provider = google-beta region = "us-central1" display_name = "Nested Folder" containing_folder = google_dataform_folder.dataform_folder_root.id diff --git a/mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go.tmpl b/mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go similarity index 90% rename from mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go.tmpl rename to mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go index 780f65c64ca4..367c2716c9fb 100644 --- a/mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go @@ -1,5 +1,4 @@ package dataform_test -{{- if ne $.TargetVersionName "ga" }} import ( "testing" @@ -18,7 +17,7 @@ func TestAccDataformFolder_update(t *testing.T) { acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccCheckDataformFolderDestroyProducer(t), Steps: []resource.TestStep{ { @@ -46,7 +45,6 @@ func TestAccDataformFolder_update(t *testing.T) { func testAccDataformFolder_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_dataform_folder" "dataform_folder_basic" { - provider = google-beta region = "us-central1" display_name = "Basic Folder-%{random_suffix}" } @@ -56,10 +54,8 @@ resource "google_dataform_folder" "dataform_folder_basic" { func testAccDataformFolder_update(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_dataform_folder" "dataform_folder_basic" { - provider = google-beta region = "us-central1" display_name = "Basic Folder Update-%{random_suffix}" } `, context) } -{{- end }} From 1cf9e197514e16ec3d28cb800d077d90eaa44d2b Mon Sep 17 00:00:00 2001 From: Sathija Silva Date: Thu, 9 Apr 2026 18:43:13 +0000 Subject: [PATCH 2/2] Enable the ga version for the v1 Dataform service --- mmv1/products/dataform/product.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mmv1/products/dataform/product.yaml b/mmv1/products/dataform/product.yaml index bada172215d7..7d7c6f7a5166 100644 --- a/mmv1/products/dataform/product.yaml +++ b/mmv1/products/dataform/product.yaml @@ -17,5 +17,7 @@ display_name: 'Dataform' versions: - name: 'beta' base_url: 'https://dataform.googleapis.com/v1beta1/' + - name: 'ga' + base_url: 'https://dataform.googleapis.com/v1/' scopes: - 'https://www.googleapis.com/auth/cloud-platform'