Skip to content

Commit 7fdf7a1

Browse files
zli82016zli82016
committed
Apply new labels model to more resources (part 3)
1 parent 34cf135 commit 7fdf7a1

22 files changed

+46
-38
lines changed

‎mmv1/products/firebasehosting/Channel.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ properties:
7676
The number of previous releases to retain on the channel for rollback or other
7777
purposes. Must be a number between 1-100. Defaults to 10 for new channels.
7878
default_from_api: true
79-
- !ruby/object:Api::Type::KeyValuePairs
79+
- !ruby/object:Api::Type::KeyValueLabels
8080
name: labels
8181
description: Text labels used for extra metadata and/or filtering
8282
- !ruby/object:Api::Type::Time

‎mmv1/products/gkebackup/BackupPlan.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ properties:
138138
If set to True, no further update is allowed on this policy, including
139139
the locked field itself.
140140
default_from_api: true
141-
- !ruby/object:Api::Type::KeyValuePairs
141+
- !ruby/object:Api::Type::KeyValueLabels
142142
name: labels
143143
description: |
144144
Description: A set of custom labels supplied by the user.

‎mmv1/products/gkehub2/Feature.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ properties:
105105
diff_suppress_func: 'tpgresource.CompareSelfLinkOrResourceName'
106106
custom_expand: templates/terraform/custom_expand/resource_from_self_link.go.erb
107107
custom_flatten: templates/terraform/custom_flatten/name_from_self_link.erb
108-
- !ruby/object:Api::Type::KeyValuePairs
108+
- !ruby/object:Api::Type::KeyValueLabels
109109
name: labels
110110
description: GCP labels for this Feature.
111111
- !ruby/object:Api::Type::NestedObject

‎mmv1/products/healthcare/ConsentStore.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ properties:
9393
required: false
9494
description: |
9595
If true, [consents.patch] [google.cloud.healthcare.v1.consent.UpdateConsent] creates the consent if it does not already exist.
96-
- !ruby/object:Api::Type::KeyValuePairs
96+
- !ruby/object:Api::Type::KeyValueLabels
9797
name: labels
9898
required: false
9999
description: |

‎mmv1/products/healthcare/DicomStore.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ properties:
7373
** Changing this property may recreate the Dicom store (removing all data) **
7474
required: true
7575
immutable: true
76-
- !ruby/object:Api::Type::KeyValuePairs
76+
- !ruby/object:Api::Type::KeyValueLabels
7777
name: labels
7878
required: false
7979
description: |

‎mmv1/products/healthcare/FhirStore.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,7 @@ properties:
166166
** This property can be changed manually in the Google Cloud Healthcare admin console without recreating the FHIR store **
167167
required: false
168168
immutable: true
169-
- !ruby/object:Api::Type::KeyValuePairs
170-
name: labels
169+
- !ruby/object:Api::Type::KeyValueLabels
171170
required: false
172171
description: |
173172
User-supplied key-value pairs used to organize FHIR stores.

‎mmv1/products/healthcare/Hl7V2Store.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ properties:
129129
- :V1
130130
- :V2
131131
- :V3
132-
- !ruby/object:Api::Type::KeyValuePairs
132+
- !ruby/object:Api::Type::KeyValueLabels
133133
name: labels
134134
required: false
135135
description: |

‎mmv1/products/monitoring/NotificationChannel.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ custom_diff: [
7878
'sensitiveLabelCustomizeDiff',
7979
]
8080
properties:
81-
- !ruby/object:Api::Type::KeyValuePairs
81+
- !ruby/object:Api::Type::KeyValueLabels
8282
name: labels
8383
description: |
8484
Configuration fields that define the channel and its behavior. The

‎mmv1/products/networkconnectivity/ServiceConnectionPolicies.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ properties:
205205
output: true
206206
description: |
207207
The type of underlying resources used to create the connection.
208-
- !ruby/object:Api::Type::KeyValuePairs
208+
- !ruby/object:Api::Type::KeyValueLabels
209209
name: "labels"
210210
description: |
211211
User-defined labels.

‎mmv1/products/networksecurity/AddressGroup.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ properties:
9595
A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits.
9696
Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z".
9797
output: true
98-
- !ruby/object:Api::Type::KeyValuePairs
98+
- !ruby/object:Api::Type::KeyValueLabels
9999
name: "labels"
100100
description: |
101101
Set of label tags associated with the AddressGroup resource.

‎mmv1/products/privateca/CaPool.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ properties:
480480
values:
481481
- :PEM
482482
- :DER
483-
- !ruby/object:Api::Type::KeyValuePairs
483+
- !ruby/object:Api::Type::KeyValueLabels
484484
name: labels
485485
description: |
486486
Labels with user-defined metadata.

‎mmv1/products/privateca/CertificateAuthority.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ properties:
735735
A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine
736736
fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z".
737737
output: true
738-
- !ruby/object:Api::Type::KeyValuePairs
738+
- !ruby/object:Api::Type::KeyValueLabels
739739
name: labels
740740
description: |
741741
Labels with user-defined metadata.

