Skip to content

Commit 438cf85

Browse files
tongyimingmikatong
andauthored
fix cvm npe (#1618)
* fix cvm npe * add changelog --------- Co-authored-by: mikatong <mikatong@tencent.com>
1 parent 356ed8d commit 438cf85

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.changelog/1618.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/tencentcloud_instance: fix npe
3+
```

tencentcloud/resource_tc_instance.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -919,15 +919,15 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
919919
err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
920920
request := cvm.NewDescribeImagesRequest()
921921
response, errRet = client.UseCvmClient().DescribeImages(request)
922+
if errRet != nil {
923+
return retryError(errRet, InternalError)
924+
}
922925
if *response.Response.TotalCount > 0 {
923926
for i := range response.Response.ImageSet {
924927
image := response.Response.ImageSet[i]
925928
cvmImages = append(cvmImages, *image.ImageId)
926929
}
927930
}
928-
if errRet != nil {
929-
return retryError(errRet, InternalError)
930-
}
931931
return nil
932932
})
933933

0 commit comments

Comments
 (0)