aaaa

cmd/deploy.go

@@ -37,7 +37,7 @@ func deployCmd() *cobra.Command {
 			defer closeFunc()
 
 			httpClient := httpClient.New(httpClient.Config{
-				HttpTimeout: time.Second * 10,
+				HttpTimeout: time.Minute * 15,
 			})
 
 			zipClient := zipClient.New(zipClient.Config{})

cmd/root.go

@@ -29,9 +29,9 @@ func ExecuteRootCmd(builtinToken string) {
 		Use: "zcli",
 	}
 
-	params.RegisterString(rootCmd, "restApiAddress", "https://api.zerops.io", "address of rest of zerops.io", paramsPackage.Persistent())
-	params.RegisterString(rootCmd, "grpcApiAddress", "api.zerops.io:20902", "address of grpc api of zerops.io", paramsPackage.Persistent())
-	params.RegisterString(rootCmd, "vpnAddress", "vpn.zerops.io", "address of vpn of zerops.io", paramsPackage.Persistent())
+	params.RegisterString(rootCmd, "restApiAddress", "https://api.zerops.io", "address of rest api", paramsPackage.Persistent())
+	params.RegisterString(rootCmd, "grpcApiAddress", "api.zerops.io:20902", "address of grpc api", paramsPackage.Persistent())
+	params.RegisterString(rootCmd, "vpnApiAddress", "vpn.zerops.io", "address of vpn api", paramsPackage.Persistent())
 	params.RegisterString(
 		rootCmd, "token", builtinToken, "authentication token",
 		paramsPackage.Persistent(),
@@ -53,7 +53,7 @@ func ExecuteRootCmd(builtinToken string) {
 
 	err = rootCmd.Execute()
 	if err != nil {
-		return
+		os.Exit(1)
 	}
 }
 

cmd/startVpn.go

@@ -10,7 +10,7 @@ import (
 
 func startVpnCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:          "startVpn projectId",
+		Use:          "startVpn projectName",
 		SilenceUsage: true,
 		Args:         cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -42,15 +42,15 @@ func startVpnCmd() *cobra.Command {
 
 			return startVpn.New(
 				startVpn.Config{
-					VpnAddress: params.GetString("vpnAddress"),
+					VpnAddress: params.GetString("vpnApiAddress"),
 					UserId:     certReader.UserId,
 				},
 				logger,
 				apiGrpcClient,
 				sudoers,
 				storage,
 			).Run(ctx, startVpn.RunConfig{
-				ProjectId: args[0],
+				ProjectName: args[0],
 			})
 		},
 	}

src/command/login/handler.go

@@ -48,7 +48,7 @@ func (h *Handler) Run(_ context.Context, runConfig RunConfig) error {
 		return errors.New("param zeropsLogin must be set")
 	}
 	if runConfig.ZeropsPassword == "" {
-		return errors.New("param ZeropsPassword must be set")
+		return errors.New("param zeropsPassword must be set")
 	}
 
 	loginData, err := json.Marshal(struct {

src/command/startVpn/handler.go

@@ -23,7 +23,7 @@ type Config struct {
 }
 
 type RunConfig struct {
-	ProjectId string
+	ProjectName string
 }
 
 type Handler struct {
@@ -52,13 +52,35 @@ func New(
 
 func (h *Handler) Run(ctx context.Context, config RunConfig) error {
 
-	if h.storage.Data.ProjectId != "" && config.ProjectId != h.storage.Data.ProjectId {
+	if config.ProjectName == "" {
+		return errors.New("project name must be filled")
+	}
+
+	projectsResponse, err := h.apiGrpcClient.GetProjectsByName(ctx, &zeropsApiProtocol.GetProjectsByNameRequest{
+		Name: config.ProjectName,
+	})
+	if err := helpers.HandleGrpcApiError(projectsResponse, err); err != nil {
+		return err
+	}
+
+	projectsResponse.GetOutput().GetProjects()
+
+	projects := projectsResponse.GetOutput().GetProjects()
+	if len(projects) == 0 {
+		return errors.New("project not found")
+	}
+	if len(projects) > 1 {
+		return errors.New("there are multiple project with same name")
+	}
+	project := projects[0]
+
+	if h.storage.Data.ProjectId != "" && project.GetId() != h.storage.Data.ProjectId {
 		if h.isVpnAlive() {
 			return errors.New("vpn is started for another project, use stopVpn first")
 		}
 	}
 
-	err := h.cleanVpn()
+	err = h.cleanVpn()
 	if err != nil {
 		return err
 	}
@@ -69,7 +91,7 @@ func (h *Handler) Run(ctx context.Context, config RunConfig) error {
 	}
 
 	apiVpnRequestResponse, err := h.apiGrpcClient.PostVpnRequest(ctx, &zeropsApiProtocol.PostVpnRequestRequest{
-		Id:              config.ProjectId,
+		Id:              project.GetId(),
 		ClientPublicKey: publicKey,
 	})
 	if err := helpers.HandleGrpcApiError(apiVpnRequestResponse, err); err != nil {
@@ -97,7 +119,7 @@ func (h *Handler) Run(ctx context.Context, config RunConfig) error {
 	defer closeFunc()
 
 	startVpnResponse, err := vpnGrpcClient.StartVpn(ctx, &zeropsVpnProtocol.StartVpnRequest{
-		InstanceId:      config.ProjectId,
+		InstanceId:      project.GetId(),
 		UserId:          h.config.UserId,
 		ClientPublicKey: publicKey,
 		Signature:       signature,
@@ -114,7 +136,7 @@ func (h *Handler) Run(ctx context.Context, config RunConfig) error {
 
 	h.logger.Info("\nclient is connected \n")
 
-	h.storage.Data.ProjectId = config.ProjectId
+	h.storage.Data.ProjectId = project.GetId()
 	err = h.storage.Save()
 	if err != nil {
 		return err

src/service/sudoers/handler.go

@@ -61,7 +61,7 @@ func runCommand(cmd *exec.Cmd) ([]byte, error) {
 				}
 			}
 		}
-		return nil, errors.New(errOutput.String())
+		return nil, err
 	}
 
 	return output.Bytes(), nil

src/service/zipClient/handler.go

@@ -27,7 +27,7 @@ func (h *Handler) Zip(source string, w io.Writer) error {
 
 	info, err := os.Stat(source)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	var baseDir string