chore(workspace): revert PR 6330 (#6359)

This reverts commit 637edcf.

Author: Lance52259

docs/resources/workspace_user.md

@@ -43,19 +43,7 @@ The following arguments are supported:
 
   Changing this will create a new resource.
 
-* `active_type` - (Optional, String) Specifies the activation mode of the user. Defaults to **USER_ACTIVATE**.  
-  The valid values are as follows:
-  + **USER_ACTIVATE**: Activated by the user.
-  + **ADMIN_ACTIVATE**: Activated by the administator.
-
-* `email` - (Optional, String) Specifies the email address of user. The value can contain `1` to `64` characters.
-
-* `phone` - (Optional, String) Specifies the phone number of user.
-
--> At least one of `email` and `phone` parameters must be provided.
-
-* `password` - (Optional, String) Specifies the initial passowrd of user.  
-  This parameter is available and required when `active_type` is set to **ADMIN_ACTIVATE**.
+* `email` - (Required, String) Specifies the email address of user. The value can contain `1` to `64` characters.
 
 * `description` - (Optional, String) Specifies the description of user. The maximum length is `255` characters.
 

go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
-	github.com/chnsz/golangsdk v0.0.0-20250218015804-069acf83754c
+	github.com/chnsz/golangsdk v0.0.0-20250217034539-d16a3d7dc780
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/go-uuid v1.0.3
@@ -19,7 +19,7 @@ require (
 	github.com/tidwall/gjson v1.17.1
 	github.com/tjfoc/gmsm v1.4.1
 	go.mongodb.org/mongo-driver v1.12.0
-	golang.org/x/crypto v0.33.0
+	golang.org/x/crypto v0.21.0
 )
 
 require (
@@ -65,8 +65,8 @@ require (
 	github.com/vmihailenco/tagparser v0.1.1 // indirect
 	github.com/zclconf/go-cty v1.11.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.56.3 // indirect

go.sum

@@ -22,8 +22,8 @@ github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/chnsz/golangsdk v0.0.0-20250218015804-069acf83754c h1:kn7DY4ztPd6SltVU0qmw82xKMDc6xG2ADPqyP+vMyr0=
-github.com/chnsz/golangsdk v0.0.0-20250218015804-069acf83754c/go.mod h1:Erm4hDWxXgAdbkG3+hhJFgRzEL1TvvcroWzw2Gax4uI=
+github.com/chnsz/golangsdk v0.0.0-20250217034539-d16a3d7dc780 h1:diWEvRNeM/FktUT+HWiv6z9LLpG3smWeKCNpAyGq5m0=
+github.com/chnsz/golangsdk v0.0.0-20250217034539-d16a3d7dc780/go.mod h1:Erm4hDWxXgAdbkG3+hhJFgRzEL1TvvcroWzw2Gax4uI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -247,9 +247,8 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -310,16 +309,15 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -329,9 +327,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

huaweicloud/services/acceptance/workspace/resource_huaweicloud_workspace_user_test.go

@@ -25,15 +25,15 @@ func getUserFunc(conf *config.Config, state *terraform.ResourceState) (interface
 
 func TestAccUser_basic(t *testing.T) {
 	var (
-		user              users.UserDetail
-		resourceName      = "huaweicloud_workspace_user.test"
-		withAdminActive   = "huaweicloud_workspace_user.with_admin_active"
-		rc                = acceptance.InitResourceCheck(resourceName, &user, getUserFunc)
-		rcWithAdminActive = acceptance.InitResourceCheck(withAdminActive, &user, getUserFunc)
-
-		rName       = acceptance.RandomAccResourceNameWithDash()
-		currentTime = time.Now().Format("2006-01-02T15:04:05Z")
-		password    = acceptance.RandomPassword()
+		user         users.UserDetail
+		resourceName = "huaweicloud_workspace_user.test"
+		rName        = acceptance.RandomAccResourceNameWithDash()
+		currentTime  = time.Now().Format("2006-01-02T15:04:05Z")
+	)
+	rc := acceptance.InitResourceCheck(
+		resourceName,
+		&user,
+		getUserFunc,
 	)
 
 	resource.Test(t, resource.TestCase{
@@ -42,50 +42,36 @@ func TestAccUser_basic(t *testing.T) {
 		CheckDestroy:      rc.CheckResourceDestroy(),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccUser_basic_step1(rName, password),
+				Config: testAccUser_basic(rName),
 				Check: resource.ComposeTestCheckFunc(
 					rc.CheckResourceExists(),
 					resource.TestCheckResourceAttr(resourceName, "name", rName),
-					resource.TestCheckResourceAttr(resourceName, "active_type", "USER_ACTIVATE"),
 					resource.TestCheckResourceAttr(resourceName, "email", "[email protected]"),
-					resource.TestCheckResourceAttr(resourceName, "phone", "+8612345678987"),
 					resource.TestCheckResourceAttr(resourceName, "description", "Created by acc test"),
 					resource.TestCheckResourceAttr(resourceName, "account_expires", "0"),
 					resource.TestCheckResourceAttr(resourceName, "password_never_expires", "false"),
 					resource.TestCheckResourceAttr(resourceName, "enable_change_password", "true"),
 					resource.TestCheckResourceAttr(resourceName, "next_login_change_password", "true"),
 					resource.TestCheckResourceAttr(resourceName, "disabled", "false"),
-					rcWithAdminActive.CheckResourceExists(),
-					resource.TestCheckResourceAttr(withAdminActive, "active_type", "ADMIN_ACTIVATE"),
-					resource.TestCheckResourceAttr(withAdminActive, "disabled", "true"),
-					resource.TestCheckResourceAttr(withAdminActive, "email", ""),
-					resource.TestCheckResourceAttr(withAdminActive, "phone", "+8612345678978"),
 				),
 			},
 			{
-				Config: testAccUser_basic_step2(rName, currentTime, password),
+				Config: testAccUser_update(rName, currentTime),
 				Check: resource.ComposeTestCheckFunc(
 					rc.CheckResourceExists(),
-					resource.TestCheckResourceAttr(resourceName, "active_type", "ADMIN_ACTIVATE"),
-					resource.TestCheckResourceAttr(resourceName, "email", ""),
+					resource.TestCheckResourceAttr(resourceName, "email", "[email protected]"),
 					resource.TestCheckResourceAttr(resourceName, "description", ""),
 					resource.TestCheckResourceAttrSet(resourceName, "account_expires"),
 					resource.TestCheckResourceAttr(resourceName, "password_never_expires", "true"),
 					resource.TestCheckResourceAttr(resourceName, "enable_change_password", "false"),
 					resource.TestCheckResourceAttr(resourceName, "next_login_change_password", "false"),
 					resource.TestCheckResourceAttr(resourceName, "disabled", "true"),
-					rcWithAdminActive.CheckResourceExists(),
-					resource.TestCheckResourceAttr(withAdminActive, "active_type", "USER_ACTIVATE"),
-					resource.TestCheckResourceAttr(withAdminActive, "disabled", "false"),
-					resource.TestCheckResourceAttr(withAdminActive, "phone", ""),
-					resource.TestCheckResourceAttr(withAdminActive, "email", "[email protected]"),
 				),
 			},
 			{
-				ResourceName:            resourceName,
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"password"},
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
@@ -107,7 +93,7 @@ resource "huaweicloud_workspace_service" "test" {
 `, common.TestBaseNetwork(rName))
 }
 
-func testAccUser_basic_step1(rName, password string) string {
+func testAccUser_basic(rName string) string {
 	return fmt.Sprintf(`
 %[1]s
 
@@ -116,55 +102,29 @@ resource "huaweicloud_workspace_user" "test" {
 
   name        = "%[2]s"
   email       = "[email protected]"
-  phone       = "+8612345678987"
   description = "Created by acc test"
 
   password_never_expires = false
   disabled               = false
 }
-
-resource "huaweicloud_workspace_user" "with_admin_active" {
-depends_on = [huaweicloud_workspace_service.test]
-
-  name        = "%[2]s_with_admin"
-  active_type = "ADMIN_ACTIVATE"
-  password    = "%[3]s"
-  phone       = "+8612345678978"
-
-  password_never_expires = false
-  disabled               = true
-}
-`, testAccUser_base(rName), rName, password)
+`, testAccUser_base(rName), rName)
 }
 
-func testAccUser_basic_step2(rName, currentTime, password string) string {
+func testAccUser_update(rName, currentTime string) string {
 	return fmt.Sprintf(`
 %[1]s
 
 resource "huaweicloud_workspace_user" "test" {
-depends_on = [huaweicloud_workspace_service.test]
+  depends_on = [huaweicloud_workspace_service.test]
 
-  name        = "%[2]s"
-  active_type = "ADMIN_ACTIVATE"
-  phone       = "+8612345678987"
-  password    = "%[4]s"
+  name  = "%[2]s"
+  email = "[email protected]"
 
   account_expires            = timeadd("%[3]s", "1h")
   password_never_expires     = true
   enable_change_password     = false
   next_login_change_password = false
   disabled                   = true
 }
-
-resource "huaweicloud_workspace_user" "with_admin_active" {
-  depends_on = [huaweicloud_workspace_service.test]
-
-  name        = "%[2]s_with_admin"
-  active_type = "USER_ACTIVATE"
-  email       = "[email protected]"
-
-  password_never_expires = false
-  disabled               = false
-}
-`, testAccUser_base(rName), rName, currentTime, password)
+`, testAccUser_base(rName), rName, currentTime)
 }

huaweicloud/services/workspace/resource_huaweicloud_workspace_user.go

@@ -52,11 +52,7 @@ func ResourceUser() *schema.Resource {
 			},
 			"email": {
 				Type:     schema.TypeString,
-				Optional: true,
-			},
-			"phone": {
-				Type:     schema.TypeString,
-				Optional: true,
+				Required: true,
 			},
 			"description": {
 				Type:     schema.TypeString,
@@ -85,16 +81,6 @@ func ResourceUser() *schema.Resource {
 				Type:     schema.TypeBool,
 				Optional: true,
 			},
-			"active_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
-			"password": {
-				Type:      schema.TypeString,
-				Optional:  true,
-				Sensitive: true,
-			},
 			"locked": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -126,10 +112,7 @@ func translateUTC0Time(timeStr string) (string, error) {
 func buildUserCreateOpts(d *schema.ResourceData) (users.CreateOpts, error) {
 	result := users.CreateOpts{
 		Name:                    d.Get("name").(string),
-		ActiveType:              d.Get("active_type").(string),
 		Email:                   d.Get("email").(string),
-		Phone:                   d.Get("phone").(string),
-		Password:                d.Get("password").(string),
 		Description:             d.Get("description").(string),
 		EnableChangePassword:    utils.Bool(d.Get("enable_change_password").(bool)),
 		NextLoginChangePassword: utils.Bool(d.Get("next_login_change_password").(bool)),
@@ -190,9 +173,7 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, meta interfac
 	mErr := multierror.Append(nil,
 		d.Set("region", region),
 		d.Set("name", resp.Name),
-		d.Set("active_type", resp.ActiveType),
 		d.Set("email", resp.Email),
-		d.Set("phone", resp.Phone),
 		d.Set("description", resp.Description),
 		d.Set("account_expires", parseUserAccountExpires(resp.AccountExpires)),
 		d.Set("enable_change_password", resp.EnableChangePassword),
@@ -210,9 +191,7 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, meta interfac
 
 func buildUserUpdateOpts(d *schema.ResourceData) (users.UpdateOpts, error) {
 	result := users.UpdateOpts{
-		ActiveType:              d.Get("active_type").(string),
-		Email:                   utils.String(d.Get("email").(string)),
-		Phone:                   utils.String(d.Get("phone").(string)),
+		Email:                   d.Get("email").(string),
 		Description:             utils.String(d.Get("description").(string)),
 		EnableChangePassword:    utils.Bool(d.Get("enable_change_password").(bool)),
 		NextLoginChangePassword: utils.Bool(d.Get("next_login_change_password").(bool)),