Skip to content

Commit 38ff552

Browse files
modular-magicianmodular-magician
authored
region_compute_disk: move several parameters into properties since they arent used in URL (#12440) (#20505)
[upstream:35c44b909e6ce117658bb8dc98e95110d7bb3352] Signed-off-by: Modular Magician <[email protected]>
1 parent 6e2c371 commit 38ff552

File tree

3 files changed

+186
-183
lines changed

3 files changed

+186
-183
lines changed

‎.changelog/12440.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/services/compute/resource_compute_region_disk.go

Lines changed: 142 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,18 @@ func resourceComputeRegionDiskCreate(d *schema.ResourceData, meta interface{}) e
375375
}
376376

377377
obj := make(map[string]interface{})
378+
diskEncryptionKeyProp, err := expandComputeRegionDiskDiskEncryptionKey(d.Get("disk_encryption_key"), d, config)
379+
if err != nil {
380+
return err
381+
} else if v, ok := d.GetOkExists("disk_encryption_key"); !tpgresource.IsEmptyValue(reflect.ValueOf(diskEncryptionKeyProp)) && (ok || !reflect.DeepEqual(v, diskEncryptionKeyProp)) {
382+
obj["diskEncryptionKey"] = diskEncryptionKeyProp
383+
}
384+
sourceSnapshotEncryptionKeyProp, err := expandComputeRegionDiskSourceSnapshotEncryptionKey(d.Get("source_snapshot_encryption_key"), d, config)
385+
if err != nil {
386+
return err
387+
} else if v, ok := d.GetOkExists("source_snapshot_encryption_key"); !tpgresource.IsEmptyValue(reflect.ValueOf(sourceSnapshotEncryptionKeyProp)) && (ok || !reflect.DeepEqual(v, sourceSnapshotEncryptionKeyProp)) {
388+
obj["sourceSnapshotEncryptionKey"] = sourceSnapshotEncryptionKeyProp
389+
}
378390
labelFingerprintProp, err := expandComputeRegionDiskLabelFingerprint(d.Get("label_fingerprint"), d, config)
379391
if err != nil {
380392
return err
@@ -453,24 +465,12 @@ func resourceComputeRegionDiskCreate(d *schema.ResourceData, meta interface{}) e
453465
} else if v, ok := d.GetOkExists("region"); !tpgresource.IsEmptyValue(reflect.ValueOf(regionProp)) && (ok || !reflect.DeepEqual(v, regionProp)) {
454466
obj["region"] = regionProp
455467
}
456-
diskEncryptionKeyProp, err := expandComputeRegionDiskDiskEncryptionKey(d.Get("disk_encryption_key"), d, config)
457-
if err != nil {
458-
return err
459-
} else if v, ok := d.GetOkExists("disk_encryption_key"); !tpgresource.IsEmptyValue(reflect.ValueOf(diskEncryptionKeyProp)) && (ok || !reflect.DeepEqual(v, diskEncryptionKeyProp)) {
460-
obj["diskEncryptionKey"] = diskEncryptionKeyProp
461-
}
462468
sourceSnapshotProp, err := expandComputeRegionDiskSnapshot(d.Get("snapshot"), d, config)
463469
if err != nil {
464470
return err
465471
} else if v, ok := d.GetOkExists("snapshot"); !tpgresource.IsEmptyValue(reflect.ValueOf(sourceSnapshotProp)) && (ok || !reflect.DeepEqual(v, sourceSnapshotProp)) {
466472
obj["sourceSnapshot"] = sourceSnapshotProp
467473
}
468-
sourceSnapshotEncryptionKeyProp, err := expandComputeRegionDiskSourceSnapshotEncryptionKey(d.Get("source_snapshot_encryption_key"), d, config)
469-
if err != nil {
470-
return err
471-
} else if v, ok := d.GetOkExists("source_snapshot_encryption_key"); !tpgresource.IsEmptyValue(reflect.ValueOf(sourceSnapshotEncryptionKeyProp)) && (ok || !reflect.DeepEqual(v, sourceSnapshotEncryptionKeyProp)) {
472-
obj["sourceSnapshotEncryptionKey"] = sourceSnapshotEncryptionKeyProp
473-
}
474474

475475
obj, err = resourceComputeRegionDiskEncoder(d, meta, obj)
476476
if err != nil {
@@ -587,6 +587,15 @@ func resourceComputeRegionDiskRead(d *schema.ResourceData, meta interface{}) err
587587
return fmt.Errorf("Error reading RegionDisk: %s", err)
588588
}
589589

