@zerops/zcli 0.25.9 → 8.0.1

package/package.json

@@ -1,22 +1,27 @@
 {
   "name": "@zerops/zcli",
-  "version": "v0.25.9",
-  "main": "./tools/npm/binary.js",
+  "version": "v8.0.1",
+  "main": "./utils/binary.js",
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "binary-install": "^0.0.1",
+    "@cloudflare/binary-install": "0.2.0",
+    "@octokit/core": "3.5.1",
     "actions-toolkit": "^2.2.0",
     "yargs": "^15.3.1"
   },
   "devDependencies": {
-    "standard": "^14.3.3"
+    "standard": "^16.0.4"
   },
   "bin": {
-    "zcli": "./tools/npm/run.js"
+    "zcli": "utils/run.js"
   },
+  "files": [
+    "/utils",
+    "package.json"
+  ],
   "scripts": {
-    "postinstall": "./tools/npm/install.js",
-    "preuninstall": "./tools/npm/uninstall.js"
+    "postinstall": "node ./utils/install.js",
+    "preuninstall": "node ./utils/uninstall.js"
   }
 }

package/{tools/npm → utils}/binary.js

@@ -1,24 +1,27 @@
-const { Binary } = require("binary-install");
+const { Binary } = require("@cloudflare/binary-install");
 const os = require("os");
 
 function getPlatform() {
   const type = os.type();
   const arch = os.arch();
-
   if (type === "Linux" && arch === "x64") return "linux-amd64";
   if (type === "Linux" && arch === "x86") return "linux-i386";
   if (type === "Darwin" && arch === "x64") return "darwin-amd64";
-
+  if (type === "Darwin" && arch === "arm64") return "darwin-arm64";
+  if (type === "Windows_NT" && arch === "x64") return "win-x64.exe";
   throw new Error(`Unsupported platform: ${type} ${arch}`);
 }
 
 function getBinary() {
   const platform_arch = getPlatform();
-  const version = require("../../package.json").version;
-  const url = `https://github.com/l-hellmann/zcli/releases/download/${version}/zcli-${platform_arch}.tar.gz`;
+  const version = require("../package.json").version;
+  const compatibleVersion = version.startsWith('v') ? version : `v${version}`;
+  const url = `https://github.com/zeropsio/zcli/releases/download/${compatibleVersion}/zcli-${platform_arch}-npm.tar.gz`;
   const name = `zcli-${platform_arch}`;
+
   return new Binary(url, { name });
 }
