Skip to content

Commit 31f0113

Browse files
feature: add Ephemeral WriteOnly attributes support (#13126) (#3484)
[upstream:6f9117a459fe10f7c00e22e63865ba61ea4ac6bb] Signed-off-by: Modular Magician <[email protected]>
1 parent d03bab9 commit 31f0113

File tree

4 files changed

+77
-1
lines changed

4 files changed

+77
-1
lines changed

tfplan2cai/converters/google/resources/services/bigquerydatatransfer/bigquerydatatransfer_config.go

+11
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
)
3131

3232
var sensitiveParams = []string{"secret_access_key"}
33+
var sensitiveWoParams = []string{"secret_access_key_wo"}
3334

3435
func sensitiveParamCustomizeDiff(_ context.Context, diff *schema.ResourceDiff, v interface{}) error {
3536
for _, sp := range sensitiveParams {
@@ -189,6 +190,12 @@ func GetBigqueryDataTransferConfigApiObject(d tpgresource.TerraformResourceData,
189190
} else if v, ok := d.GetOkExists("params"); !tpgresource.IsEmptyValue(reflect.ValueOf(paramsProp)) && (ok || !reflect.DeepEqual(v, paramsProp)) {
190191
obj["params"] = paramsProp
191192
}
193+
sensitiveParamsWoVersionProp, err := expandBigqueryDataTransferConfigSensitiveParamsWoVersion(d.Get("sensitive_params_wo_version"), d, config)
194+
if err != nil {
195+
return nil, err
196+
} else if v, ok := d.GetOkExists("sensitive_params_wo_version"); !tpgresource.IsEmptyValue(reflect.ValueOf(sensitiveParamsWoVersionProp)) && (ok || !reflect.DeepEqual(v, sensitiveParamsWoVersionProp)) {
197+
obj["sensitiveParamsWoVersion"] = sensitiveParamsWoVersionProp
198+
}
192199

193200
return resourceBigqueryDataTransferConfigEncoder(d, config, obj)
194201
}
@@ -358,3 +365,7 @@ func expandBigqueryDataTransferConfigParams(v interface{}, d tpgresource.Terrafo
358365
}
359366
return m, nil
360367
}
368+
369+
func expandBigqueryDataTransferConfigSensitiveParamsWoVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
370+
return v, nil
371+
}

tfplan2cai/converters/google/resources/services/compute/compute_disk.go

+44
Original file line numberDiff line numberDiff line change
@@ -608,13 +608,41 @@ func expandComputeDiskDiskEncryptionKey(v interface{}, d tpgresource.TerraformRe
608608
transformed["rawKey"] = transformedRawKey
609609
}
610610

611+
transformedRawKeyWoVersion, err := expandComputeDiskDiskEncryptionKeyRawKeyWoVersion(original["raw_key_wo_version"], d, config)
612+
if err != nil {
613+
return nil, err
614+
} else if val := reflect.ValueOf(transformedRawKeyWoVersion); val.IsValid() && !tpgresource.IsEmptyValue(val) {
615+
transformed["rawKeyWoVersion"] = transformedRawKeyWoVersion
616+
}
617+
618+
transformedRawKeyWo, err := expandComputeDiskDiskEncryptionKeyRawKeyWo(original["raw_key_wo"], d, config)
619+
if err != nil {
620+
return nil, err
621+
} else if val := reflect.ValueOf(transformedRawKeyWo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
622+
transformed["rawKeyWo"] = transformedRawKeyWo
623+
}
624+
625+
transformedRsaEncryptedKeyWoVersion, err := expandComputeDiskDiskEncryptionKeyRsaEncryptedKeyWoVersion(original["rsa_encrypted_key_wo_version"], d, config)
626+
if err != nil {
627+
return nil, err
628+
} else if val := reflect.ValueOf(transformedRsaEncryptedKeyWoVersion); val.IsValid() && !tpgresource.IsEmptyValue(val) {
629+
transformed["rsaEncryptedKeyWoVersion"] = transformedRsaEncryptedKeyWoVersion
630+
}
631+
611632
transformedRsaEncryptedKey, err := expandComputeDiskDiskEncryptionKeyRsaEncryptedKey(original["rsa_encrypted_key"], d, config)
612633
if err != nil {
613634
return nil, err
614635
} else if val := reflect.ValueOf(transformedRsaEncryptedKey); val.IsValid() && !tpgresource.IsEmptyValue(val) {
615636
transformed["rsaEncryptedKey"] = transformedRsaEncryptedKey
616637
}
617638