590+
if err := d.Set("disk_encryption_key", flattenComputeRegionDiskDiskEncryptionKey(res["diskEncryptionKey"], d, config)); err != nil {
591+
return fmt.Errorf("Error reading RegionDisk: %s", err)
592+
}
593+
if err := d.Set("source_snapshot_encryption_key", flattenComputeRegionDiskSourceSnapshotEncryptionKey(res["sourceSnapshotEncryptionKey"], d, config)); err != nil {
594+
return fmt.Errorf("Error reading RegionDisk: %s", err)
595+
}
596+
if err := d.Set("source_snapshot_id", flattenComputeRegionDiskSourceSnapshotId(res["sourceSnapshotId"], d, config)); err != nil {
597+
return fmt.Errorf("Error reading RegionDisk: %s", err)
598+
}
590599
if err := d.Set("label_fingerprint", flattenComputeRegionDiskLabelFingerprint(res["labelFingerprint"], d, config)); err != nil {
591600
return fmt.Errorf("Error reading RegionDisk: %s", err)
592601
}
@@ -647,18 +656,9 @@ func resourceComputeRegionDiskRead(d *schema.ResourceData, meta interface{}) err
647656
if err := d.Set("region", flattenComputeRegionDiskRegion(res["region"], d, config)); err != nil {
648657
return fmt.Errorf("Error reading RegionDisk: %s", err)
649658
}
650-
if err := d.Set("disk_encryption_key", flattenComputeRegionDiskDiskEncryptionKey(res["diskEncryptionKey"], d, config)); err != nil {
651-
return fmt.Errorf("Error reading RegionDisk: %s", err)
652-
}
653659
if err := d.Set("snapshot", flattenComputeRegionDiskSnapshot(res["sourceSnapshot"], d, config)); err != nil {
654660
return fmt.Errorf("Error reading RegionDisk: %s", err)
655661
}
656-
if err := d.Set("source_snapshot_encryption_key", flattenComputeRegionDiskSourceSnapshotEncryptionKey(res["sourceSnapshotEncryptionKey"], d, config)); err != nil {
657-
return fmt.Errorf("Error reading RegionDisk: %s", err)
658-
}
659-
if err := d.Set("source_snapshot_id", flattenComputeRegionDiskSourceSnapshotId(res["sourceSnapshotId"], d, config)); err != nil {
660-
return fmt.Errorf("Error reading RegionDisk: %s", err)
661-
}
662662
if err := d.Set("self_link", tpgresource.ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
663663
return fmt.Errorf("Error reading RegionDisk: %s", err)
664664
}
@@ -923,6 +923,62 @@ func resourceComputeRegionDiskImport(d *schema.ResourceData, meta interface{}) (
923923
return []*schema.ResourceData{d}, nil
924924
}
925925

926+
func flattenComputeRegionDiskDiskEncryptionKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
927+
if v == nil {
928+
return nil
929+
}
930+
original := v.(map[string]interface{})
931+
if len(original) == 0 {
932+
return nil
933+
}
934+
transformed := make(map[string]interface{})
935+
transformed["raw_key"] =
936+
flattenComputeRegionDiskDiskEncryptionKeyRawKey(original["rawKey"], d, config)
937+
transformed["sha256"] =
938+
flattenComputeRegionDiskDiskEncryptionKeySha256(original["sha256"], d, config)
939+
transformed["kms_key_name"] =
940+
flattenComputeRegionDiskDiskEncryptionKeyKmsKeyName(original["kmsKeyName"], d, config)
941+
return []interface{}{transformed}
942+
}
943+
func flattenComputeRegionDiskDiskEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
944+
return v
945+
}
946+
947+
func flattenComputeRegionDiskDiskEncryptionKeySha256(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
948+
return v
949+
}
950+
951+
func flattenComputeRegionDiskDiskEncryptionKeyKmsKeyName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
952+
return v
953+
}
954+
955+
func flattenComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
956+
if v == nil {
957+
return nil
958+
}
959+
original := v.(map[string]interface{})
960+
if len(original) == 0 {
961+
return nil
962+
}
963+
transformed := make(map[string]interface{})
964+
transformed["raw_key"] =
965+
flattenComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(original["rawKey"], d, config)
966+
transformed["sha256"] =
967+
flattenComputeRegionDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
968+
return []interface{}{transformed}
969+
}
970+
func flattenComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
971+
return v
972+
}
973+
974+
func flattenComputeRegionDiskSourceSnapshotEncryptionKeySha256(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
975+
return v
976+
}
977+
978+
func flattenComputeRegionDiskSourceSnapshotId(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
979+
return v
980+
}
981+
926982
func flattenComputeRegionDiskLabelFingerprint(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
927983
return v
928984
}
@@ -1097,67 +1153,90 @@ func flattenComputeRegionDiskRegion(v interface{}, d *schema.ResourceData, confi
10971153
return tpgresource.NameFromSelfLinkStateFunc(v)
10981154
}
10991155

