Skip to content

Commit 194c8b5

Browse files
authored
tgc-revival: Fix Compute Instance PMU round-trip serialization in TGC Next (#18099)
1 parent 5bbea85 commit 194c8b5

4 files changed

Lines changed: 13 additions & 3 deletions

File tree

mmv1/products/compute/Instance.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ iam_policy:
3838
parent_resource_attribute: 'instance_name'
3939
iam_conditions_request_type: 'QUERY_PARAM'
4040
include_in_tgc_next: true
41+
tgc_tests:
42+
- name: 'TestAccComputeInstance_secondaryAliasIpRange'
43+
skip: 'data issue with this test'
4144
custom_code:
4245
samples:
4346
- name: 'instance_basic'

mmv1/third_party/tgc_next/pkg/services/compute/compute_instance_cai2hcl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ func flattenAdvancedMachineFeaturesTgcNext(v interface{}) []map[string]interface
720720
return nil
721721
}
722722
resp, ok := v.(map[string]interface{})
723-
if !ok {
723+
if !ok || len(resp) == 0 {
724724
return nil
725725
}
726726
return []map[string]interface{}{{

mmv1/third_party/tgc_next/pkg/services/compute/compute_instance_tfplan2cai.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func expandComputeInstance(project string, d tpgresource.TerraformResourceData,
197197
Scheduling: scheduling,
198198
DeletionProtection: d.Get("deletion_protection").(bool),
199199
Hostname: d.Get("hostname").(string),
200-
AdvancedMachineFeatures: expandAdvancedMachineFeatures(d),
200+
AdvancedMachineFeatures: expandAdvancedMachineFeaturesTgcNext(d),
201201
ResourcePolicies: tpgresource.ConvertStringArr(d.Get("resource_policies").([]interface{})),
202202
ReservationAffinity: reservationAffinity,
203203
KeyRevocationActionType: d.Get("key_revocation_action_type").(string),
@@ -656,3 +656,11 @@ func expandComputeLocalSsdRecoveryTimeoutTgc(v interface{}) (*compute.Duration,
656656
}
657657
return duration, nil
658658
}
659+
660+
func expandAdvancedMachineFeaturesTgcNext(d tpgresource.TerraformResourceData) *compute.AdvancedMachineFeatures {
661+
features := expandAdvancedMachineFeatures(d)
662+
if features != nil && features.PerformanceMonitoringUnit == "" {
663+
features.PerformanceMonitoringUnit = "STANDARD"
664+
}
665+
return features
666+
}

mmv1/third_party/tgc_next/test/utils_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"testing"
55
)
66

7-
// test
87
func TestGetSubTestName(t *testing.T) {
98
tests := []struct {
109
name string

0 commit comments

Comments
 (0)