Apply new annotations model to more resources

zli82016 · zli82016 · commit fc9d361f851c · 2023-09-13T14:15:09.000-07:00
diff --git a/mmv1/products/cloudrunv2/Job.yaml b/mmv1/products/cloudrunv2/Job.yaml
@@ -137,7 +137,7 @@ properties:
 
       Cloud Run API v2 does not support labels with `run.googleapis.com`, `cloud.googleapis.com`, `serving.knative.dev`, or `autoscaling.knative.dev` namespaces, and they will be rejected.
       All system labels in v1 now have a corresponding field in v2 Job.
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: "annotations"
     description: |-
       Unstructured key value map that may be set by external tools to store and arbitrary metadata. They are not queryable and should be preserved when modifying objects.
diff --git a/mmv1/products/gkeonprem/BareMetalAdminCluster.yaml b/mmv1/products/gkeonprem/BareMetalAdminCluster.yaml
@@ -133,7 +133,7 @@ properties:
       Allows clients to perform consistent read-modify-writes
       through optimistic concurrency control.
     output: true
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: "annotations"
     description: |
       Annotations on the Bare Metal Admin Cluster.
diff --git a/mmv1/products/gkeonprem/BareMetalCluster.yaml b/mmv1/products/gkeonprem/BareMetalCluster.yaml
@@ -85,7 +85,7 @@ properties:
     required: true
     description: |
       A human readable description of this Bare Metal User Cluster.
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: "annotations"
     description: |
       Annotations on the Bare Metal User Cluster.
@@ -96,7 +96,6 @@ properties:
       Prefix must be a DNS subdomain.
       Name must be 63 characters or less, begin and end with alphanumerics,
       with dashes (-), underscores (_), dots (.), and alphanumerics between.
-    default_from_api: true
   - !ruby/object:Api::Type::NestedObject
     name: "networkConfig"
     description: |
diff --git a/mmv1/products/gkeonprem/BareMetalNodePool.yaml b/mmv1/products/gkeonprem/BareMetalNodePool.yaml
@@ -74,7 +74,7 @@ properties:
     name: 'displayName'
     description: |
       The display name for the Bare Metal Node Pool.
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: 'annotations'
     description: |
       Annotations on the Bare Metal Node Pool.
@@ -85,7 +85,6 @@ properties:
       Prefix must be a DNS subdomain.
       Name must be 63 characters or less, begin and end with alphanumerics,
       with dashes (-), underscores (_), dots (.), and alphanumerics between.
-    default_from_api: true
   - !ruby/object:Api::Type::NestedObject
     name: 'nodePoolConfig'
     required: true
diff --git a/mmv1/products/gkeonprem/VmwareCluster.yaml b/mmv1/products/gkeonprem/VmwareCluster.yaml
@@ -89,7 +89,7 @@ properties:
     required: true
     description: |
       The Anthos clusters on the VMware version for your user cluster.
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: 'annotations'
     description: |
       Annotations on the VMware User Cluster.
@@ -100,7 +100,6 @@ properties:
       Prefix must be a DNS subdomain.
       Name must be 63 characters or less, begin and end with alphanumerics,
       with dashes (-), underscores (_), dots (.), and alphanumerics between.
-    default_from_api: true
   - !ruby/object:Api::Type::NestedObject
     name: 'controlPlaneNode'
     description: |
diff --git a/mmv1/products/gkeonprem/VmwareNodePool.yaml b/mmv1/products/gkeonprem/VmwareNodePool.yaml
@@ -71,7 +71,7 @@ properties:
   - !ruby/object:Api::Type::String
     name: "displayName"
     description: The display name for the node pool.
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: "annotations"
     description: |
       Annotations on the node Pool.
@@ -82,7 +82,6 @@ properties:
       Prefix must be a DNS subdomain.
       Name must be 63 characters or less, begin and end with alphanumerics,
       with dashes (-), underscores (_), dots (.), and alphanumerics between.
-    default_from_api: true
   - !ruby/object:Api::Type::NestedObject
     name: "nodePoolAutoscaling"
     description: Node Pool autoscaling config for the node pool.
diff --git a/mmv1/products/secretmanager/Secret.yaml b/mmv1/products/secretmanager/Secret.yaml
@@ -76,7 +76,7 @@ properties:
 
       An object containing a list of "key": value pairs. Example:
       { "name": "wrench", "mass": "1.3kg", "count": "3" }.
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: annotations
     description: |
       Custom metadata about the secret.
diff --git a/mmv1/products/workstations/Workstation.yaml b/mmv1/products/workstations/Workstation.yaml
@@ -122,7 +122,7 @@ properties:
     description:
       'Client-specified labels that are applied to the resource and that are
       also propagated to the underlying Compute Engine resources.'
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: 'annotations'
     description: 'Client-specified annotations. This is distinct from labels.'
   - !ruby/object:Api::Type::Time
diff --git a/mmv1/products/workstations/WorkstationCluster.yaml b/mmv1/products/workstations/WorkstationCluster.yaml
@@ -118,7 +118,7 @@ properties:
       Whether this resource is in degraded mode, in which case it may require user action to restore full functionality.
       Details can be found in the conditions field.
     output: true
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: "annotations"
     description: "Client-specified annotations. This is distinct from labels."
   - !ruby/object:Api::Type::Fingerprint