1100-
func flattenComputeRegionDiskDiskEncryptionKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1156+
func flattenComputeRegionDiskSnapshot(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
11011157
if v == nil {
1102-
return nil
1158+
return v
11031159
}
1104-
original := v.(map[string]interface{})
1105-
if len(original) == 0 {
1106-
return nil
1160+
return tpgresource.ConvertSelfLinkToV1(v.(string))
1161+
}
1162+
1163+
func expandComputeRegionDiskDiskEncryptionKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1164+
l := v.([]interface{})
1165+
if len(l) == 0 || l[0] == nil {
1166+
return nil, nil
11071167
}
1168+
raw := l[0]
1169+
original := raw.(map[string]interface{})
11081170
transformed := make(map[string]interface{})
1109-
transformed["raw_key"] =
1110-
flattenComputeRegionDiskDiskEncryptionKeyRawKey(original["rawKey"], d, config)
1111-
transformed["sha256"] =
1112-
flattenComputeRegionDiskDiskEncryptionKeySha256(original["sha256"], d, config)
1113-
transformed["kms_key_name"] =
1114-
flattenComputeRegionDiskDiskEncryptionKeyKmsKeyName(original["kmsKeyName"], d, config)
1115-
return []interface{}{transformed}
1171+
1172+
transformedRawKey, err := expandComputeRegionDiskDiskEncryptionKeyRawKey(original["raw_key"], d, config)
1173+
if err != nil {
1174+
return nil, err
1175+
} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1176+
transformed["rawKey"] = transformedRawKey
1177+
}
1178+
1179+
transformedSha256, err := expandComputeRegionDiskDiskEncryptionKeySha256(original["sha256"], d, config)
1180+
if err != nil {
1181+
return nil, err
1182+
} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1183+
transformed["sha256"] = transformedSha256
1184+
}
1185+
1186+
transformedKmsKeyName, err := expandComputeRegionDiskDiskEncryptionKeyKmsKeyName(original["kms_key_name"], d, config)
1187+
if err != nil {
1188+
return nil, err
1189+
} else if val := reflect.ValueOf(transformedKmsKeyName); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1190+
transformed["kmsKeyName"] = transformedKmsKeyName
1191+
}
1192+
1193+
return transformed, nil
11161194
}
1117-
func flattenComputeRegionDiskDiskEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1118-
return v
1195+
1196+
func expandComputeRegionDiskDiskEncryptionKeyRawKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1197+
return v, nil
11191198
}
11201199

1121-
func flattenComputeRegionDiskDiskEncryptionKeySha256(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1122-
return v
1200+
func expandComputeRegionDiskDiskEncryptionKeySha256(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1201+
return v, nil
11231202
}
11241203

1125-
func flattenComputeRegionDiskDiskEncryptionKeyKmsKeyName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1126-
return v
1204+
func expandComputeRegionDiskDiskEncryptionKeyKmsKeyName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1205+
return v, nil
11271206
}
11281207

1129-
func flattenComputeRegionDiskSnapshot(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1130-
if v == nil {
1131-
return v
1208+
func expandComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1209+
l := v.([]interface{})
1210+
if len(l) == 0 || l[0] == nil {
1211+
return nil, nil
11321212
}
1133-
return tpgresource.ConvertSelfLinkToV1(v.(string))
1134-
}
1213+
raw := l[0]
1214+
original := raw.(map[string]interface{})
1215+
transformed := make(map[string]interface{})
11351216

1136-
func flattenComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1137-
if v == nil {
1138-
return nil
1217+
transformedRawKey, err := expandComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(original["raw_key"], d, config)
1218+
if err != nil {
1219+
return nil, err
1220+
} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1221+
transformed["rawKey"] = transformedRawKey
11391222
}
1140-
original := v.(map[string]interface{})
1141-
if len(original) == 0 {
1142-
return nil
1223+
1224+
transformedSha256, err := expandComputeRegionDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
1225+
if err != nil {
1226+
return nil, err
1227+
} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1228+
transformed["sha256"] = transformedSha256
11431229
}
1144-
transformed := make(map[string]interface{})
1145-
transformed["raw_key"] =
1146-
flattenComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(original["rawKey"], d, config)
1147-
transformed["sha256"] =
1148-
flattenComputeRegionDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
1149-
return []interface{}{transformed}
1150-
}
1151-
func flattenComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1152-
return v
1230+
1231+
return transformed, nil
11531232
}
11541233

