Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Project Name uniqueness check should be within project not any project in the users org #223

Merged
jhaynie merged 1 commit into from
Apr 24, 2025
Merged

Project Name uniqueness check should be within project not any project in the users org #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func ShowNewProjectImport(ctx context.Context, logger logger.Logger, cmd *cobra.
tui.WaitForAnyKey()
tui.ClearScreen()
orgId := promptForOrganization(ctx, logger, cmd, apiUrl, apikey)
name, description := promptForProjectDetail(ctx, logger, apiUrl, apikey, project.Name, project.Description)
name, description := promptForProjectDetail(ctx, logger, apiUrl, apikey, project.Name, project.Description, orgId)
project.Name = name
project.Description = description
var createWebhookAuth bool
Expand Down
8 changes: 4 additions & 4 deletions cmd/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ func initProject(ctx context.Context, logger logger.Logger, args InitProjectArgs
return result
}

func promptForProjectDetail(ctx context.Context, logger logger.Logger, apiUrl, apikey string, name string, description string) (string, string) {
func promptForProjectDetail(ctx context.Context, logger logger.Logger, apiUrl, apikey string, name string, description string, orgId string) (string, string) {
var nameOK bool
if name != "" {
if exists, err := project.ProjectWithNameExists(ctx, logger, apiUrl, apikey, name); err != nil {
if exists, err := project.ProjectWithNameExists(ctx, logger, apiUrl, apikey, orgId, name); err != nil {
errsystem.New(errsystem.ErrApiRequest, err, errsystem.WithContextMessage("Failed to check if project name exists")).ShowErrorAndExit()
} else if exists {
tui.ShowWarning("project %s already exists in this organization. please choose another name", name)
Expand All @@ -151,7 +151,7 @@ func promptForProjectDetail(ctx context.Context, logger logger.Logger, apiUrl, a
}
}
}
if exists, err := project.ProjectWithNameExists(ctx, logger, apiUrl, apikey, name); err != nil {
if exists, err := project.ProjectWithNameExists(ctx, logger, apiUrl, apikey, orgId, name); err != nil {
errsystem.New(errsystem.ErrApiRequest, err, errsystem.WithContextMessage("Failed to check if project name exists")).ShowErrorAndExit()
} else if exists {
return fmt.Errorf("project %s already exists in this organization. please choose another name", name)
Expand Down Expand Up @@ -402,7 +402,7 @@ Examples:
}
}
}
exists, err := project.ProjectWithNameExists(ctx, logger, apiUrl, apikey, name)
exists, err := project.ProjectWithNameExists(ctx, logger, apiUrl, apikey, orgId, name)
if err != nil {
return false, err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/project/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,11 @@ type Response[T any] struct {

type ProjectResponse = Response[ProjectData]

func ProjectWithNameExists(ctx context.Context, logger logger.Logger, baseUrl string, token string, name string) (bool, error) {
func ProjectWithNameExists(ctx context.Context, logger logger.Logger, baseUrl string, token string, orgId string, name string) (bool, error) {
client := util.NewAPIClient(ctx, logger, baseUrl, token)

var resp Response[bool]
if err := client.Do("GET", fmt.Sprintf("/cli/project/exists/%s", url.PathEscape(name)), nil, &resp); err != nil {
if err := client.Do("GET", fmt.Sprintf("/cli/project/exists/%s?orgId=%s", url.PathEscape(name), url.PathEscape(orgId)), nil, &resp); err != nil {
var apiErr *util.APIError
if errors.As(err, &apiErr) {
if apiErr.Status == http.StatusConflict {
Expand Down
Loading