Skip to content

Commit f1d1b5d

Browse files
committed
fix: set DescribeImages method.
1 parent 651b3ef commit f1d1b5d

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

tencentcloud/resource_tc_instance.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -846,9 +846,6 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
846846
cvmService := CvmService{
847847
client: client,
848848
}
849-
tkeService := TkeService{
850-
client: client,
851-
}
852849
var instance *cvm.Instance
853850
var errRet error
854851
err := resource.Retry(readRetryTimeout, func() *resource.RetryError {
@@ -866,9 +863,17 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
866863
return nil
867864
}
868865

869-
var tkeImages []string
866+
var cvmImages []string
867+
var response *cvm.DescribeImagesResponse
870868
err = resource.Retry(readRetryTimeout, func() *resource.RetryError {
871-
tkeImages, errRet = tkeService.DescribeImages(ctx)
869+
request := cvm.NewDescribeImagesRequest()
870+
response, errRet = client.UseCvmClient().DescribeImages(request)
871+
if *response.Response.TotalCount > 0 {
872+
for i := range response.Response.ImageSet {
873+
image := response.Response.ImageSet[i]
874+
cvmImages = append(cvmImages, *image.ImageId)
875+
}
876+
}
872877
if errRet != nil {
873878
return retryError(errRet, InternalError)
874879
}
@@ -879,7 +884,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
879884
return err
880885
}
881886

882-
if d.Get("image_id").(string) == "" || !IsContains(tkeImages, *instance.ImageId) {
887+
if d.Get("image_id").(string) == "" || !IsContains(cvmImages, *instance.ImageId) {
883888
_ = d.Set("image_id", instance.ImageId)
884889
}
885890

0 commit comments

Comments
 (0)