+
 const run = () => {
   const binary = getBinary();
   binary.run();

package/.github/workflows/master.yml

@@ -1,36 +0,0 @@
-name: Master
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.14
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Get dependencies
-      run: | 
-        export GOPATH=$HOME/go
-        ./tools/install.sh
-
-    - name: Build
-      run: go build -v .
-
-    - name: Test
-      run: go test -v .
-
-

package/.github/workflows/tag.yml

@@ -1,69 +0,0 @@
-name: Upload build asset
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    name: Upload build asset for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            buildCmd: env GOOS=linux GOARCH=amd64 go build -o zcli-linux-amd64 ./main.go && tar -czvf zcli-linux-amd64.tar.gz zcli-linux-amd64
-            file: zcli-linux-amd64
-            args:
-            strip: true
-          - os: macos-latest
-            buildCmd: env GOOS=darwin GOARCH=amd64 go build -o zcli-darwin-amd64 ./main.go && tar -czvf zcli-darwin-amd64.tar.gz zcli-darwin-amd64
-            file: zcli-darwin-amd64
-            args:
-            strip: false
-
-    steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Get dependencies
-        run: |
-          export GOPATH=$HOME/go
-          ./tools/install.sh
-
-      - name: Build
-        run: ${{ matrix.buildCmd }}
-
-      - name: Compress binary
-        uses: svenstaro/upx-action@v1-release
-        with:
-          file: ./${{ matrix.file }}
-          args: ${{ matrix.args }}
-          strip: ${{ matrix.strip }}
-
-      - name: Upload asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./${{ matrix.file }}
-          asset_name: ${{ matrix.file }}
-          asset_content_type: application/octet-stream
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - run: npm ci --ignore-scripts
-      - run: npm i -g replace-in-files-cli
-      - run: replace-in-files --string='v0.0.0-zerops' --replacement='${{ github.event.release.tag_name }}' package.json
-      - run: npm publish --access=public
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/.golangci.yaml

@@ -1,58 +0,0 @@
-concurrency: 16
-run:
-  deadline: 10m
-  issues-exit-code: 1
-  tests: true
-
-output:
-  format: colored-line-number
-
-linters-settings:
-  gocritic:
-    disabled-checks:
-      - captLocal # CIDR, IpV6, ....
-      - unlambda # falsePositive for function passed to defer
-  godox:
-    keywords:
-      - FIXME
-
-issues:
-  max-same-issues: 0
-
-  exclude-rules:
-
-    # Exclude some staticcheck messages
-    - linters:
-        - staticcheck
-      text: "SA4004:" #https://staticcheck.io/docs/checks#SA4004 The loop exits unconditionally after one iteration
-
-linters:
-  enable:
-    - scopelint
-    - govet
-    - ineffassign
-    - varcheck
-    - unused
-    - deadcode
-    - bodyclose
-    - structcheck
-    - staticcheck
-    - godox
-
-  # high priority
-  #    - rowserrcheck
-  #    - errcheck
-
-  # normal priority
-  #   - prealloc - jednotky
-
-
-  # low priority
-  #   - gosimple
-  #   - gosec
-  #   - goconst
-  #   - gocritic
-  #   - nakedret
-
-  disable-all: true
-  fast: false

package/LICENSE

@@ -1 +0,0 @@
-TODO

package/README.md

@@ -1,2 +0,0 @@
-Zerops CLI
-==========

package/bin/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

package/cmd/deploy.go

@@ -1,65 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"time"
-
-	"github.com/zerops-io/zcli/src/command/deploy"
-	"github.com/zerops-io/zcli/src/service/httpClient"
-	"github.com/zerops-io/zcli/src/service/zipClient"
-
-	"github.com/spf13/cobra"
-)
-
-func deployCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:          "deploy projectName serviceName pathToFileOrDir [pathToFileOrDir]",
-		SilenceUsage: true,
-		Args:         cobra.MinimumNArgs(3),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			regSignals(cancel, logger)
-
-			certReader, err := createCertReader()
-			if err != nil {
-				return err
-			}
-
-			tlsConfig, err := createTlsConfig(certReader)
-			if err != nil {
-				return err
-			}
-
-			apiGrpcClient, closeFunc, err := createApiGrpcClient(ctx, tlsConfig)
-			if err != nil {
-				return err
-			}
-			defer closeFunc()
-
-			httpClient := httpClient.New(httpClient.Config{
-				HttpTimeout: time.Minute * 15,
-			})
-
-			zipClient := zipClient.New(zipClient.Config{}, logger)
-
-			return deploy.New(
-				deploy.Config{},
-				httpClient,
-				zipClient,
-				logger,
-				apiGrpcClient,
-			).Run(ctx, deploy.RunConfig{
-				ZipFilePath:      params.GetString("zipFilePath"),
-				WorkingDir:       params.GetString("workingDir"),
-				ProjectName:      args[0],
-				ServiceStackName: args[1],
-				PathsForPacking:  args[2:],
-			})
-		},
-	}
-
-	params.RegisterString(cmd, "workingDir", "./", "working dir, all files path are relative to this directory")
-	params.RegisterString(cmd, "zipFilePath", "", "if it's set, save final zip file")
-
-	return cmd
-}

package/cmd/di.go

