serviceDirectory: convert all resources to GA (#15459)

BBBmau · web-flow · commit 109b92c73c11 · 2025-11-17T18:17:39.000Z
diff --git a/mmv1/products/servicedirectory/Endpoint.yaml b/mmv1/products/servicedirectory/Endpoint.yaml
@@ -15,11 +15,10 @@
 name: 'Endpoint'
 description: |
   An individual endpoint that provides a service.
-min_version: 'beta'
 references:
   guides:
     'Configuring an endpoint': 'https://cloud.google.com/service-directory/docs/configuring-service-directory#configuring_an_endpoint'
-  api: 'https://cloud.google.com/service-directory/docs/reference/rest/v1beta1/projects.locations.namespaces.services.endpoints'
+  api: 'https://cloud.google.com/service-directory/docs/reference/rest/v1/projects.locations.namespaces.services.endpoints'
 docs:
 base_url: '{{name}}'
 self_link: '{{name}}'
@@ -34,18 +33,19 @@ timeouts:
   delete_minutes: 20
 custom_code:
   custom_import: 'templates/terraform/custom_import/service_directory_endpoint.go.tmpl'
+  encoder: 'templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl'
+  decoder: 'templates/terraform/decoders/service_directory_metadata_to_annotations.go.tmpl'
+
 exclude_sweeper: true
 examples:
   - name: 'service_directory_endpoint_basic'
     primary_resource_id: 'example'
-    min_version: 'beta'
     vars:
       service_id: 'example-service'
       namespace_id: 'example-namespace'
       endpoint_id: 'example-endpoint'
   - name: 'service_directory_endpoint_with_network'
     primary_resource_id: 'example'
-    min_version: 'beta'
     vars:
       service_id: 'example-service'
       namespace_id: 'example-namespace'
@@ -56,7 +56,6 @@ parameters:
     type: String
     description: |
       The resource name of the service that this endpoint provides.
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -66,7 +65,6 @@ parameters:
     description: |
       The Resource ID must be 1-63 characters long, including digits,
       lowercase letters or the hyphen character.
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -78,34 +76,31 @@ properties:
     description: |
       The resource name for the endpoint in the format
       `projects/*/locations/*/namespaces/*/services/*/endpoints/*`.
-    min_version: 'beta'
     output: true
   - name: 'address'
     type: String
     description: |
       IPv4 or IPv6 address of the endpoint.
-    min_version: 'beta'
     validation:
       function: 'verify.ValidateIpAddress'
   - name: 'port'
     type: Integer
     description: |
       Port that the endpoint is running on, must be in the
       range of [0, 65535]. If unspecified, the default is 0.
-    min_version: 'beta'
     validation:
       function: 'validation.IntBetween(0, 65535)'
   - name: 'metadata'
     type: KeyValuePairs
+    update_mask_fields:
+      - 'annotations'
     description: |
       Metadata for the endpoint. This data can be consumed
       by service clients. The entire metadata dictionary may contain
       up to 512 characters, spread across all key-value pairs.
       Metadata that goes beyond any these limits will be rejected.
-    min_version: 'beta'
   - name: 'network'
     type: String
     description: |
       The URL to the network, such as projects/PROJECT_NUMBER/locations/global/networks/NETWORK_NAME.
-    min_version: 'beta'
     immutable: true
diff --git a/mmv1/products/servicedirectory/Namespace.yaml b/mmv1/products/servicedirectory/Namespace.yaml
@@ -16,11 +16,10 @@ name: 'Namespace'
 description: |
   A container for `services`. Namespaces allow administrators to group services
   together and define permissions for a collection of services.
-min_version: 'beta'
 references:
   guides:
     'Configuring a namespace': 'https://cloud.google.com/service-directory/docs/configuring-service-directory#configuring_a_namespace'
-  api: 'https://cloud.google.com/service-directory/docs/reference/rest/v1beta1/projects.locations.namespaces'
+  api: 'https://cloud.google.com/service-directory/docs/reference/rest/v1/projects.locations.namespaces'
 docs:
 base_url: '{{name}}'
 self_link: '{{name}}'
@@ -44,17 +43,13 @@ exclude_sweeper: true
 examples:
   - name: 'service_directory_namespace_basic'
     primary_resource_id: 'example'
-    min_version: 'beta'
     vars:
       namespace_id: 'example-namespace'
 parameters:
   - name: 'location'
     type: String
     description: |
       The location for the Namespace.
-      A full list of valid locations can be found by running
-      `gcloud beta service-directory locations list`.
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -64,7 +59,6 @@ parameters:
     description: |
       The Resource ID must be 1-63 characters long, including digits,
       lowercase letters or the hyphen character.
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -76,12 +70,10 @@ properties:
     description: |
       The resource name for the namespace
       in the format `projects/*/locations/*/namespaces/*`.
-    min_version: 'beta'
     output: true
   - name: 'labels'
     type: KeyValueLabels
     description: |
       Resource labels associated with this Namespace. No more than 64 user
       labels can be associated with a given resource. Label keys and values can
       be no longer than 63 characters.
-    min_version: 'beta'
diff --git a/mmv1/products/servicedirectory/Service.yaml b/mmv1/products/servicedirectory/Service.yaml
@@ -15,11 +15,10 @@
 name: 'Service'
 description: |
   An individual service. A service contains a name and optional metadata.
-min_version: 'beta'
 references:
   guides:
     'Configuring a service': 'https://cloud.google.com/service-directory/docs/configuring-service-directory#configuring_a_service'
-  api: 'https://cloud.google.com/service-directory/docs/reference/rest/v1beta1/projects.locations.namespaces.services'
+  api: 'https://cloud.google.com/service-directory/docs/reference/rest/v1/projects.locations.namespaces.services'
 docs:
 base_url: '{{name}}'
 self_link: '{{name}}'
@@ -39,11 +38,13 @@ iam_policy:
   parent_resource_attribute: 'name'
 custom_code:
   custom_import: 'templates/terraform/custom_import/service_directory_service.go.tmpl'
+  encoder: 'templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl'
+  decoder: 'templates/terraform/decoders/service_directory_metadata_to_annotations.go.tmpl'
+
 exclude_sweeper: true
 examples:
   - name: 'service_directory_service_basic'
     primary_resource_id: 'example'
-    min_version: 'beta'
     vars:
       service_id: 'example-service'
       namespace_id: 'example-namespace'
@@ -52,7 +53,6 @@ parameters:
     type: String
     description: |
       The resource name of the namespace this service will belong to.
-    min_version: 'beta'
     url_param_only: true
     required: true
     ignore_read: true
@@ -61,7 +61,6 @@ parameters:
     description: |
       The Resource ID must be 1-63 characters long, including digits,
       lowercase letters or the hyphen character.
-    min_version: 'beta'
     url_param_only: true
     required: true
     immutable: true
@@ -73,13 +72,13 @@ properties:
     description: |
       The resource name for the service in the
       format `projects/*/locations/*/namespaces/*/services/*`.
-    min_version: 'beta'
     output: true
   - name: 'metadata'
     type: KeyValuePairs
+    update_mask_fields:
+      - 'annotations'
     description: |
       Metadata for the service. This data can be consumed
       by service clients. The entire metadata dictionary may contain
       up to 2000 characters, spread across all key-value pairs.
       Metadata that goes beyond any these limits will be rejected.
-    min_version: 'beta'
diff --git a/mmv1/products/servicedirectory/product.yaml b/mmv1/products/servicedirectory/product.yaml
@@ -15,7 +15,7 @@
 name: 'ServiceDirectory'
 display_name: 'Service Directory'
 versions:
-  - name: 'beta'
-    base_url: 'https://servicedirectory.googleapis.com/v1beta1/'
+  - name: 'ga'
+    base_url: 'https://servicedirectory.googleapis.com/v1/'
 scopes:
   - 'https://www.googleapis.com/auth/cloud-platform'
diff --git a/mmv1/templates/terraform/decoders/service_directory_metadata_to_annotations.go.tmpl b/mmv1/templates/terraform/decoders/service_directory_metadata_to_annotations.go.tmpl
@@ -0,0 +1,5 @@
+if _, ok := res["annotations"]; ok {
+    res["metadata"] = res["annotations"].(map[string]interface{})
+    delete(res, "annotations")
+}
+return res, nil
diff --git a/mmv1/templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl b/mmv1/templates/terraform/encoders/service_directory_metadata_to_annotations.go.tmpl
@@ -0,0 +1,7 @@
+if obj["metadata"] == nil {
+	return nil, nil
+}
+
+obj["annotations"] = obj["metadata"].(map[string]string)
+delete(obj, "metadata")
+return obj, nil
diff --git a/mmv1/templates/terraform/examples/service_directory_endpoint_basic.tf.tmpl b/mmv1/templates/terraform/examples/service_directory_endpoint_basic.tf.tmpl
@@ -1,17 +1,14 @@
 resource "google_service_directory_namespace" "{{$.PrimaryResourceId}}" {
-  provider     = google-beta
   namespace_id = "{{index $.Vars "namespace_id"}}"
   location     = "us-central1"
 }
 
 resource "google_service_directory_service" "{{$.PrimaryResourceId}}" {
-  provider   = google-beta
   service_id = "{{index $.Vars "service_id"}}"
   namespace  = google_service_directory_namespace.{{$.PrimaryResourceId}}.id
 }
 
 resource "google_service_directory_endpoint" "{{$.PrimaryResourceId}}" {
-  provider    = google-beta
   endpoint_id = "{{index $.Vars "endpoint_id"}}"
   service     = google_service_directory_service.{{$.PrimaryResourceId}}.id
 
diff --git a/mmv1/templates/terraform/examples/service_directory_endpoint_with_network.tf.tmpl b/mmv1/templates/terraform/examples/service_directory_endpoint_with_network.tf.tmpl
@@ -1,26 +1,21 @@
 data "google_project" "project" {
-  provider  = google-beta
 }
 
 resource "google_compute_network" "{{$.PrimaryResourceId}}" {
-  provider  = google-beta
   name      = "{{index $.Vars "network_name"}}"
 }
 
 resource "google_service_directory_namespace" "{{$.PrimaryResourceId}}" {
-  provider     = google-beta
   namespace_id = "{{index $.Vars "namespace_id"}}"
   location     = "us-central1"
 }
 
 resource "google_service_directory_service" "{{$.PrimaryResourceId}}" {
-  provider   = google-beta
   service_id = "{{index $.Vars "service_id"}}"
   namespace  = google_service_directory_namespace.{{$.PrimaryResourceId}}.id
 }
 
 resource "google_service_directory_endpoint" "{{$.PrimaryResourceId}}" {
-  provider    = google-beta
   endpoint_id = "{{index $.Vars "endpoint_id"}}"
   service     = google_service_directory_service.{{$.PrimaryResourceId}}.id
 
diff --git a/mmv1/templates/terraform/examples/service_directory_namespace_basic.tf.tmpl b/mmv1/templates/terraform/examples/service_directory_namespace_basic.tf.tmpl
@@ -1,5 +1,4 @@
 resource "google_service_directory_namespace" "{{$.PrimaryResourceId}}" {
-  provider     = google-beta
   namespace_id = "{{index $.Vars "namespace_id"}}"
   location     = "us-central1"
 
diff --git a/mmv1/templates/terraform/examples/service_directory_service_basic.tf.tmpl b/mmv1/templates/terraform/examples/service_directory_service_basic.tf.tmpl
@@ -1,16 +1,14 @@
 resource "google_service_directory_namespace" "{{$.PrimaryResourceId}}" {
-  provider     = google-beta
   namespace_id = "{{index $.Vars "namespace_id"}}"
   location     = "us-central1"
 }
 
 resource "google_service_directory_service" "{{$.PrimaryResourceId}}" {
-  provider   = google-beta
   service_id = "{{index $.Vars "service_id"}}"
   namespace  = google_service_directory_namespace.{{$.PrimaryResourceId}}.id
 
   metadata = {
     stage  = "prod"
     region = "us-central1"
   }
-}
+}
diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_endpoint_test.go.tmpl
@@ -1,5 +1,4 @@
 package servicedirectory_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"fmt"
@@ -102,4 +101,3 @@ resource "google_service_directory_endpoint" "example" {
 }
 `, testId, location, testId, testId)
 }
-{{- end }}
diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.tmpl b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_namespace_test.go.tmpl
@@ -1,5 +1,4 @@
 package servicedirectory_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"fmt"
@@ -80,4 +79,3 @@ resource "google_service_directory_namespace" "example" {
 }
 `, testId, location)
 }
-{{- end }}
diff --git a/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_service_test.go.tmpl b/mmv1/third_party/terraform/services/servicedirectory/resource_service_directory_service_test.go.tmpl
@@ -1,5 +1,4 @@
 package servicedirectory_test
-{{- if ne $.TargetVersionName "ga" }}
 
 import (
 	"fmt"
@@ -89,4 +88,3 @@ resource "google_service_directory_service" "example" {
 }
 `, testId, location, testId)
 }
-{{- end }}
diff --git a/mmv1/third_party/tgc/resource_converters.go.tmpl b/mmv1/third_party/tgc/resource_converters.go.tmpl
@@ -88,6 +88,7 @@ import (
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/securitycenter"
     "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/securitycenterv2"
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/servicemanagement"
+	"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/servicedirectory"
     "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/spanner"
 	"github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/sql"
     "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/storage"

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,21 @@`
`1`	`1`	`data "google_project" "project" {`
`2`		`- provider = google-beta`
`3`	`2`	`}`
`4`	`3`
`5`	`4`	`resource "google_compute_network" "{{$.PrimaryResourceId}}" {`
`6`		`- provider = google-beta`
`7`	`5`	`name = "{{index $.Vars "network_name"}}"`
`8`	`6`	`}`
`9`	`7`
`10`	`8`	`resource "google_service_directory_namespace" "{{$.PrimaryResourceId}}" {`
`11`		`- provider = google-beta`
`12`	`9`	`namespace_id = "{{index $.Vars "namespace_id"}}"`
`13`	`10`	`location = "us-central1"`
`14`	`11`	`}`
`15`	`12`
`16`	`13`	`resource "google_service_directory_service" "{{$.PrimaryResourceId}}" {`
`17`		`- provider = google-beta`
`18`	`14`	`service_id = "{{index $.Vars "service_id"}}"`
`19`	`15`	`namespace = google_service_directory_namespace.{{$.PrimaryResourceId}}.id`
`20`	`16`	`}`
`21`	`17`
`22`	`18`	`resource "google_service_directory_endpoint" "{{$.PrimaryResourceId}}" {`
`23`		`- provider = google-beta`
`24`	`19`	`endpoint_id = "{{index $.Vars "endpoint_id"}}"`
`25`	`20`	`service = google_service_directory_service.{{$.PrimaryResourceId}}.id`
`26`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`resource "google_service_directory_namespace" "{{$.PrimaryResourceId}}" {`
`2`		`- provider = google-beta`
`3`	`2`	`namespace_id = "{{index $.Vars "namespace_id"}}"`
`4`	`3`	`location = "us-central1"`
`5`	`4`