Add user resource

Author: palson-cf

client/account.go

@@ -3,9 +3,10 @@ package client
 import (
 	"errors"
 	"fmt"
-	"github.com/imdario/mergo"
 	"log"
 	"strconv"
+
+	"github.com/imdario/mergo"
 )
 
 type DockerRegistry struct {
@@ -180,6 +181,45 @@ func (client *Client) GetAccountByID(id string) (*Account, error) {
 	return &account, nil
 }
 
+func (client *Client) GetAllAccounts() (*[]Account, error) {
+
+	opts := RequestOptions{
+		Path:   "/admin/accounts",
+		Method: "GET",
+	}
+
+	resp, err := client.RequestAPI(&opts)
+
+	if err != nil {
+		return nil, err
+	}
+
+	var accounts []Account
+
+	err = DecodeResponseInto(resp, &accounts)
+	if err != nil {
+		return nil, err
+	}
+
+	return &accounts, nil
+}
+
+func (client *Client) GetAccountsList(accountsId []string) (*[]Account, error) {
+
+	var accounts []Account
+
+	for _, accountId := range accountsId {
+		account, err := client.GetAccountByID(accountId)
+		if err != nil {
+			return nil, err
+		}
+
+		accounts = append(accounts, *account)
+	}
+
+	return &accounts, nil
+}
+
 func (client *Client) CreateAccount(account *Account) (*Account, error) {
 
 	body, err := EncodeToJSON(account)

client/idp.go

@@ -21,7 +21,7 @@ type IDP struct {
 	CookieIv        string   `json:"cookieIv,omitempty"`
 	CookieKey       string   `json:"cookieKey,omitempty"`
 	DisplayName     string   `json:"displayName,omitempty"`
-	ID              string   `json:"id,omitempty"`
+	ID              string   `json:"_id,omitempty"`
 	IDPLoginUrl     string   `json:"IDPLoginUrl,omitempty"`
 	LoginUrl        string   `json:"loginUrl,omitempty"`
 	RedirectUiUrl   string   `json:"redirectUiUrl,omitempty"`

client/user.go

@@ -46,16 +46,18 @@ type User struct {
 }
 
 type NewUser struct {
-	UserName string   `json:"userName"`
-	Email    string   `json:"email"`
-	Logins   []Login  `json:"logins,omitempty"`
-	Roles    []string `json:"roles,omitempty"`
-	Account  []string `json:"account,omitempty"`
+	ID       string    `json:"_id,omitempty"`
+	UserName string    `json:"userName"`
+	Email    string    `json:"email"`
+	Logins   []Login   `json:"logins,omitempty"`
+	Roles    []string  `json:"roles,omitempty"`
+	Account  []string  `json:"account,omitempty"`
+	Personal *Personal `json:"personal,omitempty"`
 }
 
 type UserAccounts struct {
-	UserName string    `json:"userName`
-	Account  []Account `json:"account`
+	UserName string    `json:"userName"`
+	Account  []Account `json:"account"`
 }
 
 func (client *Client) AddNewUserToAccount(accountId, userName, userEmail string) (*User, error) {

codefresh/provider.go

@@ -31,13 +31,14 @@ func Provider() terraform.ResourceProvider {
 			"codefresh_user":  dataSourceUser(),
 		},
 		ResourcesMap: map[string]*schema.Resource{
-			"codefresh_project":       resourceProject(),
-			"codefresh_pipeline":      resourcePipeline(),
-			"codefresh_team":          resourceTeam(),
-			"codefresh_account":       resourceAccount(),
-			"codefresh_api_key":       resourceApiKey(),
-			"codefresh_idp_accounts":  resourceIDPAccounts(),
+			"codefresh_project":        resourceProject(),
+			"codefresh_pipeline":       resourcePipeline(),
+			"codefresh_team":           resourceTeam(),
+			"codefresh_account":        resourceAccount(),
+			"codefresh_api_key":        resourceApiKey(),
+			"codefresh_idp_accounts":   resourceIDPAccounts(),
 			"codefresh_account_admins": resourceAccountAdmins(),
+			"codefresh_user":           resourceUser(),
 		},
 		ConfigureFunc: configureProvider,
 	}

codefresh/resource_account.go

@@ -168,8 +168,8 @@ func mapResourceToAccount(d *schema.ResourceData) *cfClient.Account {
 	// admins := d.Get("admins").(*schema.Set).List()
 
 	account := &cfClient.Account{
-		ID:     d.Id(),
-		Name:   d.Get("name").(string),
+		ID:   d.Id(),
+		Name: d.Get("name").(string),
 		// Admins: convertStringArr(admins),
 	}