Skip to content

Commit 921f51c

Browse files
SunithaGudisagarIBM1SunithaGudisagarIBM1
committed
get SDK to latest version and make required changes
1 parent f41670e commit 921f51c

12 files changed

+4072
-1893
lines changed

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

Lines changed: 3850 additions & 1730 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,4 @@ exclude (
243243
k8s.io/client-go v12.0.0+incompatible
244244
)
245245

246-
replace github.com/IBM/vpc-go-sdk v0.64.0 => ./common/github.com/IBM/vpc-go-sdk
246+
replace github.com/IBM/vpc-go-sdk v0.67.1 => ./common/github.com/IBM/vpc-go-sdk

‎ibm/service/vpc/data_source_ibm_is_bare_metal_server_disk.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,15 @@ func dataSourceIBMISBareMetalServerDiskRead(context context.Context, d *schema.R
132132
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting size: %s", err), "(Data) ibm_is_bare_metal_server_disk", "read", "set-size").GetDiag()
133133
}
134134
allowedUses := []map[string]interface{}{}
135-
if disk.AllowedUse != nil {
136-
modelMap, err := ResourceceIBMIsBareMetalServerDiskAllowedUseToMap(disk.AllowedUse)
135+
if bareMetalServerDisk.AllowedUse != nil {
136+
modelMap, err := ResourceceIBMIsBareMetalServerDiskAllowedUseToMap(bareMetalServerDisk.AllowedUse)
137137
if err != nil {
138-
tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_is_bare_metal_server_disk", "read")
139-
log.Println(tfErr.GetDiag())
138+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_bare_metal_server_disk", "read", "set-allowed_use").GetDiag()
140139
}
141140
allowedUses = append(allowedUses, modelMap)
142141
}
143142
if err = d.Set("allowed_use", allowedUses); err != nil {
144-
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_bare_metal_server_disk", "read", "allowed_use").GetDiag()
143+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_bare_metal_server_disk", "read", "set-allowed_use").GetDiag()
145144
}
146145
return nil
147146
}

‎ibm/service/vpc/data_source_ibm_is_bare_metal_server_disks.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ func dataSourceIBMISBareMetalServerDisksRead(context context.Context, d *schema.
135135
usageConstraintList := []map[string]interface{}{}
136136
modelMap, err := ResourceceIBMIsBareMetalServerDiskAllowedUseToMap(disk.AllowedUse)
137137
if err != nil {
138-
tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_is_bare_metal_server_disks", "read")
139-
log.Println(tfErr.GetDiag())
138+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_bare_metal_server_disks", "read", "set-allowed_use").GetDiag()
140139
}
141140
usageConstraintList = append(usageConstraintList, modelMap)
142141
l["allowed_use"] = usageConstraintList

‎ibm/service/vpc/data_source_ibm_is_volume.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -604,17 +604,15 @@ func volumeGet(context context.Context, d *schema.ResourceData, meta interface{}
604604
}
605605

606606
allowedUses := []map[string]interface{}{}
607-
if vol.AllowedUse != nil {
608-
modelMap, err := ResourceceIBMIsVolumeAllowedUseToMap(vol.AllowedUse)
607+
if volume.AllowedUse != nil {
608+
modelMap, err := ResourceceIBMIsVolumeAllowedUseToMap(volume.AllowedUse)
609609
if err != nil {
610-
tfErr := flex.TerraformErrorf(err, err.Error(), "(Data) ibm_is_volume", "read")
611-
log.Println(tfErr.GetDiag())
610+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_volume", "read", "set-allowed_use").GetDiag()
612611
}
613612
allowedUses = append(allowedUses, modelMap)
614613
}
615614
if err = d.Set("allowed_use", allowedUses); err != nil {
616-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_volume", "read")
617-
log.Println(tfErr.GetDiag())
615+
return flex.DiscriminatedTerraformErrorf(err, fmt.Sprintf("Error setting allowed_use: %s", err), "(Data) ibm_is_volume", "read", "set-allowed_use").GetDiag()
618616
}
619617
return nil
620618
}

‎ibm/service/vpc/resource_ibm_is_bare_metal_server_disk.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@ func ResourceceIBMIsBareMetalServerDiskAllowedUseToMap(model *vpcv1.BareMetalSer
192192
if model.BareMetalServer != nil {
193193
modelMap["bare_metal_server"] = *model.BareMetalServer
194194
}
195-
if model.Instance != nil {
196-
modelMap["instance"] = *model.Instance
197-
}
198195
if model.ApiVersion != nil {
199196
modelMap["api_version"] = *model.ApiVersion
200197
}

‎ibm/service/vpc/resource_ibm_is_image.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ func imgCreateByFile(context context.Context, d *schema.ResourceData, meta inter
390390
if allowedUse, ok := d.GetOk("allowed_use"); ok {
391391
allowedUseModel, err := ResourceIBMUsageConstraintsMapToImageAllowUsePrototype(allowedUse.([]interface{})[0].(map[string]interface{}))
392392
if err != nil {
393-
return err
393+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_image", "create", "parse-allowed_use").GetDiag()
394394
}
395395
imagePrototype.AllowedUse = allowedUseModel
396396
}
@@ -478,7 +478,7 @@ func imgCreateByVolume(context context.Context, d *schema.ResourceData, meta int
478478
if allowedUse, ok := d.GetOk("allowed_use"); ok {
479479
allowedUseModel, err := ResourceIBMUsageConstraintsMapToImageAllowUsePrototype(allowedUse.([]interface{})[0].(map[string]interface{}))
480480
if err != nil {
481-
return err
481+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_image", "create", "parse-allowed_use").GetDiag()
482482
}
483483
imagePrototype.AllowedUse = allowedUseModel
484484
}
@@ -773,7 +773,7 @@ func imgUpdate(context context.Context, d *schema.ResourceData, meta interface{}
773773
if d.HasChange("allowed_use") {
774774
allowedUseModel, err := ResourceIBMIsImageMapToImageAllowedUsePatch(d.Get("allowed_use").([]interface{})[0].(map[string]interface{}))
775775
if err != nil {
776-
return fmt.Errorf("[ERROR] Error on allowed use patch: %s\n", err)
776+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_image", "update", "parse-allowed_use").GetDiag()
777777
}
778778
imagePatchModel.AllowedUse = allowedUseModel
779779
}
@@ -940,10 +940,12 @@ func imgGet(context context.Context, d *schema.ResourceData, meta interface{}, i
940940
if !core.IsNil(image.AllowedUse) {
941941
allowedUseMap, err := ResourceIBMIsImageImageAllowUseToMap(image.AllowedUse)
942942
if err != nil {
943-
return err
943+
err = fmt.Errorf("Error setting allowed_use: %s", err)
944+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_image", "read", "set-allowed_use").GetDiag()
944945
}
945946
if err = d.Set("allowed_use", []map[string]interface{}{allowedUseMap}); err != nil {
946-
log.Printf("Error setting allowed_use: %s", err)
947+
err = fmt.Errorf("Error setting allowed_use: %s", err)
948+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "ibm_is_image", "read", "set-allowed_use").GetDiag()
947949
}
948950
}
949951
tags, err := flex.GetGlobalTagsUsingCRN(meta, *image.CRN, "", isImageUserTagType)

0 commit comments

Comments
 (0)