support update password

Author: mikatong

tencentcloud/services/tcr/resource_tc_tcr_service_account.go

@@ -87,6 +87,7 @@ func ResourceTencentCloudTcrServiceAccount() *schema.Resource {
 			},
 
 			"password": {
+				Optional:    true,
 				Computed:    true,
 				Type:        schema.TypeString,
 				Description: "Password of the service account.",
@@ -201,6 +202,15 @@ func resourceTencentCloudTcrServiceAccountCreate(d *schema.ResourceData, meta in
 		}
 	}
 
+	service := TCRService{client: meta.(tccommon.ProviderMeta).GetAPIV3Conn()}
+	if v, ok := d.GetOk("password"); ok {
+		password, err := service.ModifyServiceAccountPassword(ctx, registryId, name, v.(string))
+		if err != nil {
+			return err
+		}
+		_ = d.Set("password", password)
+	}
+
 	return resourceTencentCloudTcrServiceAccountRead(d, meta)
 }
 
@@ -378,9 +388,9 @@ func resourceTencentCloudTcrServiceAccountUpdate(d *schema.ResourceData, meta in
 		}
 	}
 
-	if d.HasChange("reset_password") {
-		if v, ok := d.GetOkExists("reset_password"); ok && v.(bool) {
-			password, err := service.ModifyServiceAccountPassword(ctx, registryId, name)
+	if d.HasChange("password") {
+		if v, ok := d.GetOk("password"); ok {
+			password, err := service.ModifyServiceAccountPassword(ctx, registryId, name, v.(string))
 			if err != nil {
 				return err
 			}

tencentcloud/services/tcr/resource_tc_tcr_service_account_test.go

@@ -56,21 +56,21 @@ func TestAccTencentCloudTcrServiceAccountResource_basic(t *testing.T) {
 				),
 			},
 			{
-				Config: fmt.Sprintf(testAccTcrServiceAccount_resetPassword, expireTime),
+				Config: fmt.Sprintf(testAccTcrServiceAccount_updatePassword, expireTime),
 				PreConfig: func() {
 					tcacctest.AccStepSetRegion(t, "ap-shanghai")
 					tcacctest.AccPreCheckCommon(t, tcacctest.ACCOUNT_TYPE_COMMON)
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("tencentcloud_tcr_service_account.example", "id"),
-					resource.TestCheckResourceAttrSet("tencentcloud_tcr_service_account.example", "password"),
+					resource.TestCheckResourceAttr("tencentcloud_tcr_service_account.example", "password", "passwordTest1"),
 				),
 			},
 			{
 				ResourceName:            "tencentcloud_tcr_service_account.example",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"duration", "password", "reset_password"},
+				ImportStateVerifyIgnore: []string{"duration", "password"},
 			},
 		},
 	})
@@ -79,7 +79,7 @@ func TestAccTencentCloudTcrServiceAccountResource_basic(t *testing.T) {
 const testAccTcrServiceAccount = `
 
 resource "tencentcloud_tcr_instance" "example" {
-	name          = "tf-example-tcr-instance"
+	name          = "tf-example-tcr-instance1"
 	instance_type = "premium"
 	delete_bucket = true
 	tags = {
@@ -116,7 +116,7 @@ resource "tencentcloud_tcr_instance" "example" {
 const testAccTcrServiceAccount_Update = `
 
 resource "tencentcloud_tcr_instance" "example" {
-	name          = "tf-example-tcr-instance"
+	name          = "tf-example-tcr-instance1"
 	instance_type = "premium"
 	delete_bucket = true
 	tags = {
@@ -150,10 +150,10 @@ resource "tencentcloud_tcr_instance" "example" {
 
 `
 
-const testAccTcrServiceAccount_resetPassword = `
+const testAccTcrServiceAccount_updatePassword = `
 
 resource "tencentcloud_tcr_instance" "example" {
-	name          = "tf-example-tcr-instance"
+	name          = "tf-example-tcr-instance1"
 	instance_type = "premium"
 	delete_bucket = true
 	tags = {
@@ -183,7 +183,7 @@ resource "tencentcloud_tcr_instance" "example" {
 	tags = {
 	  "createdBy" = "terraform"
 	}
-	reset_password = true
+	password = "passwordTest1"
   }
 
 `

tencentcloud/services/tcr/service_tencentcloud_tcr.go

@@ -1802,13 +1802,14 @@ func (me *TCRService) DeleteTcrServiceAccountById(ctx context.Context, registryI
 	return
 }
 
-func (me *TCRService) ModifyServiceAccountPassword(ctx context.Context, registryId string, name string) (password string, errRet error) {
+func (me *TCRService) ModifyServiceAccountPassword(ctx context.Context, registryId string, name string, password string) (passwordResp string, errRet error) {
 	logId := tccommon.GetLogId(ctx)
 
 	request := tcr.NewModifyServiceAccountPasswordRequest()
 	request.RegistryId = &registryId
 	request.Name = &name
-	request.Random = helper.Bool(true)
+	request.Random = helper.Bool(false)
+	request.Password = helper.String(password)
 
 	defer func() {
 		if errRet != nil {
@@ -1826,7 +1827,7 @@ func (me *TCRService) ModifyServiceAccountPassword(ctx context.Context, registry
 	log.Printf("[DEBUG]%s api[%s] success, request body [%s], response body [%s]\n", logId, request.GetAction(), request.ToJsonString(), response.ToJsonString())
 
 	if response.Response.Password != nil {
-		password = *response.Response.Password
+		passwordResp = *response.Response.Password
 	}
 	return
 }