Promote google_dataform_folder to GA

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,15 +33,13 @@ parameters:
   - name: 'region'
     type: String
     description: 'A reference to the region'
-    min_version: 'beta'
     required: true
     url_param_only: true
     immutable: true
 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'

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'

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}"
 }

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

mmv1/third_party/terraform/services/dataform/resource_dataform_folder_test.go.tmpl → 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 }}