Skip to content

Commit

Permalink
SDK breaking changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ujjwal-ibm
ujjwal-ibm committed Nov 13, 2024
1 parent 33c314f commit 70b4997
Show file tree
Hide file tree
Showing 21 changed files with 55 additions and 58 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ replace github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/golang-jwt
// add sdk changes.
replace github.com/portworx/sched-ops v0.0.0-20200831185134-3e8010dc7056 => github.com/portworx/sched-ops v0.20.4-openstorage-rc3 // required by rook v1.7

replace github.com/IBM/vpc-go-sdk v0.58.0 => ./common/github.com/IBM/vpc-go-sdk
replace github.com/IBM/vpc-go-sdk v0.61.0 => ./common/github.com/IBM/vpc-go-sdk

exclude (
github.com/kubernetes-incubator/external-storage v0.20.4-openstorage-rc2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3bt
github.com/IBM/go-sdk-core/v5 v5.7.0/go.mod h1:+YbdhrjCHC84ls4MeBp+Hj4NZCni+tDAc0XQUqRO9Jc=
github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI=
github.com/IBM/go-sdk-core/v5 v5.17.3/go.mod h1:GatGZpxlo1KaxiRN6E10/rNgWtUtx1hN/GoHSCaSPKA=
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
github.com/IBM/go-sdk-core/v5 v5.18.0 h1:ZB3qaLEsN4fccQWzMblfXeqLx5VztiVi+HfyIqmqask=
github.com/IBM/go-sdk-core/v5 v5.18.0/go.mod h1:3ywpylZ41WhWPusqtpJZWopYlt2brebcphV7mA2JncU=
Expand Down Expand Up @@ -194,8 +195,6 @@ github.com/IBM/vmware-go-sdk v0.1.2 h1:5lKWFyInWz9e2hwGsoFTEoLa1jYkD30SReN0fQ10w
github.com/IBM/vmware-go-sdk v0.1.2/go.mod h1:2UGPBJju3jiv5VKKBBm9a5L6bzF/aJdKOKAzJ7HaOjA=
github.com/IBM/vpc-beta-go-sdk v0.8.0 h1:cEPpv4iw3Ba5W2d0AWg3TIbKeJ8y1nPuUuibR5Jt9eE=
github.com/IBM/vpc-beta-go-sdk v0.8.0/go.mod h1:hORgIyTFRzXrZIK9IohaWmCRBBlYiDRagsufi7M6akE=
github.com/IBM/vpc-go-sdk v0.61.0 h1:VXT8ZwOQtl15/RSInj9+Z4OQC/vhE/Owoauu128BO4M=
github.com/IBM/vpc-go-sdk v0.61.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw=
github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0=
Expand Down Expand Up @@ -914,6 +913,7 @@ github.com/hashicorp/go-retryablehttp v0.6.2/go.mod h1:gEx6HMUGxYYhJScX7W1Il64m6
github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/vpc/data_source_ibm_is_backup_policy_jobs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ func dataSourceBackupPolicyJobCollectionTargetSnapshotDeletedToMap(deletedItem v
return deletedMap
}

func dataSourceBackupPolicyJobCollectionNextToMap(nextItem vpcv1.BackupPolicyJobCollectionNext) (nextMap map[string]interface{}) {
func dataSourceBackupPolicyJobCollectionNextToMap(nextItem vpcv1.PageLink) (nextMap map[string]interface{}) {
nextMap = map[string]interface{}{}

if nextItem.Href != nil {
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachments.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func dataSourceIBMIsBareMetalServerNetworkAttachmentsID(d *schema.ResourceData)
return time.Now().UTC().String()
}

func dataSourceIBMIsBareMetalServerNetworkAttachmentsBareMetalServerNetworkAttachmentCollectionFirstToMap(model *vpcv1.BareMetalServerNetworkAttachmentCollectionFirst) (map[string]interface{}, error) {
func dataSourceIBMIsBareMetalServerNetworkAttachmentsBareMetalServerNetworkAttachmentCollectionFirstToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
modelMap["href"] = model.Href
return modelMap, nil
Expand Down Expand Up @@ -446,7 +446,7 @@ func dataSourceIBMIsBareMetalServerNetworkAttachmentsBareMetalServerNetworkAttac
return modelMap, nil
}

func dataSourceIBMIsBareMetalServerNetworkAttachmentsBareMetalServerNetworkAttachmentCollectionNextToMap(model *vpcv1.BareMetalServerNetworkAttachmentCollectionNext) (map[string]interface{}, error) {
func dataSourceIBMIsBareMetalServerNetworkAttachmentsBareMetalServerNetworkAttachmentCollectionNextToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
modelMap["href"] = model.Href
return modelMap, nil
Expand Down
8 changes: 4 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_dedicated_host_groups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func dataSourceIbmIsDedicatedHostGroupsID(d *schema.ResourceData) string {
return time.Now().UTC().String()
}

func dataSourceDedicatedHostGroupCollectionFirstToMap(firstItem vpcv1.DedicatedHostGroupCollectionFirst) (firstMap map[string]interface{}) {
func dataSourceDedicatedHostGroupCollectionFirstToMap(firstItem vpcv1.PageLink) (firstMap map[string]interface{}) {
firstMap = map[string]interface{}{}

if firstItem.Href != nil {
Expand Down Expand Up @@ -351,23 +351,23 @@ func dataSourceDedicatedHostGroupCollectionGroupsSupportedInstanceProfilesToMap(
return supportedInstanceProfilesMap
}

func dataSourceDedicatedHostGroupCollectionFlattenFirst(result vpcv1.DedicatedHostGroupCollectionFirst) (finalList []map[string]interface{}) {
func dataSourceDedicatedHostGroupCollectionFlattenFirst(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceDedicatedHostGroupCollectionFirstToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceDedicatedHostGroupCollectionFlattenNext(result vpcv1.DedicatedHostGroupCollectionNext) (finalList []map[string]interface{}) {
func dataSourceDedicatedHostGroupCollectionFlattenNext(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceDedicatedHostGroupCollectionNextToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceDedicatedHostGroupCollectionNextToMap(nextItem vpcv1.DedicatedHostGroupCollectionNext) (nextMap map[string]interface{}) {
func dataSourceDedicatedHostGroupCollectionNextToMap(nextItem vpcv1.PageLink) (nextMap map[string]interface{}) {
nextMap = map[string]interface{}{}

if nextItem.Href != nil {
Expand Down
8 changes: 4 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_dedicated_host_profiles.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@ func dataSourceIbmIsDedicatedHostProfilesID(d *schema.ResourceData) string {
return time.Now().UTC().String()
}

func dataSourceDedicatedHostProfileCollectionFlattenFirst(result vpcv1.DedicatedHostProfileCollectionFirst) (finalList []map[string]interface{}) {
func dataSourceDedicatedHostProfileCollectionFlattenFirst(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceDedicatedHostProfileCollectionFirstToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceDedicatedHostProfileCollectionFirstToMap(firstItem vpcv1.DedicatedHostProfileCollectionFirst) (firstMap map[string]interface{}) {
func dataSourceDedicatedHostProfileCollectionFirstToMap(firstItem vpcv1.PageLink) (firstMap map[string]interface{}) {
firstMap = map[string]interface{}{}

if firstItem.Href != nil {
Expand All @@ -412,15 +412,15 @@ func dataSourceDedicatedHostProfileCollectionFirstToMap(firstItem vpcv1.Dedicate
return firstMap
}

func dataSourceDedicatedHostProfileCollectionFlattenNext(result vpcv1.DedicatedHostProfileCollectionNext) (finalList []map[string]interface{}) {
func dataSourceDedicatedHostProfileCollectionFlattenNext(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceDedicatedHostProfileCollectionNextToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceDedicatedHostProfileCollectionNextToMap(nextItem vpcv1.DedicatedHostProfileCollectionNext) (nextMap map[string]interface{}) {
func dataSourceDedicatedHostProfileCollectionNextToMap(nextItem vpcv1.PageLink) (nextMap map[string]interface{}) {
nextMap = map[string]interface{}{}

if nextItem.Href != nil {
Expand Down
8 changes: 4 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_dedicated_hosts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,15 +725,15 @@ func dataSourceDedicatedHostCollectionDedicatedHostsVcpuToMap(vcpuItem vpcv1.Vcp
return vcpuMap
}

func dataSourceDedicatedHostCollectionFlattenFirst(result vpcv1.DedicatedHostCollectionFirst) (finalList []map[string]interface{}) {
func dataSourceDedicatedHostCollectionFlattenFirst(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceDedicatedHostCollectionFirstToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceDedicatedHostCollectionFirstToMap(firstItem vpcv1.DedicatedHostCollectionFirst) (firstMap map[string]interface{}) {
func dataSourceDedicatedHostCollectionFirstToMap(firstItem vpcv1.PageLink) (firstMap map[string]interface{}) {
firstMap = map[string]interface{}{}

if firstItem.Href != nil {
Expand All @@ -743,15 +743,15 @@ func dataSourceDedicatedHostCollectionFirstToMap(firstItem vpcv1.DedicatedHostCo
return firstMap
}

func dataSourceDedicatedHostCollectionFlattenNext(result vpcv1.DedicatedHostCollectionNext) (finalList []map[string]interface{}) {
func dataSourceDedicatedHostCollectionFlattenNext(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceDedicatedHostCollectionNextToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceDedicatedHostCollectionNextToMap(nextItem vpcv1.DedicatedHostCollectionNext) (nextMap map[string]interface{}) {
func dataSourceDedicatedHostCollectionNextToMap(nextItem vpcv1.PageLink) (nextMap map[string]interface{}) {
nextMap = map[string]interface{}{}

if nextItem.Href != nil {
Expand Down
8 changes: 4 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_floating_ips.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,15 +283,15 @@ func dataSourceIBMIsFloatingIpsID(d *schema.ResourceData) string {
return time.Now().UTC().String()
}

func dataSourceFloatingIPCollectionFlattenFirst(result vpcv1.FloatingIPCollectionFirst) (finalList []map[string]interface{}) {
func dataSourceFloatingIPCollectionFlattenFirst(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceFloatingIPCollectionFirstToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceFloatingIPCollectionFirstToMap(firstItem vpcv1.FloatingIPCollectionFirst) (firstMap map[string]interface{}) {
func dataSourceFloatingIPCollectionFirstToMap(firstItem vpcv1.PageLink) (firstMap map[string]interface{}) {
firstMap = map[string]interface{}{}

if firstItem.Href != nil {
Expand Down Expand Up @@ -534,15 +534,15 @@ func dataSourceFloatingIPCollectionFloatingIpsZoneToMap(zoneItem vpcv1.ZoneRefer
return zoneMap
}

func dataSourceFloatingIPCollectionFlattenNext(result vpcv1.FloatingIPCollectionNext) (finalList []map[string]interface{}) {
func dataSourceFloatingIPCollectionFlattenNext(result vpcv1.PageLink) (finalList []map[string]interface{}) {
finalList = []map[string]interface{}{}
finalMap := dataSourceFloatingIPCollectionNextToMap(result)
finalList = append(finalList, finalMap)

return finalList
}

func dataSourceFloatingIPCollectionNextToMap(nextItem vpcv1.FloatingIPCollectionNext) (nextMap map[string]interface{}) {
func dataSourceFloatingIPCollectionNextToMap(nextItem vpcv1.PageLink) (nextMap map[string]interface{}) {
nextMap = map[string]interface{}{}

if nextItem.Href != nil {
Expand Down
2 changes: 1 addition & 1 deletion ibm/service/vpc/data_source_ibm_is_instance_groups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ func DataSourceIBMIsInstanceGroupsID(d *schema.ResourceData) string {
return time.Now().UTC().String()
}

func DataSourceIBMIsInstanceGroupsInstanceGroupCollectionFirstToMap(model *vpcv1.InstanceGroupCollectionFirst) (map[string]interface{}, error) {
func DataSourceIBMIsInstanceGroupsInstanceGroupCollectionFirstToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
Expand Down
8 changes: 4 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_instance_template.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,12 +883,12 @@ func dataSourceIBMISInstanceTemplateRead(context context.Context, d *schema.Reso
switch reflect.TypeOf(instance.DefaultTrustedProfile.Target).String() {
case "*vpcv1.TrustedProfileIdentityTrustedProfileByID":
{
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityTrustedProfileByID)
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityByID)
d.Set(isInstanceDefaultTrustedProfileTarget, target.ID)
}
case "*vpcv1.TrustedProfileIdentityTrustedProfileByCRN":
{
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityTrustedProfileByCRN)
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityByCRN)
d.Set(isInstanceDefaultTrustedProfileTarget, target.CRN)
}
}
Expand Down Expand Up @@ -1265,12 +1265,12 @@ func dataSourceIBMISInstanceTemplateRead(context context.Context, d *schema.Reso
switch reflect.TypeOf(instance.DefaultTrustedProfile.Target).String() {
case "*vpcv1.TrustedProfileIdentityTrustedProfileByID":
{
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityTrustedProfileByID)
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityByID)
d.Set(isInstanceDefaultTrustedProfileTarget, target.ID)
}
case "*vpcv1.TrustedProfileIdentityTrustedProfileByCRN":
{
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityTrustedProfileByCRN)
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityByCRN)
d.Set(isInstanceDefaultTrustedProfileTarget, target.CRN)
}
}
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/data_source_ibm_is_instance_templates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,12 +883,12 @@ func dataSourceIBMISInstanceTemplatesRead(d *schema.ResourceData, meta interface
switch reflect.TypeOf(instance.DefaultTrustedProfile.Target).String() {
case "*vpcv1.TrustedProfileIdentityTrustedProfileByID":
{
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityTrustedProfileByID)
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityByID)
template[isInstanceDefaultTrustedProfileTarget] = target.ID
}
case "*vpcv1.TrustedProfileIdentityTrustedProfileByCRN":
{
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityTrustedProfileByCRN)
target := instance.DefaultTrustedProfile.Target.(*vpcv1.TrustedProfileIdentityByCRN)
template[isInstanceDefaultTrustedProfileTarget] = target.CRN
}
}
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/data_source_ibm_is_private_path_service_gateway_account_policies.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesAccountReferenceToMa
return modelMap, nil
}

func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesPrivatePathServiceGatewayAccountPolicyCollectionFirstToMap(model *vpcv1.PrivatePathServiceGatewayAccountPolicyCollectionFirst) (map[string]interface{}, error) {
func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesPrivatePathServiceGatewayAccountPolicyCollectionFirstToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
}
return modelMap, nil
}

func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesPrivatePathServiceGatewayAccountPolicyCollectionNextToMap(model *vpcv1.PrivatePathServiceGatewayAccountPolicyCollectionNext) (map[string]interface{}, error) {
func dataSourceIBMIsPrivatePathServiceGatewayAccountPoliciesPrivatePathServiceGatewayAccountPolicyCollectionNextToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/data_source_ibm_is_private_path_service_gateway_endpoint_gateway_bindings.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ func dataSourceIBMIsPrivatePathServiceGatewayEndpointGatewayBindingsAccountRefer
return modelMap, nil
}

func dataSourceIBMIsPrivatePathServiceGatewayEndpointGatewayBindingsPrivatePathServiceGatewayEndpointGatewayBindingCollectionFirstToMap(model *vpcv1.PrivatePathServiceGatewayEndpointGatewayBindingCollectionFirst) (map[string]interface{}, error) {
func dataSourceIBMIsPrivatePathServiceGatewayEndpointGatewayBindingsPrivatePathServiceGatewayEndpointGatewayBindingCollectionFirstToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
}
return modelMap, nil
}

func dataSourceIBMIsPrivatePathServiceGatewayEndpointGatewayBindingsPrivatePathServiceGatewayEndpointGatewayBindingCollectionNextToMap(model *vpcv1.PrivatePathServiceGatewayEndpointGatewayBindingCollectionNext) (map[string]interface{}, error) {
func dataSourceIBMIsPrivatePathServiceGatewayEndpointGatewayBindingsPrivatePathServiceGatewayEndpointGatewayBindingCollectionNextToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/data_source_ibm_is_private_path_service_gateways.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,15 @@ func dataSourceIBMIsPrivatePathServiceGatewaysID(d *schema.ResourceData) string
return time.Now().UTC().String()
}

func dataSourceIBMIsPrivatePathServiceGatewaysPrivatePathServiceGatewayCollectionFirstToMap(model *vpcv1.PrivatePathServiceGatewayCollectionFirst) (map[string]interface{}, error) {
func dataSourceIBMIsPrivatePathServiceGatewaysPrivatePathServiceGatewayCollectionFirstToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
}
return modelMap, nil
}

func dataSourceIBMIsPrivatePathServiceGatewaysPrivatePathServiceGatewayCollectionNextToMap(model *vpcv1.PrivatePathServiceGatewayCollectionNext) (map[string]interface{}, error) {
func dataSourceIBMIsPrivatePathServiceGatewaysPrivatePathServiceGatewayCollectionNextToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
if model.Href != nil {
modelMap["href"] = *model.Href
Expand Down
3 changes: 0 additions & 3 deletions ibm/service/vpc/data_source_ibm_is_share_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,6 @@ func dataSourceShareProfileIopsToMap(iops vpcv1.ShareProfileIops) (iopsMap map[s
}
func dataSourceShareProfileCapacityToMap(capacity vpcv1.ShareProfileCapacity) (capacityMap map[string]interface{}) {
capacityMap = map[string]interface{}{}
if capacity.Default != nil {
capacityMap["default"] = int(*capacity.Default)
}
capacityMap["max"] = capacity.Max
capacityMap["min"] = capacity.Min
capacityMap["step"] = capacity.Step
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/data_source_ibm_is_virtual_network_interface_ips.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@ func dataSourceVirtualNetworkInterfaceIPsID(d *schema.ResourceData) string {
return time.Now().UTC().String()
}

func dataSourceIBMIsReservedIpsReservedIPCollectionFirstToMap(model *vpcv1.ReservedIPCollectionFirst) (map[string]interface{}, error) {
func dataSourceIBMIsReservedIpsReservedIPCollectionFirstToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
modelMap["href"] = model.Href
return modelMap, nil
}

func dataSourceIBMIsReservedIpsReservedIPCollectionNextToMap(model *vpcv1.ReservedIPCollectionNext) (map[string]interface{}, error) {
func dataSourceIBMIsReservedIpsReservedIPCollectionNextToMap(model *vpcv1.PageLink) (map[string]interface{}, error) {
modelMap := make(map[string]interface{})
modelMap["href"] = model.Href
return modelMap, nil
Expand Down
Loading

0 comments on commit 70b4997

Please sign in to comment.