639+
transformedRsaEncryptedKeyWo, err := expandComputeDiskDiskEncryptionKeyRsaEncryptedKeyWo(original["rsa_encrypted_key_wo"], d, config)
640+
if err != nil {
641+
return nil, err
642+
} else if val := reflect.ValueOf(transformedRsaEncryptedKeyWo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
643+
transformed["rsaEncryptedKeyWo"] = transformedRsaEncryptedKeyWo
644+
}
645+
618646
transformedSha256, err := expandComputeDiskDiskEncryptionKeySha256(original["sha256"], d, config)
619647
if err != nil {
620648
return nil, err
@@ -643,10 +671,26 @@ func expandComputeDiskDiskEncryptionKeyRawKey(v interface{}, d tpgresource.Terra
643671
return v, nil
644672
}
645673

674+
func expandComputeDiskDiskEncryptionKeyRawKeyWoVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
675+
return v, nil
676+
}
677+
678+
func expandComputeDiskDiskEncryptionKeyRawKeyWo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
679+
return v, nil
680+
}
681+
682+
func expandComputeDiskDiskEncryptionKeyRsaEncryptedKeyWoVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
683+
return v, nil
684+
}
685+
646686
func expandComputeDiskDiskEncryptionKeyRsaEncryptedKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
647687
return v, nil
648688
}
649689

690+
func expandComputeDiskDiskEncryptionKeyRsaEncryptedKeyWo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
691+
return v, nil
692+
}
693+
650694
func expandComputeDiskDiskEncryptionKeySha256(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
651695
return v, nil
652696
}

tfplan2cai/converters/google/resources/services/compute/compute_region_disk.go

+22
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,20 @@ func expandComputeRegionDiskDiskEncryptionKey(v interface{}, d tpgresource.Terra
217217
transformed["rawKey"] = transformedRawKey
218218
}
219219

220+
transformedRawKeyWo, err := expandComputeRegionDiskDiskEncryptionKeyRawKeyWo(original["raw_key_wo"], d, config)
221+
if err != nil {
222+
return nil, err
223+
} else if val := reflect.ValueOf(transformedRawKeyWo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
224+
transformed["rawKeyWo"] = transformedRawKeyWo
225+
}
226+
227+
transformedRawKeyWoVersion, err := expandComputeRegionDiskDiskEncryptionKeyRawKeyWoVersion(original["raw_key_wo_version"], d, config)
228+
if err != nil {
229+
return nil, err
230+
} else if val := reflect.ValueOf(transformedRawKeyWoVersion); val.IsValid() && !tpgresource.IsEmptyValue(val) {
231+
transformed["rawKeyWoVersion"] = transformedRawKeyWoVersion
232+
}
233+
220234
transformedSha256, err := expandComputeRegionDiskDiskEncryptionKeySha256(original["sha256"], d, config)
221235
if err != nil {
222236
return nil, err
@@ -238,6 +252,14 @@ func expandComputeRegionDiskDiskEncryptionKeyRawKey(v interface{}, d tpgresource
238252
return v, nil
239253
}
240254

255+
func expandComputeRegionDiskDiskEncryptionKeyRawKeyWo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
256+
return v, nil
257+
}
258+
259+
func expandComputeRegionDiskDiskEncryptionKeyRawKeyWoVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
260+
return v, nil
261+
}
262+
241263
func expandComputeRegionDiskDiskEncryptionKeySha256(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
242264
return v, nil
243265
}

tfplan2cai/converters/google/resources/services/secretmanager/secretmanager_secret_version.go

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ func expandSecretManagerSecretVersionPayload(v interface{}, d tpgresource.Terraf
122122
} else if val := reflect.ValueOf(transformedSecretData); val.IsValid() && !tpgresource.IsEmptyValue(val) {
123123
transformed["data"] = transformedSecretData
124124
}
125-
126125
return transformed, nil
127126
}
128127

0 commit comments

Comments
 (0)