Skip to content

Commit b3b9967

Browse files
MalarvizhiKhkantare
authored andcommitted
Fix cis primary certificate
1 parent 5089994 commit b3b9967

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

ibm/data_source_ibm_cis_certificates.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,18 @@ func dataIBMCISCertificatesRead(d *schema.ResourceData, meta interface{}) error
128128
certificate["id"] = convertCisToTfThreeVar(*instance.ID, zoneID, crn)
129129
certificate[cisCertificateOrderID] = *instance.ID
130130
certificate[cisCertificateOrderStatus] = *instance.Status
131-
certificate[cisCertificatesPrimaryCertificate] =
132-
convertCISCertificatesObj(*instance.Type, instance.PrimaryCertificate)
131+
if instance.PrimaryCertificate != nil {
132+
certificate[cisCertificatesPrimaryCertificate] =
133+
convertCISCertificatesObj(*instance.Type, instance.PrimaryCertificate)
134+
}
133135
certificate[cisCertificateOrderHosts] = flattenStringList(instance.Hosts)
134136

135137
certs := []interface{}{}
136138
for _, i := range instance.Certificates {
137139
cert := map[string]interface{}{}
138-
cert[cisCertificatesCertificatesID] = convertCISCertificatesObj(*instance.Type, i.ID)
140+
if i.ID != nil {
141+
cert[cisCertificatesCertificatesID] = convertCISCertificatesObj(*instance.Type, i.ID)
142+
}
139143
cert[cisCertificatesCertificatesStatus] = *i.Status
140144
cert[cisCertificatesCertificatesHosts] = flattenStringList(i.Hosts)
141145
certs = append(certs, cert)
@@ -159,7 +163,7 @@ func convertCISCertificatesObj(certType string, obj interface{}) (result string)
159163
if certType == cisCertificateTypeDedicated {
160164
result = strings.TrimSpace(fmt.Sprintf("%32.f", obj))
161165
} else {
162-
result = obj.(string)
166+
result = fmt.Sprint(obj)
163167
}
164168
return result
165169
}

0 commit comments

Comments
 (0)