Fix teams

Author: palson-cf

client/team.go

@@ -7,6 +7,7 @@ import (
 type TeamUser struct {
 	ID       string `json:"id,omitempty"`
 	UserName string `json:"userName,omitempty"`
+	Email    string `json:"email,omitempty"`
 }
 
 // Team spec
@@ -171,61 +172,48 @@ func (client *Client) SynchronizeClientWithGroup(name, ssoType string, notificat
 	return nil
 }
 
-func (client *Client) AddUserToTeam(teamID, userID string) (*Team, error) {
+func (client *Client) AddUserToTeam(teamID, userID string) error {
 
 	fullPath := fmt.Sprintf("/team/%s/%s/assignUserToTeam", teamID, userID)
 	opts := RequestOptions{
 		Path:   fullPath,
 		Method: "PUT",
 	}
 
-	resp, err := client.RequestAPI(&opts)
-
-	if err != nil {
-		return nil, err
-	}
-
-	var respTeam Team
-	err = DecodeResponseInto(resp, &respTeam)
+	_, err := client.RequestAPI(&opts)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return &respTeam, nil
+	return nil
 }
 
-func (client *Client) DeleteUserFromTeam(teamID, userID string) (*Team, error) {
+func (client *Client) DeleteUserFromTeam(teamID, userID string)  error {
 
 	fullPath := fmt.Sprintf("/team/%s/%s/deleteUserFromTeam", teamID, userID)
 	opts := RequestOptions{
 		Path:   fullPath,
 		Method: "PUT",
 	}
 
-	resp, err := client.RequestAPI(&opts)
+	_, err := client.RequestAPI(&opts)
 
 	if err != nil {
-		return nil, err
-	}
-
-	var respTeam Team
-	err = DecodeResponseInto(resp, &respTeam)
-	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return &respTeam, nil
+	return nil
 }
 
-func (client *Client) RenameTeam(teamID, name string) (*Team, error) {
+func (client *Client) RenameTeam(teamID, name string) error {
 
 	fullPath := fmt.Sprintf("/team/%s/renameTeam", teamID)
 
 	team := Team{Name: name}
 	body, err := EncodeToJSON(team)
 
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	opts := RequestOptions{
@@ -234,17 +222,47 @@ func (client *Client) RenameTeam(teamID, name string) (*Team, error) {
 		Body:   body,
 	}
 
-	resp, err := client.RequestAPI(&opts)
+	_, err = client.RequestAPI(&opts)
 
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	var respTeam Team
-	err = DecodeResponseInto(resp, &respTeam)
-	if err != nil {
-		return nil, err
+	return nil
+}
+
+func GetUsersDiff(desiredUsers []string, existingUsers []TeamUser) (usersToAdd []string, usersToDelete []string) {
+
+	existingUsersIDs := []string{}
+	usersToAdd = []string{}
+	usersToDelete = []string{}
+
+	for _, user := range existingUsers{
+		existingUsersIDs = append(existingUsersIDs, user.ID)
 	}
 
-	return &respTeam, nil
+	for _, id := range existingUsersIDs{
+		ok := find(desiredUsers, id)
+		if !ok {
+			usersToDelete = append(usersToDelete, id)
+		}
+	}
+
+	for _, id := range desiredUsers{
+		ok := find(existingUsersIDs, id)
+		if !ok {
+			usersToAdd = append(usersToAdd, id)
+		}
+	}
+
+	return usersToAdd, usersToDelete
+}
+
+func find(slice []string, val string) bool {
+    for _, item := range slice {
+        if item == val {
+            return true
+        }
+    }
+    return false
 }

codefresh/resource_team.go

@@ -1,7 +1,6 @@
 package codefresh
 
 import (
-	"fmt"
 	cfClient "github.com/codefresh-io/terraform-provider-codefresh/client"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
@@ -22,37 +21,25 @@ func resourceTeam() *schema.Resource {
 			},
 			"type": {
 				Type:     schema.TypeString,
-				ForceNew: true,
 				Optional: true,
 			},
-			"account": {
+			"account_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
 			"tags": {
 				Type:     schema.TypeSet,
 				Optional: true,
-				ForceNew: true,
 				Elem: &schema.Schema{
 					Type: schema.TypeString,
 				},
 			},
 			"users": {
-				Type:     schema.TypeList,
+				Type:     schema.TypeSet,
 				Optional: true,
-				ForceNew: true,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"user_id": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
-						"name": {
-							Type:     schema.TypeString,
-							Optional: true,
-						},
-					},
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
 				},
 			},
 		},
@@ -102,11 +89,36 @@ func resourceTeamUpdate(d *schema.ResourceData, meta interface{}) error {
 
 	team := *mapResourceToTeam(d)
 
-	_, err := client.RenameTeam(team.ID, team.Name)
+	// Rename
+	err := client.RenameTeam(team.ID, team.Name)
 	if err != nil {
 		return err
 	}
 
+	// Update users
+	existingTeam, err := client.GetTeamByID(team.ID)
+	if err != nil {
+		return nil
+	}
+
+	desiredUsers := d.Get("users").(*schema.Set).List()
+
+	usersToAdd, usersToDelete := cfClient.GetUsersDiff(convertStringArr(desiredUsers), existingTeam.Users)
+
+	for _, userId := range usersToDelete{
+		err := client.DeleteUserFromTeam(team.ID, userId)
+		if err != nil {
+			return err
+		}
+	}
+
+	for _, userId := range usersToAdd{
+		err := client.AddUserToTeam(team.ID, userId)
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -133,7 +145,7 @@ func mapTeamToResource(team *cfClient.Team, d *schema.ResourceData) error {
 		return err
 	}
 
-	err = d.Set("account", team.Account)
+	err = d.Set("account_id", team.Account)
 	if err != nil {
 		return err
 	}
@@ -151,16 +163,11 @@ func mapTeamToResource(team *cfClient.Team, d *schema.ResourceData) error {
 	return nil
 }
 
-func flattenTeamUsers(users []cfClient.TeamUser) []map[string]interface{} {
-	var res = make([]map[string]interface{}, len(users))
-	for i, user := range users {
-		m := make(map[string]interface{})
-		m["name"] = user.UserName
-		m["user_id"] = user.ID
-
-		res[i] = m
+func flattenTeamUsers(users []cfClient.TeamUser) []string {
+	res := []string{}
+	for _, user := range users {
+		res = append(res, user.ID)
 	}
-
 	return res
 }
 
@@ -170,18 +177,16 @@ func mapResourceToTeam(d *schema.ResourceData) *cfClient.Team {
 		ID:      d.Id(),
 		Name:    d.Get("name").(string),
 		Type:    d.Get("type").(string),
-		Account: d.Get("account").(string),
+		Account: d.Get("account_id").(string),
 		Tags:    convertStringArr(tags),
 	}
 
 	if _, ok := d.GetOk("users"); ok {
-		users := d.Get("users").([]interface{})
-		for idx := range users {
+		users := d.Get("users").(*schema.Set).List()
+		for _, id := range users {
 			user := cfClient.TeamUser{
-				ID:       d.Get(fmt.Sprintf("users.%v.user_id", idx)).(string),
-				UserName: d.Get(fmt.Sprintf("users.%v.name", idx)).(string),
+				ID: id.(string),
 			}
-
 			team.Users = append(team.Users, user)
 		}
 	}