🌿 Wip - Minor: Fix Err Handling and Create Command / Service

README.md

@@ -1,4 +1,13 @@
-# Zerops zCLI
+![Zerops](https://github.com/zeropsio/recipe-shared-assets/blob/main/covers/svg/cover-zcli.svg)
+
+<p align="center">
+  <br/>
+  <h2>Zerops zCli</h2>
+   A Command Line Utility / Command Line Interface is used for interacting with <a href="https://zerops.io/">Zerops</a> platform &mdash;
+  <br/>
+  powerful developer experience meets lightweight output.
+  <br/><br/>
+</p>
 
 Zerops zCLI is a command line utility for working with [zerops.io](https://zerops.io). It's used 
 for **CI/CD** development and CLI lovers.

src/cmd/project.go

@@ -13,5 +13,6 @@ func projectCmd() *cmdBuilder.Cmd {
 		AddChildrenCmd(projectListCmd()).
 		AddChildrenCmd(projectDeleteCmd()).
 		AddChildrenCmd(projectServiceImportCmd()).
-		AddChildrenCmd(projectImportCmd())
+		AddChildrenCmd(projectImportCmd()).
+		AddChildrenCmd(projectCreateCmd())
 }

src/cmd/projectCreate.go

@@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+
+	"github.com/zeropsio/zcli/src/cmd/scope"
+	"github.com/zeropsio/zcli/src/cmdBuilder"
+	"github.com/zeropsio/zcli/src/i18n"
+	"github.com/zeropsio/zcli/src/uxHelpers"
+	"github.com/zeropsio/zerops-go/dto/input/body"
+	"github.com/zeropsio/zerops-go/sdk"
+)
+
+func projectCreateCmd() *cmdBuilder.Cmd {
+	return cmdBuilder.NewCmd().
+		Use("create").
+		Short(i18n.T(i18n.CmdDescProjectCreate)).
+		ScopeLevel(scope.Project).
+		Arg(scope.ProjectArgName, cmdBuilder.OptionalArg()).
+		BoolFlag("confirm", false, i18n.T(i18n.ConfirmFlag)).
+		HelpFlag(i18n.T(i18n.CmdHelpProjectCreate)).
+		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
+			if !cmdData.Params.GetBool("confirm") {
+				confirmed, err := uxHelpers.YesNoPrompt(
+					ctx,
+					cmdData.UxBlocks,
+					i18n.T(i18n.ProjectCreateConfirm, cmdData.Project.Name),
+				)
+				if err != nil {
+					return err
+				}
+				if !confirmed {
+					return errors.New(i18n.T(i18n.DestructiveOperationConfirmationFailed))
+				}
+			}
+
+			sdk.Handler{}.PostProject(ctx, body.PostProject{
+				Name: cmdData.Project.Name,
+			})
+
+			return nil
+		})
+}

src/cmd/projectImport.go

@@ -1,43 +1,44 @@
 package cmd
 
 import (
-	"context"
-
-	"github.com/zeropsio/zcli/src/cmdBuilder"
-	"github.com/zeropsio/zcli/src/entity/repository"
-	"github.com/zeropsio/zcli/src/i18n"
-	"github.com/zeropsio/zcli/src/uxBlock/styles"
-	"github.com/zeropsio/zcli/src/uxHelpers"
-	"github.com/zeropsio/zcli/src/yamlReader"
-	"github.com/zeropsio/zerops-go/dto/input/body"
-	"github.com/zeropsio/zerops-go/types"
-	"github.com/zeropsio/zerops-go/types/uuid"
+    "context"
+    "github.com/zeropsio/zcli/src/cmdBuilder"
+    "github.com/zeropsio/zcli/src/entity/repository"
+    "github.com/zeropsio/zcli/src/i18n"
+    "github.com/zeropsio/zcli/src/uxBlock/styles"
+    "github.com/zeropsio/zcli/src/uxHelpers"
+    "github.com/zeropsio/zcli/src/yamlReader"
+    "github.com/zeropsio/zerops-go/dto/input/body"
+    "github.com/zeropsio/zerops-go/types"
+    "github.com/zeropsio/zerops-go/types/uuid"
+    "path/filepath"
 )
 
