From 0f22b1b30faeaa4acab0b9635de6d7d4a583dc47 Mon Sep 17 00:00:00 2001
From: daniel-pro <43214013+daniel-pro@users.noreply.github.com>
Date: Fri, 8 Nov 2024 15:45:33 +0100
Subject: [PATCH] Fix for issue #1477

This is the fix for the issue :  oci_certificates_management_certificate fails with config_type="IMPORTED" #1477

All credits to @bscarbrough
---
 ...ficates_management_certificate_resource.go | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/internal/service/certificates_management/certificates_management_certificate_resource.go b/internal/service/certificates_management/certificates_management_certificate_resource.go
index 9a3e869655a..2e1a78627ab 100644
--- a/internal/service/certificates_management/certificates_management_certificate_resource.go
+++ b/internal/service/certificates_management/certificates_management_certificate_resource.go
@@ -47,10 +47,31 @@ func CertificatesManagementCertificateResource() *schema.Resource {
 							Required:         true,
 							DiffSuppressFunc: tfresource.EqualIgnoreCaseSuppressDiff,
 							ValidateFunc: validation.StringInSlice([]string{
+								"IMPORTED",
 								"ISSUED_BY_INTERNAL_CA",
 								"MANAGED_EXTERNALLY_ISSUED_BY_INTERNAL_CA",
 							}, 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,
@@ -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 {
@@ -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 {