Skip to content

Commit c7f9e73

Browse files
committed
add dot env
1 parent 81981ca commit c7f9e73

File tree

3 files changed

+31
-27
lines changed

3 files changed

+31
-27
lines changed

cmd/host.go

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,41 @@ var hostCmd = &cobra.Command{
1616
Long: "Perform actions on hosts",
1717
DisableFlagParsing: true,
1818
Aliases: []string{"server", "servers", "hosts"},
19+
Run: func(cmd *cobra.Command, args []string) {
20+
host()
21+
},
1922
}
2023

2124
func hostCmdInit() {
2225
rootCmd.AddCommand(hostCmd)
23-
hostCmd.AddCommand(hostListCmd)
24-
hostCmd.AddCommand(hostSSHCmd)
25-
hostCmd.AddCommand(hostSFTPCmd)
26-
27-
sshOptions := []string{
28-
"StrictHostKeyChecking=no",
29-
"UserKnownHostsFile=/dev/null",
30-
"ConnectTimeout=3",
31-
}
26+
/*
27+
hostCmd.AddCommand(hostListCmd)
28+
hostCmd.AddCommand(hostSSHCmd)
29+
hostCmd.AddCommand(hostSFTPCmd)
30+
31+
sshOptions := []string{
32+
"StrictHostKeyChecking=no",
33+
"UserKnownHostsFile=/dev/null",
34+
"ConnectTimeout=3",
35+
}
3236
33-
hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.LoginName, "login_name", "l", DefaultSSHUser, "login name")
34-
hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.IdentityFile, "identity_file", "i",
35-
"~/.config/ssh/id_rsa", "identity file")
37+
hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.LoginName, "login_name", "l", DefaultSSHUser, "login name")
38+
hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.IdentityFile, "identity_file", "i",
39+
"~/.config/ssh/id_rsa", "identity file")
3640
37-
sshFlags.Options = hostSSHCmd.PersistentFlags().StringSliceP("option", "o", sshOptions, "ssh option")
38-
hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.SFTPDestPath, "sftp_server_path", "d", "/tmp",
39-
"sftp server dest path")
41+
sshFlags.Options = hostSSHCmd.PersistentFlags().StringSliceP("option", "o", sshOptions, "ssh option")
42+
hostSSHCmd.PersistentFlags().StringVarP(&sshFlags.SFTPDestPath, "sftp_server_path", "d", "/tmp",
43+
"sftp server dest path")
4044
41-
hostSFTPCmd.PersistentFlags().StringVarP(&sshFlags.LoginName, "login_name", "l", DefaultSSHUser, "login name")
42-
sshFlags.Options = hostSFTPCmd.PersistentFlags().StringSliceP("option", "o", sshOptions, "ssh option")
45+
hostSFTPCmd.PersistentFlags().StringVarP(&sshFlags.LoginName, "login_name", "l", DefaultSSHUser, "login name")
46+
sshFlags.Options = hostSFTPCmd.PersistentFlags().StringSliceP("option", "o", sshOptions, "ssh option")
4347
44-
hostSFTPCmd.PersistentFlags().StringVarP(&sshFlags.IdentityFile, "identity_file", "i", "~/.config/ssh/id_rsa",
45-
"identity file")
48+
hostSFTPCmd.PersistentFlags().StringVarP(&sshFlags.IdentityFile, "identity_file", "i", "~/.config/ssh/id_rsa",
49+
"identity file")
4650
47-
hostSFTPCmd.PersistentFlags().StringVarP(&sshFlags.SFTPDestPath, "sftp_server_path", "d", "/tmp",
48-
"sftp server dest path")
51+
hostSFTPCmd.PersistentFlags().StringVarP(&sshFlags.SFTPDestPath, "sftp_server_path", "d", "/tmp",
52+
"sftp server dest path")
53+
*/
4954
}
5055

5156
var hostListCmd = &cobra.Command{

cmd/serverless.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ import (
2020

2121
"github.com/airdb/adb/internal/adblib"
2222
"github.com/spf13/cobra"
23+
apigateway "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway/v20180808"
2324
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
2425
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
2526
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
2627
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/regions"
27-
28-
apigateway "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/apigateway/v20180808"
2928
)
3029

3130
// serverlessCmd represents the serverless command.
@@ -62,8 +61,10 @@ func serverless() {
6261

6362
if _, ok := err.(*errors.TencentCloudSDKError); ok {
6463
fmt.Printf("An API error has returned: %s", err)
64+
6565
return
6666
}
67+
6768
if err != nil {
6869
panic(err)
6970
}
@@ -75,8 +76,10 @@ func serverless() {
7576

7677
if _, ok := err.(*errors.TencentCloudSDKError); ok {
7778
fmt.Printf("An API error has returned: %s", err)
79+
7880
return
7981
}
82+
8083
if err != nil {
8184
panic(err)
8285
}

main.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package main
22

33
import (
4-
"log"
5-
64
"github.com/airdb/adb/cmd"
75
"github.com/airdb/adb/internal/adblib"
86
)
@@ -12,7 +10,5 @@ import (
1210
func main() {
1311
adblib.InitDotEnv()
1412

15-
log.Println(adblib.AdbConfig)
16-
1713
cmd.Execute()
1814
}

0 commit comments

Comments
 (0)