diff --git a/cmd/influx/template.go b/cmd/influx/template.go index 7ff12e313c6..1b4ba0dbbed 100644 --- a/cmd/influx/template.go +++ b/cmd/influx/template.go @@ -31,7 +31,7 @@ import ( type templateSVCsFn func() (pkger.SVC, influxdb.OrganizationService, error) func cmdApply(f *globalFlags, opts genericCLIOpts) *cobra.Command { - return newCmdPkgerBuilder(newPkgerSVC, f, opts).cmdApply() + return newCmdPkgerBuilder(newPkgerSVC, f, opts).cmdTemplateApply() } func cmdExport(f *globalFlags, opts genericCLIOpts) *cobra.Command { @@ -102,28 +102,9 @@ func newCmdPkgerBuilder(svcFn templateSVCsFn, f *globalFlags, opts genericCLIOpt } } -func (b *cmdTemplateBuilder) cmdApply() *cobra.Command { - cmd := b.cmdTemplateApply() - - deprecatedCmds := []*cobra.Command{ - b.cmdExport(), - b.cmdTemplateSummary(), - b.cmdStackDeprecated(), - b.cmdTemplateValidate(), - } - for i := range deprecatedCmds { - deprecatedCmds[i].Hidden = true - } - - cmd.AddCommand(deprecatedCmds...) - - return cmd -} - func (b *cmdTemplateBuilder) cmdTemplateApply() *cobra.Command { cmd := b.newCmd("apply", b.applyRunEFn) enforceFlagValidation(cmd) - cmd.Aliases = []string{"pkg"} cmd.Short = "Apply a template to manage resources" cmd.Long = ` The apply command applies InfluxDB template(s). Use the command to create new @@ -654,18 +635,6 @@ func (b *cmdTemplateBuilder) cmdStacks() *cobra.Command { return cmd } -// TODO(jsteenb2): nuke the deprecated command here after OSS beta13 release. -func (b *cmdTemplateBuilder) cmdStackDeprecated() *cobra.Command { - cmd := b.genericCLIOpts.newCmd("stack", nil, false) - cmd.Short = "Stack management commands" - cmd.AddCommand( - b.cmdStackInit(), - b.cmdStackList(), - b.cmdStackRemove(), - ) - return cmd -} - func (b *cmdTemplateBuilder) cmdStackInit() *cobra.Command { cmd := b.newCmd("init", b.stackInitRunEFn) cmd.Short = "Initialize a stack"