From 42946982b492e19fd08843411436711288e69c8c Mon Sep 17 00:00:00 2001 From: Bobby Christopher Date: Wed, 21 May 2025 19:07:07 -0400 Subject: [PATCH] fixed env vars --- cmd/project.go | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cmd/project.go b/cmd/project.go index 67cd1fb6..094b715d 100644 --- a/cmd/project.go +++ b/cmd/project.go @@ -801,7 +801,7 @@ Examples: name, _ := cmd.Flags().GetString("name") description, _ := cmd.Flags().GetString("description") orgId, _ := cmd.Flags().GetString("org-id") - apikey, _ := cmd.Flags().GetString("apikey") + apikey, _ := cmd.Flags().GetString("api-key") ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGINT, syscall.SIGTERM) defer cancel() @@ -812,10 +812,19 @@ Examples: if apikey != "" && orgId != "" && name != "" && description != "" { context.Project.Name = name context.Project.Description = description - _, err := context.Project.Import(ctx, logger, context.APIURL, apikey, orgId, true) + result, err := context.Project.Import(ctx, logger, context.APIURL, apikey, orgId, true) if err != nil { - errsystem.New(errsystem.ErrImportingProject, err, errsystem.WithContextMessage("Error importing project")).ShowErrorAndExit() + if isCancelled(ctx) { + os.Exit(1) + } + errsystem.New(errsystem.ErrImportingProject, err, + errsystem.WithContextMessage("Error importing project")).ShowErrorAndExit() + } + if err := context.Project.Save(context.Dir); err != nil { + errsystem.New(errsystem.ErrSaveProject, err, + errsystem.WithContextMessage("Error saving project after import")).ShowErrorAndExit() } + saveEnv(context.Dir, result.APIKey, result.ProjectKey) return } @@ -865,11 +874,9 @@ func init() { projectNewCmd.Flags().String("auth", "project", "The authentication type for the agent (project, webhook, or none)") projectNewCmd.Flags().String("action", "github-app", "The action to take for the project (github-action, github-app, none)") - projectImportCmd.Flags().String("apikey", "", "The API key to use for the project") projectImportCmd.Flags().String("name", "", "The name of the project to import") projectImportCmd.Flags().String("description", "", "The description of the project to import") - projectImportCmd.Flags().MarkHidden("apikey") projectImportCmd.Flags().MarkHidden("name") projectImportCmd.Flags().MarkHidden("description") projectImportCmd.Flags().MarkHidden("org-id")