Skip to content

Commit 26a2bc0

Browse files
committed
resolved errors of sdks
1 parent fb4db21 commit 26a2bc0

File tree

6 files changed

+25
-24
lines changed

6 files changed

+25
-24
lines changed

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/IBM/eventstreams-go-sdk v1.4.0
2323
github.com/IBM/go-sdk-core v1.1.0
2424
github.com/IBM/go-sdk-core/v3 v3.2.4
25-
github.com/IBM/go-sdk-core/v5 v5.19.0
25+
github.com/IBM/go-sdk-core/v5 v5.20.1
2626
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3
2727
github.com/IBM/ibm-cos-sdk-go v1.12.0
2828
github.com/IBM/ibm-cos-sdk-go-config/v2 v2.2.0
@@ -43,7 +43,7 @@ require (
4343
github.com/IBM/secrets-manager-go-sdk/v2 v2.0.10
4444
github.com/IBM/vmware-go-sdk v0.1.3
4545
github.com/IBM/vpc-beta-go-sdk v0.8.0
46-
github.com/IBM/vpc-go-sdk v0.67.1
46+
github.com/IBM/vpc-go-sdk v0.69.1
4747
github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
4848
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
4949
github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0
@@ -118,7 +118,7 @@ require (
118118
github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
119119
github.com/go-playground/locales v0.14.1 // indirect
120120
github.com/go-playground/universal-translator v0.18.1 // indirect
121-
github.com/go-playground/validator/v10 v10.24.0 // indirect
121+
github.com/go-playground/validator/v10 v10.26.0 // indirect
122122
github.com/go-test/deep v1.1.0 // indirect
123123
github.com/gogo/protobuf v1.3.2 // indirect
124124
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
@@ -214,7 +214,7 @@ require (
214214
golang.org/x/net v0.38.0 // indirect
215215
golang.org/x/oauth2 v0.22.0 // indirect
216216
golang.org/x/sync v0.12.0 // indirect
217-
golang.org/x/sys v0.32.0 // indirect
217+
golang.org/x/sys v0.33.0 // indirect
218218
golang.org/x/term v0.30.0 // indirect
219219
golang.org/x/text v0.23.0 // indirect
220220
golang.org/x/time v0.3.0 // indirect
@@ -242,6 +242,7 @@ replace github.com/dgrijalva/jwt-go v3.2.0+incompatible => github.com/golang-jwt
242242
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
243243

244244
replace github.com/IBM/vpc-go-sdk v0.66.0 => ./common/github.com/IBM/vpc-go-sdk
245+
245246
replace github.com/hashicorp/consul/api v1.1.0 => github.com/hashicorp/consul/api v1.30.0
246247

247248
replace github.com/hashicorp/vault => github.com/hashicorp/vault v1.18.2

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ github.com/IBM/go-sdk-core/v5 v5.6.3/go.mod h1:tt/B9rxLkRtglE7pvqLuYikgCXaZFL3bt
133133
github.com/IBM/go-sdk-core/v5 v5.9.5/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
134134
github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI=
135135
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
136-
github.com/IBM/go-sdk-core/v5 v5.19.0 h1:YN2S5JUvq/EwYulmcNFwgyYBxZhVWl9nkY22H7Hpghw=
137-
github.com/IBM/go-sdk-core/v5 v5.19.0/go.mod h1:deZO1J5TSlU69bCnl/YV7nPxFZA2UEaup7cq/7ZTOgw=
136+
github.com/IBM/go-sdk-core/v5 v5.20.1 h1:dzeyifh1kfRLw8VfAIIS5okZYuqLTqplPZP/Kcsgdlo=
137+
github.com/IBM/go-sdk-core/v5 v5.20.1/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
138138
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3 h1:9TZHocmCfgmF8TGVrpP1kFyQbjcqLNW7+bM07lefpKQ=
139139
github.com/IBM/ibm-backup-recovery-sdk-go v1.0.3/go.mod h1:jsYutWlnGysdCNoAk0zoIXb2vfKM9TmMpiUkI4pVuXY=
140140
github.com/IBM/ibm-cos-sdk-go v1.12.0 h1:Wrk3ve4JS3euhl7XjNFd3RlvPT56199G2/rKaPWpRKU=
@@ -176,8 +176,8 @@ github.com/IBM/vmware-go-sdk v0.1.3 h1:uJL3kwzM0jAKsT6Gj9tE5xT9SZBVXVaJvZdxrSMx8
176176
github.com/IBM/vmware-go-sdk v0.1.3/go.mod h1:OyQKRInGGsBaOyE5LIZCqH7b1DZ01BvIYa8BgGy+wWo=
177177
github.com/IBM/vpc-beta-go-sdk v0.8.0 h1:cEPpv4iw3Ba5W2d0AWg3TIbKeJ8y1nPuUuibR5Jt9eE=
178178
github.com/IBM/vpc-beta-go-sdk v0.8.0/go.mod h1:hORgIyTFRzXrZIK9IohaWmCRBBlYiDRagsufi7M6akE=
179-
github.com/IBM/vpc-go-sdk v0.67.1 h1:z0q1af1iItV4kHgreM21vzZtw6XQ13og2GBkX7WCJ8c=
180-
github.com/IBM/vpc-go-sdk v0.67.1/go.mod h1:VL7sy61ybg6tvA60SepoQx7TFe20m7JyNUt+se2tHP4=
179+
github.com/IBM/vpc-go-sdk v0.69.1 h1:2krrr/TGFrC+AUPQmgV2TA6vTCZ0COTJo7nIUlgOtOs=
180+
github.com/IBM/vpc-go-sdk v0.69.1/go.mod h1:K3vVlje72PYE3ZRt1iouE+jSIq+vCyYzT1HiFC06hUA=
181181
github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0=
182182
github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56/go.mod h1:Zb3OT4l0mf7P/GOs2w2Ilj5sdm5Whoq3pa24dAEBHFc=
183183
github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
@@ -502,8 +502,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
502502
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
503503
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
504504
github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
505-
github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
506-
github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
505+
github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
506+
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
507507
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
508508
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
509509
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
@@ -1643,8 +1643,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16431643
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16441644
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
16451645
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1646-
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
1647-
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1646+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
1647+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
16481648
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
16491649
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
16501650
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

ibm/service/vpc/data_source_ibm_is_instance_profile.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ func instanceProfileGet(d *schema.ResourceData, meta interface{}, name string) e
962962

963963
// Manufacturer details added.
964964
if profile.VcpuManufacturer != nil {
965-
err = d.Set(isInstanceVCPUManufacturer, dataSourceInstanceProfileFlattenVcpuManufacture(*profile.VcpuManufacturer))
965+
err = d.Set(isInstanceVCPUManufacturer, dataSourceInstanceProfileFlattenVcpuManufacture(*&profile.VcpuManufacturer))
966966
if err != nil {
967967
return err
968968
}
@@ -1272,22 +1272,22 @@ func dataSourceInstanceProfileVcpuArchitectureToMap(vcpuArchitectureItem vpcv1.I
12721272
}
12731273

12741274
/* Changes for the AMD Support VCPU Manufacturer */
1275-
func dataSourceInstanceProfileFlattenVcpuManufacture(result vpcv1.InstanceProfileVcpuManufacturer) (fl []map[string]interface{}) {
1275+
func dataSourceInstanceProfileFlattenVcpuManufacture(result vpcv1.InstanceProfileVcpuManufacturerIntf) (fl []map[string]interface{}) {
12761276
fl = []map[string]interface{}{}
12771277
finalMap := dataSourceInstanceProfileVcpuManufacturerToMap(result)
12781278
fl = append(fl, finalMap)
12791279

12801280
return fl
12811281
}
12821282

1283-
func dataSourceInstanceProfileVcpuManufacturerToMap(vcpuManufacutererItem vpcv1.InstanceProfileVcpuManufacturer) (vcpuManufacturerMap map[string]interface{}) {
1283+
func dataSourceInstanceProfileVcpuManufacturerToMap(vcpuManufacutererItem vpcv1.InstanceProfileVcpuManufacturerIntf) (vcpuManufacturerMap map[string]interface{}) {
12841284
vcpuManufacturerMap = map[string]interface{}{}
12851285

1286-
if vcpuManufacutererItem.Type != nil {
1287-
vcpuManufacturerMap["type"] = vcpuManufacutererItem.Type
1288-
}
1289-
if vcpuManufacutererItem.Value != nil {
1290-
vcpuManufacturerMap["value"] = vcpuManufacutererItem.Value
1286+
if vcpuManufacutererItem != nil {
1287+
if vcpuManufacturer, ok := vcpuManufacutererItem.(*vpcv1.InstanceProfileVcpuManufacturer); ok {
1288+
vcpuManufacturerMap["type"] = vcpuManufacturer.Type
1289+
vcpuManufacturerMap["value"] = vcpuManufacturer.Value
1290+
}
12911291
}
12921292

12931293
return vcpuManufacturerMap

ibm/service/vpc/data_source_ibm_is_instance_profiles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ func instanceProfilesList(d *schema.ResourceData, meta interface{}) error {
945945
// reduce the line of code here. - sumit's suggestions
946946
if profile.VcpuManufacturer != nil {
947947
vcpuManufacturerList := []map[string]interface{}{}
948-
vcpuManufacturerMap := dataSourceInstanceProfileVcpuManufacturerToMap(*profile.VcpuManufacturer)
948+
vcpuManufacturerMap := dataSourceInstanceProfileVcpuManufacturerToMap(profile.VcpuManufacturer)
949949
vcpuManufacturerList = append(vcpuManufacturerList, vcpuManufacturerMap)
950950
l["vcpu_manufacturer"] = vcpuManufacturerList
951951
}

ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection_local_cidrs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ func dataSourceIBMIsVPNGatewayConnectionLocalCidrsRead(context context.Context,
4949
return diag.FromErr(err)
5050
}
5151

52-
listVPNGatewayConnectionsLocalCidrsOptions := &vpcv1.ListVPNGatewayConnectionsLocalCIDRsOptions{}
52+
listVPNGatewayConnectionsLocalCidrsOptions := &vpcv1.ListVPNGatewayConnectionsPeerCIDRsOptions{}
5353

5454
listVPNGatewayConnectionsLocalCidrsOptions.SetVPNGatewayID(d.Get("vpn_gateway").(string))
5555
listVPNGatewayConnectionsLocalCidrsOptions.SetID(d.Get("vpn_gateway_connection").(string))
5656

57-
vpnGatewayConnectionCidRs, response, err := vpcClient.ListVPNGatewayConnectionsLocalCIDRsWithContext(context, listVPNGatewayConnectionsLocalCidrsOptions)
57+
vpnGatewayConnectionCidRs, response, err := vpcClient.ListVPNGatewayConnectionsPeerCIDRsWithContext(context, listVPNGatewayConnectionsLocalCidrsOptions)
5858
if err != nil {
5959
log.Printf("[DEBUG] ListVPNGatewayConnectionsLocalCidrsWithContext failed %s\n%s", err, response)
6060
return diag.FromErr(fmt.Errorf("ListVPNGatewayConnectionsLocalCidrsWithContext failed %s\n%s", err, response))

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [[ -n "${TF_RELEASE}" ]]; then
5151
fi
5252

5353
# Build!
54-
VERSION="1.64.0"
54+
# VERSION="1.62.0"
5555
echo "==> Building..."
5656
gox \
5757
-os="${XC_OS}" \

0 commit comments

Comments
 (0)