Skip to content

Commit 03ac249

Browse files
deepaksibmdeepaksibm
committed
corrections
1 parent 2feecae commit 03ac249

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

‎ibm/service/vpc/data_source_ibm_is_share_profile.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func DataSourceIbmIsShareProfile() *schema.Resource {
137137
func dataSourceIbmIsShareProfileRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
138138
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
139139
if err != nil {
140-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_profile", "read")
140+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_share_profile", "read")
141141
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
142142
return tfErr.GetDiag()
143143
}
@@ -148,7 +148,7 @@ func dataSourceIbmIsShareProfileRead(context context.Context, d *schema.Resource
148148

149149
shareProfile, response, err := vpcClient.GetShareProfileWithContext(context, getShareProfileOptions)
150150
if err != nil {
151-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetShareProfileWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_profile", "read")
151+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("GetShareProfileWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_share_profile", "read")
152152
log.Printf("[DEBUG] %s", tfErr.GetDebugMessage())
153153
return tfErr.GetDiag()
154154
}
@@ -160,7 +160,7 @@ func dataSourceIbmIsShareProfileRead(context context.Context, d *schema.Resource
160160
capacityList = append(capacityList, capacityMap)
161161
if err = d.Set("capacity", capacityList); err != nil {
162162
err = fmt.Errorf("Error setting capacity: %s", err)
163-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profile", "read", "set-capacity").GetDiag()
163+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profile", "read", "set-capacity").GetDiag()
164164
}
165165
}
166166
if shareProfile.Iops != nil {
@@ -170,21 +170,21 @@ func dataSourceIbmIsShareProfileRead(context context.Context, d *schema.Resource
170170
iopsList = append(iopsList, iopsMap)
171171
if err = d.Set("iops", iopsList); err != nil {
172172
err = fmt.Errorf("Error setting iops: %s", err)
173-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profile", "read", "set-iops").GetDiag()
173+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profile", "read", "set-iops").GetDiag()
174174
}
175175
}
176176
d.SetId(*shareProfile.Name)
177177
if err = d.Set("family", shareProfile.Family); err != nil {
178178
err = fmt.Errorf("Error setting family: %s", err)
179-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profile", "read", "set-family").GetDiag()
179+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profile", "read", "set-family").GetDiag()
180180
}
181181
if err = d.Set("href", shareProfile.Href); err != nil {
182182
err = fmt.Errorf("Error setting href: %s", err)
183-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profile", "read", "set-href").GetDiag()
183+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profile", "read", "set-href").GetDiag()
184184
}
185185
if err = d.Set("resource_type", shareProfile.ResourceType); err != nil {
186186
err = fmt.Errorf("Error setting resource_type: %s", err)
187-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profile", "read", "set-resource_type").GetDiag()
187+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profile", "read", "set-resource_type").GetDiag()
188188
}
189189

190190
return nil

‎ibm/service/vpc/data_source_ibm_is_share_profiles.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func DataSourceIbmIsShareProfiles() *schema.Resource {
152152
func dataSourceIbmIsShareProfilesRead(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
153153
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
154154
if err != nil {
155-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_profiles", "read")
155+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "(Data) ibm_is_share_profiles", "read")
156156
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
157157
return tfErr.GetDiag()
158158
}
@@ -161,7 +161,7 @@ func dataSourceIbmIsShareProfilesRead(context context.Context, d *schema.Resourc
161161

162162
shareProfileCollection, response, err := vpcClient.ListShareProfilesWithContext(context, listShareProfilesOptions)
163163
if err != nil {
164-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListShareProfilesWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_profiles", "read")
164+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("ListShareProfilesWithContext failed: %s\n%s", err.Error(), response), "(Data) ibm_is_share_profiles", "read")
165165
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
166166
return tfErr.GetDiag()
167167
}
@@ -172,12 +172,12 @@ func dataSourceIbmIsShareProfilesRead(context context.Context, d *schema.Resourc
172172
err = d.Set("profiles", dataSourceShareProfileCollectionFlattenProfiles(shareProfileCollection.Profiles))
173173
if err != nil {
174174
err = fmt.Errorf("Error setting profiles: %s", err)
175-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profiles", "read", "set-profiles").GetDiag()
175+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profiles", "read", "set-profiles").GetDiag()
176176
}
177177
}
178178
if err = d.Set("total_count", shareProfileCollection.TotalCount); err != nil {
179179
err = fmt.Errorf("Error setting total_count: %s", err)
180-
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_profiles", "read", "set-total_count").GetDiag()
180+
return flex.DiscriminatedTerraformErrorf(err, err.Error(), "(Data) ibm_is_share_profiles", "read", "set-total_count").GetDiag()
181181
}
182182

183183
return nil

‎ibm/service/vpc/resource_ibm_is_share.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,7 @@ func resourceIbmIsShareDelete(context context.Context, d *schema.ResourceData, m
16901690
}
16911691
_, err = isWaitForTargetDelete(context, vpcClient, d, d.Id(), *targetsItem.ID)
16921692
if err != nil {
1693-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Wait for target delete failed: %s", err.Error()), "ibm_is_share", "update")
1693+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("Wait for target delete failed: %s", err.Error()), "ibm_is_share", "delete")
16941694
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
16951695
return tfErr.GetDiag()
16961696
}
@@ -1710,7 +1710,7 @@ func resourceIbmIsShareDelete(context context.Context, d *schema.ResourceData, m
17101710
d.SetId("")
17111711
return nil
17121712
}
1713-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("share err %s\n%s", err, response), "ibm_is_share", "read")
1713+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("share err %s\n%s", err, response), "ibm_is_share", "delete")
17141714
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
17151715
return diag.FromErr(tfErr)
17161716
}
@@ -1744,7 +1744,7 @@ func resourceIbmIsShareDelete(context context.Context, d *schema.ResourceData, m
17441744
d.SetId("")
17451745
return nil
17461746
}
1747-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("share err %s\n%s", err, response), "ibm_is_share", "read")
1747+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("share err %s\n%s", err, response), "ibm_is_share", "delete")
17481748
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
17491749
return diag.FromErr(tfErr)
17501750
}
@@ -1773,7 +1773,7 @@ func resourceIbmIsShareDelete(context context.Context, d *schema.ResourceData, m
17731773
d.SetId("")
17741774
return nil
17751775
}
1776-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("share err %s\n%s", err, response), "ibm_is_share", "read")
1776+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("shaGetShareWithContextre faialed %s\n%s", err, response), "ibm_is_share", "delete")
17771777
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
17781778
return diag.FromErr(tfErr)
17791779
}
@@ -1784,7 +1784,7 @@ func resourceIbmIsShareDelete(context context.Context, d *schema.ResourceData, m
17841784
deleteShareOptions.IfMatch = &ETag
17851785
_, response, err = vpcClient.DeleteShareWithContext(context, deleteShareOptions)
17861786
if err != nil {
1787-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("share err %s\n%s", err, response), "ibm_is_share", "delete")
1787+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("DeleteShareWithContext failed %s\n%s", err, response), "ibm_is_share", "delete")
17881788
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
17891789
return diag.FromErr(tfErr)
17901790
}

