Merge pull request #16 from zeropsio/18525

#18525 - better notifications

src/cliAction/buildDeploy/handler_checkInputValues.go

@@ -44,7 +44,7 @@ func (h *Handler) checkInputValues(ctx context.Context, config RunConfig) (*zero
 	}
 	serviceStack := serviceStackResponse.GetOutput()
 
-	fmt.Println(i18n.BuildDeployServiceStatus + ": " + serviceStack.GetStatus().String())
+	fmt.Printf(i18n.BuildDeployServiceStatus+"\n", serviceStack.GetStatus().String())
 
 	return serviceStack, nil
 }

src/cliAction/buildDeploy/handler_checkProcess.go

@@ -2,10 +2,10 @@ package buildDeploy
 
 import (
 	"context"
-	"errors"
-	"github.com/zerops-io/zcli/src/i18n"
+	"fmt"
 	"time"
 
+	"github.com/zerops-io/zcli/src/i18n"
 	"github.com/zerops-io/zcli/src/utils"
 	"github.com/zerops-io/zcli/src/zeropsApiProtocol"
 )
@@ -31,7 +31,7 @@ func (h *Handler) checkProcess(ctx context.Context, processId string) error {
 
 			if !(processStatus == zeropsApiProtocol.ProcessStatus_PROCESS_STATUS_RUNNING ||
 				processStatus == zeropsApiProtocol.ProcessStatus_PROCESS_STATUS_PENDING) {
-				return errors.New(i18n.ProcessInvalidState + ": " + zeropsApiProtocol.ProcessStatus_name[int32(processStatus)])
+				return fmt.Errorf(i18n.ProcessInvalidState, getProcessResponse.GetOutput().GetId())
 			}
 			time.Sleep(time.Second)
 		}

src/cliAction/buildDeploy/handler_deploy.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"github.com/zerops-io/zcli/src/i18n"
-
 	"github.com/zerops-io/zcli/src/utils"
 	"github.com/zerops-io/zcli/src/zeropsApiProtocol"
 )
