Skip to content

Commit ae23661

Browse files
praveenrewar100mik
authored andcommitted
Support positional arguments for pkg repo kick
while using package command tree Signed-off-by: Praveen Rewar <[email protected]>
1 parent 9870aee commit ae23661

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

cli/pkg/kctrl/cmd/kctrl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func AddPackageCommands(o *KctrlOptions, cmd *cobra.Command, flagsFactory cmdcor
186186
pkgrepoCmd.AddCommand(pkgrepo.NewDeleteCmd(pkgrepo.NewDeleteOptions(o.ui, o.depsFactory, o.logger, opts), flagsFactory))
187187
pkgrepoCmd.AddCommand(pkgrepo.NewAddCmd(pkgrepo.NewAddOrUpdateOptions(o.ui, o.depsFactory, o.logger, opts), flagsFactory))
188188
pkgrepoCmd.AddCommand(pkgrepo.NewUpdateCmd(pkgrepo.NewAddOrUpdateOptions(o.ui, o.depsFactory, o.logger, opts), flagsFactory))
189-
pkgrepoCmd.AddCommand(pkgrepo.NewKickCmd(pkgrepo.NewKickOptions(o.ui, o.depsFactory, o.logger), flagsFactory))
189+
pkgrepoCmd.AddCommand(pkgrepo.NewKickCmd(pkgrepo.NewKickOptions(o.ui, o.depsFactory, o.logger, opts), flagsFactory))
190190
pkgrepoCmd.AddCommand(pkgreporel.NewReleaseCmd(pkgreporel.NewReleaseOptions(o.ui, o.depsFactory, o.logger)))
191191

192192
pkgiCmd := pkginst.NewCmd()

cli/pkg/kctrl/cmd/package/repository/kick.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ type KickOptions struct {
3030

3131
NamespaceFlags cmdcore.NamespaceFlags
3232
Name string
33+
34+
pkgCmdTreeOpts cmdcore.PackageCommandTreeOpts
3335
}
3436

35-
func NewKickOptions(ui ui.UI, depsFactory cmdcore.DepsFactory, logger logger.Logger) *KickOptions {
36-
return &KickOptions{ui: ui, statusUI: cmdcore.NewStatusLoggingUI(ui), depsFactory: depsFactory, logger: logger}
37+
func NewKickOptions(ui ui.UI, depsFactory cmdcore.DepsFactory, logger logger.Logger, pkgCmdTreeOpts cmdcore.PackageCommandTreeOpts) *KickOptions {
38+
return &KickOptions{ui: ui, statusUI: cmdcore.NewStatusLoggingUI(ui), depsFactory: depsFactory, logger: logger, pkgCmdTreeOpts: pkgCmdTreeOpts}
3739
}
3840

3941
func NewKickCmd(o *KickOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Command {
@@ -46,7 +48,14 @@ func NewKickCmd(o *KickOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
4648
}
4749

4850
o.NamespaceFlags.Set(cmd, flagsFactory)
49-
cmd.Flags().StringVarP(&o.Name, "repository", "r", "", "Set repository name (required)")
51+
52+
if !o.pkgCmdTreeOpts.PositionalArgs {
53+
cmd.Flags().StringVarP(&o.Name, "repository", "r", "", "Set repository name (required)")
54+
} else {
55+
cmd.Use = "kick REPOSITORY_NAME"
56+
cmd.Args = cobra.ExactArgs(1)
57+
}
58+
5059
o.WaitFlags.Set(cmd, flagsFactory, &cmdcore.WaitFlagsOpts{
5160
AllowDisableWait: true,
5261
DefaultInterval: 1 * time.Second,

0 commit comments

Comments
 (0)