feat: attach to available instance

cmd/initapp/initapp.go

@@ -91,21 +91,6 @@ func RunInitApp(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	appName, shouldContinue, err := GetAppName(cmd, args)
-	if err != nil {
-		printer.Error(cmd, err)
-		return
-	}
-	//If the operation is canceled
-	if !shouldContinue {
-		return
-	}
-
-	appAlternateId := GetAppID(cmd, appName)
-	if appAlternateId == "" {
-		return
-	}
-
 	if manifest.ExistsLocal() {
 		response := prompt.PromptYesNo(cmd, "Config file exists. Do you want to overwrite it?", false)
 		if !response.Confirmed {
@@ -124,24 +109,31 @@ func RunInitApp(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	newApp, err := appService.CreateApp(orgID, *p.ID, appAlternateId, appName)
-	if err != nil {
-		if !errors.Is(err, errors.ErrConflict) {
+	aid, _ := cmd.Flags().GetString("id")
+
+	var newApp *app.App
+	if aid != "" {
+		exists, err := appService.DoesAppExist(orgID, aid)
+		if err != nil {
 			printer.Error(cmd, err)
-			return
+			os.Exit(1)
 		}
 
-		existingApp, handleErr := HandleExistingApp(cmd, *appService, orgID, appAlternateId)
-		if handleErr != nil {
-			printer.Error(cmd, handleErr)
-			return
-		}
-		if existingApp == nil {
-			printer.Info("Operation cancelled.")
-			return
+		if exists {
+			newApp, err = HandleExistingApp(cmd, *appService, orgID, aid)
+			if err != nil {
+				printer.Error(cmd, err)
+				os.Exit(1)
+			}
 		}
+	}
 
-		newApp = *existingApp
+	if newApp == nil {
+		newApp, err = CreateNewApp(cmd, *appService, orgID, args, p)
+		if err != nil {
+			printer.Error(cmd, err)
+			os.Exit(1)
+		}
 	}
 
 	mcl := manifest.Config{
@@ -398,3 +390,43 @@ func HandleExistingApp(cmd *cobra.Command, appService app.AppService, orgID, app
 	printer.Info(fmt.Sprintf("Using existing app '%s' (%s)", existingApp.Name, existingApp.AlternateId))
 	return &existingApp, nil
 }
+
+func CreateNewApp(cmd *cobra.Command, appService app.AppService, orgID string, args []string, p projects.Project) (*app.App, error) {
+
+	appName, shouldContinue, err := GetAppName(cmd, args)
+	if err != nil {
+		return nil, err
+	}
+	//If the operation is canceled
+	if !shouldContinue {
+		printer.Error(cmd, err)
+		os.Exit(1)
+	}
+
+	appAlternateId := GetAppID(cmd, appName)
+	if appAlternateId == "" {
+		os.Exit(0)
+	}
+
+	newApp, err := appService.CreateApp(orgID, *p.ID, appAlternateId, appName)
+	if err != nil {
+		if !errors.Is(err, errors.ErrConflict) {
+			printer.Error(cmd, err)
+			os.Exit(1)
+		}
+
+		existingApp, handleErr := HandleExistingApp(cmd, appService, orgID, appAlternateId)
+		if handleErr != nil {
+			printer.Error(cmd, handleErr)
+			os.Exit(1)
+		}
+		if existingApp == nil {
+			printer.Info("Operation cancelled.")
+			os.Exit(0)
+		}
+
+		newApp = *existingApp
+	}
+
+	return &newApp, nil
+}

cmd/initproject/initproject.go

@@ -74,20 +74,31 @@ func RunInitProject(cmd *cobra.Command, args []string) {
 
 	projectService := projects.NewService(orgID)
 
-	projectName, shouldContinue, err := GetProjectName(cmd, args)
-	if err != nil {
-		printer.Error(cmd, err)
-		os.Exit(1)
-	}
-	if !shouldContinue {
-		os.Exit(0)
-	}
+	pid, _ := cmd.Flags().GetString("id")
 
-	projectAlternateId := GetProjectID(cmd, projectName)
-	if projectAlternateId == "" {
-		os.Exit(0)
-	}
+	var proj *projects.Project
+	if pid != "" {
+		exists, err := projectService.DoesProjectExist(pid)
+		if err != nil {
+			printer.Error(cmd, err)
+			os.Exit(1)
+		}
 
+		if exists {
+			proj, err = HandleExistingProject(cmd, projectService, pid)
+			if err != nil {
+				printer.Error(cmd, err)
+				os.Exit(1)
+			}
+		}
+	}
+	if proj == nil {
+		proj, err = CreateNewProject(cmd, args, projectService)
+		if err != nil {
+			printer.Error(cmd, err)
+			os.Exit(1)
+		}
+	}
 	if manifest.ExistsLocal() {
 		response := prompt.PromptYesNo(cmd, "Config file exists. Do you want to overwrite it?", false)
 		if !response.Confirmed {
@@ -100,36 +111,10 @@ func RunInitProject(cmd *cobra.Command, args []string) {
 		}
 	}
 
-	newProject := projects.Project{
-		Name:        projectName,
-		AlternateID: projectAlternateId,
-		IsMonorepo:  IsMonorepo,
-	}
-
-	createdProject, err := projectService.CreateProject(newProject)
-	if err != nil {
-		if !errors.Is(err, errors.ErrConflict) {
-			printer.Error(cmd, err)
-			os.Exit(1)
-		}
-
-		existingProject, handleErr := HandleExistingProject(cmd, projectService, projectAlternateId)
-		if handleErr != nil {
-			printer.Error(cmd, handleErr)
-			os.Exit(1)
-		}
-		if existingProject == nil {
-			printer.Info("Operation cancelled.")
-			os.Exit(0)
-		}
-
-		createdProject = *existingProject
-	}
-
 	mcl := manifest.Config{
-		ProjectId:          createdProject.ID,
-		ProjectAlternateId: &createdProject.AlternateID,
-		ProjectName:        &createdProject.Name,
+		ProjectId:          proj.ID,
+		ProjectAlternateId: &proj.AlternateID,
+		ProjectName:        &proj.Name,
 		OrganizationId:     orgID,
 	}
 	mcl.IsMonorepo = ptr.Bool(IsMonorepo)
@@ -143,7 +128,7 @@ func RunInitProject(cmd *cobra.Command, args []string) {
 	if err := gitutil.EnsureGitignore(manifest.ManifestSecretFile); err != nil {
 		printer.Error(cmd, fmt.Errorf("error adding .hxkey to .gitignore: %w. Please do this manually if you wish", err))
 	}
-	PrintInitializationSummary(createdProject.Name, createdProject.AlternateID, *createdProject.ID, orgID)
+	PrintInitializationSummary(proj.Name, proj.AlternateID, *proj.ID, orgID)
 }
 
 func GetProjectID(cmd *cobra.Command, projectName string) string {
@@ -229,6 +214,10 @@ func HandleExistingProject(cmd *cobra.Command, projectService projects.ProjectSe
 		return nil, err
 	}
 
+	if IsMonorepo && !existingProject.IsMonorepo {
+		return nil, errors.New("Existing project is not a monorepo project")
+	}
+
 	printer.Info(fmt.Sprintf("Using existing project '%s' (%s)", existingProject.Name, existingProject.AlternateID))
 	return &existingProject, nil
 }
@@ -263,3 +252,48 @@ func GetProjectName(cmd *cobra.Command, args []string) (string, bool, error) {
 
 	return dirName, true, nil
 }
+
+func CreateNewProject(cmd *cobra.Command, args []string, ps projects.ProjectService) (*projects.Project, error) {
+
+	projectName, shouldContinue, err := GetProjectName(cmd, args)
+	if err != nil {
+		printer.Error(cmd, err)
+		os.Exit(1)
+	}
+	if !shouldContinue {
+		os.Exit(0)
+	}
+
+	projectAlternateId := GetProjectID(cmd, projectName)
+	if projectAlternateId == "" {
+		os.Exit(0)
+	}
+
+	newProject := projects.Project{
+		Name:        projectName,
+		AlternateID: projectAlternateId,
+		IsMonorepo:  IsMonorepo,
+	}
+
+	createdProject, err := ps.CreateProject(newProject)
+	if err != nil {
+		if !errors.Is(err, errors.ErrConflict) {
+			printer.Error(cmd, err)
+			os.Exit(1)
+		}
+
+		existingProject, handleErr := HandleExistingProject(cmd, ps, projectAlternateId)
+		if handleErr != nil {
+			printer.Error(cmd, handleErr)
+			os.Exit(1)
+		}
+		if existingProject == nil {
+			printer.Info("Operation cancelled.")
+			os.Exit(0)
+		}
+
+		createdProject = *existingProject
+	}
+
+	return &createdProject, nil
+}

internal/app/service.go

@@ -17,6 +17,7 @@ type AppServicer interface {
 	CreateApp(organizationID, projectID, alternateID, name string) (App, error)
 	GetApp(organizationID, appID string) (App, error)
 	DeleteApp(organizationID, appID string) error
+	DoesAppExist(organizationID, appID string) (bool, error)
 }
 
 type AppService struct {
@@ -167,3 +168,28 @@ func (ps *AppService) DeleteApp(organizationID, appID string) error {
 
 	return nil
 }
+
+func (ps *AppService) DoesAppExist(organizationID, appID string) (bool, error) {
+	url := fmt.Sprintf("%s/api/organizations/%s/apps/%s/", ps.baseUrl, organizationID, appID)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return false, errors.Wrap(err, "Failed to create request")
+	}
+
+	resp, err := ps.httpClient.Do(req)
+	if err != nil {
+		return false, errors.Wrap(err, "Request failed")
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusOK {
+		return true, nil
+	}
+
+	if resp.StatusCode == http.StatusNotFound {
+		return false, nil
+	}
+
+	return false, errors.HandleHTTPError(resp)
+}

internal/projects/service.go

@@ -16,6 +16,7 @@ type ProjectServicer interface {
 	ListProjects() ([]Project, error)
 	GetProject(projectID string) (Project, error)
 	CreateProject(project Project) (Project, error)
+	DoesProjectExist(projectID string) (bool, error)
 }
 
 type ProjectService struct {
@@ -149,3 +150,28 @@ func (ps *ProjectService) CreateProject(project Project) (Project, error) {
 
 	return createdProject, nil
 }
+
+func (ps *ProjectService) DoesProjectExist(projectID string) (bool, error) {
+	url := fmt.Sprintf("%s/%s", ps.baseUrl, projectID)
+
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return false, errors.Wrap(err, "Failed to create request")
+	}
+
+	resp, err := ps.httpClient.Do(req)
+	if err != nil {
+		return false, errors.Wrap(err, "Request failed")
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == http.StatusOK {
+		return true, nil
+	}
+
+	if resp.StatusCode == http.StatusNotFound {
+		return false, nil
+	}
+
+	return false, errors.HandleHTTPError(resp)
+}