Skip to content

Commit fa65e94

Browse files
fix: only set flags that are actually set (#1640)
This was causing issues where empty flags were being passed to old (pinned) CLI versions that may not know how to process them
1 parent 34eed2d commit fa65e94

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

cmd/run.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,19 @@ func preRun(cmd *cobra.Command, flags *RunFlags) error {
272272
}
273273

274274
// We must set these after prompting for them or else the user will be prompted a second time
275-
if err := cmd.Flags().Set("source", flags.Source); err != nil {
276-
return err
275+
if flags.Source != "" {
276+
if err := cmd.Flags().Set("source", flags.Source); err != nil {
277+
return err
278+
}
277279
}
280+
// Not checking target flag not empty for safety, don't want to change how it was working before
278281
if err := cmd.Flags().Set("target", flags.Target); err != nil {
279282
return err
280283
}
281-
if err := cmd.Flags().Set("dependent", flags.Dependent); err != nil {
282-
return err
284+
if flags.Dependent != "" { // We don't want to set this flag unnecessarily, as it will break old (pinned) versions of the CLI
285+
if err := cmd.Flags().Set("dependent", flags.Dependent); err != nil {
286+
return err
287+
}
283288
}
284289

285290
// Gets a proper value for a mapFlag based on the singleFlag value and the mapFlag value

0 commit comments

Comments
 (0)