@@ -1,65 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"crypto/tls"
-	"os"
-	"path"
-
-	"github.com/zerops-io/zcli/src/service/storage"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
-
-	"github.com/zerops-io/zcli/src/service/sudoers"
-
-	"github.com/zerops-io/zcli/src/service/certReader"
-	"github.com/zerops-io/zcli/src/service/tlsConfig"
-	"github.com/zerops-io/zcli/src/zeropsApiProtocol"
-)
-
-func createCertReader() (*certReader.Handler, error) {
-	return certReader.New(
-		certReader.Config{
-			Token: params.GetString("token"),
-		},
-	)
-}
-
-func createSudoers() *sudoers.Handler {
-	return sudoers.New(
-		sudoers.Config{},
-	)
-}
-
-func createStorage() (*storage.Handler, error) {
-	currentDir, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-
-	return storage.New(
-		storage.Config{
-			FilePath: path.Join(currentDir, "zcli.data"),
-		},
-	)
-}
-
-func createTlsConfig(certReader *certReader.Handler) (*tls.Config, error) {
-	return tlsConfig.CreateTlsConfig(
-		certReader,
-	)
-}
-
-func createApiGrpcClient(ctx context.Context, tlsConfig *tls.Config) (_ zeropsApiProtocol.ZeropsApiProtocolClient, closeFunc func(), _ error) {
-
-	connection, err := grpc.DialContext(ctx, params.GetString("grpcApiAddress"), grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	closeFunc = func() { _ = connection.Close() }
-
-	return zeropsApiProtocol.NewZeropsApiProtocolClient(connection), closeFunc, nil
-
-}

package/cmd/login.go

@@ -1,48 +0,0 @@
-package cmd
-
-import (
-	"context"
-	"time"
-
-	"github.com/zerops-io/zcli/src/command/login"
-	"github.com/zerops-io/zcli/src/service/httpClient"
-
-	"github.com/spf13/cobra"
-)
-
-func loginCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:          "login",
-		SilenceUsage: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			regSignals(cancel, logger)
-
-			storage, err := createStorage()
-			if err != nil {
-				return err
-			}
-
-			httpClient := httpClient.New(httpClient.Config{
-				HttpTimeout: time.Second * 10,
-			})
-
-			return login.New(
-				login.Config{
-					ApiAddress: params.GetString("restApiAddress"),
-				},
-				logger,
-				storage,
-				httpClient,
-			).Run(ctx, login.RunConfig{
-				ZeropsLogin:    params.GetString("zeropsLogin"),
-				ZeropsPassword: params.GetString("zeropsPassword"),
-			})
-		},
-	}
-
-	params.RegisterString(cmd, "zeropsLogin", "", "zerops account login")
-	params.RegisterString(cmd, "zeropsPassword", "", "zerops account password")
-
-	return cmd
-}

package/cmd/root.go

@@ -1,70 +0,0 @@
-package cmd
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/spf13/cobra"
-	loggerPackage "github.com/zerops-io/zcli/src/service/logger"
-	paramsPackage "github.com/zerops-io/zcli/src/service/params"
-	storagePackage "github.com/zerops-io/zcli/src/service/storage"
-)
-
-var (
-	logger = loggerPackage.New(loggerPackage.Config{})
-	params *paramsPackage.Handler
-)
-
-func ExecuteRootCmd(builtinToken string) {
-
-	storage, err := createStorage()
-	if err != nil {
-		logger.Error(err)
-		return
-	}
-	params = paramsPackage.New(logger, storage)
-
-	rootCmd := &cobra.Command{
-		Use: "zcli",
-	}
-
-	params.RegisterString(rootCmd, "restApiAddress", "https://app.zerops.dev", "address of rest api", paramsPackage.Persistent())
-	params.RegisterString(rootCmd, "grpcApiAddress", "app.zerops.dev:20902", "address of grpc api", paramsPackage.Persistent())
-	params.RegisterString(rootCmd, "vpnApiAddress", "vpn.app.zerops.dev", "address of vpn api", paramsPackage.Persistent())
-	params.RegisterString(
-		rootCmd, "token", builtinToken, "authentication token",
-		paramsPackage.Persistent(),
-		paramsPackage.FromTempData(func(data *storagePackage.Data) interface{} {
-			return data.Token
-		}),
-	)
-
-	rootCmd.AddCommand(deployCmd())
-	rootCmd.AddCommand(startVpnCmd())
-	rootCmd.AddCommand(stopVpnCmd())
-	rootCmd.AddCommand(loginCmd())
-
-	err = params.InitViper()
-	if err != nil {
-		logger.Error(err)
-		return
-	}
-
-	err = rootCmd.Execute()
-	if err != nil {
-		os.Exit(1)
-	}
-}
-
-func regSignals(contextCancel func(), logger loggerPackage.Logger) {
-	sigs := make(chan os.Signal, 1)
-
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
-
-	go func() {
-		sig := <-sigs
-		logger.Info("\n", "signal:", sig)
-		contextCancel()
-	}()
-}

package/cmd/startVpn.go