‎mmv1/products/secretmanager/Secret.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ properties:
6969
output: true
7070
description: |
7171
The time at which the Secret was created.
72-
- !ruby/object:Api::Type::KeyValuePairs
72+
- !ruby/object:Api::Type::KeyValueLabels
7373
name: labels
7474
description: |
7575
The labels assigned to this Secret.

‎mmv1/products/vertexai/Endpoint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ properties:
359359
"overwrite" update happens.
360360
output: true
361361
ignore_read: true
362-
- !ruby/object:Api::Type::KeyValuePairs
362+
- !ruby/object:Api::Type::KeyValueLabels
363363
name: labels
364364
description:
365365
The labels with user-defined metadata to organize your Endpoints. Label

‎mmv1/products/workstations/WorkstationCluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ properties:
8989
output: true
9090
description: |
9191
The system-generated UID of the resource.
92-
- !ruby/object:Api::Type::KeyValuePairs
92+
- !ruby/object:Api::Type::KeyValueLabels
9393
name: "labels"
9494
description:
9595
"Client-specified labels that are applied to the resource and that are

‎mmv1/third_party/terraform/services/firebasehosting/resource_firebase_hosting_channel_test.go.erb

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) {
7575
ResourceName: "google_firebase_hosting_channel.update",
7676
ImportState: true,
7777
ImportStateVerify: true,
78-
ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id"},
78+
ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id", "labels", "terraform_labels"},
7979
},
8080
{
8181
Config: testAccFirebaseHostingChannel_firebasehostingChannelMultipleFields(context),
@@ -84,7 +84,7 @@ func TestAccFirebaseHostingChannel_firebasehostingChannelUpdate(t *testing.T) {
8484
ResourceName: "google_firebase_hosting_channel.update",
8585
ImportState: true,
8686
ImportStateVerify: true,
87-
ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id"},
87+
ImportStateVerifyIgnore: []string{"ttl", "site_id", "channel_id", "labels", "terraform_labels"},
8888
},
8989
{
9090
Config: testAccFirebaseHostingChannel_firebasehostingChannelBasic(context),

‎mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.erb

+6
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ resource "google_gke_backup_backup_plan" "backupplan" {
6868
include_secrets = false
6969
all_namespaces = true
7070
}
71+
labels = {
72+
"some-key-1": "some-value-1"
73+
}
7174
}
7275
`, context)
7376
}
@@ -113,6 +116,9 @@ resource "google_gke_backup_backup_plan" "backupplan" {
113116
}
114117
}
115118
}
119+
labels = {
120+
"some-key-2": "some-value-2"
121+
}
116122
}
117123
`, context)
118124
}

‎mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb

+3-2
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func TestAccGKEHubFeature_gkehubFeatureMciUpdate(t *testing.T) {
231231
ResourceName: "google_gke_hub_feature.feature",
232232
ImportState: true,
233233
ImportStateVerify: true,
234-
ImportStateVerifyIgnore: []string{"update_time"},
234+
ImportStateVerifyIgnore: []string{"update_time", "labels", "terraform_labels"},
235235
},
236236
},
237237
})
@@ -366,7 +366,7 @@ func TestAccGKEHubFeature_gkehubFeatureMcsd(t *testing.T) {
366366
ResourceName: "google_gke_hub_feature.feature",
367367
ImportState: true,
368368
ImportStateVerify: true,
369-
ImportStateVerifyIgnore: []string{"project"},
369+
ImportStateVerifyIgnore: []string{"project", "labels", "terraform_labels"},
370370
},
371371
{
372372
Config: testAccGKEHubFeature_gkehubFeatureMcsdUpdate(context),
@@ -375,6 +375,7 @@ func TestAccGKEHubFeature_gkehubFeatureMcsd(t *testing.T) {
375375
ResourceName: "google_gke_hub_feature.feature",
376376
ImportState: true,
377377
ImportStateVerify: true,
378+
ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
378379
},
379380
},
380381
})

‎mmv1/third_party/terraform/services/networksecurity/resource_network_security_address_group_test.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,19 @@ func TestAccNetworkSecurityAddressGroups_update(t *testing.T) {
2424
Config: testAccNetworkSecurityAddressGroups_basic(addressGroupsName, projectName),
2525
},
2626
{
27-
ResourceName: "google_network_security_address_group.foobar",
28-
ImportState: true,
29-
ImportStateVerify: true,
27+
ResourceName: "google_network_security_address_group.foobar",
28+
ImportState: true,
29+
ImportStateVerify: true,
30+
ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
3031
},
3132
{
3233
Config: testAccNetworkSecurityAddressGroups_update(addressGroupsName, projectName),
3334
},
3435
{
35-
ResourceName: "google_network_security_address_group.foobar",
36-
ImportState: true,
37-
ImportStateVerify: true,
36+
ResourceName: "google_network_security_address_group.foobar",
37+
ImportState: true,
38+
ImportStateVerify: true,
39+
ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
3840
},
3941
},
4042
})

