Skip to content

Commit 5f2ff19

Browse files
melinathmelinath
authored
Updated IGM meta to use json names and fixed mappings (#15482)
1 parent 7bc38e4 commit 5f2ff19

File tree

2 files changed

+69
-38
lines changed

2 files changed

+69
-38
lines changed

‎mmv1/third_party/terraform/services/compute/resource_compute_instance_group_manager_meta.yaml.tmpl‎

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,32 @@ api_resource_type_kind: 'InstanceGroupManager'
1010
api_variant_patterns:
1111
- 'projects/{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}'
1212
fields:
13-
- field: 'all_instances_config.labels'
14-
- field: 'all_instances_config.metadata'
13+
- api_field: 'allInstancesConfig.properties.labels
14+
field: 'all_instances_config.labels'
15+
- api_field: 'allInstancesConfig.properties.metadata
16+
field: 'all_instances_config.metadata'
1517
- api_field: 'autoHealingPolicies.healthCheck'
1618
- api_field: 'autoHealingPolicies.initialDelaySec'
1719
- api_field: 'baseInstanceName'
1820
- api_field: 'creationTimestamp'
1921
- api_field: 'description'
2022
- api_field: 'fingerprint'
2123
- api_field: 'instanceGroup'
22-
- field: 'instance_group_manager_id'
24+
- api_field: 'id'
25+
field: 'instance_group_manager_id'
2326
- api_field: 'instanceLifecyclePolicy.defaultActionOnFailure'
2427
{{- if ne $.TargetVersionName "ga" }}
2528
- api_field: 'instanceLifecyclePolicy.onFailedHealthCheck'
2629
{{- end }}
2730
- api_field: 'instanceLifecyclePolicy.forceUpdateOnRepair'
2831
- api_field: 'listManagedInstancesResults'
2932
- api_field: 'name'
30-
- field: 'named_port.name'
31-
- field: 'named_port.port'
33+
- api_field: 'namedPorts.name'
34+
field: 'named_port.name'
35+
- api_field: 'namedPorts.port'
36+
field: 'named_port.port'
3237
- field: 'operation'
38+
provider_only: true
3339
{{- if ne $.TargetVersionName "ga" }}
3440
- api_field: 'params.resourceManagerTags'
3541
{{- end }}
@@ -38,17 +44,17 @@ fields:
3844
- api_field: 'standbyPolicy.initialDelaySec'
3945
- api_field: 'standbyPolicy.mode'
4046
- field: 'stateful_disk.delete_rule'
41-
api_field: 'stateful_policy.preserved_state.disks.value.auto_delete'
47+
api_field: 'statefulPolicy.preservedState.disks'
4248
- field: 'stateful_disk.device_name'
43-
api_field: 'stateful_policy.preserved_state.disks.key'
49+
api_field: 'statefulPolicy.preservedState.disks'
4450
- field: 'stateful_external_ip.delete_rule'
45-
api_field: 'stateful_policy.preserved_state.external_ips.value.auto_delete'
51+
api_field: 'statefulPolicy.preservedState.externalIPs'
4652
- field: 'stateful_external_ip.interface_name'
47-
api_field: 'stateful_policy.preserved_state.external_ips.key'
53+
api_field: 'statefulPolicy.preservedState.externalIPs'
4854
- field: 'stateful_internal_ip.delete_rule'
49-
api_field: 'stateful_policy.preserved_state.internal_ips.value.auto_delete'
55+
api_field: 'statefulPolicy.preservedState.internalIPs'
5056
- field: 'stateful_internal_ip.interface_name'
51-
api_field: 'stateful_policy.preserved_state.internal_ips.key'
57+
api_field: 'statefulPolicy.preservedState.internalIPs'
5258
- api_field: 'status.allInstancesConfig.currentRevision'
5359
- api_field: 'status.allInstancesConfig.effective'
5460
- api_field: 'status.isStable'
@@ -59,21 +65,31 @@ fields:
5965
- api_field: 'targetSize'
6066
- api_field: 'targetStoppedSize'
6167
- api_field: 'targetSuspendedSize'
62-
- field: 'update_policy.max_surge_fixed'
63-
- field: 'update_policy.max_surge_percent'
64-
- field: 'update_policy.max_unavailable_fixed'
65-
- field: 'update_policy.max_unavailable_percent'
68+
- api_field: 'updatePolicy.maxSurge.fixed'
69+
field: 'update_policy.max_surge_fixed'
70+
- api_field: 'updatePolicy.maxSurge.percent'
71+
field: 'update_policy.max_surge_percent'
72+
- api_field: 'updatePolicy.maxUnavailable.fixed'
73+
field: 'update_policy.max_unavailable_fixed'
74+
- api_field: 'updatePolicy.maxUnavailable.percent'
75+
field: 'update_policy.max_unavailable_percent'
6676
{{- if ne $.TargetVersionName "ga" }}
6777
- api_field: 'updatePolicy.minReadySec'
6878
{{- end }}
6979
- api_field: 'updatePolicy.minimalAction'
7080
- api_field: 'updatePolicy.mostDisruptiveAllowedAction'
7181
- api_field: 'updatePolicy.replacementMethod'
7282
- api_field: 'updatePolicy.type'
73-
- field: 'version.instance_template'
74-
- field: 'version.name'
75-
- field: 'version.target_size.fixed'
76-
- field: 'version.target_size.percent'
83+
- api_field: 'versions.instanceTemplate'
84+
field: 'version.instance_template'
85+
- api_field: 'versions.name'
86+
field: 'version.name'
87+
- api_field: 'versions.targetSize.fixed'
88+
field: 'version.target_size.fixed'
89+
- api_field: 'versions.targetSize.percent'
90+
field: 'version.target_size.percent'
7791
- field: 'wait_for_instances'
92+
provider_only: true
7893
- field: 'wait_for_instances_status'
94+
provider_only: true
7995
- api_field: 'zone'

‎mmv1/third_party/terraform/services/compute/resource_compute_region_instance_group_manager_meta.yaml.tmpl‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ api_resource_type_kind: 'InstanceGroupManager'
1010
api_variant_patterns:
1111
- 'projects/{project}/regions/{region}/instanceGroupManagers/{instanceGroupManager}'
1212
fields:
13-
- field: 'all_instances_config.labels'
14-
- field: 'all_instances_config.metadata'
13+
- api_field: 'allInstancesConfig.properties.labels
14+
field: 'all_instances_config.labels'
15+
- api_field: 'allInstancesConfig.properties.metadata
16+
field: 'all_instances_config.metadata'
1517
- api_field: 'autoHealingPolicies.healthCheck'
1618
- api_field: 'autoHealingPolicies.initialDelaySec'
1719
- api_field: 'baseInstanceName'
@@ -24,16 +26,19 @@ fields:
2426
- field: 'instance_flexibility_policy.instance_selections.name'
2527
- field: 'instance_flexibility_policy.instance_selections.rank'
2628
- api_field: 'instanceGroup'
27-
- field: 'instance_group_manager_id'
29+
- api_field: 'id'
30+
field: 'instance_group_manager_id'
2831
- api_field: 'instanceLifecyclePolicy.defaultActionOnFailure'
2932
{{- if ne $.TargetVersionName "ga" }}
3033
- api_field: 'instanceLifecyclePolicy.onFailedHealthCheck'
3134
{{- end }}
3235
- api_field: 'instanceLifecyclePolicy.forceUpdateOnRepair'
3336
- api_field: 'listManagedInstancesResults'
3437
- api_field: 'name'
35-
- field: 'named_port.name'
36-
- field: 'named_port.port'
38+
- api_field: 'namedPorts.name'
39+
field: 'named_port.name'
40+
- api_field: 'namedPorts.port'
41+
field: 'named_port.port'
3742
{{- if ne $.TargetVersionName "ga" }}
3843
- api_field: 'params.resourceManagerTags'
3944
{{- end }}
@@ -43,17 +48,17 @@ fields:
4348
- api_field: 'standbyPolicy.initialDelaySec'
4449
- api_field: 'standbyPolicy.mode'
4550
- field: 'stateful_disk.delete_rule'
46-
api_field: 'stateful_policy.preserved_state.disks.value.auto_delete'
51+
api_field: 'statefulPolicy.preservedState.disks'
4752
- field: 'stateful_disk.device_name'
48-
api_field: 'stateful_policy.preserved_state.disks.key'
53+
api_field: 'statefulPolicy.preservedState.disks'
4954
- field: 'stateful_external_ip.delete_rule'
50-
api_field: 'stateful_policy.preserved_state.external_ips.value.auto_delete'
55+
api_field: 'statefulPolicy.preservedState.externalIPs'
5156
- field: 'stateful_external_ip.interface_name'
52-
api_field: 'stateful_policy.preserved_state.external_ips.key'
57+
api_field: 'statefulPolicy.preservedState.externalIPs'
5358
- field: 'stateful_internal_ip.delete_rule'
54-
api_field: 'stateful_policy.preserved_state.internal_ips.value.auto_delete'
59+
api_field: 'statefulPolicy.preservedState.internalIPs'
5560
- field: 'stateful_internal_ip.interface_name'
56-
api_field: 'stateful_policy.preserved_state.internal_ips.key'
61+
api_field: 'statefulPolicy.preservedState.internalIPs'
5762
- api_field: 'status.allInstancesConfig.currentRevision'
5863
- api_field: 'status.allInstancesConfig.effective'
5964
- api_field: 'status.isStable'
@@ -65,20 +70,30 @@ fields:
6570
- api_field: 'targetStoppedSize'
6671
- api_field: 'targetSuspendedSize'
6772
- api_field: 'updatePolicy.instanceRedistributionType'
68-
- field: 'update_policy.max_surge_fixed'
69-
- field: 'update_policy.max_surge_percent'
70-
- field: 'update_policy.max_unavailable_fixed'
71-
- field: 'update_policy.max_unavailable_percent'
73+
- api_field: 'updatePolicy.maxSurge.fixed'
74+
field: 'update_policy.max_surge_fixed'
75+
- api_field: 'updatePolicy.maxSurge.percent'
76+
field: 'update_policy.max_surge_percent'
77+
- api_field: 'updatePolicy.maxUnavailable.fixed'
78+
field: 'update_policy.max_unavailable_fixed'
79+
- api_field: 'updatePolicy.maxUnavailable.percent'
80+
field: 'update_policy.max_unavailable_percent'
7281
{{- if ne $.TargetVersionName "ga" }}
7382
- api_field: 'updatePolicy.minReadySec'
7483
{{- end }}
7584
- api_field: 'updatePolicy.minimalAction'
7685
- api_field: 'updatePolicy.mostDisruptiveAllowedAction'
7786
- api_field: 'updatePolicy.replacementMethod'
7887
- api_field: 'updatePolicy.type'
79-
- field: 'version.instance_template'
80-
- field: 'version.name'
81-
- field: 'version.target_size.fixed'
82-
- field: 'version.target_size.percent'
88+
- api_field: 'versions.instanceTemplate'
89+
field: 'version.instance_template'
90+
- api_field: 'versions.name'
91+
field: 'version.name'
92+
- api_field: 'versions.targetSize.fixed'
93+
field: 'version.target_size.fixed'
94+
- api_field: 'versions.targetSize.percent'
95+
field: 'version.target_size.percent'
8396
- field: 'wait_for_instances'
97+
provider_only: true
8498
- field: 'wait_for_instances_status'
99+
provider_only: true

0 commit comments

Comments
 (0)