1155-
func flattenComputeRegionDiskSourceSnapshotEncryptionKeySha256(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1156-
return v
1234+
func expandComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1235+
return v, nil
11571236
}
11581237

1159-
func flattenComputeRegionDiskSourceSnapshotId(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1160-
return v
1238+
func expandComputeRegionDiskSourceSnapshotEncryptionKeySha256(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1239+
return v, nil
11611240
}
11621241

11631242
func expandComputeRegionDiskLabelFingerprint(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
@@ -1293,51 +1372,6 @@ func expandComputeRegionDiskRegion(v interface{}, d tpgresource.TerraformResourc
12931372
return f.RelativeLink(), nil
12941373
}
12951374

1296-
func expandComputeRegionDiskDiskEncryptionKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1297-
l := v.([]interface{})
1298-
if len(l) == 0 || l[0] == nil {
1299-
return nil, nil
1300-
}
1301-
raw := l[0]
1302-
original := raw.(map[string]interface{})
1303-
transformed := make(map[string]interface{})
1304-
1305-
transformedRawKey, err := expandComputeRegionDiskDiskEncryptionKeyRawKey(original["raw_key"], d, config)
1306-
if err != nil {
1307-
return nil, err
1308-
} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1309-
transformed["rawKey"] = transformedRawKey
1310-
}
1311-
1312-
transformedSha256, err := expandComputeRegionDiskDiskEncryptionKeySha256(original["sha256"], d, config)
1313-
if err != nil {
1314-
return nil, err
1315-
} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1316-
transformed["sha256"] = transformedSha256
1317-
}
1318-
1319-
transformedKmsKeyName, err := expandComputeRegionDiskDiskEncryptionKeyKmsKeyName(original["kms_key_name"], d, config)
1320-
if err != nil {
1321-
return nil, err
1322-
} else if val := reflect.ValueOf(transformedKmsKeyName); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1323-
transformed["kmsKeyName"] = transformedKmsKeyName
1324-
}
1325-
1326-
return transformed, nil
1327-
}
1328-
1329-
func expandComputeRegionDiskDiskEncryptionKeyRawKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1330-
return v, nil
1331-
}
1332-
1333-
func expandComputeRegionDiskDiskEncryptionKeySha256(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1334-
return v, nil
1335-
}
1336-
1337-
func expandComputeRegionDiskDiskEncryptionKeyKmsKeyName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1338-
return v, nil
1339-
}
1340-
13411375
func expandComputeRegionDiskSnapshot(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
13421376
f, err := tpgresource.ParseGlobalFieldValue("snapshots", v.(string), "project", d, config, true)
13431377
if err != nil {
@@ -1346,40 +1380,6 @@ func expandComputeRegionDiskSnapshot(v interface{}, d tpgresource.TerraformResou
13461380
return f.RelativeLink(), nil
13471381
}
13481382

1349-
func expandComputeRegionDiskSourceSnapshotEncryptionKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1350-
l := v.([]interface{})
1351-
if len(l) == 0 || l[0] == nil {
1352-
return nil, nil
1353-
}
1354-
raw := l[0]
1355-
original := raw.(map[string]interface{})
1356-
transformed := make(map[string]interface{})
1357-
1358-
transformedRawKey, err := expandComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(original["raw_key"], d, config)
1359-
if err != nil {
1360-
return nil, err
1361-
} else if val := reflect.ValueOf(transformedRawKey); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1362-
transformed["rawKey"] = transformedRawKey
1363-
}
1364-
1365-
transformedSha256, err := expandComputeRegionDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
1366-
if err != nil {
1367-
return nil, err
1368-
} else if val := reflect.ValueOf(transformedSha256); val.IsValid() && !tpgresource.IsEmptyValue(val) {
1369-
transformed["sha256"] = transformedSha256
1370-
}
1371-
1372-
return transformed, nil
1373-
}
1374-
1375-
func expandComputeRegionDiskSourceSnapshotEncryptionKeyRawKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1376-
return v, nil
1377-
}
1378-
1379-
func expandComputeRegionDiskSourceSnapshotEncryptionKeySha256(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
1380-
return v, nil
1381-
}
1382-
13831383
func resourceComputeRegionDiskEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
13841384
config := meta.(*transport_tpg.Config)
13851385

0 commit comments

Comments
 (0)