Merge pull request #61 from sudoapt-getclean/master

Add Group Membership, Group Variable, fix Project Variable, refactor Project Membership

Author: roidelapluie

CHANGELOG.md

@@ -1,4 +1,21 @@
 ## 1.0.1 (Unreleased)
+
+FEATURES:
+
+* **New Resource:** `gitlab_project_membership`
+* **New Resource:** `gitlab_group_membership` ([#8](https://github.com/terraform-providers/terraform-provider-gitlab/issues/8))
+* **New Resource:** `gitlab_project_variable` ([#47](https://github.com/terraform-providers/terraform-provider-gitlab/issues/47))
+* **New Resource:** `gitlab_group_variable` ([#47](https://github.com/terraform-providers/terraform-provider-gitlab/issues/47))
+
+BACKWARDS INCOMPATIBILITIES:
+
+`gitlab_project_membership` is not compatible with a previous *unrealeased* version due to an id change resource will need to be reimported manually
+e.g
+```bash
+terraform state rm gitlab_project_membership.foo
+terraform import gitlab_project_membership.foo 12345:1337
+```
+
 ## 1.0.0 (October 06, 2017)
 
 BACKWARDS INCOMPATIBILITIES:

README.md

@@ -48,15 +48,16 @@ $ $GOPATH/bin/terraform-provider-gitlab
 ...
 ```
 
-In order to test the provider, you can simply run `make test`.
+### Running tests
+The Terraform Provider only has acceptance tests, these can run against a gitlab instance where you have a token with administrator permissions (likely not gitlab.com). 
+There is excellent documentation on [how to run gitlab from docker at gitlab.com](https://docs.gitlab.com/omnibus/docker/)
 
-```sh
-$ make test
-```
+In order to run the full suite of acceptance tests, export the environment variables: 
 
-In order to run the full suite of Acceptance tests, run `make testacc`.
+- `GITLAB_TOKEN` //token for account with admin priviliges
+- `GITLAB_BASE_URL` //URL with api part e.g. `http://localhost:8929/api/v4/`
 
-*Note:* Acceptance tests create real resources, and often cost money to run.
+and run `make testacc`.
 
 ```sh
 $ make testacc

gitlab/data_source_gitlab_user.go

@@ -15,7 +15,11 @@ func dataSourceGitlabUser() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			"email": {
 				Type:     schema.TypeString,
-				Required: true,
+				Optional: true,
+			},
+			"username": {
+				Type:     schema.TypeString,
+				Optional: true,
 			},
 		},
 	}
@@ -27,8 +31,15 @@ func dataSourceGitlabUserRead(d *schema.ResourceData, meta interface{}) error {
 	log.Printf("[INFO] Reading Gitlab user")
 
 	searchEmail := strings.ToLower(d.Get("email").(string))
+	userName := strings.ToLower(d.Get("username").(string))
+	var q *string
+	if searchEmail != "" {
+		q = &searchEmail
+	} else {
+		q = &userName
+	}
 	query := &gitlab.ListUsersOptions{
-		Search: &searchEmail,
+		Search: q,
 	}
 	users, _, err := client.Users.ListUsers(query)
 	if err != nil {
@@ -37,18 +48,28 @@ func dataSourceGitlabUserRead(d *schema.ResourceData, meta interface{}) error {
 
 	var found *gitlab.User
 
-	for _, user := range users {
-		if strings.ToLower(user.Email) == searchEmail {
-			found = user
-			break
+	if searchEmail != "" {
+		for _, user := range users {
+			if strings.ToLower(user.Email) == searchEmail {
+				found = user
+				break
+			}
+		}
+	} else {
+		for _, user := range users {
+			if strings.ToLower(user.Username) == userName {
+				found = user
+				break
+			}
 		}
 	}
+
 	if found == nil {
 		return fmt.Errorf("The email '%s' does not match any user email", searchEmail)
 	}
 	d.SetId(fmt.Sprintf("%d", found.ID))
 	d.Set("name", found.Name)
-	d.Set("username", found.Username)
+	d.Set("userName", found.Username)
 	d.Set("email", found.Email)
 	return nil
 }

gitlab/provider.go

@@ -54,6 +54,9 @@ func Provider() terraform.ResourceProvider {
 			"gitlab_deploy_key":         resourceGitlabDeployKey(),
 			"gitlab_user":               resourceGitlabUser(),
 			"gitlab_project_membership": resourceGitlabProjectMembership(),
+			"gitlab_group_membership":   resourceGitlabGroupMembership(),
+			"gitlab_project_variable":   resourceGitlabProjectVariable(),
+			"gitlab_group_variable":     resourceGitlabGroupVariable(),
 		},
 
 		ConfigureFunc: providerConfigure,

gitlab/resource_gitlab_group_membership.go

@@ -0,0 +1,162 @@
+package gitlab
+
+import (
+	"log"
+	"strconv"
+	"strings"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/xanzy/go-gitlab"
+)
+
+func resourceGitlabGroupMembership() *schema.Resource {
+	acceptedAccessLevels := make([]string, 0, len(accessLevelID))
+	for k := range accessLevelID {
+		acceptedAccessLevels = append(acceptedAccessLevels, k)
+	}
+	return &schema.Resource{
+		Create: resourceGitlabGroupMembershipCreate,
+		Read:   resourceGitlabGroupMembershipRead,
+		Update: resourceGitlabGroupMembershipUpdate,
+		Delete: resourceGitlabGroupMembershipDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"group_id": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Required: true,
+			},
+			"user_id": {
+				Type:     schema.TypeInt,
+				ForceNew: true,
+				Required: true,
+			},
+			"access_level": {
+				Type:         schema.TypeString,
+				ValidateFunc: validateValueFunc(acceptedAccessLevels),
+				Required:     true,
+			},
+			"expires_at": {
+				Type:         schema.TypeString, // Format YYYY-MM-DD
+				ValidateFunc: validateDateFunc(),
+				Optional:     true,
+			},
+		},
+	}
+}
+
+func resourceGitlabGroupMembershipCreate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+
+	userId := d.Get("user_id").(int)
+	groupId := d.Get("group_id").(string)
+	expiresAt := d.Get("expires_at").(string)
+	accessLevelId := accessLevelID[d.Get("access_level").(string)]
+
+	options := &gitlab.AddGroupMemberOptions{
+		UserID:      &userId,
+		AccessLevel: &accessLevelId,
+		ExpiresAt:   &expiresAt,
+	}
+	log.Printf("[DEBUG] create gitlab group groupMember for %d in %s", options.UserID, groupId)
+
+	groupMember, _, err := client.GroupMembers.AddGroupMember(groupId, options)
+	if err != nil {
+		return err
+	}
+	userIdString := strconv.Itoa(groupMember.ID)
+	d.SetId(buildTwoPartID(&groupId, &userIdString))
+	return resourceGitlabGroupMembershipRead(d, meta)
+}
+
+func resourceGitlabGroupMembershipRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+	id := d.Id()
+	log.Printf("[DEBUG] read gitlab group groupMember %s", id)
+
+	groupId, userId, e := groupIdAndUserIdFromId(id)
+	if e != nil {
+		return e
+	}
+
+	groupMember, resp, err := client.GroupMembers.GetGroupMember(groupId, userId)
+	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Group member %v not found in group %s", userId, groupId)
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
+	resourceGitlabGroupMembershipSetToState(d, groupMember, &groupId)
+	return nil
+}
+
+func groupIdAndUserIdFromId(id string) (string, int, error) {
+	groupId, userIdString, err := parseTwoPartID(id)
+	userId, e := strconv.Atoi(userIdString)
+	if err != nil {
+		e = err
+	}
+	if e != nil {
+		log.Printf("[WARN] cannot get group member id from input: %v", id)
+	}
+	return groupId, userId, e
+}
+
+func resourceGitlabGroupMembershipUpdate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+
+	userId := d.Get("user_id").(int)
+	groupId := d.Get("group_id").(string)
+	expiresAt := d.Get("expires_at").(string)
+	accessLevelId := accessLevelID[strings.ToLower(d.Get("access_level").(string))]
+
+	options := gitlab.EditGroupMemberOptions{
+		AccessLevel: &accessLevelId,
+		ExpiresAt:   &expiresAt,
+	}
+	log.Printf("[DEBUG] update gitlab group membership %v for %s", userId, groupId)
+
+	_, resp, err := client.GroupMembers.EditGroupMember(groupId, userId, &options)
+	if err != nil {
+		if resp.StatusCode == 404 {
+			log.Printf("[WARN] Group member %v not found in group %s, removing from state", userId, groupId)
+			d.SetId("")
+			return nil
+		}
+		return err
+	}
+
+	return resourceGitlabGroupMembershipRead(d, meta)
+}
+
+func resourceGitlabGroupMembershipDelete(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+
+	id := d.Id()
+	groupId, userId, e := groupIdAndUserIdFromId(id)
+	if e != nil {
+		return e
+	}
+
+	log.Printf("[DEBUG] Delete gitlab group membership %v for %s", userId, groupId)
+
+	_, err := client.GroupMembers.RemoveGroupMember(groupId, userId)
+	return err
+}
+
+func resourceGitlabGroupMembershipSetToState(d *schema.ResourceData, groupMember *gitlab.GroupMember, groupId *string) {
+
+	d.Set("group_id", groupId)
+	d.Set("user_id", groupMember.ID)
+	d.Set("access_level", accessLevel[groupMember.AccessLevel])
+	d.Set("expires_at", groupMember.ExpiresAt)
+
+	userId := strconv.Itoa(groupMember.ID)
+	d.SetId(buildTwoPartID(groupId, &userId))
+}