diff --git a/mmv1/products/workstations/WorkstationConfig.yaml b/mmv1/products/workstations/WorkstationConfig.yaml
@@ -158,7 +158,7 @@ properties:
     description:
       'Client-specified labels that are applied to the resource and that are
       also propagated to the underlying Compute Engine resources.'
-  - !ruby/object:Api::Type::KeyValuePairs
+  - !ruby/object:Api::Type::KeyValueAnnotations
     name: 'annotations'
     description: 'Client-specified annotations. This is distinct from labels.'
   - !ruby/object:Api::Type::Fingerprint
diff --git a/mmv1/templates/terraform/examples/gkeonprem_bare_metal_admin_cluster_full.tf.erb b/mmv1/templates/terraform/examples/gkeonprem_bare_metal_admin_cluster_full.tf.erb
@@ -4,7 +4,9 @@ resource "google_gkeonprem_bare_metal_admin_cluster" "<%= ctx[:primary_resource_
   location = "us-west1"
   description = "test description"
   bare_metal_version = "1.13.4"
-  annotations = {}
+  annotations = {
+    env = "test"
+  }
   network_config {
     island_mode_cidr {
       service_address_cidr_blocks = ["172.26.0.0/16"]
diff --git a/mmv1/templates/terraform/examples/workstation_config_basic.tf.erb b/mmv1/templates/terraform/examples/workstation_config_basic.tf.erb
@@ -37,6 +37,10 @@ resource "google_workstations_workstation_config" "<%= ctx[:primary_resource_id]
   idle_timeout = "600s"
   running_timeout = "21600s"
 
+  annotations = {
+    label-one = "value-one"
+  }
+
   host {
     gce_instance {
       machine_type                = "e2-standard-4"
diff --git a/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_job_test.go b/mmv1/third_party/terraform/services/cloudrunv2/resource_cloud_run_v2_job_test.go
@@ -26,7 +26,7 @@ func TestAccCloudRunV2Job_cloudrunv2JobFullUpdate(t *testing.T) {
 				ResourceName:            "google_cloud_run_v2_job.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"location", "launch_stage"},
+				ImportStateVerifyIgnore: []string{"location", "launch_stage", "annotations"},
 			},
 			{
 				Config: testAccCloudRunV2Job_cloudrunv2JobFullUpdate(context),
@@ -35,7 +35,7 @@ func TestAccCloudRunV2Job_cloudrunv2JobFullUpdate(t *testing.T) {
 				ResourceName:            "google_cloud_run_v2_job.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"location", "launch_stage"},
+				ImportStateVerifyIgnore: []string{"location", "launch_stage", "annotations"},
 			},
 		},
 	})
diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.erb
@@ -25,6 +25,7 @@ func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBasic(t *testing.T)
         ResourceName:      "google_gkeonprem_bare_metal_cluster.cluster-metallb",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
       {
         Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context),
@@ -33,6 +34,7 @@ func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBasic(t *testing.T)
         ResourceName:      "google_gkeonprem_bare_metal_cluster.cluster-metallb",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
     },
   })
@@ -105,6 +107,9 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context
     provider = google-beta
     name = "cluster-metallb"
     location = "us-west1"