-const projectImportArgName = "importYamlPath"
+const defaultYamlFileName = "foo.yml"
 
 func projectImportCmd() *cmdBuilder.Cmd {
-	return cmdBuilder.NewCmd().
-		Use("project-import").
-		Short(i18n.T(i18n.CmdDescProjectImport)).
-		Long(i18n.T(i18n.CmdDescProjectImportLong)).
-		Arg(projectImportArgName).
-		StringFlag("orgId", "", i18n.T(i18n.OrgIdFlag)).
-		StringFlag("workingDie", "./", i18n.T(i18n.BuildWorkingDir)).
-		HelpFlag(i18n.T(i18n.CmdHelpProjectImport)).
-		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
-			uxBlocks := cmdData.UxBlocks
-
-			orgId, err := getOrgId(ctx, cmdData)
+    return cmdBuilder.NewCmd().
+        Use("import").
+        Short(i18n.T(i18n.CmdDescProjectImport)).
+        Long(i18n.T(i18n.CmdDescProjectImportLong)).
+        StringFlag("orgId", "", i18n.T(i18n.OrgIdFlag)).
+        StringFlag("workingDir", "./", i18n.T(i18n.BuildWorkingDir)).
+        HelpFlag(i18n.T(i18n.CmdHelpProjectImport)).
+        LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
+            uxBlocks := cmdData.UxBlocks
+
+            orgId, err := getOrgId(ctx, cmdData)
+            if err != nil {
+                return err
+            }
+
+			workingDir := cmdData.Params.GetString("workingDir")
+			yamlFilePath := filepath.Join(workingDir, defaultYamlFileName)
 			if err != nil {
+				uxBlocks.PrintError(styles.ErrorLine(i18n.T(i18n.NoYamlFound)))
 				return err
 			}
-
-			yamlContent, err := yamlReader.ReadContent(
-				uxBlocks,
-				cmdData.Args[projectImportArgName][0],
-				cmdData.Params.GetString("workingDir"),
-			)
+			yamlContent, err := yamlReader.ReadContent(uxBlocks, yamlFilePath, workingDir)
 			if err != nil {
 				return err
 			}
@@ -46,64 +47,64 @@ func projectImportCmd() *cmdBuilder.Cmd {
 				ctx,
 				body.ProjectImport{
 					ClientId: orgId,
-					Yaml:     types.Text(yamlContent),
+					Yaml: types.Text(yamlContent),
 				},
 			)
 			if err != nil {
+				uxBlocks.PrintError(styles.ErrorLine(i18n.T(i18n.ProjectImportFailed)))
 				return err
 			}
 
-			responseOutput, err := importProjectResponse.Output()
-			if err != nil {
-				return err
-			}
-
-			var processes []uxHelpers.Process
-			for _, service := range responseOutput.ServiceStacks {
-				for _, process := range service.Processes {
-					processes = append(processes, uxHelpers.Process{
-						F:                   uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient),
-						RunningMessage:      service.Name.String() + ": " + process.ActionName.String(),
-						ErrorMessageMessage: service.Name.String() + ": " + process.ActionName.String(),
-						SuccessMessage:      service.Name.String() + ": " + process.ActionName.String(),
-					})
-				}
-			}
-
-			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.ServiceCount, len(responseOutput.ServiceStacks))))
-			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.QueuedProcesses, len(processes))))
-			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.CoreServices)))
-
-			err = uxHelpers.ProcessCheckWithSpinner(ctx, cmdData.UxBlocks, processes)
+			projectOutput, err := importProjectResponse.Output()
 			if err != nil {
-				return err
-			}
-
-			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.ProjectImported)))
-
-			return nil
-		})
+				uxBlocks.PrintError(styles.ErrorLine(i18n.T(i18n.ProjectImportFailed)))
+			} 
+
+            var processes []uxHelpers.Process
+            for _, service := range projectOutput.ServiceStacks {
+                for _, process := range service.Processes {
+                    processes = append(processes, uxHelpers.Process{
+                        F:                  uxHelpers.CheckZeropsProcess(process.Id, cmdData.RestApiClient),
+                        RunningMessage:     service.Name.String() + ": " + process.ActionName.String(),
+                        ErrorMessageMessage: service.Name.String() + ": " + process.ActionName.String(),
+                        SuccessMessage:     service.Name.String() + ": " + process.ActionName.String(),
+                    })
+                }
+            }
+
+            uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.ServiceCount, len(projectOutput.ServiceStacks))))
+            uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.QueuedProcesses, len(processes))))
+            uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.CoreServices)))
+
+            err = uxHelpers.ProcessCheckWithSpinner(ctx, cmdData.UxBlocks, processes)
+            if err != nil {
+                return err
+            }
+
+            uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.ProjectImported)))
+            return nil
+        })
 }
 
 func getOrgId(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) (uuid.ClientId, error) {
-	orgId := uuid.ClientId(cmdData.Params.GetString("orgId"))
-	if orgId != "" {
-		return orgId, nil
-	}
-
-	orgs, err := repository.GetAllOrgs(ctx, cmdData.RestApiClient)
-	if err != nil {
-		return "", err
-	}
-
-	if len(orgs) == 1 {
-		return orgs[0].ID, nil
-	}
-
-	selectedOrg, err := uxHelpers.PrintOrgSelector(ctx, cmdData.UxBlocks, cmdData.RestApiClient)
-	if err != nil {
-		return "", err
-	}
-
-	return selectedOrg.ID, nil
-}
+    orgId := uuid.ClientId(cmdData.Params.GetString("orgId"))
+    if orgId != "" {
+        return orgId, nil
+    }
+
+    orgs, err := repository.GetAllOrgs(ctx, cmdData.RestApiClient)
+    if err != nil {
+        return "", err
+    }
+
+    if len(orgs) == 1 {
+        return orgs[0].ID, nil
+    }
+
+    selectedOrg, err := uxHelpers.PrintOrgSelector(ctx, cmdData.UxBlocks, cmdData.RestApiClient)
+    if err != nil {
+        return "", err
+    }
+
+    return selectedOrg.ID, nil
+}

