Thanks to visit codestin.com
Credit goes to github.com

Skip to content

breaking(profiles): replace --name with positional arg + allow global override #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Integralist merged 1 commit into from
Mar 8, 2023
Merged

breaking(profiles): replace --name with positional arg + allow global override #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions pkg/commands/profile/profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,28 @@ func TestToken(t *testing.T) {
{
TestScenario: testutil.TestScenario{
Name: "validate token is displayed for the specified profile",
Args: args("profile token --name bar"), // we choose a non-default profile
Args: args("profile token bar"), // we choose a non-default profile
WantOutput: "456",
},
ConfigFile: config.File{
Profiles: config.Profiles{
"foo": &config.Profile{
Default: true,
Email: "[email protected]",
Token: "123",
},
"bar": &config.Profile{
Default: false,
Email: "[email protected]",
Token: "456",
},
},
},
},
{
TestScenario: testutil.TestScenario{
Name: "validate token is displayed for the specified profile using global --profile",
Args: args("profile token --profile bar"), // we choose a non-default profile
WantOutput: "456",
},
ConfigFile: config.File{
Expand All @@ -651,7 +672,7 @@ func TestToken(t *testing.T) {
{
TestScenario: testutil.TestScenario{
Name: "validate an unrecognised profile causes an error",
Args: args("profile token --name unknown"),
Args: args("profile token unknown"),
WantError: "profile 'unknown' does not exist",
},
},
Expand Down
27 changes: 19 additions & 8 deletions pkg/commands/profile/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,42 @@ type TokenCommand struct {
func NewTokenCommand(parent cmd.Registerer, g *global.Data) *TokenCommand {
var c TokenCommand
c.Globals = g
c.CmdClause = parent.Command("token", "Print access token")
c.CmdClause.Flag("name", "Print access token for the named profile").Short('n').StringVar(&c.profile)
c.CmdClause = parent.Command("token", "Print access token (defaults to the 'active' profile)")
c.CmdClause.Arg("profile", "Print access token for the named profile").Short('p').StringVar(&c.profile)
return &c
}

// Exec implements the command interface.
func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) (err error) {
if c.profile == "" {
if name, p := profile.Default(c.Globals.Config.Profiles); name != "" {
var p string
if c.profile != "" {
p = c.profile
}
if c.Globals.Flags.Profile != "" {
p = c.Globals.Flags.Profile
// NOTE: If global --profile is set, it take precedence over 'profile' arg.
// It's unlikely someone will provide both, but we'll code defensively.
}

if p != "" {
if name, p := profile.Get(p, c.Globals.Config.Profiles); name != "" {
text.Output(out, p.Token)
return nil
}
msg := fmt.Sprintf(profile.DoesNotExist, p)
return fsterr.RemediationError{
Inner: fmt.Errorf("no profiles available"),
Inner: fmt.Errorf(msg),
Remediation: fsterr.ProfileRemediation,
}
}

if name, p := profile.Get(c.profile, c.Globals.Config.Profiles); name != "" {
// If no 'profile' arg or global --profile, then we'll use 'active' profile.
if name, p := profile.Default(c.Globals.Config.Profiles); name != "" {
text.Output(out, p.Token)
return nil
}
msg := fmt.Sprintf(profile.DoesNotExist, c.profile)
return fsterr.RemediationError{
Inner: fmt.Errorf(msg),
Inner: fmt.Errorf("no profiles available"),
Remediation: fsterr.ProfileRemediation,
}
}