fix: errors and tests refactor

src/cmd/login.go

@@ -19,10 +19,10 @@ import (
 func loginCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("login").
-		Short(i18n.T(i18n.CmdLogin)).
+		Short(i18n.T(i18n.CmdDescLogin)).
 		StringFlag("regionUrl", constants.DefaultRegionUrl, i18n.T(i18n.RegionUrlFlag), cmdBuilder.HiddenFlag()).
 		StringFlag("region", "", i18n.T(i18n.RegionFlag), cmdBuilder.HiddenFlag()).
-		HelpFlag(i18n.T(i18n.LoginHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpLogin)).
 		Arg("token").
 		GuestRunFunc(func(ctx context.Context, cmdData *cmdBuilder.GuestCmdData) error {
 			uxBlocks := cmdData.UxBlocks

src/cmd/project.go

@@ -8,8 +8,8 @@ import (
 func projectCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("project").
-		Short(i18n.T(i18n.CmdProject)).
-		HelpFlag(i18n.T(i18n.ProjectHelp)).
+		Short(i18n.T(i18n.CmdDescProject)).
+		HelpFlag(i18n.T(i18n.CmdHelpProject)).
 		AddChildrenCmd(projectListCmd()).
 		AddChildrenCmd(projectDeleteCmd()).
 		AddChildrenCmd(projectServiceImportCmd()).

src/cmd/projectDelete.go

@@ -15,11 +15,11 @@ import (
 func projectDeleteCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("delete").
-		Short(i18n.T(i18n.CmdProjectDelete)).
+		Short(i18n.T(i18n.CmdDescProjectDelete)).
 		ScopeLevel(scope.Project).
 		Arg(scope.ProjectArgName, cmdBuilder.OptionalArg()).
 		BoolFlag("confirm", false, i18n.T(i18n.ConfirmFlag)).
-		HelpFlag(i18n.T(i18n.ProjectDeleteHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpProjectDelete)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			if !cmdData.Params.GetBool("confirm") {
 				confirmed, err := uxHelpers.YesNoPrompt(
@@ -58,7 +58,7 @@ func projectDeleteCmd() *cmdBuilder.Cmd {
 				[]uxHelpers.Process{{
 					F:                   uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
 					RunningMessage:      i18n.T(i18n.ProjectDeleting),
-					ErrorMessageMessage: i18n.T(i18n.ProjectDeleting),
+					ErrorMessageMessage: i18n.T(i18n.ProjectDeleteFailed),
 					SuccessMessage:      i18n.T(i18n.ProjectDeleted),
 				}},
 			)

src/cmd/projectImport.go

@@ -19,12 +19,12 @@ const projectImportArgName = "importYamlPath"
 func projectImportCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("project-import").
-		Short(i18n.T(i18n.CmdProjectImport)).
-		Long(i18n.T(i18n.CmdProjectImportLong)).
+		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.ProjectImportHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpProjectImport)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			uxBlocks := cmdData.UxBlocks
 

src/cmd/projectList.go

@@ -11,8 +11,8 @@ import (
 func projectListCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("list").
-		Short(i18n.T(i18n.CmdProjectList)).
-		HelpFlag(i18n.T(i18n.ProjectListHelp)).
+		Short(i18n.T(i18n.CmdDescProjectList)).
+		HelpFlag(i18n.T(i18n.CmdHelpProjectList)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			err := uxHelpers.PrintProjectList(ctx, cmdData.UxBlocks, cmdData.RestApiClient)
 			if err != nil {

src/cmd/projectServiceImport.go

@@ -18,10 +18,10 @@ const serviceImportArgName = "importYamlPath"
 func projectServiceImportCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("service-import").
-		Short(i18n.T(i18n.CmdServiceImport)).
+		Short(i18n.T(i18n.CmdDescProjectServiceImport)).
 		ScopeLevel(scope.Project).
 		Arg(serviceImportArgName).
-		HelpFlag(i18n.T(i18n.ProjectServiceImportHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpProjectServiceImport)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			uxBlocks := cmdData.UxBlocks
 

src/cmd/root.go

@@ -3,15 +3,13 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/zeropsio/zcli/src/cmd/scope"
 	"github.com/zeropsio/zcli/src/cmdBuilder"
 	"github.com/zeropsio/zcli/src/constants"
 	"github.com/zeropsio/zcli/src/entity/repository"
 	"github.com/zeropsio/zcli/src/errorsx"
 	"github.com/zeropsio/zcli/src/i18n"
-	"github.com/zeropsio/zcli/src/nettools"
 	"github.com/zeropsio/zcli/src/uxBlock"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
 	"github.com/zeropsio/zerops-go/errorCode"
@@ -71,7 +69,7 @@ func rootCmd() *cmdBuilder.Cmd {
 				projectId, _ := cmdData.CliStorage.Data().ScopeProjectId.Get()
 				project, err := repository.GetProjectById(ctx, cmdData.RestApiClient, projectId)
 				if err != nil {
-					if errorsx.Check(err, errorsx.CheckErrorCode(errorCode.ProjectNotFound)) {
+					if errorsx.Is(err, errorsx.ErrorCode(errorCode.ProjectNotFound)) {
 						err := scope.ProjectScopeReset(cmdData)
 						if err != nil {
 							return err
@@ -84,13 +82,10 @@ func rootCmd() *cmdBuilder.Cmd {
 				}
 			}
 
-			pingCtx, cancel := context.WithTimeout(ctx, time.Second)
-			defer cancel()
-
-			if err := nettools.Ping(pingCtx, vpnCheckAddress); err != nil {
-				body.AddStringsRow(i18n.T(i18n.StatusInfoVpnStatus), i18n.T(i18n.VpnCheckingConnectionIsNotActive))
-			} else {
+			if isVpnUp(ctx) {
 				body.AddStringsRow(i18n.T(i18n.StatusInfoVpnStatus), i18n.T(i18n.VpnCheckingConnectionIsActive))
+			} else {
+				body.AddStringsRow(i18n.T(i18n.StatusInfoVpnStatus), i18n.T(i18n.VpnCheckingConnectionIsNotActive))
 			}
 
 			cmdData.UxBlocks.Table(body)

src/cmd/scope.go

@@ -8,8 +8,8 @@ import (
 func scopeCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("scope").
-		Short(i18n.T(i18n.CmdScope)).
-		HelpFlag(i18n.T(i18n.ScopeHelp)).
+		Short(i18n.T(i18n.CmdDescScope)).
+		HelpFlag(i18n.T(i18n.CmdHelpScope)).
 		AddChildrenCmd(scopeProjectCmd()).
 		AddChildrenCmd(scopeResetCmd())
 }

src/cmd/scope/scopeProject.go

@@ -11,6 +11,7 @@ import (
 	"github.com/zeropsio/zcli/src/i18n"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
 	"github.com/zeropsio/zcli/src/uxHelpers"
+	"github.com/zeropsio/zerops-go/apiError"
 	"github.com/zeropsio/zerops-go/errorCode"
 	"github.com/zeropsio/zerops-go/types/uuid"
 )
@@ -39,7 +40,7 @@ func (p *project) LoadSelectedScope(ctx context.Context, cmd *cmdBuilder.Cmd, cm
 
 		project, err = repository.GetProjectById(ctx, cmdData.RestApiClient, projectId)
 		if err != nil {
-			if errorsx.Check(err, errorsx.CheckErrorCode(errorCode.ProjectNotFound)) {
+			if errorsx.Is(err, errorsx.ErrorCode(errorCode.ProjectNotFound)) {
 				err := ProjectScopeReset(cmdData)
 				if err != nil {
 					return err
@@ -57,7 +58,14 @@ func (p *project) LoadSelectedScope(ctx context.Context, cmd *cmdBuilder.Cmd, cm
 		if err != nil {
 			return errorsx.Convert(
 				err,
-				errorsx.ConvertInvalidUserInput("id", i18n.T(i18n.ErrorInvalidProjectId)),
+				errorsx.InvalidUserInput(
+					"id",
+					errorsx.InvalidUserInputErrorMessage(
+						func(_ apiError.Error, metaItemTyped map[string]interface{}) string {
+							return i18n.T(i18n.ErrorInvalidProjectId, projectId, metaItemTyped["message"])
+						},
+					),
+				),
 			)
 		}
 
@@ -70,7 +78,14 @@ func (p *project) LoadSelectedScope(ctx context.Context, cmd *cmdBuilder.Cmd, cm
 		if err != nil {
 			return errorsx.Convert(
 				err,
-				errorsx.ConvertInvalidUserInput("id", i18n.T(i18n.ErrorInvalidProjectId)),
+				errorsx.InvalidUserInput(
+					"id",
+					errorsx.InvalidUserInputErrorMessage(
+						func(_ apiError.Error, metaItemTyped map[string]interface{}) string {
+							return i18n.T(i18n.ErrorInvalidProjectId, projectId, metaItemTyped["message"])
+						},
+					),
+				),
 			)
 		}
 

src/cmd/scope/scopeService.go

@@ -10,6 +10,7 @@ import (
 	"github.com/zeropsio/zcli/src/i18n"
 	"github.com/zeropsio/zcli/src/uxBlock/styles"
 	"github.com/zeropsio/zcli/src/uxHelpers"
+	"github.com/zeropsio/zerops-go/apiError"
 	"github.com/zeropsio/zerops-go/types/uuid"
 )
 
@@ -50,7 +51,14 @@ func (s *service) LoadSelectedScope(ctx context.Context, _ *cmdBuilder.Cmd, cmdD
 		if err != nil {
 			return errorsx.Convert(
 				err,
-				errorsx.ConvertInvalidUserInput("id", i18n.T(i18n.ErrorInvalidServiceId)),
+				errorsx.InvalidUserInput(
+					"id",
+					errorsx.InvalidUserInputErrorMessage(
+						func(_ apiError.Error, metaItemTyped map[string]interface{}) string {
+							return i18n.T(i18n.ErrorInvalidServiceId, serviceId, metaItemTyped["message"])
+						},
+					),
+				),
 			)
 		}
 	}

src/cmd/scopeProject.go

@@ -19,15 +19,15 @@ import (
 func scopeProjectCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("project").
-		Short(i18n.T(i18n.CmdScopeProject)).
+		Short(i18n.T(i18n.CmdDescScopeProject)).
 		Arg(scope.ProjectArgName, cmdBuilder.OptionalArg()).
-		HelpFlag(i18n.T(i18n.ScopeProjectHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpScopeProject)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			projectId, projectSet := cmdData.CliStorage.Data().ScopeProjectId.Get()
 			if projectSet {
 				project, err := repository.GetProjectById(ctx, cmdData.RestApiClient, projectId)
 				if err != nil {
-					if errorsx.Check(err, errorsx.CheckErrorCode(errorCode.ProjectNotFound)) {
+					if errorsx.Is(err, errorsx.ErrorCode(errorCode.ProjectNotFound)) {
 						cmdData.UxBlocks.PrintWarning(styles.WarningLine(err.Error()))
 					} else {
 						return err

src/cmd/scopeReset.go

@@ -12,8 +12,8 @@ import (
 func scopeResetCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("reset").
-		Short(i18n.T(i18n.CmdScopeReset)).
-		HelpFlag(i18n.T(i18n.ScopeResetHelp)).
+		Short(i18n.T(i18n.CmdDescScopeReset)).
+		HelpFlag(i18n.T(i18n.CmdHelpScopeReset)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			err := scope.ProjectScopeReset(cmdData)
 			if err != nil {

src/cmd/service.go

@@ -8,8 +8,8 @@ import (
 func serviceCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("service").
-		Short(i18n.T(i18n.CmdService)).
-		HelpFlag(i18n.T(i18n.ServiceHelp)).
+		Short(i18n.T(i18n.CmdDescService)).
+		HelpFlag(i18n.T(i18n.CmdHelpService)).
 		AddChildrenCmd(serviceDeleteCmd()).
 		AddChildrenCmd(serviceListCmd()).
 		AddChildrenCmd(serviceLogCmd()).

src/cmd/serviceDelete.go

@@ -15,11 +15,11 @@ import (
 func serviceDeleteCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("delete").
-		Short(i18n.T(i18n.CmdServiceDelete)).
+		Short(i18n.T(i18n.CmdDescServiceDelete)).
 		ScopeLevel(scope.Service).
 		Arg(scope.ServiceArgName, cmdBuilder.OptionalArg()).
 		BoolFlag("confirm", false, i18n.T(i18n.ConfirmFlag)).
-		HelpFlag(i18n.T(i18n.ServiceDeleteHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpServiceDelete)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			if !cmdData.Params.GetBool("confirm") {
 				confirmed, err := uxHelpers.YesNoPrompt(
@@ -58,7 +58,7 @@ func serviceDeleteCmd() *cmdBuilder.Cmd {
 				[]uxHelpers.Process{{
 					F:                   uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
 					RunningMessage:      i18n.T(i18n.ServiceDeleting),
-					ErrorMessageMessage: i18n.T(i18n.ServiceDeleting),
+					ErrorMessageMessage: i18n.T(i18n.ServiceDeleteFailed),
 					SuccessMessage:      i18n.T(i18n.ServiceDeleted),
 				}},
 			)

src/cmd/serviceDeploy.go

@@ -22,16 +22,16 @@ import (
 func serviceDeployCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("deploy").
-		Short(i18n.T(i18n.CmdDeployDesc)).
-		Long(i18n.T(i18n.CmdDeployDesc)+"\n\n"+i18n.T(i18n.DeployDescLong)+"\n\n"+i18n.T(i18n.DeployHintPush)).
+		Short(i18n.T(i18n.CmdDescDeploy)).
+		Long(i18n.T(i18n.CmdDescDeployLong)).
 		ScopeLevel(scope.Service).
 		Arg("pathToFileOrDir", cmdBuilder.ArrayArg()).
 		StringFlag("workingDir", "./", i18n.T(i18n.BuildWorkingDir)).
 		StringFlag("archiveFilePath", "", i18n.T(i18n.BuildArchiveFilePath)).
 		StringFlag("versionName", "", i18n.T(i18n.BuildVersionName)).
 		StringFlag("zeropsYamlPath", "", i18n.T(i18n.ZeropsYamlLocation)).
 		BoolFlag("deployGitFolder", false, i18n.T(i18n.ZeropsYamlLocation)).
-		HelpFlag(i18n.T(i18n.ServiceDeployHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpServiceDeploy)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			uxBlocks := cmdData.UxBlocks
 
@@ -53,7 +53,7 @@ func serviceDeployCmd() *cmdBuilder.Cmd {
 				return err
 			}
 
-			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.BuildDeployCreatingPackageStart)))
+			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.PushDeployCreatingPackageStart)))
 
 			appVersion, err := createAppVersion(
 				ctx,
@@ -132,16 +132,22 @@ func serviceDeployCmd() *cmdBuilder.Cmd {
 						}
 						return nil
 					},
-					RunningMessage:      i18n.T(i18n.BuildDeployUploadingPackageStart),
-					ErrorMessageMessage: i18n.T(i18n.BuildDeployUploadPackageFailed),
-					SuccessMessage:      i18n.T(i18n.BuildDeployUploadingPackageDone),
+					RunningMessage:      i18n.T(i18n.PushDeployUploadingPackageStart),
+					ErrorMessageMessage: i18n.T(i18n.PushDeployUploadPackageFailed),
+					SuccessMessage:      i18n.T(i18n.PushDeployUploadingPackageDone),
 				}},
 			)
 			if err != nil {
 				return err
 			}
 
-			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.BuildDeployDeployingStart)))
+			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.PushDeployCreatingPackageDone)))
+
+			if cmdData.Params.GetString("archiveFilePath") != "" {
+				uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.PushDeployPackageSavedInto, cmdData.Params.GetString("archiveFilePath"))))
+			}
+
+			uxBlocks.PrintInfo(styles.InfoLine(i18n.T(i18n.PushDeployDeployingStart)))
 
 			deployResponse, err := cmdData.RestApiClient.PutAppVersionDeploy(
 				ctx,

src/cmd/serviceEnableSubdomain.go

@@ -14,10 +14,10 @@ import (
 func serviceEnableSubdomainCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("enable-subdomain").
-		Short(i18n.T(i18n.CmdServiceEnableSubdomain)).
+		Short(i18n.T(i18n.CmdDescServiceEnableSubdomain)).
 		ScopeLevel(scope.Service).
 		Arg(scope.ServiceArgName, cmdBuilder.OptionalArg()).
-		HelpFlag(i18n.T(i18n.ServiceEnableSubdomainHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpServiceEnableSubdomain)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			enableSubdomainResponse, err := cmdData.RestApiClient.PutServiceStackEnableSubdomainAccess(
 				ctx,
@@ -42,7 +42,7 @@ func serviceEnableSubdomainCmd() *cmdBuilder.Cmd {
 				[]uxHelpers.Process{{
 					F:                   uxHelpers.CheckZeropsProcess(processId, cmdData.RestApiClient),
 					RunningMessage:      i18n.T(i18n.ServiceEnablingSubdomain),
-					ErrorMessageMessage: i18n.T(i18n.ServiceEnablingSubdomain),
+					ErrorMessageMessage: i18n.T(i18n.ServiceEnableSubdomainFailed),
 					SuccessMessage:      i18n.T(i18n.ServiceEnabledSubdomain),
 				}},
 			)

src/cmd/serviceList.go

@@ -12,10 +12,10 @@ import (
 func serviceListCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("list").
-		Short(i18n.T(i18n.CmdServiceList)).
+		Short(i18n.T(i18n.CmdDescServiceList)).
 		ScopeLevel(scope.Project).
 		Arg(scope.ProjectArgName, cmdBuilder.OptionalArg()).
-		HelpFlag(i18n.T(i18n.ServiceListHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpServiceList)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			err := uxHelpers.PrintServiceList(ctx, cmdData.UxBlocks, cmdData.RestApiClient, *cmdData.Project)
 			if err != nil {

src/cmd/serviceLog.go

@@ -16,8 +16,8 @@ import (
 func serviceLogCmd() *cmdBuilder.Cmd {
 	return cmdBuilder.NewCmd().
 		Use("log").
-		Short(i18n.T(i18n.CmdServiceLog)).
-		Long(i18n.T(i18n.CmdServiceLogLong)+i18n.T(i18n.ServiceLogAdditional)).
+		Short(i18n.T(i18n.CmdDescServiceLog)).
+		Long(i18n.T(i18n.CmdDescServiceLogLong)).
 		ScopeLevel(scope.Service).
 		IntFlag("limit", 100, i18n.T(i18n.LogLimitFlag)).
 		StringFlag("minimumSeverity", "", i18n.T(i18n.LogMinSeverityFlag)).
@@ -26,7 +26,7 @@ func serviceLogCmd() *cmdBuilder.Cmd {
 		StringFlag("formatTemplate", "", i18n.T(i18n.LogFormatTemplateFlag)).
 		BoolFlag("follow", false, i18n.T(i18n.LogFollowFlag)).
 		BoolFlag("showBuildLogs", false, i18n.T(i18n.LogShowBuildFlag)).
-		HelpFlag(i18n.T(i18n.ServiceLogHelp)).
+		HelpFlag(i18n.T(i18n.CmdHelpServiceLog)).
 		LoggedUserRunFunc(func(ctx context.Context, cmdData *cmdBuilder.LoggedUserCmdData) error {
 			handler := serviceLogs.New(
 				serviceLogs.Config{},