promoting google_parallelstore_instance to ga (GoogleCloudPlatform#…

…12271) Co-authored-by: Sarah French <sarah.french@hashicorp.com>
trodge · Nov 14, 2024 · 171b7b6 · 171b7b6
1 parent ee0a468
commit 171b7b6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 35 deletions.
diff --git a/mmv1/products/parallelstore/Instance.yaml b/mmv1/products/parallelstore/Instance.yaml
@@ -14,7 +14,6 @@
 ---
 name: 'Instance'
 description: A Parallelstore Instance.
-min_version: 'beta'
 docs:
 id_format: 'projects/{{project}}/locations/{{location}}/instances/{{instance_id}}'
 base_url: 'projects/{{project}}/locations/{{location}}/instances'
@@ -46,7 +45,6 @@ custom_code:
 examples:
   - name: 'parallelstore_instance_basic'
     primary_resource_id: 'instance'
-    min_version: 'beta'
     vars:
       name: 'instance'
       network_name: 'network'
@@ -56,7 +54,6 @@ parameters:
     type: String
     description: |
       Part of `parent`. See documentation of `projectsId`.
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -69,7 +66,6 @@ parameters:
         * Must be between 1-63 characters.
         * Must end with a number or a letter.
         * Must be unique within the customer project/ location
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -79,13 +75,11 @@ properties:
     description: |
       Identifier. The resource name of the instance, in the format
       `projects/{project}/locations/{location}/instances/{instance_id}`
-    min_version: 'beta'
     output: true
   - name: 'description'
     type: String
     description: |
       The description of the instance. 2048 characters or less.
-    min_version: 'beta'
   - name: 'state'
     type: String
     description: |
@@ -97,19 +91,16 @@ properties:
         DELETING
         FAILED
         UPGRADING
-    min_version: 'beta'
     output: true
   - name: 'createTime'
     type: String
     description: |
       The time when the instance was created.
-    min_version: 'beta'
     output: true
   - name: 'updateTime'
     type: String
     description: |
       The time when the instance was updated.
-    min_version: 'beta'
     output: true
   - name: 'labels'
     type: KeyValueLabels
@@ -135,26 +126,22 @@ properties:
       specific characters being disallowed.  For example, representing labels
       as the string:  `name + "_" + value` would prove problematic if we were to
       allow `"_"` in a future release. "
-    min_version: 'beta'
   - name: 'capacityGib'
     type: String
     description: |
       Required. Immutable. Storage capacity of Parallelstore instance in Gibibytes (GiB).
-    min_version: 'beta'
     required: true
     immutable: true
   - name: 'daosVersion'
     type: String
     description: |
       The version of DAOS software running in the instance.
-    min_version: 'beta'
     output: true
   - name: 'accessPoints'
     type: Array
     description: |
       Output only. List of access_points.
       Contains a list of IPv4 addresses used for client side configuration.
-    min_version: 'beta'
     output: true
     item_type:
       type: String