src/i18n/en.go

@@ -30,6 +30,15 @@ var en = map[string]string{
 	CmdHelpProjectList: "the project list command.",
 	CmdDescProjectList: "Lists all projects.",
 
+	// project create
+	CmdHelpProjectCreate:  "the project create command.",
+	CmdDescProjectCreate:  "Creates an empty project.",
+	ProjectCreateConfirm:  "Creating %s a new empty project ? \n Are you sure?",
+	ServiceCreateConfirm:  "Would you like to create a new service? \n y/n",
+	ProjectCreation:       "Project is being created.",
+	ProjectCreationFailed: "Creation of a new project failed.",
+	ProjectCreated:        "Project created successfully",
+
 	// project delete
 	CmdHelpProjectDelete: "the project delete command.",
 	CmdDescProjectDelete: "Deletes a project and all of its services.",
@@ -41,9 +50,11 @@ var en = map[string]string{
 
 	// project import
 	CmdHelpProjectImport:     "the project import command.",
-	CmdDescProjectImport:     "Creates a new project with one or more services.",
+	CmdDescProjectImport:     "Initializes a new project with one or more services with foo.yaml.",
 	CmdDescProjectImportLong: "Creates a new project with one or more services according to the definition in the import YAML file.",
-	ProjectImported:          "project imported",
+	ProjectImported:          "Project imported",
+	NoYamlFound:              "No foo.yml file detected in your directory. For more information, please visit https://docs.zerops.io/references/import/.",
+	ProjectImportFailed: 	  "Failed while importing, seems like there's an issue try reaching out at https://discord.com/invite/WDvCZ54",
 
 	// project service import
 	CmdHelpProjectServiceImport: "the project service import command.",
@@ -218,7 +229,7 @@ var en = map[string]string{
 
 	// import
 	ImportYamlOk:        "Yaml file was checked",
-	ImportYamlEmpty:     "Config file import yaml is empty",
+	ImportYamlEmpty:     "The config foo.yml file is empty. For more information, please visit https://docs.zerops.io/references/import/",
 	ImportYamlTooLarge:  "Max. size of import yaml is 100 KB",
 	ImportYamlFound:     "Import yaml found",
 	ImportYamlNotFound:  "Import yaml not found",

src/i18n/i18n.go

@@ -43,6 +43,15 @@ const (
 	CmdHelpProjectList = "CmdHelpProjectList"
 	CmdDescProjectList = "CmdDescProjectList"
 
+	// project create
+	CmdHelpProjectCreate  = "CmdHelpProjectCreate"
+	CmdDescProjectCreate  = "CmdDescProjectCreate"
+	ProjectCreateConfirm  = "ProjectCreateConfirm"
+	ServiceCreateConfirm  = "ServiceCreateConfirm"
+	ProjectCreation       = "ProjectCreation"
+	ProjectCreationFailed = "ProjectCreationFailed"
+	ProjectCreated 		  = "ProjectCreated"
+
 	// project delete
 	CmdHelpProjectDelete = "CmdHelpProjectDelete"
 	CmdDescProjectDelete = "CmdDescProjectDelete"
@@ -57,6 +66,8 @@ const (
 	CmdDescProjectImport     = "CmdDescProjectImport"
 	CmdDescProjectImportLong = "CmdDescProjectImportLong"
 	ProjectImported          = "ProjectImported"
+	NoYamlFound			 	 = "NoYamlFound"
+	ProjectImportFailed    	 = "ProjectImportFailed"
 
 	// project service import
 	CmdHelpProjectServiceImport = "CmdHelpProjectServiceImport"