@@ -50,11 +49,11 @@ func (h *Handler) Deploy(ctx context.Context, config RunConfig) error {
 
 	temporaryShutdown := false
 	if serviceStack.GetStatus() == zeropsApiProtocol.ServiceStackStatus_SERVICE_STACK_STATUS_READY_TO_DEPLOY ||
-		serviceStack.GetStatus() == zeropsApiProtocol.ServiceStackStatus_SERVICE_STACK_STATUS_UPGRADE_FAILED {
+		serviceStack.GetStatus() == zeropsApiProtocol.ServiceStackStatus_SERVICE_STACK_STATUS_ACTION_FAILED {
 		temporaryShutdown = true
 	}
 
-	fmt.Println(i18n.BuildDeployTemporaryShutdown+": ", temporaryShutdown)
+	fmt.Printf(i18n.BuildDeployTemporaryShutdown+"\n", temporaryShutdown)
 
 	deployResponse, err := h.apiGrpcClient.PutAppVersionDeploy(ctx, &zeropsApiProtocol.PutAppVersionDeployRequest{
 		Id:                appVersion.GetId(),

src/cliAction/buildDeploy/handler_savePackage.go

@@ -21,7 +21,7 @@ func (h *Handler) savePackage(config RunConfig, buff *bytes.Buffer) error {
 			return err
 		}
 
-		fmt.Println(i18n.BuildDeployPackageSavedInto+": ", zipFilePath)
+		fmt.Printf(i18n.BuildDeployPackageSavedInto+"\n", zipFilePath)
 	}
 	return nil
 }

src/cliAction/login/handler.go

@@ -94,7 +94,7 @@ func (h *Handler) Run(ctx context.Context, runConfig RunConfig) error {
 	return nil
 }
 
-func (h *Handler) loginWithPassword(ctx context.Context, login, password string) error {
+func (h *Handler) loginWithPassword(_ context.Context, login, password string) error {
 
 	if login == "" {
 		return errors.New(i18n.LoginZeropsLoginMissing)

src/cmd/daemonRun.go

@@ -51,7 +51,11 @@ func daemonRunCmd() *cobra.Command {
 				}
 			}()
 
-			grpcServer := createDaemonGrpcServer(vpn)
+			grpcServer, err := createDaemonGrpcServer(vpn)
+			if err != nil {
+				return err
+			}
+
 			wg.Add(1)
 			go func() {
 				defer wg.Done()

src/cmd/di.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"os"
+	"path"
 	"time"
 
 	"github.com/zerops-io/zcli/src/cliStorage"
@@ -64,10 +66,16 @@ func createVpn(
 	)
 }
 
-func createDaemonGrpcServer(vpn *vpn.Handler) *grpcDaemonServer.Handler {
+func createDaemonGrpcServer(vpn *vpn.Handler) (*grpcDaemonServer.Handler, error) {
+	socketDir := path.Dir(constants.SocketFilePath)
+	err := os.MkdirAll(socketDir, 0755)
+	if err != nil {
+		return nil, err
+	}
+
 	return grpcDaemonServer.New(grpcDaemonServer.Config{
 		Socket: constants.SocketFilePath,
 	},
 		vpn,
-	)
+	), nil
 }

src/cmd/login.go

@@ -31,7 +31,7 @@ func loginCmd() *cobra.Command {
 			}
 
 			httpClient := httpClient.New(httpClient.Config{
-				HttpTimeout: time.Second * 10,
+				HttpTimeout: time.Second * 5,
 			})
 
 			apiClientFactory := grpcApiClientFactory.New(grpcApiClientFactory.Config{

src/daemonInstaller/handler_darwin.go

@@ -3,13 +3,15 @@
 package daemonInstaller
 
 import (
+	"errors"
 	"os"
 	"os/exec"
 	"path"
 	"regexp"
 	"text/template"
 
 	"github.com/zerops-io/zcli/src/constants"
+	"github.com/zerops-io/zcli/src/i18n"
 )
 
 type darwinRecord struct {
@@ -31,6 +33,16 @@ func (daemon *darwinRecord) Install() error {
 		return ErrAlreadyInstalled
 	}
 
+	_, err := exec.LookPath("wg")
+	if err != nil {
+		return errors.New(i18n.DaemonInstallWireguardNotFoundDarwin)
+	}
+
+	_, err = exec.LookPath("wireguard-go")
+	if err != nil {
+		return errors.New(i18n.DaemonInstallWireguardNotFoundDarwin)
+	}
+
 	cliBinaryPath, err := os.Executable()
 	if err != nil {
 		return err
@@ -43,8 +55,8 @@ func (daemon *darwinRecord) Install() error {
 	}
 	defer file.Close()
 
-	logDir, _ := path.Split(constants.LogFilePath)
-	daemonStorageDir, _ := path.Split(constants.DaemonStorageFilePath)
+	logDir := path.Dir(constants.LogFilePath)
+	daemonStorageDir := path.Dir(constants.DaemonStorageFilePath)
 
 	templ, err := template.New("propertyList").Parse(propertyList)
 	if err != nil {
@@ -99,7 +111,7 @@ func (daemon *darwinRecord) Remove() error {
 		}
 	}
 
-	daemonStorageDir, _ := path.Split(constants.DaemonStorageFilePath)
+	daemonStorageDir := path.Dir(constants.DaemonStorageFilePath)
 
 	{
 		err := sudoCommands(

src/daemonInstaller/handler_linux_systemd.go

@@ -3,16 +3,17 @@
 package daemonInstaller
 
 import (
+	"errors"
 	"os"
 	"os/exec"
 	"path"
 	"regexp"
 	"strings"
 	"text/template"
 
-	"github.com/zerops-io/zcli/src/dns"
-
 	"github.com/zerops-io/zcli/src/constants"
+	"github.com/zerops-io/zcli/src/dns"
+	"github.com/zerops-io/zcli/src/i18n"
 )
 
 type systemDRecord struct {
@@ -26,6 +27,11 @@ func (daemon *systemDRecord) Install() error {
 		return ErrAlreadyInstalled
 	}
 
+	_, err := exec.LookPath("wg")
+	if err != nil {
+		return errors.New(i18n.DaemonInstallWireguardNotFound)
+	}
+
 	tmpServiceFilePath := path.Join(os.TempDir(), daemon.serviceName())
 	file, err := os.Create(tmpServiceFilePath)
 	if err != nil {
@@ -39,8 +45,8 @@ func (daemon *systemDRecord) Install() error {
 	}
 
 	// create read writes paths
-	logDir, _ := path.Split(constants.LogFilePath)
-	daemonStorageDir, _ := path.Split(constants.DaemonStorageFilePath)
+	logDir := path.Dir(constants.LogFilePath)
+	daemonStorageDir := path.Dir(constants.DaemonStorageFilePath)
 	readWritePaths := []string{
 		logDir,
 		daemonStorageDir,
@@ -51,17 +57,16 @@ func (daemon *systemDRecord) Install() error {
 		return err
 	}
 	if dnsManagement == dns.LocalDnsManagementResolveConf {
-		dir, _ := path.Split(constants.ResolvconfOrderFilePath)
+		dir := path.Dir(constants.ResolvconfOrderFilePath)
 		readWritePaths = append(readWritePaths, dir)
 		readWritePaths = append(readWritePaths, "/run/resolvconf/")
 	}
 	if dnsManagement == dns.LocalDnsManagementFile {
-		dir, _ := path.Split(constants.ResolvFilePath)
+		dir := path.Dir(constants.ResolvFilePath)
 		readWritePaths = append(readWritePaths, dir)
 	}
 
-	runtimeDirectory, _ := path.Split(constants.SocketFilePath)
-	runtimeDirectoryName := path.Base(runtimeDirectory)
+	runtimeDirectoryName := path.Base(path.Dir(constants.SocketFilePath))
 
 	if err := tmpl.Execute(
 		file,
@@ -122,8 +127,8 @@ func (daemon *systemDRecord) Remove() error {
 		}
 	}
 
-	logDir, _ := path.Split(constants.LogFilePath)
-	DaemonStorageDir, _ := path.Split(constants.DaemonStorageFilePath)
+	logDir := path.Dir(constants.LogFilePath)
+	DaemonStorageDir := path.Dir(constants.DaemonStorageFilePath)
 
 	{
 		err := sudoCommands(

src/dns/handler_detectDns.go

@@ -22,11 +22,18 @@ const (
 
 func DetectDns() (LocalDnsManagement, error) {
 
-	if utils.FileExists(scutil.BinaryLocation) {
+	binaryLocationExists, err := utils.FileExists(scutil.BinaryLocation)
+	if err != nil {
+		return "", err
+	}
+	if binaryLocationExists {
 		return LocalDnsManagementScutil, nil
 	}
 
-	resolvExists := utils.FileExists(constants.ResolvFilePath)
+	resolvExists, err := utils.FileExists(constants.ResolvFilePath)
+	if err != nil {
+		return "", err
+	}
 
 	if resolvExists {
 		valid, err := isValidSystemdResolve(constants.ResolvFilePath)
@@ -42,7 +49,7 @@ func DetectDns() (LocalDnsManagement, error) {
 		}
 	}
 
-	_, err := exec.LookPath("resolvconf")
+	_, err = exec.LookPath("resolvconf")
 	if err == nil {
 		return LocalDnsManagementResolveConf, nil
 	}

src/dns/handler_isAlive.go

@@ -0,0 +1,43 @@
+package dns
+
+import (
+	"context"
+	"errors"
+	"os/exec"
+	"time"
+
+	"github.com/zerops-io/zcli/src/i18n"
+)
+
+func IsAlive() (bool, error) {
+
+	_, err := exec.LookPath("dig")
+	if err == nil {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+		defer cancel()
+		ipAddress, err := exec.CommandContext(ctx, "dig", "+short", "core-master.zerops", "AAAA").Output()
+		if err != nil {
+			return false, err
+		}
+		if string(ipAddress) == "" {
+			return false, nil
+		}
+
+		return true, nil
+	}
+
+	// ping6 fallback
+	_, err = exec.LookPath("ping6")
+	if err == nil {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+		defer cancel()
+		_, err = exec.CommandContext(ctx, "ping6", "-c", "1", "core-master.zerops").Output()
+		if err != nil {
+			return false, nil
+		}
+
+		return true, nil
+	}
+
+	return false, errors.New(i18n.VpnStatusDnsNoCheckFunction)
+}

src/grpcApiClientFactory/handler.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"time"
 
 	"golang.org/x/oauth2"
 	"google.golang.org/grpc/credentials/oauth"
@@ -44,7 +45,13 @@ func (h *Handler) CreateClient(ctx context.Context, grpcApiAddress string, token
 		grpcApiAddress,
 		grpc.WithPerRPCCredentials(h.createBearerCredentials(token)),
 		grpc.WithTransportCredentials(tlsCreds),
+		grpc.WithChainUnaryInterceptor(func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
+			timeoutCtx, cancel := context.WithTimeout(ctx, time.Second*5)
+			defer cancel()
+			return invoker(timeoutCtx, method, req, reply, cc, opts...)
+		}),
 	)
+
 	if err != nil {
 		return
 	}