feat(commands/service/alert): convert alerts to service alert

BREAKING CHANGE:

Author: anthony-gomez-fastly

pkg/commands/alias/alert/create.go

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

pkg/commands/alias/alert/delete.go

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

pkg/commands/alias/alert/describe.go

@@ -0,0 +1,29 @@
+package alert
+
+import (
+	"io"
+
+	newcmd "github.com/fastly/cli/pkg/commands/service/alert"
+
+	"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 {
+	text.Deprecated(out, "Use the 'service alert describe' command instead.")
+	return c.DescribeCommand.Exec(in, out)
+}

pkg/commands/alias/alert/doc.go

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

pkg/commands/alias/alert/history.go

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

pkg/commands/alias/alert/list.go

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

pkg/commands/alerts/root.go pkg/commands/alias/alert/root.gopkg/commands/alerts/root.go renamed to pkg/commands/alias/alert/root.go

@@ -1,4 +1,4 @@
-package alerts
+package alert
 
 import (
 	"io"
@@ -15,13 +15,13 @@ type RootCommand struct {
 }
 
 // CommandName is the string to be used to invoke this command.
-const CommandName = "alerts"
+const CommandName = "alert"
 
 // 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 Alerts")
+	c.CmdClause = parent.Command(CommandName, "Manipulate Fastly Alerts").Hidden()
 	return &c
 }
 

pkg/commands/alias/alert/update.go

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

pkg/commands/commands.go

