Merge branch 'main' into rcaril/CDTOOL-1265-move-fastly-vcl-commands-under-service

Author: rcaril

CHANGELOG.md

@@ -13,6 +13,7 @@
 - feat(compute/deploy): added the  `--no-default-domain` flag to allow for the skipping of automatic domain creation when  deploying a Compute service([#1610](https://github.com/fastly/cli/pull/1610))
 - refactor(argparser/flags.go): add flag conversion utilities for converting string flags to bools and checking ascending and desecnding flags ([#1611](https://github.com/fastly/cli/pull/1611))
 - feat(commands/service/purge): Add 'service purge' command as replacement for 'purge', with an unlisted and deprecated alias of 'purge'. ([#1612](https://github.com/fastly/cli/pull/1612))
+- feat(commands/service/version): Add 'service version ...' commands as replacements for 'service-version ...', with unlisted and deprecated aliases of 'service-version ...'. ([#1614](https://github.com/fastly/cli/pull/1614))
 
 ### Bug fixes:
 

pkg/app/run_test.go

@@ -92,7 +92,6 @@ secret-store
 secret-store-entry
 service
 service-auth
-service-version
 stats
 tls-config
 tls-custom

pkg/commands/alias/serviceversion/activate.go

@@ -0,0 +1,29 @@
+package serviceversion
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/version"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/text"
+)
+
+// ActivateCommand wraps the ActivateCommand from the newcmd package.
+type ActivateCommand struct {
+	*newcmd.ActivateCommand
+}
+
+// NewActivateCommand returns a usable command registered under the parent.
+func NewActivateCommand(parent argparser.Registerer, g *global.Data) *ActivateCommand {
+	c := ActivateCommand{newcmd.NewActivateCommand(parent, g)}
+	c.CmdClause.Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *ActivateCommand) Exec(in io.Reader, out io.Writer) error {
+	text.Deprecated(out, "Use the 'service version activate' command instead.")
+	return c.ActivateCommand.Exec(in, out)
+}

pkg/commands/alias/serviceversion/clone.go

@@ -0,0 +1,31 @@
+package serviceversion
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/version"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/text"
+)
+
+// CloneCommand wraps the CloneCommand from the newcmd package.
+type CloneCommand struct {
+	*newcmd.CloneCommand
+}
+
+// NewCloneCommand returns a usable command registered under the parent.
+func NewCloneCommand(parent argparser.Registerer, g *global.Data) *CloneCommand {
+	c := CloneCommand{newcmd.NewCloneCommand(parent, g)}
+	c.CmdClause.Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *CloneCommand) Exec(in io.Reader, out io.Writer) error {
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service version clone' command instead.")
+	}
+	return c.CloneCommand.Exec(in, out)
+}

pkg/commands/alias/serviceversion/deactivate.go

@@ -0,0 +1,29 @@
+package serviceversion
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/version"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/text"
+)
+
+// DeactivateCommand wraps the DeactivateCommand from the newcmd package.
+type DeactivateCommand struct {
+	*newcmd.DeactivateCommand
+}
+
+// NewDeactivateCommand returns a usable command registered under the parent.
+func NewDeactivateCommand(parent argparser.Registerer, g *global.Data) *DeactivateCommand {
+	c := DeactivateCommand{newcmd.NewDeactivateCommand(parent, g)}
+	c.CmdClause.Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *DeactivateCommand) Exec(in io.Reader, out io.Writer) error {
+	text.Deprecated(out, "Use the 'service version deactivate' command instead.")
+	return c.DeactivateCommand.Exec(in, out)
+}

pkg/commands/alias/serviceversion/doc.go

@@ -0,0 +1,2 @@
+// Package serviceversion contains the 'service-version' aliases for the 'service version' commands.
+package serviceversion

pkg/commands/alias/serviceversion/list.go

@@ -0,0 +1,31 @@
+package serviceversion
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/version"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/text"
+)
+
+// ListCommand wraps the ListCommand from the newcmd package.
+type ListCommand struct {
+	*newcmd.ListCommand
+}
+
+// NewListCommand returns a usable command registered under the parent.
+func NewListCommand(parent argparser.Registerer, g *global.Data) *ListCommand {
+	c := ListCommand{newcmd.NewListCommand(parent, g)}
+	c.CmdClause.Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *ListCommand) Exec(in io.Reader, out io.Writer) error {
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service version list' command instead.")
+	}
+	return c.ListCommand.Exec(in, out)
+}

pkg/commands/alias/serviceversion/lock.go

@@ -0,0 +1,29 @@
+package serviceversion
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/version"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/text"
+)
+
+// LockCommand wraps the LockCommand from the newcmd package.
+type LockCommand struct {
+	*newcmd.LockCommand
+}
+
+// NewLockCommand returns a usable command registered under the parent.
+func NewLockCommand(parent argparser.Registerer, g *global.Data) *LockCommand {
+	c := LockCommand{newcmd.NewLockCommand(parent, g)}
+	c.CmdClause.Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *LockCommand) Exec(in io.Reader, out io.Writer) error {
+	text.Deprecated(out, "Use the 'service version lock' command instead.")
+	return c.LockCommand.Exec(in, out)
+}

pkg/commands/serviceversion/root.go pkg/commands/alias/serviceversion/root.gopkg/commands/serviceversion/root.go renamed to pkg/commands/alias/serviceversion/root.go

@@ -21,7 +21,7 @@ const CommandName = "service-version"
 func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand {
 	var c RootCommand
 	c.Globals = g
-	c.CmdClause = parent.Command(CommandName, "Manipulate Fastly service versions")
+	c.CmdClause = parent.Command(CommandName, "Manipulate Fastly service versions").Hidden()
 	return &c
 }
 

pkg/commands/alias/serviceversion/stage.go

@@ -0,0 +1,29 @@
+package serviceversion
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/version"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/text"
+)
+
+// StageCommand wraps the StageCommand from the newcmd package.
+type StageCommand struct {
+	*newcmd.StageCommand
+}
+
+// NewStageCommand returns a usable command registered under the parent.
+func NewStageCommand(parent argparser.Registerer, g *global.Data) *StageCommand {
+	c := StageCommand{newcmd.NewStageCommand(parent, g)}
+	c.CmdClause.Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *StageCommand) Exec(in io.Reader, out io.Writer) error {
+	text.Deprecated(out, "Use the 'service version stage' command instead.")
+	return c.StageCommand.Exec(in, out)
+}