Merge pull request #482 from oliverpei/master

likexian · web-flow · commit f592fe27d016 · 2020-07-30T15:05:56.000+08:00
fix cvm set key_name error
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ ENHANCEMENTS:
 * Resource: `tencentcloud_mongodb_sharding_instance` supports prepaid type, new mongodb SDK version `2019-07-25` and standby instance.
 * Resource: `tencentcloud_security_group_lite_rule` refine update process and doc.
 
+BUG FIXES:
+
+* Resource: `tencentcloud_instance` fix set `key_name` error.
+
 ## 1.39.0 (July 18, 2020)
 
 ENHANCEMENTS:
diff --git a/tencentcloud/resource_tc_instance.go b/tencentcloud/resource_tc_instance.go
@@ -716,7 +716,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})
 		_ = d.Set("public_ip", instance.PublicIpAddresses[0])
 	}
 	if len(instance.LoginSettings.KeyIds) > 0 {
-		_ = d.Set("key_name", instance.LoginSettings.KeyIds)
+		_ = d.Set("key_name", instance.LoginSettings.KeyIds[0])
 	}
 	if *instance.InstanceState == CVM_STATUS_STOPPED {
 		_ = d.Set("running_flag", false)

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,7 @@ func resourceTencentCloudInstanceRead(d *schema.ResourceData, meta interface{})`
`716`	`716`	`_ = d.Set("public_ip", instance.PublicIpAddresses[0])`
`717`	`717`	`}`
`718`	`718`	`if len(instance.LoginSettings.KeyIds) > 0 {`
`719`		`- _ = d.Set("key_name", instance.LoginSettings.KeyIds)`
	`719`	`+ _ = d.Set("key_name", instance.LoginSettings.KeyIds[0])`
`720`	`720`	`}`
`721`	`721`	`if *instance.InstanceState == CVM_STATUS_STOPPED {`
`722`	`722`	`_ = d.Set("running_flag", false)`