Skip to content

Commit 2d2ade6

Browse files
authored
tgc-revival: generate handwritten tests by default (#16220)
1 parent b88ed02 commit 2d2ade6

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

mmv1/products/redis/Cluster.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ include_in_tgc_next: true
119119
custom_code:
120120
encoder: 'templates/terraform/encoders/redis_cluster.go.tmpl'
121121
decoder: 'templates/terraform/decoders/redis_cluster.go.tmpl'
122+
tgc_ignore_terraform_decoder: true
122123
sweeper:
123124
ensure_value:
124125
field: deletionProtectionEnabled

mmv1/products/redis/Instance.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ custom_code:
4444
encoder: 'templates/terraform/encoders/redis_location_id_for_fallback_zone.go.tmpl'
4545
decoder: 'templates/terraform/decoders/redis_instance.go.tmpl'
4646
pre_delete: 'templates/terraform/pre_delete/redis_instance.go.tmpl'
47+
tgc_ignore_terraform_decoder: true
4748
custom_diff:
4849
- 'customdiff.ForceNewIfChange("redis_version", isRedisVersionDecreasing)'
4950
- 'tpgresource.DefaultProviderProject'

mmv1/products/secretmanager/SecretVersion.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ virtual_fields:
116116
type: Boolean
117117
immutable: true
118118
description: If set to 'true', the secret data is expected to be base64-encoded string and would be sent as is.
119+
tgc_tests:
120+
- name: 'TestAccSecretManagerSecretVersion_update'
121+
skip: 'fix later'
122+
- name: 'TestAccSecretManagerSecretVersion_byName'
123+
skip: 'fix later'
119124
parameters:
120125
- name: 'project'
121126
type: String

mmv1/products/secretmanagerregional/RegionalSecretVersion.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ examples:
9090
ignore_read_extra:
9191
- 'deletion_policy'
9292
tgc_skip_test: fix later
93+
tgc_tests:
94+
- name: 'TestAccSecretManagerRegionalRegionalSecretVersion_update'
95+
skip: 'fix later'
96+
- name: 'TestAccSecretManagerRegionalRegionalSecretVersion_cmekOutputOnly'
97+
skip: 'fix later'
9398
virtual_fields:
9499
- name: 'deletion_policy'
95100
description: |

mmv1/provider/terraform_tgc_next.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,8 @@ func (tgc TerraformGoogleConversionNext) GenerateObject(object api.Resource, out
106106
if !object.IsExcluded() {
107107
tgc.GenerateResource(object, *templateData, outputFolder, generateCode, generateDocs)
108108
tgc.addTestsFromSamples(&object)
109-
if object.TGCIncludeHandwrittenTests {
110-
if err := tgc.addTestsFromHandwrittenTests(&object); err != nil {
111-
log.Printf("Error adding examples from handwritten tests: %v", err)
112-
}
109+
if err := tgc.addTestsFromHandwrittenTests(&object); err != nil {
110+
log.Printf("Error adding examples from handwritten tests: %v", err)
113111
}
114112
tgc.GenerateResourceTests(object, *templateData, outputFolder)
115113
}

mmv1/third_party/tgc_next/test/setup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var (
7171

7272
func ReadTestsDataFromGcs() ([]NightlyRun, error) {
7373
if !setupDone {
74-
bucketName := "cai_assets_metadata"
74+
bucketName := "cai_assets_metadata_test"
7575
currentDate := time.Now()
7676
ctx := context.Background()
7777

0 commit comments

Comments
 (0)