Skip to content

Commit da4b918

Browse files
modular-magicianmodular-magician
authored
Revert "feat(spanner): add instance autoscaling attributed to spanner instance resource (#9267)" (#9397) (#1664)
This reverts commit 7490407042e7eca65478b0c0ae43c1bd27b4d39c. [upstream:d7cf6a7c69fdaf6c7fc8b0ee49b55c5cefc806da] Signed-off-by: Modular Magician <[email protected]>
1 parent 0fa8c3a commit da4b918

File tree

1 file changed

+0
-160
lines changed

1 file changed

+0
-160
lines changed

‎tfplan2cai/converters/google/resources/services/spanner/spanner_instance.go

-160
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ func GetSpannerInstanceApiObject(d tpgresource.TerraformResourceData, config *tr
147147
} else if v, ok := d.GetOkExists("processing_units"); !tpgresource.IsEmptyValue(reflect.ValueOf(processingUnitsProp)) && (ok || !reflect.DeepEqual(v, processingUnitsProp)) {
148148
obj["processingUnits"] = processingUnitsProp
149149
}
150-
autoscalingConfigProp, err := expandSpannerInstanceAutoscalingConfig(d.Get("autoscaling_config"), d, config)
151-
if err != nil {
152-
return nil, err
153-
} else if v, ok := d.GetOkExists("autoscaling_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(autoscalingConfigProp)) && (ok || !reflect.DeepEqual(v, autoscalingConfigProp)) {
154-
obj["autoscalingConfig"] = autoscalingConfigProp
155-
}
156150
labelsProp, err := expandSpannerInstanceEffectiveLabels(d.Get("effective_labels"), d, config)
157151
if err != nil {
158152
return nil, err
@@ -212,160 +206,6 @@ func expandSpannerInstanceProcessingUnits(v interface{}, d tpgresource.Terraform
212206
return v, nil
213207
}
214208

215-
func expandSpannerInstanceAutoscalingConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
216-
l := v.([]interface{})
217-
if len(l) == 0 || l[0] == nil {
218-
return nil, nil
219-
}
220-
raw := l[0]
221-
original := raw.(map[string]interface{})
222-
transformed := make(map[string]interface{})
223-
224-
transformedAutoscalingLimits, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimits(original["autoscaling_limits"], d, config)
225-
if err != nil {
226-
return nil, err
227-
} else if val := reflect.ValueOf(transformedAutoscalingLimits); val.IsValid() && !tpgresource.IsEmptyValue(val) {
228-
transformed["autoscalingLimits"] = transformedAutoscalingLimits
229-
}
230-
231-
transformedAutoscalingTargets, err := expandSpannerInstanceAutoscalingConfigAutoscalingTargets(original["autoscaling_targets"], d, config)
232-
if err != nil {
233-
return nil, err
234-
} else if val := reflect.ValueOf(transformedAutoscalingTargets); val.IsValid() && !tpgresource.IsEmptyValue(val) {
235-
transformed["autoscalingTargets"] = transformedAutoscalingTargets
236-
}
237-
238-
return transformed, nil
239-
}
240-
241-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimits(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
242-
l := v.([]interface{})
243-
if len(l) == 0 || l[0] == nil {
244-
return nil, nil
245-
}
246-
raw := l[0]
247-
original := raw.(map[string]interface{})
248-
transformed := make(map[string]interface{})
249-
250-
transformedMinLimit, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMinLimit(original["min_limit"], d, config)
251-
if err != nil {
252-
return nil, err
253-
} else if val := reflect.ValueOf(transformedMinLimit); val.IsValid() && !tpgresource.IsEmptyValue(val) {
254-
transformed["minLimit"] = transformedMinLimit
255-
}
256-
257-
transformedMaxLimit, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMaxLimit(original["max_limit"], d, config)
258-
if err != nil {
259-
return nil, err
260-
} else if val := reflect.ValueOf(transformedMaxLimit); val.IsValid() && !tpgresource.IsEmptyValue(val) {
261-
transformed["maxLimit"] = transformedMaxLimit
262-
}
263-
264-
return transformed, nil
265-
}
266-
267-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMinLimit(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
268-
l := v.([]interface{})
269-
if len(l) == 0 || l[0] == nil {
270-
return nil, nil
271-
}
272-
raw := l[0]
273-
original := raw.(map[string]interface{})
274-
transformed := make(map[string]interface{})
275-
276-
transformedMinNodes, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMinLimitMinNodes(original["min_nodes"], d, config)
277-
if err != nil {
278-
return nil, err
279-
} else if val := reflect.ValueOf(transformedMinNodes); val.IsValid() && !tpgresource.IsEmptyValue(val) {
280-
transformed["minNodes"] = transformedMinNodes
281-
}
282-
283-
transformedMinProcessingUnits, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMinLimitMinProcessingUnits(original["min_processing_units"], d, config)
284-
if err != nil {
285-
return nil, err
286-
} else if val := reflect.ValueOf(transformedMinProcessingUnits); val.IsValid() && !tpgresource.IsEmptyValue(val) {
287-
transformed["minProcessingUnits"] = transformedMinProcessingUnits
288-
}
289-
290-
return transformed, nil
291-
}
292-
293-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMinLimitMinNodes(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
294-
return v, nil
295-
}
296-
297-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMinLimitMinProcessingUnits(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
298-
return v, nil
299-
}
300-
301-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMaxLimit(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
302-
l := v.([]interface{})
303-
if len(l) == 0 || l[0] == nil {
304-
return nil, nil
305-
}
306-
raw := l[0]
307-
original := raw.(map[string]interface{})
308-
transformed := make(map[string]interface{})
309-
310-
transformedMaxNodes, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMaxLimitMaxNodes(original["max_nodes"], d, config)
311-
if err != nil {
312-
return nil, err
313-
} else if val := reflect.ValueOf(transformedMaxNodes); val.IsValid() && !tpgresource.IsEmptyValue(val) {
314-
transformed["maxNodes"] = transformedMaxNodes
315-
}
316-
317-
transformedMaxProcessingUnits, err := expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMaxLimitMaxProcessingUnits(original["max_processing_units"], d, config)
318-
if err != nil {
319-
return nil, err
320-
} else if val := reflect.ValueOf(transformedMaxProcessingUnits); val.IsValid() && !tpgresource.IsEmptyValue(val) {
321-
transformed["maxProcessingUnits"] = transformedMaxProcessingUnits
322-
}
323-
324-
return transformed, nil
325-
}
326-
327-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMaxLimitMaxNodes(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
328-
return v, nil
329-
}
330-
331-
func expandSpannerInstanceAutoscalingConfigAutoscalingLimitsMaxLimitMaxProcessingUnits(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
332-
return v, nil
333-
}
334-
335-
func expandSpannerInstanceAutoscalingConfigAutoscalingTargets(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
336-
l := v.([]interface{})
337-
if len(l) == 0 || l[0] == nil {
338-
return nil, nil
339-
}
340-
raw := l[0]
341-
original := raw.(map[string]interface{})
342-
transformed := make(map[string]interface{})
343-
344-
transformedHighPriorityCpuUtilizationPercent, err := expandSpannerInstanceAutoscalingConfigAutoscalingTargetsHighPriorityCpuUtilizationPercent(original["high_priority_cpu_utilization_percent"], d, config)
345-
if err != nil {
346-
return nil, err
347-
} else if val := reflect.ValueOf(transformedHighPriorityCpuUtilizationPercent); val.IsValid() && !tpgresource.IsEmptyValue(val) {
348-
transformed["highPriorityCpuUtilizationPercent"] = transformedHighPriorityCpuUtilizationPercent
349-
}
350-
351-
transformedStorageUtilizationPercent, err := expandSpannerInstanceAutoscalingConfigAutoscalingTargetsStorageUtilizationPercent(original["storage_utilization_percent"], d, config)
352-
if err != nil {
353-
return nil, err
354-
} else if val := reflect.ValueOf(transformedStorageUtilizationPercent); val.IsValid() && !tpgresource.IsEmptyValue(val) {
355-
transformed["storageUtilizationPercent"] = transformedStorageUtilizationPercent
356-
}
357-
358-
return transformed, nil
359-
}
360-
361-
func expandSpannerInstanceAutoscalingConfigAutoscalingTargetsHighPriorityCpuUtilizationPercent(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
362-
return v, nil
363-
}
364-
365-
func expandSpannerInstanceAutoscalingConfigAutoscalingTargetsStorageUtilizationPercent(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
366-
return v, nil
367-
}
368-
369209
func expandSpannerInstanceEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
370210
if v == nil {
371211
return map[string]string{}, nil

0 commit comments

Comments
 (0)