Skip to content

Fix for issue #1477 #2342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for issue #1477 #2342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7db3c40
Fix for issue #1477
daniel-pro Mar 28, 2025
7e3d3a7
Merge branch 'oracle:master' into fix-for-issue-#1477
daniel-pro Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions internal/service/certificates_management/certificates_management_certificate_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,29 @@ func CertificatesManagementCertificateResource() *schema.Resource {
ValidateFunc: validation.StringInSlice([]string{
"ISSUED_BY_INTERNAL_CA",
"MANAGED_EXTERNALLY_ISSUED_BY_INTERNAL_CA",
"IMPORTED",
}, true),
},
"cert_chain_pem": {
Type: schema.TypeString,
Optional: true,
Computed: false,
},
"certificate_pem": {
Type: schema.TypeString,
Optional: true,
Computed: false,
},
"private_key_pem": {
Type: schema.TypeString,
Optional: true,
Computed: false,
},
"private_key_pem_passphrase": {
Type: schema.TypeString,
Optional: true,
Computed: false,
},
"certificate_profile_type": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -1135,6 +1156,30 @@ func (s *CertificatesManagementCertificateResourceCrud) mapToCreateCertificateCo
configType = "" // default value
}
switch strings.ToLower(configType) {
case strings.ToLower("IMPORTED"):
details := oci_certificates_management.CreateCertificateByImportingConfigDetails{}
if certChainPem, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "cert_chain_pem")); ok {
tmp := certChainPem.(string)
details.CertChainPem = &tmp
}
if certificatePem, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "certificate_pem")); ok {
tmp := certificatePem.(string)
details.CertificatePem = &tmp
}
if privateKeyPem, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "private_key_pem")); ok {
tmp := privateKeyPem.(string)
details.PrivateKeyPem = &tmp
}
if privateKeyPemPassphrase, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "private_key_pem_passphrase")); ok {
tmp := privateKeyPemPassphrase.(string)
details.PrivateKeyPemPassphrase = &tmp
}
if versionName, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "version_name")); ok {
tmp := versionName.(string)
details.VersionName = &tmp
}

baseObject = details
case strings.ToLower("ISSUED_BY_INTERNAL_CA"):
details := oci_certificates_management.CreateCertificateIssuedByInternalCaConfigDetails{}
if validity, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "validity")); ok {
Expand Down Expand Up @@ -1440,6 +1485,26 @@ func (s *CertificatesManagementCertificateResourceCrud) mapToUpdateCertificateCo
configType = "" // default value
}
switch strings.ToLower(configType) {
case strings.ToLower("IMPORTED"):
details := oci_certificates_management.UpdateCertificateByImportingConfigDetails{}
if certChainPem, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "cert_chain_pem")); ok {
tmp := certChainPem.(string)
details.CertChainPem = &tmp
}
if certificatePem, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "certificate_pem")); ok {
tmp := certificatePem.(string)
details.CertificatePem = &tmp
}
if privateKeyPem, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "private_key_pem")); ok {
tmp := privateKeyPem.(string)
details.PrivateKeyPem = &tmp
}
if privateKeyPemPassphrase, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "private_key_pem_passphrase")); ok {
tmp := privateKeyPemPassphrase.(string)
details.PrivateKeyPemPassphrase = &tmp
}

baseObject = details
case strings.ToLower("ISSUED_BY_INTERNAL_CA"):
details := oci_certificates_management.UpdateCertificateIssuedByInternalCaConfigDetails{}
if validity, ok := s.D.GetOkExists(fmt.Sprintf(fieldKeyFormat, "validity")); ok {
Expand Down