Merge pull request #38 from airdb/dev

Dev

Author: deancn

.github/hooks/pre-commit

@@ -9,4 +9,4 @@
 
 # Step 1: gofmt, ignore gin-template files
 gofmt -w -s $(git rev-parse --show-toplevel) || true
-#golangci-lint run
+golangci-lint run

cmd/generate.go

@@ -24,7 +24,7 @@ import (
 
 	// statik zip data, `statik -include='*' -src gin-template/ -f`.
 	_ "airdb.io/airdb/adb/statik"
-	"github.com/airdb/sailor"
+	"airdb.io/airdb/sailor/fileutil"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cobra"
 )
@@ -100,7 +100,7 @@ func generate(args []string) {
 			return err
 		}
 
-		err = sailor.TemplateGenerateFileFromReader(srcFile, projectDir, generateFlags)
+		err = fileutil.TemplateGenerateFileFromReader(srcFile, projectDir, generateFlags)
 		if err != nil {
 			return err
 		}

cmd/host.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/airdb/sailor"
+	"airdb.io/airdb/sailor"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
 	"github.com/spf13/cobra"
 )
@@ -30,7 +30,9 @@ func hostCmdInit() {
 	}
 
 	hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.LoginName, "login_name", "l", DefaultSSHUser, "login name")
-	hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.IdentityFile, "identity_file", "i", "~/.config/ssh/id_rsa", "identity file")
+	hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.IdentityFile, "identity_file", "i",
+		"~/.config/ssh/id_rsa", "identity file")
+
 	sshFlags.Options = hostSSHCmd.PersistentFlags().StringSliceP("option", "o", sshOptions, "ssh option")
 	hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.SFTPDestPath, "sftp_server_path", "d", "/tmp",
 		"sftp server dest path")

cmd/mysql.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"airdb.io/airdb/adb/internal/adblib"
-	"github.com/airdb/sailor"
+	"airdb.io/airdb/sailor"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
 	"github.com/spf13/cobra"
 )

cmd/service.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 
 	"airdb.io/airdb/adb/internal/adblib"
-	"github.com/airdb/sailor"
+	"airdb.io/airdb/sailor"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
 	"github.com/spf13/cobra"
 )

go.mod

@@ -3,20 +3,17 @@ module airdb.io/airdb/adb
 go 1.15
 
 require (
+	airdb.io/airdb/sailor v0.0.3
 	github.com/AlecAivazis/survey/v2 v2.0.8
 	github.com/MakeNowJust/heredoc v1.0.0
-	github.com/airdb/sailor v1.1.2-0.20200802151610-a033b3f2a246
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.279
 	github.com/imroc/req v0.2.4
-	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/minio/selfupdate v0.3.1
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/rakyll/statik v0.1.7
 	github.com/slack-go/slack v0.6.5
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.0
 	github.com/tencentcloud/tencentcloud-sdk-go v1.0.12
-	golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
 	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
 )

go.sum

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"path"
 
+	"airdb.io/airdb/sailor/fileutil"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/airdb/sailor"
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/viper"
 )
@@ -121,7 +121,7 @@ func SetAliyunConfig() error {
 		return err
 	}
 
-	err = sailor.WriteFile(aliyunConfigFile(), string(jsonByte))
+	err = fileutil.WriteFile(aliyunConfigFile(), string(jsonByte))
 	if err != nil {
 		return err
 	}
@@ -159,7 +159,7 @@ func SetSlackConfig() error {
 		return err
 	}
 
-	err = sailor.WriteFile(slackConfigFile(), string(jsonByte))
+	err = fileutil.WriteFile(slackConfigFile(), string(jsonByte))
 	if err != nil {
 		return err
 	}

internal/adblib/config.go

@@ -1,11 +1,12 @@
 package adblib
 
 import (
+	"airdb.io/airdb/sailor"
 	"fmt"
 	"time"
 
+	"airdb.io/airdb/sailor/process"
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/airdb/sailor"
 	"github.com/imroc/req"
 )
 
@@ -18,7 +19,7 @@ type User struct {
 func LoginWithToken() {
 	fmt.Print(TokenRequest)
 
-	var bar sailor.ProcessBar
+	var bar process.Bar
 
 	bar.NewOption(0, 100)
 

internal/adblib/login.go

@@ -148,6 +148,7 @@ $ tcpdump commands
 `)
 	S3Doc = heredoc.Doc(`
 # Minio
+	wget https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2019-10-02T19-41-02Z
 	wget https://dl.min.io/client/mc/release/linux-amd64/mc
 	mc config host add <bucketname> https://s3.airdb.io <accessKey> <secretKey>
 `)