Skip to content

Fixed --environment flag #705

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
andrewnester merged 1 commit into from
Aug 28, 2023
Merged

Fixed --environment flag #705

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
2 changes: 1 addition & 1 deletion cmd/root/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func getTarget(cmd *cobra.Command) (value string) {

oldFlag := cmd.Flag("environment")
if oldFlag != nil {
value = flag.Value.String()
value = oldFlag.Value.String()
Copy link
Copy Markdown
Contributor

@lennartkats-db lennartkats-db Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d'oh

if value != "" {
return
}
Expand Down
18 changes: 16 additions & 2 deletions cmd/root/bundle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestTargetFlagFull(t *testing.T) {
err := cmd.ExecuteContext(ctx)
assert.NoError(t, err)

assert.Equal(t, cmd.Flag("target").Value.String(), "development")
assert.Equal(t, getTarget(cmd), "development")
}

func TestTargetFlagShort(t *testing.T) {
Expand All @@ -150,5 +150,19 @@ func TestTargetFlagShort(t *testing.T) {
err := cmd.ExecuteContext(ctx)
assert.NoError(t, err)

assert.Equal(t, cmd.Flag("target").Value.String(), "production")
assert.Equal(t, getTarget(cmd), "production")
}

// TODO: remove when environment flag is fully deprecated
func TestTargetEnvironmentFlag(t *testing.T) {
cmd := emptyCommand(t)
initTargetFlag(cmd)
initEnvironmentFlag(cmd)
cmd.SetArgs([]string{"version", "--environment", "development"})

ctx := context.Background()
err := cmd.ExecuteContext(ctx)
assert.NoError(t, err)

assert.Equal(t, getTarget(cmd), "development")
}