+    annotations = {
+      env = "test"
+    }
     admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
     bare_metal_version = "1.12.3"
     network_config {
@@ -181,6 +186,9 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context map[
     provider = google-beta
     name = "cluster-metallb"
     location = "us-west1"
+    annotations = {
+      env = "test-update"
+    }
     admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
     bare_metal_version = "1.12.3"
     network_config {
diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.erb
@@ -27,6 +27,7 @@ func TestAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(t *testing.T) {
         ResourceName:      "google_gkeonprem_bare_metal_node_pool.nodepool",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
       {
         Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context),
@@ -35,6 +36,7 @@ func TestAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(t *testing.T) {
         ResourceName:      "google_gkeonprem_bare_metal_node_pool.nodepool",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
     },
   })
@@ -121,7 +123,9 @@ func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context map[
     name = "tf-test-nodepool-%{random_suffix}"
     location = "us-west1"
     bare_metal_cluster = google_gkeonprem_bare_metal_cluster.cluster.name
-    annotations = {}
+    annotations = {
+      env = "test"
+    }
     node_pool_config {
       operating_system = "LINUX"
       labels = {}
@@ -215,7 +219,9 @@ func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context map[strin
     name = "tf-test-nodepool-%{random_suffix}"
     location = "us-west1"
     bare_metal_cluster = google_gkeonprem_bare_metal_cluster.cluster.name
-    annotations = {}
+    annotations = {
+      env = "test-update"
+    }
     node_pool_config {
       operating_system = "LINUX"
       labels = {}
diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.erb
@@ -27,6 +27,7 @@ func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateBasic(t *testing.T) {
         ResourceName:      "google_gkeonprem_vmware_cluster.cluster",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
       {
         Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context),
@@ -35,6 +36,7 @@ func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateBasic(t *testing.T) {
         ResourceName:      "google_gkeonprem_vmware_cluster.cluster",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
     },
   })
@@ -117,7 +119,9 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context map[s
     admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
     description = "test cluster"
     on_prem_version = "1.13.1-gke.35"
-    annotations = {}
+    annotations = {
+      env = "test"
+    }
     network_config {
       service_address_cidr_blocks = ["10.96.0.0/12"]
       pod_address_cidr_blocks = ["192.168.0.0/16"]
@@ -165,7 +169,9 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context map[string
     admin_cluster_membership = "projects/870316890899/locations/global/memberships/gkeonprem-terraform-test"
     description = "test cluster updated"
     on_prem_version = "1.13.1-gke.36"
-    annotations = {}
+    annotations = {
+      env = "test-update"
+    }
     network_config {
       service_address_cidr_blocks = ["10.96.0.0/16"]
       pod_address_cidr_blocks = ["192.168.0.0/20"]
diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.erb b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.erb
@@ -27,6 +27,7 @@ func TestAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(t *testing.T) {
         ResourceName:      "google_gkeonprem_vmware_node_pool.nodepool",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
       {
         Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context),
@@ -35,6 +36,7 @@ func TestAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(t *testing.T) {
         ResourceName:      "google_gkeonprem_vmware_node_pool.nodepool",
         ImportState:       true,
         ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"annotations"},
       },
     },
   })
@@ -92,7 +94,9 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string
     name = "tf-test-nodepool-%{random_suffix}"
     location = "us-west1"
     vmware_cluster = google_gkeonprem_vmware_cluster.cluster.name
-    annotations = {}
+    annotations = {
+      env = "test"
+    }
     config {
         cpus = 4
         memory_mb = 8196
@@ -167,7 +171,9 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context map[string]inte
     name = "tf-test-nodepool-%{random_suffix}"
     location = "us-west1"
     vmware_cluster = google_gkeonprem_vmware_cluster.cluster.name
-    annotations = {}
+    annotations = {
+      env = "test-update"
+    }
     config {
         cpus = 5
         memory_mb = 4096
diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.erb
@@ -83,7 +83,7 @@ func TestAccSecretManagerSecret_annotationsUpdate(t *testing.T) {
 				ResourceName:      "google_secret_manager_secret.secret-with-annotations",
 				ImportState:       true,
 				ImportStateVerify: true,
-				ImportStateVerifyIgnore: []string{"ttl"},
+				ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"},
 			},
 			{
 				Config: testAccSecretManagerSecret_annotationsUpdate(context),
@@ -92,7 +92,7 @@ func TestAccSecretManagerSecret_annotationsUpdate(t *testing.T) {
 				ResourceName:      "google_secret_manager_secret.secret-with-annotations",
 				ImportState:       true,
 				ImportStateVerify: true,
-				ImportStateVerifyIgnore: []string{"ttl"},
+				ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"},
 			},
 			{
 				Config: testAccSecretManagerSecret_annotationsBasic(context),
@@ -101,7 +101,7 @@ func TestAccSecretManagerSecret_annotationsUpdate(t *testing.T) {
 				ResourceName:      "google_secret_manager_secret.secret-with-annotations",
 				ImportState:       true,
 				ImportStateVerify: true,
-				ImportStateVerifyIgnore: []string{"ttl"},
+				ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"},
 			},
 		},
 	})
diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb
@@ -28,7 +28,7 @@ func TestAccWorkstationsWorkstationCluster_update(t *testing.T) {
 				ResourceName:            "google_workstations_workstation_cluster.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"etag"},
+				ImportStateVerifyIgnore: []string{"etag", "annotations"},
 			},
 			{
 				Config: testAccWorkstationsWorkstationCluster_update(context),
@@ -37,7 +37,7 @@ func TestAccWorkstationsWorkstationCluster_update(t *testing.T) {
 				ResourceName:            "google_workstations_workstation_cluster.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"etag"},
+				ImportStateVerifyIgnore: []string{"etag", "annotations"},
 			},
 		},
 	})
@@ -62,7 +62,7 @@ func TestAccWorkstationsWorkstationCluster_Private_update(t *testing.T) {
 				ResourceName:            "google_workstations_workstation_cluster.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"etag"},
+				ImportStateVerifyIgnore: []string{"etag", "annotations"},
 			},
 			{
 				Config: testAccWorkstationsWorkstationCluster_private_update(context),
@@ -71,7 +71,7 @@ func TestAccWorkstationsWorkstationCluster_Private_update(t *testing.T) {
 				ResourceName:            "google_workstations_workstation_cluster.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"etag"},
+				ImportStateVerifyIgnore: []string{"etag", "annotations"},
 			},
 		},
 	})
diff --git a/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb b/mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_config_test.go.erb
diff --git a/mmv1/third_party/terraform/tpgresource/labels.go b/mmv1/third_party/terraform/tpgresource/labels.go
diff --git a/mmv1/third_party/terraform/tpgresource/lables.go b/mmv1/third_party/terraform/tpgresource/lables.go
