Skip to content

fix: variable update in non-interactive mode clears all existing variables #196

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
yuaanlin merged 1 commit into from
Mar 25, 2026
Merged

fix: variable update in non-interactive mode clears all existing variables #196

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
4 changes: 2 additions & 2 deletions internal/cmd/variable/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ func runCreateVariableInteractive(f *cmdutil.Factory, opts *Options) error {
if err != nil {
return err
}
keyValue := strings.Split(varInput, "=")
keyValue := strings.SplitN(varInput, "=", 2)
if len(keyValue) != 2 {
return fmt.Errorf("invalid input")
return fmt.Errorf("invalid input: expected KEY=VALUE format")
}
opts.keys[keyValue[0]] = keyValue[1]

Expand Down
23 changes: 19 additions & 4 deletions internal/cmd/variable/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ func NewCmdUpdateVariable(f *cmdutil.Factory) *cobra.Command {
}

func runUpdateVariable(f *cmdutil.Factory, opts *Options) error {
opts.keys = make(map[string]string)

if f.Interactive {
opts.keys = make(map[string]string)
return runUpdateVariableInteractive(f, opts)
} else {
return runUpdateVariableNonInteractive(f, opts)
}
return runUpdateVariableNonInteractive(f, opts)
}

func runUpdateVariableInteractive(f *cmdutil.Factory, opts *Options) error {
Expand Down Expand Up @@ -131,6 +129,23 @@ func runUpdateVariableNonInteractive(f *cmdutil.Factory, opts *Options) error {
spinner.WithColor(cmdutil.SpinnerColor),
spinner.WithSuffix(fmt.Sprintf(" Updating variables of service: %s...", opts.name)),
)
s.Start()

// Fetch existing variables and merge with user-provided keys,
// so that unmentioned variables are preserved (not deleted).
// In interactive mode, opts.keys already contains the full
// variable map from the interactive flow.
varList, _, err := f.ApiClient.ListVariables(context.Background(), opts.id, opts.environmentID)
if err != nil {
s.Stop()
return err
}
mergedVars := varList.ToMap()
for k, v := range opts.keys {
mergedVars[k] = v
}
opts.keys = mergedVars

createVarResult, err := f.ApiClient.UpdateVariables(context.Background(), opts.id, opts.environmentID, opts.keys)
if err != nil {
s.Stop()
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/variable/variable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/spf13/cobra"

variableCreateCmd "github.com/zeabur/cli/internal/cmd/variable/create"
varableDeleteCmd "github.com/zeabur/cli/internal/cmd/variable/delete"
variableDeleteCmd "github.com/zeabur/cli/internal/cmd/variable/delete"
variableEnvCmd "github.com/zeabur/cli/internal/cmd/variable/env"
variableListCmd "github.com/zeabur/cli/internal/cmd/variable/list"
variableUpdateCmd "github.com/zeabur/cli/internal/cmd/variable/update"
Expand All @@ -22,7 +22,7 @@ func NewCmdVariable(f *cmdutil.Factory) *cobra.Command {
cmd.AddCommand(variableListCmd.NewCmdListVariables(f))
cmd.AddCommand(variableCreateCmd.NewCmdCreateVariable(f))
cmd.AddCommand(variableUpdateCmd.NewCmdUpdateVariable(f))
cmd.AddCommand(varableDeleteCmd.NewCmdDeleteVariable(f))
cmd.AddCommand(variableDeleteCmd.NewCmdDeleteVariable(f))
cmd.AddCommand(variableEnvCmd.NewCmdEnvVariable(f))

return cmd
Expand Down