‎mmv1/third_party/terraform/services/privateca/resource_privateca_ca_pool_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolUpdate(t *testing.T) {
2626
ResourceName: "google_privateca_ca_pool.default",
2727
ImportState: true,
2828
ImportStateVerify: true,
29-
ImportStateVerifyIgnore: []string{"name", "location"},
29+
ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"},
3030
},
3131
{
3232
Config: testAccPrivatecaCaPool_privatecaCapoolEnd(context),
@@ -35,7 +35,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolUpdate(t *testing.T) {
3535
ResourceName: "google_privateca_ca_pool.default",
3636
ImportState: true,
3737
ImportStateVerify: true,
38-
ImportStateVerifyIgnore: []string{"name", "location"},
38+
ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"},
3939
},
4040
{
4141
Config: testAccPrivatecaCaPool_privatecaCapoolStart(context),
@@ -44,7 +44,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolUpdate(t *testing.T) {
4444
ResourceName: "google_privateca_ca_pool.default",
4545
ImportState: true,
4646
ImportStateVerify: true,
47-
ImportStateVerifyIgnore: []string{"name", "location"},
47+
ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"},
4848
},
4949
},
5050
})
@@ -233,7 +233,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolEmptyBaseline(t *testing.T) {
233233
ResourceName: "google_privateca_ca_pool.default",
234234
ImportState: true,
235235
ImportStateVerify: true,
236-
ImportStateVerifyIgnore: []string{"name", "location"},
236+
ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"},
237237
},
238238
},
239239
})
@@ -297,7 +297,7 @@ func TestAccPrivatecaCaPool_privatecaCapoolEmptyPublishingOptions(t *testing.T)
297297
ResourceName: "google_privateca_ca_pool.default",
298298
ImportState: true,
299299
ImportStateVerify: true,
300-
ImportStateVerifyIgnore: []string{"name", "location"},
300+
ImportStateVerifyIgnore: []string{"name", "location", "labels", "terraform_labels"},
301301
},
302302
},
303303
})

‎mmv1/third_party/terraform/services/privateca/resource_privateca_certificate_authority_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityUpdate(t
3434
ResourceName: "google_privateca_certificate_authority.default",
3535
ImportState: true,
3636
ImportStateVerify: true,
37-
ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period"},
37+
ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period", "labels", "terraform_labels"},
3838
},
3939
{
4040
Config: testAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityEnd(context),
@@ -43,7 +43,7 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityUpdate(t
4343
ResourceName: "google_privateca_certificate_authority.default",
4444
ImportState: true,
4545
ImportStateVerify: true,
46-
ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period"},
46+
ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period", "labels", "terraform_labels"},
4747
},
4848
{
4949
Config: testAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityBasicRoot(context),
@@ -52,7 +52,7 @@ func TestAccPrivatecaCertificateAuthority_privatecaCertificateAuthorityUpdate(t
5252
ResourceName: "google_privateca_certificate_authority.default",
5353
ImportState: true,
5454
ImportStateVerify: true,
55-
ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period"},
55+
ImportStateVerifyIgnore: []string{"ignore_active_certificates_on_deletion", "location", "certificate_authority_id", "pool", "deletion_protection", "skip_grace_period", "labels", "terraform_labels"},
5656
},
5757
},
5858
})

‎mmv1/third_party/terraform/services/workstations/resource_workstations_workstation_cluster_test.go.erb

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestAccWorkstationsWorkstationCluster_update(t *testing.T) {
2828
ResourceName: "google_workstations_workstation_cluster.default",
2929
ImportState: true,
3030
ImportStateVerify: true,
31-
ImportStateVerifyIgnore: []string{"etag", "annotations"},
31+
ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"},
3232
},
3333
{
3434
Config: testAccWorkstationsWorkstationCluster_update(context),
@@ -37,7 +37,7 @@ func TestAccWorkstationsWorkstationCluster_update(t *testing.T) {
3737
ResourceName: "google_workstations_workstation_cluster.default",
3838
ImportState: true,
3939
ImportStateVerify: true,
40-
ImportStateVerifyIgnore: []string{"etag", "annotations"},
40+
ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"},
4141
},
4242
},
4343
})
@@ -62,7 +62,7 @@ func TestAccWorkstationsWorkstationCluster_Private_update(t *testing.T) {
6262
ResourceName: "google_workstations_workstation_cluster.default",
6363
ImportState: true,
6464
ImportStateVerify: true,
65-
ImportStateVerifyIgnore: []string{"etag", "annotations"},
65+
ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"},
6666
},
6767
{
6868
Config: testAccWorkstationsWorkstationCluster_private_update(context),
@@ -71,7 +71,7 @@ func TestAccWorkstationsWorkstationCluster_Private_update(t *testing.T) {
7171
ResourceName: "google_workstations_workstation_cluster.default",
7272
ImportState: true,
7373
ImportStateVerify: true,
74-
ImportStateVerifyIgnore: []string{"etag", "annotations"},
74+
ImportStateVerifyIgnore: []string{"etag", "annotations", "labels", "terraform_labels"},
7575
},
7676
},
7777
})

0 commit comments

Comments
 (0)