Skip to content

Commit 35f8c83

Browse files
authored
tgc-revival: fix the service package in resource metadata (#15230)
1 parent ae8959b commit 35f8c83

File tree

6 files changed

+1
-16
lines changed

6 files changed

+1
-16
lines changed

mmv1/products/certificatemanager/Certificate.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,33 +66,28 @@ examples:
6666
dns_auth_name2: 'dns-auth2'
6767
dns_auth_subdomain2: 'subdomain2'
6868
cert_name: 'dns-cert'
69-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
7069
- name: 'certificate_manager_google_managed_certificate_issuance_config'
7170
primary_resource_id: 'default'
7271
vars:
7372
cert_name: 'issuance-config-cert'
7473
ca_name: 'ca-authority'
7574
pool_name: 'ca-pool'
7675
issuance_config_name: 'issuance-config'
77-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
7876
- name: 'certificate_manager_self_managed_certificate'
7977
primary_resource_id: 'default'
8078
vars:
8179
cert_name: 'self-managed-cert'
82-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
8380
- name: 'certificate_manager_self_managed_certificate_regional'
8481
primary_resource_id: 'default'
8582
vars:
8683
cert_name: 'self-managed-cert'
87-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
8884
- name: 'certificate_manager_google_managed_certificate_issuance_config_all_regions'
8985
primary_resource_id: 'default'
9086
vars:
9187
cert_name: 'issuance-config-cert'
9288
ca_name: 'ca-authority'
9389
pool_name: 'ca-pool'
9490
issuance_config_name: 'issuance-config'
95-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
9691
- name: 'certificate_manager_google_managed_certificate_dns_all_regions'
9792
primary_resource_id: 'default'
9893
vars:
@@ -101,19 +96,16 @@ examples:
10196
dns_auth_name2: 'dns-auth2'
10297
dns_auth_subdomain2: 'subdomain2'
10398
cert_name: 'dns-cert'
104-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
10599
- name: 'certificate_manager_google_managed_regional_certificate_dns_auth'
106100
primary_resource_id: 'default'
107101
vars:
108102
dns_auth_name: 'dns-auth'
109103
dns_auth_subdomain: 'subdomain'
110104
cert_name: 'dns-cert'
111-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
112105
- name: 'certificate_manager_client_auth_certificate'
113106
primary_resource_id: 'default'
114107
vars:
115108
cert_name: 'client-auth-cert'
116-
tgc_skip_test: 'Need to figure out to get the desired cai asset state.'
117109
parameters:
118110
- name: 'name'
119111
type: String

mmv1/products/networksecurity/GatewaySecurityPolicy.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,13 @@ examples:
5858
primary_resource_id: 'default'
5959
vars:
6060
resource_name: 'my-gateway-security-policy'
61-
tgc_skip_test: 'It takes time to fix it.'
6261
- name: 'network_security_gateway_security_policy_tls_inspection_basic'
6362
primary_resource_id: 'default'
6463
vars:
6564
resource_name: 'my-gateway-security-policy'
6665
privateca_ca_tls_name: 'my-tls-inspection-policy'
6766
privateca_ca_pool_name: 'my-basic-ca-pool'
6867
privateca_certificate_authority_id: 'my-basic-certificate-authority'
69-
tgc_skip_test: 'It takes time to fix it.'
7068
parameters:
7169
- name: 'name'
7270
type: String

mmv1/products/networksecurity/GatewaySecurityPolicyRule.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@ examples:
5151
vars:
5252
gateway_security_policy_id: 'my-gateway-security-policy'
5353
resource_name: 'my-gateway-security-policy-rule'
54-
tgc_skip_test: 'It takes time to fix it.'
5554
- name: 'network_security_gateway_security_policy_rules_advanced'
5655
primary_resource_id: 'default'
5756
vars:
5857
gateway_security_policy_id: 'my-gateway-security-policy'
5958
resource_name: 'my-gateway-security-policy-rule'
6059
tgc_test_ignore_extra:
6160
- 'tls_inspection_enabled' # Ignore its false value in Terraform configuration
62-
tgc_skip_test: 'It takes time to fix it.'
6361
parameters:
6462
- name: 'name'
6563
type: String

mmv1/products/networksecurity/TlsInspectionPolicy.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ examples:
5252
resource_name: 'my-tls-inspection-policy'
5353
privateca_ca_pool_name: 'my-basic-ca-pool'
5454
privateca_certificate_authority_id: 'my-basic-certificate-authority'
55-
tgc_skip_test: 'It takes time to fix it.'
5655
- name: 'network_security_tls_inspection_policy_custom'
5756
primary_resource_id: 'default'
5857
min_version: 'beta'

mmv1/products/networksecurity/UrlLists.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,10 @@ examples:
5151
primary_resource_id: 'default'
5252
vars:
5353
resource_name: 'my-url-lists'
54-
tgc_skip_test: 'It takes time to fix it.'
5554
- name: 'network_security_url_lists_advanced'
5655
primary_resource_id: 'default'
5756
vars:
5857
resource_name: 'my-url-lists'
59-
tgc_skip_test: 'It takes time to fix it.'
6058
parameters:
6159
- name: 'name'
6260
type: String

mmv1/third_party/terraform/acctest/tgc_utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ func extendWithTGCData(t *testing.T, c resource.TestCase) resource.TestCase {
292292
ResourceType: resourceType,
293293
ResourceAddress: res,
294294
ImportMetadata: importMeta,
295-
Service: ApiServiceNameCache.Get(resourceType),
295+
Service: ServicePackageCache.Get(resourceType),
296296
// CaiAssetNames will be populated at runtime in the check function
297297
}
298298
}

0 commit comments

Comments
 (0)