Skip to content

Commit 5c70156

Browse files
shreyasms07shreyasms07
committed
feat(secuirty-group-rule-name):fixed build fail
1 parent 7b7b92b commit 5c70156

5 files changed

+30
-30
lines changed

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -897,8 +897,8 @@ func setvpnGatewayConnectionIntfDatasourceData(d *schema.ResourceData, vpn_gatew
897897
if err = d.Set("peer_address", peer.Address); err != nil {
898898
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting peer_address: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-peer_address").GetDiag()
899899
}
900-
if len(peer.CIDRs) > 0 {
901-
err = d.Set("peer_cidrs", peer.CIDRs)
900+
if len(peer.Cidrs) > 0 {
901+
err = d.Set("peer_cidrs", peer.Cidrs)
902902
if err != nil {
903903
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting peer_cidrs: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-peer_cidrs").GetDiag()
904904
}
@@ -919,8 +919,8 @@ func setvpnGatewayConnectionIntfDatasourceData(d *schema.ResourceData, vpn_gatew
919919
// Deprecated
920920
if vpnGatewayConnection.Local != nil {
921921
local := vpnGatewayConnection.Local
922-
if len(local.CIDRs) > 0 {
923-
err = d.Set("local_cidrs", local.CIDRs)
922+
if len(local.Cidrs) > 0 {
923+
err = d.Set("local_cidrs", local.Cidrs)
924924
if err != nil {
925925
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting local_cidrs: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-local_cidrs").GetDiag()
926926
}
@@ -1099,7 +1099,7 @@ func dataSourceIBMIsVPNGatewayConnectionVPNGatewayConnectionPolicyModeLocalToMap
10991099
ikeIdentities = append(ikeIdentities, ikeIdentitiesItemMap)
11001100
}
11011101
modelMap["ike_identities"] = ikeIdentities
1102-
modelMap["cidrs"] = model.CIDRs
1102+
modelMap["cidrs"] = model.Cidrs
11031103
return modelMap, nil
11041104
}
11051105

@@ -1197,8 +1197,8 @@ func dataSourceIBMIsVPNGatewayConnectionVPNGatewayConnectionPolicyModePeerToMap(
11971197
if model.Fqdn != nil {
11981198
modelMap["fqdn"] = model.Fqdn
11991199
}
1200-
if model.CIDRs != nil {
1201-
modelMap["cidrs"] = model.CIDRs
1200+
if model.Cidrs != nil {
1201+
modelMap["cidrs"] = model.Cidrs
12021202
}
12031203
return modelMap, nil
12041204
} else {
@@ -1226,8 +1226,8 @@ func dataSourceIBMIsVPNGatewayConnectionVPNGatewayConnectionPolicyModePeerVPNGat
12261226
modelMap["ike_identity"] = []map[string]interface{}{ikeIdentityMap}
12271227
modelMap["type"] = model.Type
12281228
modelMap["address"] = model.Address
1229-
if model.CIDRs != nil {
1230-
modelMap["cidrs"] = model.CIDRs
1229+
if model.Cidrs != nil {
1230+
modelMap["cidrs"] = model.Cidrs
12311231
}
12321232
return modelMap, nil
12331233
}
@@ -1251,8 +1251,8 @@ func dataSourceIBMIsVPNGatewayConnectionVPNGatewayConnectionPolicyModePeerVPNGat
12511251
modelMap["ike_identity"] = []map[string]interface{}{ikeIdentityMap}
12521252
modelMap["type"] = model.Type
12531253
modelMap["fqdn"] = model.Fqdn
1254-
if model.CIDRs != nil {
1255-
modelMap["cidrs"] = model.CIDRs
1254+
if model.Cidrs != nil {
1255+
modelMap["cidrs"] = model.Cidrs
12561256
}
12571257
return modelMap, nil
12581258
}

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection_local_cidrs.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ func dataSourceIBMIsVPNGatewayConnectionLocalCidrsRead(context context.Context,
5252
return tfErr.GetDiag()
5353
}
5454

55-
listVPNGatewayConnectionsLocalCidrsOptions := &vpcv1.ListVPNGatewayConnectionsLocalCIDRsOptions{}
55+
listVPNGatewayConnectionsLocalCidrsOptions := &vpcv1.ListVPNGatewayConnectionsLocalCidrsOptions{}
5656

5757
listVPNGatewayConnectionsLocalCidrsOptions.SetVPNGatewayID(d.Get("vpn_gateway").(string))
5858
listVPNGatewayConnectionsLocalCidrsOptions.SetID(d.Get("vpn_gateway_connection").(string))
5959

60-
vpnGatewayConnectionCidRs, _, err := vpcClient.ListVPNGatewayConnectionsLocalCIDRsWithContext(context, listVPNGatewayConnectionsLocalCidrsOptions)
60+
vpnGatewayConnectionCidRs, _, err := vpcClient.ListVPNGatewayConnectionsLocalCidrsWithContext(context, listVPNGatewayConnectionsLocalCidrsOptions)
6161
if err != nil {
6262
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListVPNGatewayConnectionsLocalCIDRsWithContext failed %s", err), "(Data) ibm_is_vpn_gateway_connection_local_cidrs", "read")
6363
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
6464
return tfErr.GetDiag()
6565
}
6666
d.SetId(dataSourceIBMIsVPNGatewayConnectionLocalCidrsID(d))
6767

68-
if err = d.Set("cidrs", vpnGatewayConnectionCidRs.CIDRs); err != nil {
68+
if err = d.Set("cidrs", vpnGatewayConnectionCidRs.Cidrs); err != nil {
6969
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting cidrs %s", err), "(Data) ibm_is_vpn_gateway_connection_local_cidrs", "read", "cidrs-set").GetDiag()
7070
}
7171

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection_peer_cidrs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ func dataSourceIBMIsVPNGatewayConnectionPeerCidrsRead(context context.Context, d
5151
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
5252
return tfErr.GetDiag()
5353
}
54-
listVPNGatewayConnectionsPeerCidrsOptions := &vpcv1.ListVPNGatewayConnectionsPeerCIDRsOptions{}
54+
listVPNGatewayConnectionsPeerCidrsOptions := &vpcv1.ListVPNGatewayConnectionsPeerCidrsOptions{}
5555

5656
listVPNGatewayConnectionsPeerCidrsOptions.SetVPNGatewayID(d.Get("vpn_gateway").(string))
5757
listVPNGatewayConnectionsPeerCidrsOptions.SetID(d.Get("vpn_gateway_connection").(string))
5858

59-
vpnGatewayConnectionCidRs, _, err := vpcClient.ListVPNGatewayConnectionsPeerCIDRsWithContext(context, listVPNGatewayConnectionsPeerCidrsOptions)
59+
vpnGatewayConnectionCidRs, _, err := vpcClient.ListVPNGatewayConnectionsPeerCidrsWithContext(context, listVPNGatewayConnectionsPeerCidrsOptions)
6060
if err != nil {
6161
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListVPNGatewayConnectionsPeerCIDRsWithContext failed %s", err), "(Data) ibm_is_vpn_gateway_connection_peer_cidrs", "read")
6262
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
6363
return tfErr.GetDiag()
6464
}
6565
d.SetId(dataSourceIBMIsVPNGatewayConnectionPeerCidrsID(d))
66-
d.Set("cidrs", vpnGatewayConnectionCidRs.CIDRs)
67-
if err = d.Set("cidrs", vpnGatewayConnectionCidRs.CIDRs); err != nil {
66+
d.Set("cidrs", vpnGatewayConnectionCidRs.Cidrs)
67+
if err = d.Set("cidrs", vpnGatewayConnectionCidRs.Cidrs); err != nil {
6868
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting cidrs %s", err), "(Data) ibm_is_vpn_gateway_connection_peer_cidrs", "read", "cidrs-set").GetDiag()
6969
}
7070
return nil

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_connections.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ func getvpnGatewayConnectionIntfData(vpnGatewayConnectionIntf vpcv1.VPNGatewayCo
569569
if vpnGatewayConnection.Peer != nil {
570570
peer := vpnGatewayConnection.Peer.(*vpcv1.VPNGatewayConnectionPolicyModePeer)
571571
gatewayconnection["peer_address"] = peer.Address
572-
if len(peer.CIDRs) > 0 {
573-
gatewayconnection["peer_cidrs"] = peer.CIDRs
572+
if len(peer.Cidrs) > 0 {
573+
gatewayconnection["peer_cidrs"] = peer.Cidrs
574574
}
575575
}
576576
gatewayconnection["psk"] = vpnGatewayConnection.Psk
@@ -580,8 +580,8 @@ func getvpnGatewayConnectionIntfData(vpnGatewayConnectionIntf vpcv1.VPNGatewayCo
580580
// Deprecated
581581
if vpnGatewayConnection.Local != nil {
582582
local := vpnGatewayConnection.Local
583-
if len(local.CIDRs) > 0 {
584-
gatewayconnection["local_cidrs"] = local.CIDRs
583+
if len(local.Cidrs) > 0 {
584+
gatewayconnection["local_cidrs"] = local.Cidrs
585585
}
586586
}
587587

‎ibm/service/vpc/resource_ibm_is_vpn_gateway_connections.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ func vpngwconCreate(context context.Context, d *schema.ResourceData, meta interf
505505
log.Println("[INFO] inside local cidrs block")
506506
localCidrs := flex.ExpandStringList((d.Get(isVPNGatewayConnectionLocalCIDRS).(*schema.Set)).List())
507507
model := &vpcv1.VPNGatewayConnectionPolicyModeLocalPrototype{}
508-
model.CIDRs = localCidrs
508+
model.Cidrs = localCidrs
509509
vpnGatewayConnectionPrototypeModel.Local = model
510510
}
511511
if peerOk, ok := d.GetOk("peer"); ok && len(peerOk.([]interface{})) > 0 {
@@ -518,7 +518,7 @@ func vpngwconCreate(context context.Context, d *schema.ResourceData, meta interf
518518
model := &vpcv1.VPNGatewayConnectionPolicyModePeerPrototype{}
519519
if ok {
520520
peerCidrs := flex.ExpandStringList((d.Get(isVPNGatewayConnectionPeerCIDRS).(*schema.Set)).List())
521-
model.CIDRs = peerCidrs
521+
model.Cidrs = peerCidrs
522522
}
523523
if peerAddress != "" {
524524
model.Address = &peerAddress
@@ -1151,7 +1151,7 @@ func resourceIBMIsVPNGatewayConnectionMapToVPNGatewayConnectionPolicyModeLocalPr
11511151
}
11521152
if modelMap["cidrs"] != nil && modelMap["cidrs"].(*schema.Set).Len() > 0 {
11531153
localCidrs := flex.ExpandStringList((modelMap["cidrs"].(*schema.Set)).List())
1154-
model.CIDRs = localCidrs
1154+
model.Cidrs = localCidrs
11551155
}
11561156
return model, nil
11571157
}
@@ -1197,7 +1197,7 @@ func resourceIBMIsVPNGatewayConnectionMapToVPNGatewayConnectionPolicyModePeerPro
11971197
}
11981198
if modelMap["cidrs"] != nil && modelMap["cidrs"].(*schema.Set).Len() > 0 {
11991199
peerCidrs := flex.ExpandStringList((modelMap["cidrs"].(*schema.Set)).List())
1200-
model.CIDRs = peerCidrs
1200+
model.Cidrs = peerCidrs
12011201
}
12021202
return model, nil
12031203
}
@@ -1859,8 +1859,8 @@ func setvpnGatewayConnectionIntfResource(context context.Context, d *schema.Reso
18591859
err = fmt.Errorf("Error setting peer_address: %s", err)
18601860
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_vpn_gateway_connection", "read", "set-peer_address").GetDiag()
18611861
}
1862-
if len(peer.CIDRs) > 0 {
1863-
err = d.Set("peer_cidrs", peer.CIDRs)
1862+
if len(peer.Cidrs) > 0 {
1863+
err = d.Set("peer_cidrs", peer.Cidrs)
18641864
if err != nil {
18651865
err = fmt.Errorf("Error setting peer_cidrs: %s", err)
18661866
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_vpn_gateway_connection", "read", "set-peer_cidrs").GetDiag()
@@ -1886,8 +1886,8 @@ func setvpnGatewayConnectionIntfResource(context context.Context, d *schema.Reso
18861886
// Deprecated
18871887
if vpnGatewayConnection.Local != nil {
18881888
local := vpnGatewayConnection.Local
1889-
if len(local.CIDRs) > 0 {
1890-
err = d.Set("local_cidrs", local.CIDRs)
1889+
if len(local.Cidrs) > 0 {
1890+
err = d.Set("local_cidrs", local.Cidrs)
18911891
if err != nil {
18921892
err = fmt.Errorf("Error setting local_cidrs: %s", err)
18931893
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_vpn_gateway_connection", "read", "set-local_cidrs").GetDiag()

0 commit comments

Comments
 (0)