update (#230)

* update:Help information for the configure command

* add: flag --expired-seconds

Author: night556

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ### Master
 
+- add: flag `--expired-seconds` to specify expiration time
+- update: Help information for the configure command
+
 ### 3.0.29
 
 - update: meta data

config/configure.go

@@ -17,6 +17,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"strconv"
 	"strings"
 
 	"github.com/aliyun/aliyun-cli/cli"
@@ -37,7 +38,7 @@ func NewConfigureCommand() *cli.Command {
 		Short: i18n.T(
 			"configure credential and settings",
 			"配置身份认证和其他信息"),
-		Usage: "configure --mode <AuthenticateMode> --profile <profileName>",
+		Usage: "configure --mode {AK|StsToken|RamRoleArn|EcsRamRole|RsaKeyPair} --profile <profileName>",
 		Run: func(ctx *cli.Context, args []string) error {
 			if len(args) > 0 {
 				return cli.NewInvalidCommandError(args[0], ctx)
@@ -171,7 +172,11 @@ func configureRamRoleArn(w io.Writer, cp *Profile) error {
 	cp.RamRoleArn = ReadInput(cp.RamRoleArn)
 	cli.Printf(w, "Role Session Name [%s]: ", cp.RoleSessionName)
 	cp.RoleSessionName = ReadInput(cp.RoleSessionName)
-	cp.ExpiredSeconds = 900
+	if cp.ExpiredSeconds == 0 {
+		cp.ExpiredSeconds = 900
+	}
+	cli.Printf(w, "Expired Seconds [%v]: ", cp.ExpiredSeconds)
+	cp.ExpiredSeconds, _ = strconv.Atoi(ReadInput(strconv.Itoa(cp.ExpiredSeconds)))
 	return nil
 }
 

config/configure_set.go

@@ -100,6 +100,7 @@ func doConfigureSet(w io.Writer, flags *cli.FlagSet) {
 		profile.AccessKeySecret = AccessKeySecretFlag(flags).GetStringOrDefault(profile.AccessKeySecret)
 		profile.RamRoleArn = RamRoleArnFlag(flags).GetStringOrDefault(profile.RamRoleArn)
 		profile.RoleSessionName = RoleSessionNameFlag(flags).GetStringOrDefault(profile.RoleSessionName)
+		profile.ExpiredSeconds = ExpiredSecondsFlag(flags).GetIntegerOrDefault(profile.ExpiredSeconds)
 	case EcsRamRole:
 		profile.RamRoleName = RamRoleNameFlag(flags).GetStringOrDefault(profile.RamRoleName)
 	case RsaKeyPair:

config/configure_test.go

@@ -158,7 +158,7 @@ func TestConfigureStsToken(t *testing.T) {
 func TestConfigureRamRoleArn(t *testing.T) {
 	w := new(bytes.Buffer)
 	err := configureRamRoleArn(w, &Profile{Name: "default", Mode: AK, AccessKeyId: "access_key_id", AccessKeySecret: "access_key_secret", RamRoleArn: "RamRoleArn", RoleSessionName: "RoleSessionName", RegionId: "cn-hangzhou", OutputFormat: "json"})
-	assert.Equal(t, "Access Key Id [**********_id]: Access Key Secret [**************ret]: Ram Role Arn [RamRoleArn]: Role Session Name [RoleSessionName]: ", w.String())
+	assert.Equal(t, "Access Key Id [**********_id]: Access Key Secret [**************ret]: Ram Role Arn [RamRoleArn]: Role Session Name [RoleSessionName]: Expired Seconds [900]: ", w.String())
 	assert.Nil(t, err)
 }
 

config/flags.go

@@ -35,6 +35,7 @@ const (
 	RetryCountFlagName      = "retry-count"
 	SkipSecureVerifyName    = "skip-secure-verify"
 	ConfigurePathFlagName   = "config-path"
+	ExpiredSecondsFlagName  = "expired-seconds"
 )
 
 func AddFlags(fs *cli.FlagSet) {
@@ -54,6 +55,7 @@ func AddFlags(fs *cli.FlagSet) {
 	fs.Add(NewRetryTimeoutFlag())
 	fs.Add(NewRetryCountFlag())
 	fs.Add(NewSkipSecureVerify())
+	fs.Add(NewExpiredSecondsFlag())
 }
 
 func ProfileFlag(fs *cli.FlagSet) *cli.Flag {
@@ -118,6 +120,9 @@ func SkipSecureVerify(fs *cli.FlagSet) *cli.Flag {
 func ConfigurePathFlag(fs *cli.FlagSet) *cli.Flag {
 	return fs.Get(ConfigurePathFlagName)
 }
+func ExpiredSecondsFlag(fs *cli.FlagSet) *cli.Flag {
+	return fs.Get(ExpiredSecondsFlagName)
+}
 
 //var OutputFlag = &cli.Flag{Category: "config",
 //	Name: "output", AssignedMode: cli.AssignedOnce, Hidden: true,
@@ -207,7 +212,15 @@ func NewRoleSessionNameFlag() *cli.Flag {
 			"use `--role-session-name <RoleSessionName>` to assign RoleSessionName",
 			"使用 `--role-session-name <RoleSessionName>` 指定RoleSessionName")}
 }
-
+func NewExpiredSecondsFlag() *cli.Flag {
+	return &cli.Flag{
+		Category:     "config",
+		Name:         ExpiredSecondsFlagName,
+		AssignedMode: cli.AssignedOnce,
+		Short: i18n.T(
+			"use `--expired-seconds <seconds>` to specify expiration time",
+			"使用 `--expired-seconds <seconds>` 指定凭证过期时间")}
+}
 func NewPrivateKeyFlag() *cli.Flag {
 	return &cli.Flag{Category: "config",
 		Name:         PrivateKeyFlagName,

config/flags_test.go

@@ -295,8 +295,29 @@ func TestAddFlag(t *testing.T) {
 			Shorthand:    0,
 			DefaultValue: "",
 		}
+		newExpiredSecondsFlag = &cli.Flag{
+			Category:     "config",
+			Name:         ExpiredSecondsFlagName,
+			AssignedMode: cli.AssignedOnce,
+			Short: i18n.T(
+				"use `--expired-seconds <seconds>` to specify expiration time",
+				"使用 `--expired-seconds <seconds>` 指定凭证过期时间"),
+			Long:         nil,
+			Required:     false,
+			Aliases:      nil,
+			Hidden:       false,
+			Validate:     nil,
+			Fields:       nil,
+			ExcludeWith:  nil,
+			Shorthand:    0,
+			DefaultValue: "",
+			Persistent:   false,
+		}
 	)
-	f := NewProfileFlag()
+	f := NewExpiredSecondsFlag()
+	assert.Equal(t, newExpiredSecondsFlag, f)
+
+	f = NewProfileFlag()
 	assert.Equal(t, newProfileFlag, f)
 
 	f = NewModeFlag()