api-ket no extra-user

Author: kosta709

client/account.go

@@ -174,6 +174,43 @@ func (client *Client) GetAccountByID(id string) (*Account, error) {
 	return &account, nil
 }
 
+// GetAccountByName - returns account
+func (client *Client) GetAccountByName(name string) (*Account, error) {
+
+	if name == "" {
+		return nil, fmt.Errorf("GetAccountByName - must specify name param")
+	}
+	opts := RequestOptions{
+		Path:   "/admin/accounts",
+		Method: "GET",
+		QS: map[string]string{"filter[name]": name},
+	}
+
+	resp, err := client.RequestAPI(&opts)
+
+	if err != nil {
+		return nil, err
+	}
+
+	var accounts []Account
+
+	err = DecodeResponseInto(resp, &accounts)
+	if err != nil {
+		return nil, err
+	}
+
+	var account *Account
+	for _, acc := range(accounts) {
+		if acc.Name == name {
+			account = &acc
+		}		
+	}
+	if account == nil {
+		return nil, fmt.Errorf("GetAccountByName - cannot find account by name %s", name)
+	}
+	return account, nil
+}
+
 func (client *Client) GetAllAccounts() (*[]Account, error) {
 
 	opts := RequestOptions{

client/api_key.go

@@ -97,7 +97,8 @@ func (client *Client) UpdateAPIKey(key *ApiKey) error {
 	return nil
 }
 
-func (client *Client) CreateApiKey(accountId string, apiKey *ApiKey) (string, error) {
+// CreateApiKey - creates api key for account by switch to the user and call /api/auth/keys
+func (client *Client) CreateApiKey(userID string, accountId string, apiKey *ApiKey) (string, error) {
 
 	// Check collaborataros
 	account, err := client.GetAccountByID(accountId)
@@ -108,34 +109,18 @@ func (client *Client) CreateApiKey(accountId string, apiKey *ApiKey) (string, er
 		log.Fatal("[ERROR] Collaborators are not set")
 	}
 
-	// add user
-	userPrefix := acctest.RandString(10)
-	userName := "tfuser" + userPrefix
-	userEmail := userName + "@codefresh.io"
-
-	user, err := client.AddNewUserToAccount(accountId, userName, userEmail)
-	if err != nil {
-		return "", err
-	}
-	userID := user.ID
-
-	// activate
-	_, err = client.ActivateUser(userID)
-	if err != nil {
-		return "", err
-	}
-
-	// set user as account admin
-	err = client.SetUserAsAccountAdmin(accountId, userID)
-	if err != nil {
-		return "", nil
-	}
-
+	var xAccessToken string
+	if userID == "" {
+		userID, err = client.createRandomUser(accountId)
+		if err != nil {
+			return "", err
+		}		
+	} 
 	// login as user
-	xAccessToken, err := client.GetXAccessToken(userID)
+	xAccessToken, err = client.GetXAccessToken(userID, accountId)
 	if err != nil {
 		return "", err
-	}
+	}	
 
 	// generate token
 	apiToken, err := client.GenerateToken(xAccessToken, apiKey)
@@ -144,10 +129,10 @@ func (client *Client) CreateApiKey(accountId string, apiKey *ApiKey) (string, er
 	}
 
 	return apiToken, nil
-
 }
 
-func (client *Client) GetXAccessToken(userID string) (string, error) {
+// GetXAccessToken
+func (client *Client) GetXAccessToken(userID string, accountId string) (string, error) {
 
 	url := fmt.Sprintf("%s/admin/user/loginAsUser?userId=%s", client.Host, userID)
 	request, err := http.NewRequest("GET", url, nil)
@@ -165,13 +150,44 @@ func (client *Client) GetXAccessToken(userID string) (string, error) {
 
 	defer resp.Body.Close()
 
+	var userCfAccessToken string
 	for _, cookie := range resp.Cookies() {
 		if cookie.Name == "cf-access-token" {
-			return cookie.Value, nil
+			userCfAccessToken = cookie.Value
+			break
+		}
+	}
+	if userCfAccessToken == "" {
+		return "", fmt.Errorf("Failed to GetXAccessToken for userId = %s", userID)
+	}
+
+	// change account
+	changeAccURL := fmt.Sprintf("%s/user/changeaccount/%s", client.Host, accountId)
+	changeAccRequest, err := http.NewRequest("POST", changeAccURL, nil)
+	if err != nil {
+		return "", err
+	}
+
+	changeAccRequest.Header.Set("x-access-token", userCfAccessToken)
+	changeAccRequest.Header.Set("Content-Type", "application/json; charset=utf-8")
+
+	changeAccResp, err := client.Client.Do(changeAccRequest)
+	if err != nil {
+		return "", err
+	}
+
+	var accCfAccessToken string
+	for _, cookie := range changeAccResp.Cookies() {
+		if cookie.Name == "cf-access-token" {
+			accCfAccessToken = cookie.Value
+			break
 		}
 	}
+	if accCfAccessToken == "" {
+		return "", fmt.Errorf("Failed to GetXAccessToken for userId = %s after ChangeAcocunt to %s", userID, accountId)
+	}
 
-	return "", nil
+	return accCfAccessToken, nil
 }
 
 func (client *Client) GenerateToken(xToken string, apiKey *ApiKey) (string, error) {
@@ -219,3 +235,30 @@ func (client *Client) GetApiKeysList() ([]ApiKey, error) {
 
 	return apiKeys, nil
 }
+
+func (client *Client) createRandomUser(accountId string) (string, error) {
+	// add user
+	userPrefix := acctest.RandString(10)
+	userName := "tfuser" + userPrefix
+	userEmail := userName + "@codefresh.io"
+
+	user, err := client.AddNewUserToAccount(accountId, userName, userEmail)
+	if err != nil {
+		return "", err
+	}
+	userID := user.ID
+
+	// activate
+	_, err = client.ActivateUser(userID)
+	if err != nil {
+		return "", err
+	}
+
+	// set user as account admin
+	err = client.SetUserAsAccountAdmin(accountId, userID)
+	if err != nil {
+		return "", nil
+	}
+	return userID, nil
+
+}

codefresh/provider.go

@@ -29,6 +29,7 @@ func Provider() *schema.Provider {
 			"codefresh_users": dataSourceUsers(),
 			"codefresh_user":  dataSourceUser(),
 			"codefresh_idps": dataSourceIdps(),
+			"codefresh_account": dataSourceAccount(),
 		},
 		ResourcesMap: map[string]*schema.Resource{
 			"codefresh_project":        resourceProject(),

codefresh/resource_api_key.go

@@ -25,6 +25,10 @@ func resourceApiKey() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"user_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
 			"token": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -45,8 +49,9 @@ func resourceApiKeyCreate(d *schema.ResourceData, meta interface{}) error {
 
 	apiKey := *mapResourceToApiKey(d)
 	accountID := d.Get("account_id").(string)
+	userID := d.Get("user_id").(string)
 
-	resp, err := client.CreateApiKey(accountID, &apiKey)
+	resp, err := client.CreateApiKey(userID, accountID, &apiKey)
 	if err != nil {
 		fmt.Println(string(resp))
 		return err