‎ibm/service/vpc/resource_ibm_is_share_delete_accessor_binding.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ func ResourceIbmIsShareDeleteAccessorBinding() *schema.Resource {
4545
func resourceIbmIsShareDeleteAccessorBindingCreate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
4646
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
4747
if err != nil {
48-
return diag.FromErr(err)
48+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "ibm_is_share_delete_accessor_binding", "create")
49+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
50+
return tfErr.GetDiag()
4951
}
5052

5153
share_id := d.Get("share").(string)

‎ibm/service/vpc/resource_ibm_is_share_mount_target.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,10 @@ func isWaitForOldTargetDelete(context context.Context, vpcClient *vpcv1.VpcV1, d
280280
func resourceIBMIsShareMountTargetCreate(context context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
281281
vpcClient, err := meta.(conns.ClientSession).VpcV1API()
282282
if err != nil {
283-
if err != nil {
284-
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "ibm_is_share_mount_target", "create")
285-
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
286-
return tfErr.GetDiag()
287-
}
283+
tfErr := flex.TerraformErrorf(err, fmt.Sprintf("vpcClient creation failed: %s", err.Error()), "ibm_is_share_mount_target", "create")
284+
log.Printf("[DEBUG]\n%s", tfErr.GetDebugMessage())
285+
return tfErr.GetDiag()
286+
288287
}
289288

290289
//Temporary code to fix concurrent mount target issues.

0 commit comments

Comments
 (0)