Skip to content

Commit 11408c8

Browse files
kavya498hkantare
authored andcommitted
Fix: Nil pointer exception on is_instance_group,is_instance_group_manager, is_instance_gropu_manager_policy
1 parent a3de689 commit 11408c8

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

ibm/resource_ibm_is_instance_group.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func resourceIBMISInstanceGroupCreate(d *schema.ResourceData, meta interface{})
220220
}
221221

222222
instanceGroup, response, err := sess.CreateInstanceGroup(&instanceGroupOptions)
223-
if err != nil {
223+
if err != nil || instanceGroup == nil {
224224
return fmt.Errorf("Error Creating InstanceGroup: %s\n%s", err, response)
225225
}
226226
d.SetId(*instanceGroup.ID)
@@ -258,7 +258,7 @@ func resourceIBMISInstanceGroupUpdate(d *schema.ResourceData, meta interface{})
258258
instanceGroupID := d.Id()
259259
getInstanceGroupOptions := vpcv1.GetInstanceGroupOptions{ID: &instanceGroupID}
260260
instanceGroup, response, err := sess.GetInstanceGroup(&getInstanceGroupOptions)
261-
if err != nil {
261+
if err != nil || instanceGroup == nil {
262262
return fmt.Errorf("Error getting instance group: %s\n%s", err, response)
263263
}
264264
oldList, newList := d.GetChange("tags")
@@ -342,7 +342,7 @@ func resourceIBMISInstanceGroupRead(d *schema.ResourceData, meta interface{}) er
342342
instanceGroupID := d.Id()
343343
getInstanceGroupOptions := vpcv1.GetInstanceGroupOptions{ID: &instanceGroupID}
344344
instanceGroup, response, err := sess.GetInstanceGroup(&getInstanceGroupOptions)
345-
if err != nil {
345+
if err != nil || instanceGroup == nil {
346346
if response != nil && response.StatusCode == 404 {
347347
d.SetId("")
348348
return nil
@@ -397,7 +397,7 @@ func resourceIBMISInstanceGroupDelete(d *schema.ResourceData, meta interface{})
397397
instanceGroupPatchModel := vpcv1.InstanceGroupPatch{}
398398

399399
instanceGroupPatchModel.MembershipCount = &zeroMembers
400-
instanceGroupPatch, _ := instanceGroupPatchModel.AsPatch()
400+
instanceGroupPatch, err := instanceGroupPatchModel.AsPatch()
401401
if err != nil {
402402
return fmt.Errorf("Error calling asPatch for ImagePatch: %s", err)
403403
}
@@ -461,10 +461,11 @@ func waitForHealthyInstanceGroup(d *schema.ResourceData, meta interface{}, timeo
461461
Target: []string{HEALTHY},
462462
Refresh: func() (interface{}, string, error) {
463463
instanceGroup, response, err := sess.GetInstanceGroup(&getInstanceGroupOptions)
464-
log.Println("Status : ", *instanceGroup.Status)
465-
if err != nil {
464+
if err != nil || instanceGroup == nil {
466465
return nil, SCALING, fmt.Errorf("Error Getting InstanceGroup: %s\n%s", err, response)
467466
}
467+
log.Println("Status : ", *instanceGroup.Status)
468+
468469
if *instanceGroup.Status == "" {
469470
return instanceGroup, SCALING, nil
470471
}

ibm/resource_ibm_is_instance_group_manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func resourceIBMISInstanceGroupManagerCreate(d *schema.ResourceData, meta interf
194194
InstanceGroupManagerPrototype: &instanceGroupManagerPrototype,
195195
}
196196
instanceGroupManager, response, err := sess.CreateInstanceGroupManager(&createInstanceGroupManagerOptions)
197-
if err != nil {
197+
if err != nil || instanceGroupManager == nil {
198198
return fmt.Errorf("Error creating InstanceGroup manager: %s\n%s", err, response)
199199
}
200200
d.SetId(fmt.Sprintf("%s/%s", instanceGroupID, *instanceGroupManager.ID))
@@ -289,7 +289,7 @@ func resourceIBMISInstanceGroupManagerRead(d *schema.ResourceData, meta interfac
289289
InstanceGroupID: &instanceGroupID,
290290
}
291291
instanceGroupManager, response, err := sess.GetInstanceGroupManager(&getInstanceGroupManagerOptions)
292-
if err != nil {
292+
if err != nil || instanceGroupManager == nil {
293293
if response != nil && response.StatusCode == 404 {
294294
d.SetId("")
295295
return nil

ibm/resource_ibm_is_instance_group_manager_policy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func resourceIBMISInstanceGroupManagerPolicyCreate(d *schema.ResourceData, meta
126126
InstanceGroupManagerPolicyPrototype: &instanceGroupManagerPolicyPrototype,
127127
}
128128
data, response, err := sess.CreateInstanceGroupManagerPolicy(&createInstanceGroupManagerPolicyOptions)
129-
if err != nil {
129+
if err != nil || data == nil {
130130
return fmt.Errorf("Error Creating InstanceGroup Manager Policy: %s\n%s", err, response)
131131
}
132132
instanceGroupManagerPolicy := data.(*vpcv1.InstanceGroupManagerPolicy)
@@ -205,7 +205,7 @@ func resourceIBMISInstanceGroupManagerPolicyRead(d *schema.ResourceData, meta in
205205
InstanceGroupManagerID: &instanceGroupManagerID,
206206
}
207207
data, response, err := sess.GetInstanceGroupManagerPolicy(&getInstanceGroupManagerPolicyOptions)
208-
if err != nil {
208+
if err != nil || data == nil {
209209
if response != nil && response.StatusCode == 404 {
210210
d.SetId("")
211211
return nil

0 commit comments

Comments
 (0)