@@ -4,9 +4,9 @@ import (
 	"github.com/fastly/kingpin"
 
 	"github.com/fastly/cli/pkg/argparser"
-	"github.com/fastly/cli/pkg/commands/alerts"
 	aliasacl "github.com/fastly/cli/pkg/commands/alias/acl"
 	aliasaclentry "github.com/fastly/cli/pkg/commands/alias/aclentry"
+	aliasalert "github.com/fastly/cli/pkg/commands/alias/alert"
 	aliasbackend "github.com/fastly/cli/pkg/commands/alias/backend"
 	aliashealthcheck "github.com/fastly/cli/pkg/commands/alias/healthcheck"
 	aliaspurge "github.com/fastly/cli/pkg/commands/alias/purge"
@@ -100,6 +100,7 @@ import (
 	"github.com/fastly/cli/pkg/commands/service"
 	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"
 	servicebackend "github.com/fastly/cli/pkg/commands/service/backend"
 	servicedomain "github.com/fastly/cli/pkg/commands/service/domain"
 	servicehealthcheck "github.com/fastly/cli/pkg/commands/service/healthcheck"
@@ -145,13 +146,6 @@ func Define( // nolint:revive // function-length
 	// beginning of the list of commands.
 	ssoCmdRoot := sso.NewRootCommand(app, data)
 
-	alertsCmdRoot := alerts.NewRootCommand(app, data)
-	alertsCreate := alerts.NewCreateCommand(alertsCmdRoot.CmdClause, data)
-	alertsDelete := alerts.NewDeleteCommand(alertsCmdRoot.CmdClause, data)
-	alertsDescribe := alerts.NewDescribeCommand(alertsCmdRoot.CmdClause, data)
-	alertsList := alerts.NewListCommand(alertsCmdRoot.CmdClause, data)
-	alertsListHistory := alerts.NewListHistoryCommand(alertsCmdRoot.CmdClause, data)
-	alertsUpdate := alerts.NewUpdateCommand(alertsCmdRoot.CmdClause, data)
 	authtokenCmdRoot := authtoken.NewRootCommand(app, data)
 	authtokenCreate := authtoken.NewCreateCommand(authtokenCmdRoot.CmdClause, data)
 	authtokenDelete := authtoken.NewDeleteCommand(authtokenCmdRoot.CmdClause, data)
@@ -602,6 +596,13 @@ func Define( // nolint:revive // function-length
 	serviceSearch := service.NewSearchCommand(serviceCmdRoot.CmdClause, data)
 	serviceUpdate := service.NewUpdateCommand(serviceCmdRoot.CmdClause, data)
 	servicePurge := servicepurge.NewPurgeCommand(serviceCmdRoot.CmdClause, data)
+	servicealertCmdRoot := servicealert.NewRootCommand(serviceCmdRoot.CmdClause, data)
+	servicealertCreate := servicealert.NewCreateCommand(servicealertCmdRoot.CmdClause, data)
+	servicealertDelete := servicealert.NewDeleteCommand(servicealertCmdRoot.CmdClause, data)
+	servicealertDescribe := servicealert.NewDescribeCommand(servicealertCmdRoot.CmdClause, data)
+	servicealertList := servicealert.NewListCommand(servicealertCmdRoot.CmdClause, data)
+	servicealertListHistory := servicealert.NewListHistoryCommand(servicealertCmdRoot.CmdClause, data)
+	servicealertUpdate := servicealert.NewUpdateCommand(servicealertCmdRoot.CmdClause, data)
 	serviceaclCmdRoot := serviceacl.NewRootCommand(serviceCmdRoot.CmdClause, data)
 	serviceaclCreate := serviceacl.NewCreateCommand(serviceaclCmdRoot.CmdClause, data)
 	serviceaclDelete := serviceacl.NewDeleteCommand(serviceaclCmdRoot.CmdClause, data)
@@ -736,6 +737,13 @@ func Define( // nolint:revive // function-length
 	aliasHealthcheckList := aliashealthcheck.NewListCommand(aliasHealthcheckRoot.CmdClause, data)
 	aliasHealthcheckUpdate := aliashealthcheck.NewUpdateCommand(aliasHealthcheckRoot.CmdClause, data)
 	aliasPurge := aliaspurge.NewCommand(app, data)
+	aliasAlertRoot := aliasalert.NewRootCommand(app, data)
+	aliasAlertCreate := aliasalert.NewCreateCommand(aliasAlertRoot.CmdClause, data)
+	aliasAlertDelete := aliasalert.NewDeleteCommand(aliasAlertRoot.CmdClause, data)
+	aliasAlertDescribe := aliasalert.NewDescribeCommand(aliasAlertRoot.CmdClause, data)
+	aliasAlertList := aliasalert.NewListCommand(aliasAlertRoot.CmdClause, data)
+	aliasAlertListHistory := aliasalert.NewListHistoryCommand(aliasAlertRoot.CmdClause, data)
+	aliasAlertUpdate := aliasalert.NewUpdateCommand(aliasAlertRoot.CmdClause, data)
 	aliasACLRoot := aliasacl.NewRootCommand(app, data)
 	aliasACLCreate := aliasacl.NewCreateCommand(aliasACLRoot.CmdClause, data)
 	aliasACLDelete := aliasacl.NewDeleteCommand(aliasACLRoot.CmdClause, data)
@@ -780,12 +788,6 @@ func Define( // nolint:revive // function-length
 
 	return []argparser.Command{
 		shellcompleteCmdRoot,
-		alertsCreate,
-		alertsDelete,
-		alertsDescribe,
-		alertsList,
-		alertsListHistory,
-		alertsUpdate,
 		authtokenCmdRoot,
 		authtokenCreate,
 		authtokenDelete,
@@ -1230,6 +1232,12 @@ func Define( // nolint:revive // function-length
 		serviceSearch,
 		serviceUpdate,
 		servicePurge,
+		servicealertCreate,
+		servicealertDelete,
+		servicealertDescribe,
+		servicealertList,
+		servicealertListHistory,
+		servicealertUpdate,
 		serviceaclCmdRoot,
 		serviceaclCreate,
 		serviceaclDelete,
@@ -1361,6 +1369,13 @@ func Define( // nolint:revive // function-length
 		aliasHealthcheckList,
 		aliasHealthcheckUpdate,
 		aliasPurge,
+		aliasAlertRoot,
+		aliasAlertCreate,
+		aliasAlertDelete,
+		aliasAlertDescribe,
+		aliasAlertList,
+		aliasAlertListHistory,
+		aliasAlertUpdate,
 		aliasACLCreate,
 		aliasACLDelete,
 		aliasACLDescribe,

pkg/commands/alerts/alerts_test.go pkg/commands/service/alert/alert_test.gopkg/commands/alerts/alerts_test.go renamed to pkg/commands/service/alert/alert_test.go

@@ -6,7 +6,8 @@ import (
 	"testing"
 	"time"
 
-	root "github.com/fastly/cli/pkg/commands/alerts"
+	root "github.com/fastly/cli/pkg/commands/service"
+	sub "github.com/fastly/cli/pkg/commands/service/alert"
 	"github.com/fastly/cli/pkg/mock"
 	"github.com/fastly/cli/pkg/testutil"
 	"github.com/fastly/go-fastly/v12/fastly"
@@ -98,7 +99,7 @@ func TestAlertsCreate(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "create"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "create"}, scenarios)
 }
 
 func TestAlertsUpdate(t *testing.T) {
@@ -186,7 +187,7 @@ func TestAlertsUpdate(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "update"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "update"}, scenarios)
 }
 
 func TestAlertsDelete(t *testing.T) {
@@ -206,7 +207,7 @@ func TestAlertsDelete(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "delete"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "delete"}, scenarios)
 }
 
 func TestAlertsDescribe(t *testing.T) {
@@ -228,7 +229,7 @@ func TestAlertsDescribe(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "describe"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "describe"}, scenarios)
 }
 
 func TestAlertsList(t *testing.T) {
@@ -308,7 +309,7 @@ func TestAlertsList(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "list"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "list"}, scenarios)
 }
 
 func TestAlertsHistoryList(t *testing.T) {
@@ -388,7 +389,7 @@ func TestAlertsHistoryList(t *testing.T) {
 		},
 	}
 
-	testutil.RunCLIScenarios(t, []string{root.CommandName, "history"}, scenarios)
+	testutil.RunCLIScenarios(t, []string{root.CommandName, sub.CommandName, "history"}, scenarios)
 }
 
 type flag struct {