Skip to content

fix: api key read errors out when getting keys for users #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2025
Merged

fix: api key read errors out when getting keys for users #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb17270
fix: api key read errors out when getting keys for other users
ilia-medvedev-codefresh Sep 8, 2025
6a098d8
fmt
ilia-medvedev-codefresh Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 39 additions & 49 deletions codefresh/cfclient/api_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
"errors"
"fmt"
"log"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
)

type ApiKeySubject struct {
Expand Down Expand Up @@ -38,14 +36,21 @@ type TokenResponse struct {
} `json:"user"`
}

func (client *Client) GetAPIKey(keyID string) (*ApiKey, error) {
func (client *Client) GetAPIKey(userID string, accountId string, keyID string) (*ApiKey, error) {

xAccessToken, err := client.GetXAccessToken(userID, accountId)

if err != nil {
return nil, err
}

opts := RequestOptions{
Path: fmt.Sprintf("/auth/key/%s", keyID),
Method: "GET",
Path: fmt.Sprintf("/auth/key/%s", keyID),
XAccessToken: xAccessToken,
Method: "GET",
}

resp, err := client.RequestAPI(&opts)
resp, err := client.RequestApiXAccessToken(&opts)

if err != nil {
return nil, err
Expand All @@ -61,14 +66,21 @@ func (client *Client) GetAPIKey(keyID string) (*ApiKey, error) {
return &apiKey, nil
}

func (client *Client) DeleteAPIKey(keyID string) error {
func (client *Client) DeleteAPIKey(userID string, accountId string, keyID string) error {
// login as user

xAccessToken, err := client.GetXAccessToken(userID, accountId)

if err != nil {
return err
}
opts := RequestOptions{
Path: fmt.Sprintf("/auth/key/%s", keyID),
Method: "DELETE",
Path: fmt.Sprintf("/auth/key/%s", keyID),
Method: "DELETE",
XAccessToken: xAccessToken,
}

resp, err := client.RequestAPI(&opts)
resp, err := client.RequestApiXAccessToken(&opts)
if err != nil {
fmt.Println(string(resp))
return err
Expand All @@ -77,7 +89,7 @@ func (client *Client) DeleteAPIKey(keyID string) error {
return nil
}

func (client *Client) UpdateAPIKey(key *ApiKey) error {
func (client *Client) UpdateAPIKey(userID string, accountId string, key *ApiKey) error {

keyID := key.ID
if keyID == "" {
Expand All @@ -89,13 +101,23 @@ func (client *Client) UpdateAPIKey(key *ApiKey) error {
return err
}

var xAccessToken string

// login as user
xAccessToken, err = client.GetXAccessToken(userID, accountId)

if err != nil {
return err
}

opts := RequestOptions{
Path: fmt.Sprintf("/auth/key/%s", keyID),
Method: "PATCH",
Body: body,
Path: fmt.Sprintf("/auth/key/%s", keyID),
Method: "PATCH",
XAccessToken: xAccessToken,
Body: body,
}

resp, err := client.RequestAPI(&opts)
resp, err := client.RequestApiXAccessToken(&opts)

if err != nil {
fmt.Println(string(resp))
Expand All @@ -110,6 +132,7 @@ func (client *Client) CreateApiKey(userID string, accountId string, apiKey *ApiK

// Check collaborataros
account, err := client.GetAccountByID(accountId)

if err != nil {
return "", err
}
Expand All @@ -118,12 +141,7 @@ func (client *Client) CreateApiKey(userID string, accountId string, apiKey *ApiK
}

var xAccessToken string
if userID == "" {
userID, err = client.createRandomUser(accountId)
if err != nil {
return "", err
}
}

// login as user
xAccessToken, err = client.GetXAccessToken(userID, accountId)
if err != nil {
Expand Down Expand Up @@ -333,31 +351,3 @@ func (client *Client) CreateApiKeyServiceUser(serviceUserId string, apiKey *ApiK

return string(resp), 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

}
13 changes: 9 additions & 4 deletions codefresh/resource_api_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ func resourceApiKeyRead(d *schema.ResourceData, meta interface{}) error {
if serviceAccountId := d.Get("service_account_id").(string); serviceAccountId != "" {
apiKey, err = client.GetAPIKeyServiceUser(keyID, serviceAccountId)
} else {
apiKey, err = client.GetAPIKey(keyID)
accountID := d.Get("account_id").(string)
userID := d.Get("user_id").(string)
apiKey, err = client.GetAPIKey(userID, accountID, keyID)
}

if err != nil {
Expand Down Expand Up @@ -178,8 +180,9 @@ func resourceApiKeyUpdate(d *schema.ResourceData, meta interface{}) error {
if serviceAccountId := d.Get("service_account_id").(string); serviceAccountId != "" {
err = client.UpdateAPIKeyServiceUser(&apiKey, serviceAccountId)
} else {
err = client.UpdateAPIKey(&apiKey)

accountID := d.Get("account_id").(string)
userID := d.Get("user_id").(string)
err = client.UpdateAPIKey(userID, accountID, &apiKey)
}

if err != nil {
Expand All @@ -201,7 +204,9 @@ func resourceApiKeyDelete(d *schema.ResourceData, meta interface{}) error {
if serviceAccountId := d.Get("service_account_id").(string); serviceAccountId != "" {
err = client.DeleteAPIKeyServiceUser(d.Id(), serviceAccountId)
} else {
err = client.DeleteAPIKey(d.Id())
accountID := d.Get("account_id").(string)
userID := d.Get("user_id").(string)
err = client.DeleteAPIKey(userID, accountID, d.Id())
}

if err != nil {
Expand Down
Loading