feat(cmd/service/auth): move service-auth into the service/auth folder and rename to auth as well as create deprecation alias for service-auth

BREAKING CHANGE:

Author: anthony-gomez-fastly

pkg/app/run_test.go

@@ -81,7 +81,6 @@ profile
 secret-store
 secret-store-entry
 service
-service-auth
 stats
 tls-config
 tls-custom

pkg/commands/alias/serviceauth/create.go

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

pkg/commands/alias/serviceauth/delete.go

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

pkg/commands/alias/serviceauth/describe.go

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

pkg/commands/alias/serviceauth/doc.go

@@ -0,0 +1,2 @@
+// Package serviceauth contains deprecated aliases for the 'service auth' commands.
+package serviceauth

pkg/commands/alias/serviceauth/list.go

@@ -0,0 +1,31 @@
+package serviceauth
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/auth"
+
+	"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 auth list' command instead.")
+	}
+	return c.ListCommand.Exec(in, out)
+}

pkg/commands/alias/serviceauth/root.go

@@ -0,0 +1,31 @@
+package serviceauth
+
+import (
+	"io"
+
+	"github.com/fastly/cli/pkg/argparser"
+	"github.com/fastly/cli/pkg/global"
+)
+
+// RootCommand is the parent command for all subcommands in this package.
+// It should be installed under the primary root command.
+type RootCommand struct {
+	argparser.Base
+	// no flags
+}
+
+// CommandName is the string to be used to invoke this command.
+const CommandName = "serviceauth"
+
+// NewRootCommand returns a new command registered in the parent.
+func NewRootCommand(parent argparser.Registerer, g *global.Data) *RootCommand {
+	var c RootCommand
+	c.Globals = g
+	c.CmdClause = parent.Command(CommandName, "Manipulate Fastly Service Authentication").Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *RootCommand) Exec(_ io.Reader, _ io.Writer) error {
+	panic("unreachable")
+}

pkg/commands/alias/serviceauth/update.go

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

pkg/commands/commands.go

@@ -15,6 +15,7 @@ import (
 	aliaspurge "github.com/fastly/cli/pkg/commands/alias/purge"
 	aliasratelimit "github.com/fastly/cli/pkg/commands/alias/ratelimit"
 	aliasresourcelink "github.com/fastly/cli/pkg/commands/alias/resourcelink"
+	aliasserviceauth "github.com/fastly/cli/pkg/commands/alias/serviceauth"
 	aliasserviceversion "github.com/fastly/cli/pkg/commands/alias/serviceversion"
 	aliasvcl "github.com/fastly/cli/pkg/commands/alias/vcl"
 	aliasvclcondition "github.com/fastly/cli/pkg/commands/alias/vcl/condition"
@@ -101,6 +102,7 @@ import (
 	serviceacl "github.com/fastly/cli/pkg/commands/service/acl"
 	serviceaclentry "github.com/fastly/cli/pkg/commands/service/aclentry"
 	servicealert "github.com/fastly/cli/pkg/commands/service/alert"
+	serviceauth "github.com/fastly/cli/pkg/commands/service/auth"
 	servicebackend "github.com/fastly/cli/pkg/commands/service/backend"
 	servicedictionary "github.com/fastly/cli/pkg/commands/service/dictionary"
 	servicedictionaryentry "github.com/fastly/cli/pkg/commands/service/dictionaryentry"
@@ -115,7 +117,6 @@ import (
 	servicevclcustom "github.com/fastly/cli/pkg/commands/service/vcl/custom"
 	servicevclsnippet "github.com/fastly/cli/pkg/commands/service/vcl/snippet"
 	serviceversion "github.com/fastly/cli/pkg/commands/service/version"
-	"github.com/fastly/cli/pkg/commands/serviceauth"
 	"github.com/fastly/cli/pkg/commands/shellcomplete"
 	"github.com/fastly/cli/pkg/commands/sso"
 	"github.com/fastly/cli/pkg/commands/stats"
@@ -593,7 +594,7 @@ func Define( // nolint:revive // function-length
 	serviceaclentryDescribe := serviceaclentry.NewDescribeCommand(serviceaclentryCmdRoot.CmdClause, data)
 	serviceaclentryList := serviceaclentry.NewListCommand(serviceaclentryCmdRoot.CmdClause, data)
 	serviceaclentryUpdate := serviceaclentry.NewUpdateCommand(serviceaclentryCmdRoot.CmdClause, data)
-	serviceauthCmdRoot := serviceauth.NewRootCommand(app, data)
+	serviceauthCmdRoot := serviceauth.NewRootCommand(serviceCmdRoot.CmdClause, data)
 	serviceauthCreate := serviceauth.NewCreateCommand(serviceauthCmdRoot.CmdClause, data)
 	serviceauthDelete := serviceauth.NewDeleteCommand(serviceauthCmdRoot.CmdClause, data)
 	serviceauthDescribe := serviceauth.NewDescribeCommand(serviceauthCmdRoot.CmdClause, data)
@@ -788,6 +789,12 @@ func Define( // nolint:revive // function-length
 	aliasResourceLinkDescribe := aliasresourcelink.NewDescribeCommand(aliasResourceLinkRoot.CmdClause, data)
 	aliasResourceLinkList := aliasresourcelink.NewListCommand(aliasResourceLinkRoot.CmdClause, data)
 	aliasResourceLinkUpdate := aliasresourcelink.NewUpdateCommand(aliasResourceLinkRoot.CmdClause, data)
+	aliasServiceAuthRoot := aliasserviceauth.NewRootCommand(app, data)
+	aliasServiceAuthCreate := aliasserviceauth.NewCreateCommand(aliasServiceAuthRoot.CmdClause, data)
+	aliasServiceAuthDelete := aliasserviceauth.NewDeleteCommand(aliasServiceAuthRoot.CmdClause, data)
+	aliasServiceAuthDescribe := aliasserviceauth.NewDescribeCommand(aliasServiceAuthRoot.CmdClause, data)
+	aliasServiceAuthList := aliasserviceauth.NewListCommand(aliasServiceAuthRoot.CmdClause, data)
+	aliasServiceAuthUpdate := aliasserviceauth.NewUpdateCommand(aliasServiceAuthRoot.CmdClause, data)
 	aliasVclRoot := aliasvcl.NewRootCommand(app, data)
 	aliasVclDescribe := aliasvcl.NewDescribeCommand(aliasVclRoot.CmdClause, data)
 	aliasVclConditionRoot := aliasvclcondition.NewRootCommand(aliasVclRoot.CmdClause, data)
@@ -1440,6 +1447,11 @@ func Define( // nolint:revive // function-length
 		aliasResourceLinkDescribe,
 		aliasResourceLinkList,
 		aliasResourceLinkUpdate,
+		aliasServiceAuthCreate,
+		aliasServiceAuthDelete,
+		aliasServiceAuthDescribe,
+		aliasServiceAuthList,
+		aliasServiceAuthUpdate,
 		aliasVclDescribe,
 		aliasVclConditionCreate,
 		aliasVclConditionDelete,

pkg/commands/serviceauth/create.go pkg/commands/service/auth/create.gopkg/commands/serviceauth/create.go renamed to pkg/commands/service/auth/create.go

@@ -1,4 +1,4 @@
-package serviceauth
+package auth
 
 import (
 	"context"