Skip to content
This repository has been archived by the owner on May 15, 2023. It is now read-only.

Commit

Permalink
revert changes as they're a breaking change and fields will need to b…
Browse files Browse the repository at this point in the history
…e added instead (#6600) (#993)

Signed-off-by: Modular Magician <magic-modules@google.com>

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Sep 23, 2022
1 parent 9b8daa1 commit 2f34f23
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions converters/google/resources/certificatemanager_certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,28 +121,28 @@ func expandCertificateManagerCertificateSelfManaged(v interface{}, d TerraformRe
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})

transformedPemCertificate, err := expandCertificateManagerCertificateSelfManagedPemCertificate(original["pem_certificate"], d, config)
transformedCertificatePem, err := expandCertificateManagerCertificateSelfManagedCertificatePem(original["certificate_pem"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedPemCertificate); val.IsValid() && !isEmptyValue(val) {
transformed["pemCertificate"] = transformedPemCertificate
} else if val := reflect.ValueOf(transformedCertificatePem); val.IsValid() && !isEmptyValue(val) {
transformed["certificatePem"] = transformedCertificatePem
}

transformedPemPrivateKey, err := expandCertificateManagerCertificateSelfManagedPemPrivateKey(original["pem_private_key"], d, config)
transformedPrivateKeyPem, err := expandCertificateManagerCertificateSelfManagedPrivateKeyPem(original["private_key_pem"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedPemPrivateKey); val.IsValid() && !isEmptyValue(val) {
transformed["pemPrivateKey"] = transformedPemPrivateKey
} else if val := reflect.ValueOf(transformedPrivateKeyPem); val.IsValid() && !isEmptyValue(val) {
transformed["privateKeyPem"] = transformedPrivateKeyPem
}

return transformed, nil
}

func expandCertificateManagerCertificateSelfManagedPemCertificate(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
func expandCertificateManagerCertificateSelfManagedCertificatePem(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandCertificateManagerCertificateSelfManagedPemPrivateKey(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
func expandCertificateManagerCertificateSelfManagedPrivateKeyPem(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

Expand Down

0 comments on commit 2f34f23

Please sign in to comment.