Skip to content

Commit f878a98

Browse files
keerthi-gpkeerthi-gp
committed
feat(vpn-gateway): Fix err message and update sdk
1 parent 8ecaed2 commit f878a98

File tree

6 files changed

+7772
-2293
lines changed

6 files changed

+7772
-2293
lines changed

‎common/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go‎

Lines changed: 7656 additions & 2223 deletions
Large diffs are not rendered by default.

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -855,101 +855,101 @@ func setvpnGatewayConnectionIntfDatasourceData(d *schema.ResourceData, vpn_gatew
855855
vpnGatewayConnection := vpnGatewayConnectionIntf.(*vpcv1.VPNGatewayConnectionRouteModeVPNGatewayConnectionDynamicRouteMode)
856856
d.SetId(fmt.Sprintf("%s/%s", vpn_gateway_id, *vpnGatewayConnection.ID))
857857
if err = d.Set("admin_state_up", vpnGatewayConnection.AdminStateUp); err != nil {
858-
return fmt.Errorf("[ERROR] Error setting admin_state_up: %s", err)
858+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting admin_state_up: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-admin_state_up").GetDiag()
859859
}
860860
if err = d.Set("authentication_mode", vpnGatewayConnection.AuthenticationMode); err != nil {
861-
return fmt.Errorf("[ERROR] Error setting authentication_mode: %s", err)
861+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting authentication_mode: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-authentication_mode").GetDiag()
862862
}
863863
if err = d.Set("created_at", flex.DateTimeToString(vpnGatewayConnection.CreatedAt)); err != nil {
864-
return fmt.Errorf("[ERROR] Error setting created_at: %s", err)
864+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting created_at: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-created_at").GetDiag()
865865
}
866866

867867
if vpnGatewayConnection.DeadPeerDetection != nil {
868868
err = d.Set("dead_peer_detection", dataSourceVPNGatewayConnectionFlattenDeadPeerDetection(*vpnGatewayConnection.DeadPeerDetection))
869869
if err != nil {
870-
return fmt.Errorf("[ERROR] Error setting dead_peer_detection %s", err)
870+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting dead_peer_detection: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-dead_peer_detection").GetDiag()
871871
}
872872
}
873873
if err = d.Set("href", vpnGatewayConnection.Href); err != nil {
874-
return fmt.Errorf("[ERROR] Error setting href: %s", err)
874+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting href: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-href").GetDiag()
875875
}
876876

877877
if vpnGatewayConnection.IkePolicy != nil {
878878
err = d.Set("ike_policy", dataSourceVPNGatewayConnectionFlattenIkePolicy(*vpnGatewayConnection.IkePolicy))
879879
if err != nil {
880-
return fmt.Errorf("[ERROR] Error setting ike_policy %s", err)
880+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting ike_policy: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-ike_policy").GetDiag()
881881
}
882882
}
883883

884884
if vpnGatewayConnection.IpsecPolicy != nil {
885885
err = d.Set("ipsec_policy", dataSourceVPNGatewayConnectionFlattenIpsecPolicy(*vpnGatewayConnection.IpsecPolicy))
886886
if err != nil {
887-
return fmt.Errorf("[ERROR] Error setting ipsec_policy %s", err)
887+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting ipsec_policy: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-ipsec_policy").GetDiag()
888888
}
889889
}
890890
if err = d.Set("mode", vpnGatewayConnection.Mode); err != nil {
891-
return fmt.Errorf("[ERROR] Error setting mode: %s", err)
891+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting mode: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-mode").GetDiag()
892892
}
893893
if err = d.Set("name", vpnGatewayConnection.Name); err != nil {
894-
return fmt.Errorf("[ERROR] Error setting name: %s", err)
894+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting name: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-name").GetDiag()
895895
}
896896

897897
// breaking changes
898898
if err = d.Set("establish_mode", vpnGatewayConnection.EstablishMode); err != nil {
899-
return fmt.Errorf("[ERROR] Error setting establish_mode: %s", err)
899+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting establish_mode: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-establish_mode").GetDiag()
900900
}
901901
local := []map[string]interface{}{}
902902
if vpnGatewayConnection.Local != nil {
903903
modelMap, err := dataSourceIBMIsVPNGatewayConnectionVPNGatewayConnectionDynamicRouteModeLocalToMap(vpnGatewayConnection.Local)
904904
if err != nil {
905-
return err
905+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_vpn_gateway_connection", "read", "local-to-map").GetDiag()
906906
}
907907
local = append(local, modelMap)
908908
}
909909
if err = d.Set("local", local); err != nil {
910-
return fmt.Errorf("[ERROR] Error setting local %s", err)
910+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting local: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-local").GetDiag()
911911
}
912912

913913
peer := []map[string]interface{}{}
914914
if vpnGatewayConnection.Peer != nil {
915915
modelMap, err := dataSourceIBMIsVPNGatewayConnectionVPNGatewayConnectionDynamicRouteModePeerToMap(vpnGatewayConnection.Peer)
916916
if err != nil {
917-
return err
917+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_vpn_gateway_connection", "read", "peer-to-map").GetDiag()
918918
}
919919
peer = append(peer, modelMap)
920920
}
921921
if err = d.Set("peer", peer); err != nil {
922-
return fmt.Errorf("[ERROR] Error setting peer %s", err)
922+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting peer: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-peer").GetDiag()
923923
}
924924
if vpnGatewayConnection.Peer != nil {
925925
peer := vpnGatewayConnection.Peer.(*vpcv1.VPNGatewayConnectionDynamicRouteModePeer)
926926
if err = d.Set("peer_address", peer.Address); err != nil {
927-
return fmt.Errorf("[ERROR] Error setting peer_address: %s", err)
927+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting peer_address: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-peer_address").GetDiag()
928928
}
929929
}
930930
if err = d.Set("psk", vpnGatewayConnection.Psk); err != nil {
931-
return fmt.Errorf("[ERROR] Error setting psk: %s", err)
931+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting psk: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-psk").GetDiag()
932932
}
933933
if err = d.Set("resource_type", vpnGatewayConnection.ResourceType); err != nil {
934-
return fmt.Errorf("[ERROR] Error setting resource_type: %s", err)
934+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting resource_type: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-resource_type").GetDiag()
935935
}
936936
if err = d.Set("status", vpnGatewayConnection.Status); err != nil {
937-
return fmt.Errorf("[ERROR] Error setting status: %s", err)
937+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting status: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-status").GetDiag()
938938
}
939939
if err = d.Set("distribute_traffic", vpnGatewayConnection.DistributeTraffic); err != nil {
940-
return fmt.Errorf("[ERROR] Error setting distribute_traffic: %s", err)
940+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting distribute_traffic: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-distribute_traffic").GetDiag()
941941
}
942942
if err := d.Set("status_reasons", resourceVPNGatewayConnectionFlattenLifecycleReasons(vpnGatewayConnection.StatusReasons)); err != nil {
943-
return fmt.Errorf("[ERROR] Error setting status_reasons: %s", err)
943+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting status_reasons: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-status_reasons").GetDiag()
944944
}
945945
if err = d.Set("routing_protocol", vpnGatewayConnection.RoutingProtocol); err != nil {
946-
return fmt.Errorf("[ERROR] Error setting routing_protocol: %s", err)
946+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting routing_protocol: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-routing_protocol").GetDiag()
947947
}
948948

949949
if vpnGatewayConnection.Tunnels != nil {
950950
err = d.Set("tunnels", dataSourceVPNGatewayConnectionFlattenDynamicTunnels(vpnGatewayConnection.Tunnels))
951951
if err != nil {
952-
return fmt.Errorf("[ERROR] Error setting tunnels %s", err)
952+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting tunnels: %s", err), "(Data) ibm_is_vpn_gateway_connection", "read", "set-tunnels").GetDiag()
953953
}
954954
}
955955
}

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_service_connection.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func dataSourceIBMIsVPNGatewayServiceConnectionRead(context context.Context, d *
144144
vpn_gateway_name := d.Get("vpn_gateway_name").(string)
145145
vpn_gateway_service_connection := d.Get("vpn_gateway_service_connection").(string)
146146

147-
var vpnGatewayServiceConn vpcv1.VPNServiceConnection
147+
var vpnGatewayServiceConn vpcv1.VPNGatewayServiceConnection
148148

149149
if vpn_gateway_name != "" {
150150
listvpnGWOptions := vpcClient.NewListVPNGatewaysOptions()
@@ -203,7 +203,7 @@ func dataSourceIBMIsVPNGatewayServiceConnectionRead(context context.Context, d *
203203
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
204204
return diag.FromErr(tfErr)
205205
}
206-
if err := d.Set("creator", resourceVPNGatewayServiceConnectionFlattenCreator(*vpnGatewayServiceConn.Creator)); err != nil {
206+
if err := d.Set("creator", resourceVPNGatewayServiceConnectionFlattenCreator(vpnGatewayServiceConn.Creator)); err != nil {
207207
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting creator: %s", err), "(Data) ibm_is_vpn_gateway_service_connection", "read")
208208
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
209209
return diag.FromErr(tfErr)

‎ibm/service/vpc/data_source_ibm_is_vpn_gateway_service_connections.go‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func dataSourceIBMIsVPNGatewayServiceConnectionsRead(ctx context.Context, d *sch
148148
}
149149

150150
start := ""
151-
allrecs := []vpcv1.VPNServiceConnection{}
151+
allrecs := []vpcv1.VPNGatewayServiceConnection{}
152152
for {
153153
listvpnGWServiceConnectionsOptions := sess.NewListVPNGatewayServiceConnectionsOptions(vpnGateway)
154154
listvpnGWServiceConnectionsOptions.VPNGatewayID = &vpnGateway
@@ -173,7 +173,7 @@ func dataSourceIBMIsVPNGatewayServiceConnectionsRead(ctx context.Context, d *sch
173173
connection := map[string]interface{}{}
174174
connection[isVPNGatewayServiceConnectionCreatedAt] = serviceConnection.CreatedAt.String()
175175
connection[isVPNGatewayServiceConnectionId] = *serviceConnection.ID
176-
connection[isVPNGatewayServiceConnectionCreator] = resourceVPNGatewayServiceConnectionFlattenCreator(*serviceConnection.Creator)
176+
connection[isVPNGatewayServiceConnectionCreator] = resourceVPNGatewayServiceConnectionFlattenCreator(serviceConnection.Creator)
177177
connection[isVPNGatewayServiceConnectionLifecycleReasons] = resourceVPNGatewayServiceConnectionFlattenLifecycleReasons(serviceConnection.LifecycleReasons)
178178
connection[isVPNGatewayServiceConnectionLifecycleState] = *serviceConnection.LifecycleState
179179
connection[isVPNGatewayServiceConnectionStatus] = *serviceConnection.Status
@@ -192,7 +192,7 @@ func dataSourceIBMVPNGatewayServiceConnectionsID(d *schema.ResourceData) string
192192
return time.Now().UTC().String()
193193
}
194194

195-
func resourceVPNGatewayServiceConnectionFlattenLifecycleReasons(lifecycleReasons []vpcv1.VPNServiceConnectionLifecycleReason) (lifecycleReasonsList []map[string]interface{}) {
195+
func resourceVPNGatewayServiceConnectionFlattenLifecycleReasons(lifecycleReasons []vpcv1.VPNGatewayServiceConnectionLifecycleReason) (lifecycleReasonsList []map[string]interface{}) {
196196
lifecycleReasonsList = make([]map[string]interface{}, 0)
197197
for _, lr := range lifecycleReasons {
198198
currentLR := map[string]interface{}{}
@@ -208,7 +208,7 @@ func resourceVPNGatewayServiceConnectionFlattenLifecycleReasons(lifecycleReasons
208208
return lifecycleReasonsList
209209
}
210210

211-
func resourceVPNGatewayServiceConnectionFlattenStateReasons(healthReasons []vpcv1.VPNServiceConnectionStatusReason) (statusReasonsList []map[string]interface{}) {
211+
func resourceVPNGatewayServiceConnectionFlattenStateReasons(healthReasons []vpcv1.VPNGatewayServiceConnectionStatusReason) (statusReasonsList []map[string]interface{}) {
212212
statusReasonsList = make([]map[string]interface{}, 0)
213213
for _, lr := range healthReasons {
214214
currentLR := map[string]interface{}{}
@@ -224,15 +224,16 @@ func resourceVPNGatewayServiceConnectionFlattenStateReasons(healthReasons []vpcv
224224
return statusReasonsList
225225
}
226226

227-
func resourceVPNGatewayServiceConnectionFlattenCreator(model vpcv1.VPNServiceConnectionCreator) (modelMap map[string]interface{}) {
228-
if model.CRN != nil {
229-
modelMap["crn"] = *model.CRN
227+
func resourceVPNGatewayServiceConnectionFlattenCreator(model vpcv1.VPNGatewayServiceConnectionCreatorIntf) (modelMap map[string]interface{}) {
228+
connectionCreatorItem := model.(*vpcv1.VPNGatewayServiceConnectionCreator)
229+
if connectionCreatorItem.CRN != nil {
230+
modelMap["crn"] = *connectionCreatorItem.CRN
230231
}
231-
if model.ID != nil {
232-
modelMap["id"] = *model.ID
232+
if connectionCreatorItem.ID != nil {
233+
modelMap["id"] = *connectionCreatorItem.ID
233234
}
234-
if model.ResourceType != nil {
235-
modelMap["resource_type"] = *model.ResourceType
235+
if connectionCreatorItem.ResourceType != nil {
236+
modelMap["resource_type"] = *connectionCreatorItem.ResourceType
236237
}
237238
return
238239
}

‎ibm/service/vpc/resource_ibm_is_vpn_gateway.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,16 @@ func vpngwGet(context context.Context, d *schema.ResourceData, meta interface{},
658658
}
659659
}
660660
if vpnGateway.AdvertisedCIDRs != nil {
661-
d.Set(isVPNGatewayAdvertisedCidrs, vpnGateway.AdvertisedCIDRs)
661+
if err = d.Set(isVPNGatewayAdvertisedCidrs, vpnGateway.AdvertisedCIDRs); err != nil {
662+
err = fmt.Errorf("Error setting advertised_cidrs: %s", err)
663+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_vpn_gateway", "read", "set-advertised_cidrs").GetDiag()
664+
}
662665
}
663666
if vpnGateway.LocalAsn != nil {
664-
d.Set(isVPNGatewayLocalAsn, *vpnGateway.LocalAsn)
667+
if err = d.Set(isVPNGatewayLocalAsn, *vpnGateway.LocalAsn); err != nil {
668+
err = fmt.Errorf("Error setting local_asn: %s", err)
669+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_vpn_gateway", "read", "set-local_asn").GetDiag()
670+
}
665671
}
666672
if err = d.Set(isVPNGatewayMode, *vpnGateway.Mode); err != nil {
667673
err = fmt.Errorf("Error setting mode: %s", err)
@@ -704,8 +710,7 @@ func resourceIBMISVPNGatewayUpdate(context context.Context, d *schema.ResourceDa
704710
id := d.Id()
705711
hasChanged := false
706712

707-
708-
err := vpngwUpdate(d, meta, id, hasChanged)
713+
err := vpngwUpdate(context, d, meta, id, hasChanged)
709714
if err != nil {
710715
return err
711716
}

0 commit comments

Comments
 (0)