@@ -1,59 +0,0 @@
-package cmd
-
-import (
-	"context"
-
-	"github.com/zerops-io/zcli/src/command/startVpn"
-
-	"github.com/spf13/cobra"
-)
-
-func startVpnCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:          "startVpn projectName",
-		SilenceUsage: true,
-		Args:         cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			regSignals(cancel, logger)
-
-			sudoers := createSudoers()
-
-			storage, err := createStorage()
-			if err != nil {
-				return err
-			}
-
-			certReader, err := createCertReader()
-			if err != nil {
-				return err
-			}
-
-			tlsConfig, err := createTlsConfig(certReader)
-			if err != nil {
-				return err
-			}
-
-			apiGrpcClient, apiCloseFunc, err := createApiGrpcClient(ctx, tlsConfig)
-			if err != nil {
-				return err
-			}
-			defer apiCloseFunc()
-
-			return startVpn.New(
-				startVpn.Config{
-					VpnAddress: params.GetString("vpnApiAddress"),
-					UserId:     certReader.UserId,
-				},
-				logger,
-				apiGrpcClient,
-				sudoers,
-				storage,
-			).Run(ctx, startVpn.RunConfig{
-				ProjectName: args[0],
-			})
-		},
-	}
-
-	return cmd
-}

package/cmd/stopVpn.go

@@ -1,36 +0,0 @@
-package cmd
-
-import (
-	"context"
-
-	"github.com/zerops-io/zcli/src/command/stopVpn"
-
-	"github.com/spf13/cobra"
-)
-
-func stopVpnCmd() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:          "stopVpn",
-		SilenceUsage: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			ctx, cancel := context.WithCancel(context.Background())
-			regSignals(cancel, logger)
-
-			sudoers := createSudoers()
-
-			storage, err := createStorage()
-			if err != nil {
-				return err
-			}
-
-			return stopVpn.New(
-				stopVpn.Config{},
-				logger,
-				sudoers,
-				storage,
-			).Run(ctx, stopVpn.RunConfig{})
-		},
-	}
-
-	return cmd
-}

package/tools/gomodrun.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-)
-
-func getMod(dir string) (string, error) {
-	if _, err := os.Stat(path.Join(dir, "go.mod")); err == nil {
-		return dir, nil
-	}
-	newDir := path.Dir(dir)
-	if newDir != "" {
-		return getMod(newDir)
-	}
-	return "", fmt.Errorf("go.mod not found")
-}
-
-func main() {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	modDir, err := getMod(wd)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if len(os.Args) < 2 {
-		log.Fatal("executable not defined")
-		return
-	}
-
-	bin := os.Args[1]
-	if !path.IsAbs(bin) {
-		bin = path.Join(modDir, "bin", bin)
-	}
-
-	if err := os.Setenv("PATH", path.Join(modDir, "bin")+":"+os.Getenv("PATH")); err != nil {
-		log.Fatal(err)
-		return
-	}
-
-	cmd := &exec.Cmd{
-		Path:   bin,
-		Dir:    wd,
-		Stdout: os.Stdout,
-		Stdin:  os.Stdin,
-		Stderr: os.Stderr,
-		Args:   os.Args[1:],
-		Env:    os.Environ(),
-	}
-	if err := cmd.Run(); err != nil {
-		log.Fatal(err)
-	}
-	os.Exit(0)
-}

package/tools/install.sh

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-cd `dirname $0`
-
-set -e
-
-cd ..
-export GOBIN=$GOPATH/bin
-export PATH=$GOBIN:$PATH
-
-[[ ! -d "${GOBIN}" ]] && mkdir -p "${GOBIN}"
-
-go install tools/gomodrun.go
-
-export GOBIN=$PWD/bin
-export PATH="${GOBIN}:${PATH}"
-
-echo "GOBIN=${GOBIN}"
-
-go install github.com/golang/protobuf/protoc-gen-go/...
-
-[[ -f protoc.zip ]] && rm protoc.zip
-[[ -f bin/protoc ]] && rm bin/protoc
-[[ -d tmp ]] && rm -rf tmp
-mkdir tmp
-cd tmp
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protoc-3.7.1-osx-x86_64.zip
-else
-    wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip
-fi
-ls -la protoc.zip
-unzip protoc.zip
-mv bin/protoc ../bin
-cd ..
-rm -rf tmp
-chmod +x bin/protoc
-
-# https://github.com/golangci/golangci-lint#go Please, do not install golangci-lint by go get
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$GOBIN" v1.23.8