Skip to content

Commit 02eddfa

Browse files
committed
transit encryption user_managed to ipsec in default handling and more checks
1 parent 2ac164c commit 02eddfa

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

ibm/service/vpc/resource_ibm_is_share.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,8 @@ func resourceIbmIsShareCreate(context context.Context, d *schema.ResourceData, m
11481148
}
11491149
if allowedTransitEncryptionModesIntf, ok := d.GetOk("allowed_transit_encryption_modes"); ok {
11501150
allowedTransitEncryptionModes := []string{}
1151-
for _, allowedTransitEncryptionModesItemIntf := range allowedTransitEncryptionModesIntf.([]interface{}) {
1151+
allowedTransitEncryptionModesItems := allowedTransitEncryptionModesIntf.(*schema.Set)
1152+
for _, allowedTransitEncryptionModesItemIntf := range allowedTransitEncryptionModesItems.List() {
11521153
allowedTransitEncryptionModesItem := allowedTransitEncryptionModesItemIntf.(string)
11531154
if allowedTransitEncryptionModesItem == "user_managed" {
11541155
allowedTransitEncryptionModesItem = "ipsec"
@@ -1419,7 +1420,7 @@ func resourceIbmIsShareMapToShareMountTargetPrototype(d *schema.ResourceData, sh
14191420
}
14201421

14211422
}
1422-
if accessProtocolIntf, ok := shareTargetPrototypeMap["access_protocol"]; ok && accessProtocolIntf != nil {
1423+
if accessProtocolIntf, ok := shareTargetPrototypeMap["access_protocol"]; ok && accessProtocolIntf != nil && accessProtocolIntf.(string) != "" {
14231424
accessProtocol := accessProtocolIntf.(string)
14241425
shareTargetPrototype.AccessProtocol = &accessProtocol
14251426
} else {
@@ -1429,7 +1430,7 @@ func resourceIbmIsShareMapToShareMountTargetPrototype(d *schema.ResourceData, sh
14291430
if transitEncryptionIntf, ok := shareTargetPrototypeMap["transit_encryption"]; ok && transitEncryptionIntf != "" {
14301431
transitEncryption := transitEncryptionIntf.(string)
14311432
if transitEncryption == "user_managed" {
1432-
transitEncryption = "none"
1433+
transitEncryption = "ipsec"
14331434
}
14341435
shareTargetPrototype.TransitEncryption = &transitEncryption
14351436
} else {
@@ -2153,15 +2154,18 @@ func shareUpdate(vpcClient *vpcv1.VpcV1, context context.Context, d *schema.Reso
21532154
}
21542155
if d.HasChange("allowed_transit_encryption_modes") {
21552156
var allowedTransitEncryptionModes []string
2156-
for _, v := range d.Get("allowed_transit_encryption_modes").([]interface{}) {
2157-
allowedTransitEncryptionModesItem := v.(string)
2158-
if allowedTransitEncryptionModesItem == "user_managed" {
2159-
allowedTransitEncryptionModesItem = "ipsec"
2157+
if allowedTPMModesItemsIntf, ok := d.GetOk("allowed_transit_encryption_modes"); ok {
2158+
allowedTPMModesItems := allowedTPMModesItemsIntf.(*schema.Set)
2159+
for _, v := range allowedTPMModesItems.List() {
2160+
allowedTransitEncryptionModesItem := v.(string)
2161+
if allowedTransitEncryptionModesItem == "user_managed" {
2162+
allowedTransitEncryptionModesItem = "ipsec"
2163+
}
2164+
allowedTransitEncryptionModes = append(allowedTransitEncryptionModes, allowedTransitEncryptionModesItem)
21602165
}
2161-
allowedTransitEncryptionModes = append(allowedTransitEncryptionModes, allowedTransitEncryptionModesItem)
2166+
sharePatchModel.AllowedTransitEncryptionModes = allowedTransitEncryptionModes
2167+
hasChange = true
21622168
}
2163-
sharePatchModel.AllowedTransitEncryptionModes = allowedTransitEncryptionModes
2164-
hasChange = true
21652169
}
21662170
if d.HasChange("access_control_protocols") {
21672171
var access_control_protocols []string

0 commit comments

Comments
 (0)