@@ -163,7 +150,6 @@ properties:
     description: |
       Immutable. The name of the Google Compute Engine [VPC network](https://cloud.google.com/vpc/docs/vpc)
       to which the instance is connected.
-    min_version: 'beta'
     immutable: true
   - name: 'reservedIpRange'
     type: String
@@ -172,7 +158,6 @@ properties:
       associated with the private service access connection for example, \"test-default\"
       associated with IP range 10.0.0.0/29. If no range id is provided all ranges will
       be considered.
-    min_version: 'beta'
     immutable: true
   - name: 'effectiveReservedIpRange'
     type: String
@@ -181,7 +166,6 @@ properties:
       range associated with the private service access connection for example, \"test-default\"
       associated with IP range 10.0.0.0/29. This field is populated by the service
       and contains the value currently used by the service.
-    min_version: 'beta'
     immutable: true
     output: true
   - name: 'fileStripeLevel'
@@ -195,7 +179,6 @@ properties:
         FILE_STRIPE_LEVEL_MIN
         FILE_STRIPE_LEVEL_BALANCED
         FILE_STRIPE_LEVEL_MAX
-    min_version: 'beta'
   - name: 'directoryStripeLevel'
     type: String
     description: |
@@ -207,4 +190,3 @@ properties:
         DIRECTORY_STRIPE_LEVEL_MIN
         DIRECTORY_STRIPE_LEVEL_BALANCED
         DIRECTORY_STRIPE_LEVEL_MAX
-    min_version: 'beta'
diff --git a/mmv1/products/parallelstore/product.yaml b/mmv1/products/parallelstore/product.yaml
@@ -15,6 +15,8 @@
 name: 'Parallelstore'
 display_name: 'Parallelstore'
 versions:
+  - name: 'ga'
+    base_url: 'https://parallelstore.googleapis.com/v1/'
   - name: 'beta'
     base_url: 'https://parallelstore.googleapis.com/v1beta/'
 scopes:

diff --git a/mmv1/templates/terraform/examples/parallelstore_instance_basic.tf.tmpl b/mmv1/templates/terraform/examples/parallelstore_instance_basic.tf.tmpl
@@ -9,15 +9,13 @@ resource "google_parallelstore_instance" "{{$.PrimaryResourceId}}" {
   labels = {
     test = "value"
   }
-  provider = google-beta
   depends_on = [google_service_networking_connection.default]
 }
 
 resource "google_compute_network" "network" {
   name                    = "{{index $.Vars "network_name"}}"
   auto_create_subnetworks = true
   mtu = 8896
-  provider = google-beta
 }
 
 # Create an IP address
@@ -27,13 +25,11 @@ resource "google_compute_global_address" "private_ip_alloc" {
   address_type  = "INTERNAL"
   prefix_length = 24
   network       = google_compute_network.network.id
-  provider = google-beta
 }
 
 # Create a private connection
 resource "google_service_networking_connection" "default" {
   network                 = google_compute_network.network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
-  provider = google-beta
 }
diff --git a/...third_party/terraform/services/parallelstore/resource_parallelstore_instance_test.go.tmpl b/...third_party/terraform/services/parallelstore/resource_parallelstore_instance_test.go.tmpl
@@ -18,7 +18,6 @@
 
 package parallelstore_test
 
-{{ if ne $.TargetVersionName `ga` -}}
 import (
 	"testing"
 
@@ -35,7 +34,7 @@ func TestAccParallelstoreInstance_parallelstoreInstanceBasicExample_update(t *te
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckParallelstoreInstanceDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -75,15 +74,13 @@ resource "google_parallelstore_instance" "instance" {
   labels = {
     test = "value"
   }
-  provider = google-beta
   depends_on = [google_service_networking_connection.default]
 }
 
 resource "google_compute_network" "network" {
   name                    = "network%{random_suffix}"
   auto_create_subnetworks = true
   mtu = 8896
-  provider = google-beta
 }
 
 
@@ -95,15 +92,13 @@ resource "google_compute_global_address" "private_ip_alloc" {
   address_type  = "INTERNAL"
   prefix_length = 24
   network       = google_compute_network.network.id
-  provider = google-beta
 }
 
 # Create a private connection
 resource "google_service_networking_connection" "default" {
   network                 = google_compute_network.network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
-  provider = google-beta
 }
 `, context)
 }
@@ -120,15 +115,13 @@ resource "google_parallelstore_instance" "instance" {
   labels = {
     test = "value23"
   }
-  provider = google-beta
   depends_on = [google_service_networking_connection.default]
 }
 
 resource "google_compute_network" "network" {
   name                    = "network%{random_suffix}"
   auto_create_subnetworks = true
   mtu = 8896
-  provider = google-beta
 }
 
 
@@ -140,17 +133,13 @@ resource "google_compute_global_address" "private_ip_alloc" {
   address_type  = "INTERNAL"
   prefix_length = 24
   network       = google_compute_network.network.id
-  provider = google-beta
 }
 
 # Create a private connection
 resource "google_service_networking_connection" "default" {
   network                 = google_compute_network.network.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
-  provider = google-beta
 }
 `, context)
-}
-
-{{ end }}
+}