Merge pull request #54 from adam-janis/testy

users: add is_external attribute

Author: roidelapluie

gitlab/resource_gitlab_label.go

@@ -66,7 +66,7 @@ func resourceGitlabLabelRead(d *schema.ResourceData, meta interface{}) error {
 	labelName := d.Id()
 	log.Printf("[DEBUG] read gitlab label %s/%s", project, labelName)
 
-	labels, response, err := client.Labels.ListLabels(project)
+	labels, response, err := client.Labels.ListLabels(project, nil)
 	if err != nil {
 		if response.StatusCode == 404 {
 			log.Printf("[WARN] removing label %s from state because it no longer exists in gitlab", labelName)

gitlab/resource_gitlab_label_test.go

@@ -73,7 +73,7 @@ func testAccCheckGitlabLabelExists(n string, label *gitlab.Label) resource.TestC
 		}
 		conn := testAccProvider.Meta().(*gitlab.Client)
 
-		labels, _, err := conn.Labels.ListLabels(repoName)
+		labels, _, err := conn.Labels.ListLabels(repoName, nil)
 		if err != nil {
 			return err
 		}

gitlab/resource_gitlab_user.go

@@ -58,6 +58,11 @@ func resourceGitlabUser() *schema.Resource {
 				Optional: true,
 				Default:  0,
 			},
+			"is_external": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 		},
 	}
 }
@@ -80,6 +85,7 @@ func resourceGitlabUserCreate(d *schema.ResourceData, meta interface{}) error {
 		Admin:            gitlab.Bool(d.Get("is_admin").(bool)),
 		CanCreateGroup:   gitlab.Bool(d.Get("can_create_group").(bool)),
 		SkipConfirmation: gitlab.Bool(d.Get("skip_confirmation").(bool)),
+		External:         gitlab.Bool(d.Get("is_external").(bool)),
 	}
 
 	log.Printf("[DEBUG] create gitlab user %q", options.Username)
@@ -91,6 +97,7 @@ func resourceGitlabUserCreate(d *schema.ResourceData, meta interface{}) error {
 
 	d.SetId(fmt.Sprintf("%d", user.ID))
 	d.Set("is_admin", user.IsAdmin)
+	d.Set("is_external", user.External)
 
 	return resourceGitlabUserRead(d, meta)
 }
@@ -141,6 +148,10 @@ func resourceGitlabUserUpdate(d *schema.ResourceData, meta interface{}) error {
 		options.ProjectsLimit = gitlab.Int(d.Get("projects_limit").(int))
 	}
 
+	if d.HasChange("is_external") {
+		options.Admin = gitlab.Bool(d.Get("is_external").(bool))
+	}
+
 	log.Printf("[DEBUG] update gitlab user %s", d.Id())
 
 	id, _ := strconv.Atoi(d.Id())

gitlab/resource_gitlab_user_test.go

@@ -34,6 +34,7 @@ func TestAccGitlabUser_basic(t *testing.T) {
 						Admin:            false,
 						CanCreateGroup:   false,
 						SkipConfirmation: true,
+						External:         false,
 					}),
 				),
 			},
@@ -51,6 +52,7 @@ func TestAccGitlabUser_basic(t *testing.T) {
 						Admin:            true,
 						CanCreateGroup:   true,
 						SkipConfirmation: false,
+						External:         true,
 					}),
 				),
 			},
@@ -68,6 +70,7 @@ func TestAccGitlabUser_basic(t *testing.T) {
 						Admin:            false,
 						CanCreateGroup:   false,
 						SkipConfirmation: false,
+						External:         false,
 					}),
 				),
 			},
@@ -108,6 +111,7 @@ type testAccGitlabUserExpectedAttributes struct {
 	Admin            bool
 	CanCreateGroup   bool
 	SkipConfirmation bool
+	External         bool
 }
 
 func testAccCheckGitlabUserAttributes(user *gitlab.User, want *testAccGitlabUserExpectedAttributes) resource.TestCheckFunc {
@@ -158,6 +162,7 @@ resource "gitlab_user" "foo" {
   is_admin         = false
   projects_limit   = 0
   can_create_group = false
+  is_external      = false
 }
   `, rInt, rInt, rInt, rInt)
 }
@@ -172,6 +177,7 @@ resource "gitlab_user" "foo" {
   is_admin         = true
   projects_limit   = 10
   can_create_group = true
+  is_external      = true
 }
   `, rInt, rInt, rInt, rInt)
 }