Merge branch 'tkeber-master'

Author: alexkalyvitis

auth0/resource_auth0_user.go

@@ -39,6 +39,10 @@ func newUser() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"nickname": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"password": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -82,6 +86,7 @@ func readUser(d *schema.ResourceData, m interface{}) error {
 
 	d.Set("user_id", u.ID)
 	d.Set("username", u.Username)
+	d.Set("nickname", u.Nickname)
 	d.Set("phone_number", u.PhoneNumber)
 	d.Set("email_verified", u.EmailVerified)
 	d.Set("phone_verified", u.PhoneVerified)
@@ -128,6 +133,7 @@ func buildUser(d *schema.ResourceData) *management.User {
 		ID:            String(d, "user_id"),
 		Connection:    String(d, "connection_name"),
 		Username:      String(d, "username"),
+		Nickname:      String(d, "nickname"),
 		PhoneNumber:   String(d, "phone_number"),
 		EmailVerified: Bool(d, "email_verified"),
 		VerifyEmail:   Bool(d, "verify_email"),

auth0/resource_auth0_user_test.go

@@ -40,6 +40,7 @@ func TestAccUserCreateUser(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_user.user", "user_id", "12345"),
 					resource.TestCheckResourceAttr("auth0_user.user", "email", "[email protected]"),
+					resource.TestCheckResourceAttr("auth0_user.user", "nickname", "testnick"),
 					resource.TestCheckResourceAttr("auth0_user.user", "connection_name", "Username-Password-Authentication"),
 				),
 			},
@@ -52,9 +53,11 @@ provider "auth0" {}
 
 resource "auth0_user" "user" {
   connection_name = "Username-Password-Authentication"
+  username = "test"
   user_id = "12345"
   email = "[email protected]"
-  password = "testtest$12$12"
+  password = "passpass$12$12"
+  nickname = "testnick"
   user_metadata = <<EOF
 {
   	"foo": "bar",

example/user/main.tf

@@ -3,7 +3,9 @@ provider "auth0" {}
 resource "auth0_user" "user" {
   connection_name = "Username-Password-Authentication"
   user_id = "12345"
+  username = "test"
+  nickname = "testnick"
   email = "[email protected]"
   email_verified = true
-  password = "testtest$12$12"
+  password = "passpass$12$12"
 }