Merge pull request #572 from ilpianista/feature/users-note

Support the Note field in the User resource/data

Author: armsnyder

docs/data-sources/users.md

@@ -57,6 +57,7 @@ The following attributes are exported:
   * `provider` - The UID provider of the user.
   * `organization` - The organization of the user.
   * `two_factor_enabled` - Whether user's two factor auth is enabled.
+  * `note` - The note associated to the user.
   * `avatar_url` - The avatar URL of the user.
   * `bio` - The bio of the user.
   * `location` - The location of the user.

docs/resources/user.md

@@ -44,6 +44,8 @@ for the user.
 
 * `is_external` - (Optional) Boolean, defaults to false. Whether a user has access only to some internal or private projects. External users can only access projects to which they are explicitly granted access.
 
+* `note` - (Optional) The note associated to the user.
+
 * `reset_password` - (Optional) Boolean, defaults to false. Send user password reset link.
 
 ## Attributes Reference

gitlab/data_source_gitlab_user.go

@@ -84,6 +84,10 @@ func dataSourceGitlabUser() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"note": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"user_provider": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -198,6 +202,7 @@ func dataSourceGitlabUserRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("created_at", user.CreatedAt)
 	d.Set("organization", user.Organization)
 	d.Set("two_factor_enabled", user.TwoFactorEnabled)
+	d.Set("note", user.Note)
 	d.Set("provider", user.Provider)
 	d.Set("avatar_url", user.AvatarURL)
 	d.Set("bio", user.Bio)

gitlab/resource_gitlab_user.go

@@ -68,6 +68,10 @@ func resourceGitlabUser() *schema.Resource {
 				Type:     schema.TypeBool,
 				Optional: true,
 			},
+			"note": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -80,6 +84,7 @@ func resourceGitlabUserSetToState(d *schema.ResourceData, user *gitlab.User) {
 	d.Set("email", user.Email)
 	d.Set("is_admin", user.IsAdmin)
 	d.Set("is_external", user.External)
+	d.Set("note", user.Note)
 	d.Set("skip_confirmation", user.ConfirmedAt != nil && !user.ConfirmedAt.IsZero())
 }
 
@@ -96,6 +101,7 @@ func resourceGitlabUserCreate(d *schema.ResourceData, meta interface{}) error {
 		SkipConfirmation: gitlab.Bool(d.Get("skip_confirmation").(bool)),
 		External:         gitlab.Bool(d.Get("is_external").(bool)),
 		ResetPassword:    gitlab.Bool(d.Get("reset_password").(bool)),
+		Note:             gitlab.String(d.Get("note").(string)),
 	}
 
 	if *options.Password == "" && !*options.ResetPassword {
@@ -163,6 +169,10 @@ func resourceGitlabUserUpdate(d *schema.ResourceData, meta interface{}) error {
 		options.External = gitlab.Bool(d.Get("is_external").(bool))
 	}
 
+	if d.HasChange("note") {
+		options.Note = gitlab.String(d.Get("note").(string))
+	}
+
 	log.Printf("[DEBUG] update gitlab user %s", d.Id())
 
 	id, _ := strconv.Atoi(d.Id())

gitlab/resource_gitlab_user_test.go

@@ -54,6 +54,7 @@ func TestAccGitlabUser_basic(t *testing.T) {
 						CanCreateGroup:   true,
 						SkipConfirmation: false,
 						External:         false,
+						Note:             fmt.Sprintf("note%d", rInt),
 					}),
 				),
 			},
@@ -144,6 +145,7 @@ type testAccGitlabUserExpectedAttributes struct {
 	CanCreateGroup   bool
 	SkipConfirmation bool
 	External         bool
+	Note             string
 }
 
 func testAccCheckGitlabUserAttributes(user *gitlab.User, want *testAccGitlabUserExpectedAttributes) resource.TestCheckFunc {
@@ -168,6 +170,10 @@ func testAccCheckGitlabUserAttributes(user *gitlab.User, want *testAccGitlabUser
 			return fmt.Errorf("got is_external %t; want %t", user.External, want.External)
 		}
 
+		if user.Note != want.Note {
+			return fmt.Errorf("got note %q; want %q", user.Note, want.Note)
+		}
+
 		if user.IsAdmin != want.Admin {
 			return fmt.Errorf("got is_admin %t; want %t", user.IsAdmin, want.Admin)
 		}
@@ -230,8 +236,9 @@ resource "gitlab_user" "foo" {
   projects_limit   = 10
   can_create_group = true
   is_external      = false
+  note             = "note%d"
 }
-  `, rInt, rInt, rInt, rInt)
+  `, rInt, rInt, rInt, rInt, rInt)
 }
 
 func testAccGitlabUserConfigPasswordReset(rInt int) string {