add external mode

Author: night556

config/configure.go

@@ -14,9 +14,11 @@
 package config
 
 import (
+	"bufio"
 	"fmt"
 	"io"
 	"io/ioutil"
+	"os"
 	"strconv"
 	"strings"
 
@@ -107,6 +109,9 @@ func doConfigure(ctx *cli.Context, profileName string, mode string) error {
 		case RsaKeyPair:
 			cp.Mode = RsaKeyPair
 			configureRsaKeyPair(w, &cp)
+		case External:
+			cp.Mode = External
+			configureExternal(w, &cp)
 		default:
 			return fmt.Errorf("unexcepted authenticate mode: %s", mode)
 		}
@@ -218,9 +223,18 @@ func configureRsaKeyPair(w io.Writer, cp *Profile) error {
 	return nil
 }
 
+func configureExternal(w io.Writer, cp *Profile) error {
+	cli.Printf(w, "Process Command [%s]: ", cp.ProcessCommand)
+	cp.ProcessCommand = ReadInput(cp.ProcessCommand)
+	return nil
+}
+
 func ReadInput(defaultValue string) string {
 	var s string
-	fmt.Scanf("%s\n", &s)
+	scanner := bufio.NewScanner(os.Stdin)
+	if scanner.Scan() {
+		s = scanner.Text()
+	}
 	if s == "" {
 		return defaultValue
 	}

config/configure_get_test.go

@@ -79,7 +79,7 @@ func TestDoConfigureGet(t *testing.T) {
 	ctx.Flags().Get("profile").SetAssigned(true)
 	ctx.Flags().Get("profile").SetValue("default")
 	doConfigureGet(ctx, []string{})
-	assert.Equal(t, "{\n\t\"name\": \"default\",\n\t\"mode\": \"AK\",\n\t\"access_key_id\": \"default_aliyun_access_key_id\",\n\t\"access_key_secret\": \"default_aliyun_access_key_secret\",\n\t\"sts_token\": \"\",\n\t\"ram_role_name\": \"\",\n\t\"ram_role_arn\": \"\",\n\t\"ram_session_name\": \"\",\n\t\"private_key\": \"\",\n\t\"key_pair_name\": \"\",\n\t\"expired_seconds\": 0,\n\t\"verified\": \"\",\n\t\"region_id\": \"\",\n\t\"output_format\": \"json\",\n\t\"language\": \"\",\n\t\"site\": \"\",\n\t\"retry_timeout\": 0,\n\t\"connect_timeout\": 0,\n\t\"retry_count\": 0\n}\n\n", w.String())
+	assert.Equal(t, "{\n\t\"name\": \"default\",\n\t\"mode\": \"AK\",\n\t\"access_key_id\": \"default_aliyun_access_key_id\",\n\t\"access_key_secret\": \"default_aliyun_access_key_secret\",\n\t\"sts_token\": \"\",\n\t\"ram_role_name\": \"\",\n\t\"ram_role_arn\": \"\",\n\t\"ram_session_name\": \"\",\n\t\"private_key\": \"\",\n\t\"key_pair_name\": \"\",\n\t\"expired_seconds\": 0,\n\t\"verified\": \"\",\n\t\"region_id\": \"\",\n\t\"output_format\": \"json\",\n\t\"language\": \"\",\n\t\"site\": \"\",\n\t\"retry_timeout\": 0,\n\t\"connect_timeout\": 0,\n\t\"retry_count\": 0,\n\t\"process_command\": \"\"\n}\n\n", w.String())
 
 	//testcase 5
 	hookLoadConfiguration = func(fn func(path string, w io.Writer) (Configuration, error)) func(path string, w io.Writer) (Configuration, error) {

config/configure_list.go

@@ -67,6 +67,8 @@ func doConfigureList(w io.Writer) {
 			cred = "arn:" + "***" + GetLastChars(pf.AccessKeyId, 3)
 		case RsaKeyPair:
 			cred = "RsaKeyPair:" + pf.KeyPairName
+		case External:
+			cred = "ProcessCommand:" + pf.ProcessCommand
 		}
 		fmt.Fprintf(tw, "%s\t| %s\t| %s\t| %s\t| %s\n", name, cred, valid, pf.RegionId, pf.Language)
 	}

config/configure_set.go

@@ -111,6 +111,8 @@ func doConfigureSet(w io.Writer, flags *cli.FlagSet) {
 	case RsaKeyPair:
 		profile.PrivateKey = PrivateKeyFlag(flags).GetStringOrDefault(profile.PrivateKey)
 		profile.KeyPairName = KeyPairNameFlag(flags).GetStringOrDefault(profile.KeyPairName)
+	case External:
+		profile.ProcessCommand = ProcessCommandFlag(flags).GetStringOrDefault(profile.ProcessCommand)
 	}
 	profile.RegionId = RegionFlag(flags).GetStringOrDefault(profile.RegionId)
 	profile.Language = LanguageFlag(flags).GetStringOrDefault(profile.Language)

config/configure_set_test.go

@@ -108,7 +108,7 @@ func TestDoConfigureSet(t *testing.T) {
 	w.Reset()
 	doConfigureSet(w, fs)
 	assert.Empty(t, w.String())
-	
+
 	//RsaKeyPair
 	hookLoadConfiguration = func(fn func(path string, w io.Writer) (Configuration, error)) func(path string, w io.Writer) (Configuration, error) {
 		return func(path string, w io.Writer) (Configuration, error) {
@@ -118,4 +118,14 @@ func TestDoConfigureSet(t *testing.T) {
 	w.Reset()
 	doConfigureSet(w, fs)
 	assert.Empty(t, w.String())
+
+	//External
+	hookLoadConfiguration = func(fn func(path string, w io.Writer) (Configuration, error)) func(path string, w io.Writer) (Configuration, error) {
+		return func(path string, w io.Writer) (Configuration, error) {
+			return Configuration{CurrentProfile: "default", Profiles: []Profile{Profile{Name: "default", Mode: External, ProcessCommand: "process command", OutputFormat: "json", RegionId: "cn-hangzhou"}, Profile{Name: "aaa", Mode: AK, AccessKeyId: "sdf", AccessKeySecret: "ddf", OutputFormat: "json"}}}, nil
+		}
+	}
+	w.Reset()
+	doConfigureSet(w, fs)
+	assert.Empty(t, w.String())
 }

config/configure_test.go

@@ -179,6 +179,14 @@ func TestConfigureRsaKeyPair(t *testing.T) {
 		assert.EqualError(t, err, "read key file  failed open : no such file or directory")
 	}
 }
+
+func TestConfigureExternal(t *testing.T) {
+	w := new(bytes.Buffer)
+	err := configureExternal(w, &Profile{Name: "default", Mode: External, ProcessCommand: "process command", RegionId: "cn-hangzhou", OutputFormat: "json"})
+	assert.Equal(t, "Process Command [process command]: ", w.String())
+	assert.Nil(t, err)
+}
+
 func TestReadInput(t *testing.T) {
 	assert.Equal(t, "default", ReadInput("default"))
 }

config/flags.go

@@ -37,6 +37,7 @@ const (
 	SkipSecureVerifyName    = "skip-secure-verify"
 	ConfigurePathFlagName   = "config-path"
 	ExpiredSecondsFlagName  = "expired-seconds"
+	ProcessCommandFlagName  = "process-command"
 )
 
 func AddFlags(fs *cli.FlagSet) {
@@ -58,6 +59,7 @@ func AddFlags(fs *cli.FlagSet) {
 	fs.Add(NewRetryCountFlag())
 	fs.Add(NewSkipSecureVerify())
 	fs.Add(NewExpiredSecondsFlag())
+	fs.Add(NewProcessCommandFlag())
 }
 func ConnectTimeoutFlag(fs *cli.FlagSet) *cli.Flag {
 	return fs.Get(ConnectTimeoutFlagName)
@@ -128,6 +130,9 @@ func ConfigurePathFlag(fs *cli.FlagSet) *cli.Flag {
 func ExpiredSecondsFlag(fs *cli.FlagSet) *cli.Flag {
 	return fs.Get(ExpiredSecondsFlagName)
 }
+func ProcessCommandFlag(fs *cli.FlagSet) *cli.Flag {
+	return fs.Get(ProcessCommandFlagName)
+}
 
 //var OutputFlag = &cli.Flag{Category: "config",
 //	Name: "output", AssignedMode: cli.AssignedOnce, Hidden: true,
@@ -244,6 +249,18 @@ func NewKeyPairNameFlag() *cli.Flag {
 			"使用 `--key-pair-name <KeyPairName>` 指定KeyPairName")}
 }
 
+func NewProcessCommandFlag() *cli.Flag {
+	return &cli.Flag{
+		Category:     "config",
+		Name:         ProcessCommandFlagName,
+		AssignedMode: cli.AssignedOnce,
+		Short: i18n.T(
+			"use `--process-command <ProcessCommand>` to specify external program execution command",
+			"使用 `--process-command <ProcessCommand>` 指定外部程序运行命令",
+		),
+	}
+}
+
 func NewRegionFlag() *cli.Flag {
 	return &cli.Flag{Category: "config",
 		Name:         RegionFlagName,

config/flags_test.go

@@ -204,6 +204,25 @@ func TestAddFlag(t *testing.T) {
 			DefaultValue: "",
 			Persistent:   false,
 		}
+		newProcessCommandFlag = &cli.Flag{
+			Category:     "config",
+			Name:         ProcessCommandFlagName,
+			AssignedMode: cli.AssignedOnce,
+			Short: i18n.T(
+				"use `--process-command <ProcessCommand>` to specify external program execution command",
+				"使用 `--process-command <ProcessCommand>` 指定外部程序运行命令",
+			),
+			Long:         nil,
+			Required:     false,
+			Aliases:      nil,
+			Hidden:       false,
+			Validate:     nil,
+			Fields:       nil,
+			ExcludeWith:  nil,
+			Shorthand:    0,
+			DefaultValue: "",
+			Persistent:   false,
+		}
 		newRegionFlag = &cli.Flag{
 			Category:     "config",
 			Name:         RegionFlagName,
@@ -365,6 +384,9 @@ func TestAddFlag(t *testing.T) {
 	f = NewKeyPairNameFlag()
 	assert.Equal(t, newKeyPairNameFlag, f)
 
+	f = NewProcessCommandFlag()
+	assert.Equal(t, newProcessCommandFlag, f)
+
 	f = NewRegionFlag()
 	assert.Equal(t, newRegionFlag, f)
 

config/profile.go

@@ -18,8 +18,10 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"regexp"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk"
@@ -39,6 +41,7 @@ const (
 	EcsRamRole        = AuthenticateMode("EcsRamRole")
 	RsaKeyPair        = AuthenticateMode("RsaKeyPair")
 	RamRoleArnWithEcs = AuthenticateMode("RamRoleArnWithRoleName")
+	External          = AuthenticateMode("External")
 )
 
 type Profile struct {
@@ -61,6 +64,7 @@ type Profile struct {
 	ReadTimeout     int              `json:"retry_timeout"`
 	ConnectTimeout  int              `json:"connect_timeout"`
 	RetryCount      int              `json:"retry_count"`
+	ProcessCommand  string           `json:"process_command"`
 	parent          *Configuration   //`json:"-"`
 }
 
@@ -117,10 +121,13 @@ func (cp *Profile) Validate() error {
 		if cp.KeyPairName == "" {
 			return fmt.Errorf("invailed key_pair_name")
 		}
+	case External:
+		if cp.ProcessCommand == "" {
+			return fmt.Errorf("invailed process_command")
+		}
 	default:
 		return fmt.Errorf("invailed mode: %s", cp.Mode)
 	}
-
 	return nil
 }
 
@@ -144,6 +151,7 @@ func (cp *Profile) OverwriteWithFlags(ctx *cli.Context) {
 	cp.ConnectTimeout = ConnectTimeoutFlag(ctx.Flags()).GetIntegerOrDefault(cp.ConnectTimeout)
 	cp.RetryCount = RetryCountFlag(ctx.Flags()).GetIntegerOrDefault(cp.RetryCount)
 	cp.ExpiredSeconds = ExpiredSecondsFlag(ctx.Flags()).GetIntegerOrDefault(cp.ExpiredSeconds)
+	cp.ProcessCommand = ProcessCommandFlag(ctx.Flags()).GetStringOrDefault(cp.ProcessCommand)
 
 	if cp.AccessKeyId == "" {
 		switch {
@@ -199,6 +207,8 @@ func AutoModeRecognition(cp *Profile) {
 		cp.Mode = RsaKeyPair
 	} else if cp.RamRoleName != "" {
 		cp.Mode = EcsRamRole
+	} else if cp.ProcessCommand != "" {
+		cp.Mode = External
 	}
 }
 
@@ -233,6 +243,8 @@ func (cp *Profile) GetClient(ctx *cli.Context) (*sdk.Client, error) {
 		client, err = cp.GetClientByPrivateKey(config)
 	case RamRoleArnWithEcs:
 		client, err = cp.GetClientByRamRoleArnWithEcs(config)
+	case External:
+		return cp.GetClientByExternal(config, ctx)
 	default:
 		client, err = nil, fmt.Errorf("unexcepted certificate mode: %s", cp.Mode)
 	}
@@ -336,6 +348,22 @@ func (cp *Profile) GetClientByPrivateKey(config *sdk.Config) (*sdk.Client, error
 	return client, err
 }
 
+func (cp *Profile) GetClientByExternal(config *sdk.Config, ctx *cli.Context) (*sdk.Client, error) {
+	args := strings.Fields(cp.ProcessCommand)
+	cmd := exec.Command(args[0], args[1:]...)
+	buf, err := cmd.CombinedOutput()
+	if err != nil {
+		return nil, err
+	}
+	err = json.Unmarshal(buf, cp)
+	if err != nil {
+		fmt.Println(cp.ProcessCommand)
+		fmt.Println(string(buf))
+		return nil, err
+	}
+	return cp.GetClient(ctx)
+}
+
 func IsRegion(region string) bool {
 	if match, _ := regexp.MatchString("^[a-zA-Z0-9-]*$", region); !match {
 		return false