fix naming of alias and add json check

Author: anthony-gomez-fastly

CHANGELOG.md

@@ -18,7 +18,7 @@
 - feat(service/backend): moved the `backend` command under the `service` command, with an unlisted and deprecated alias of `backend` ([#1621](https://github.com/fastly/cli/pull/1621))
 - feat(service/backend): moved the `acl` and `aclentry` commands under the `service` command, with a unlisted and deprecated aliases of `acl` and `aclentry` ([#1621](https://github.com/fastly/cli/pull/1624))
 - feat(version): If the latest version is at least one major version higher than the current version, provide links to the release notes for the major version(s) so the user can review them before upgrading. ([#1623](https://github.com/fastly/cli/pull/1623))
-- feat(service/alert): moved the `alert` command under the `service` command, with an unlisted and deprecated alias of `alert` ([#1616](https://github.com/fastly/cli/pull/1626))
+- feat(service/alert): moved the `alerts` command to the `service alert` command, with an unlisted and deprecated alias of `alerts` ([#1616](https://github.com/fastly/cli/pull/1626))
 
 ### Bug fixes:
 

pkg/commands/alias/acl/describe.go

@@ -24,6 +24,8 @@ func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCo
 
 // Exec implements the command interface.
 func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error {
-	text.Deprecated(out, "Use the 'service acl describe' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service acl describe' command instead.")
+	}
 	return c.DescribeCommand.Exec(in, out)
 }

pkg/commands/alias/acl/list.go

@@ -24,6 +24,8 @@ func NewListCommand(parent argparser.Registerer, g *global.Data) *ListCommand {
 
 // Exec implements the command interface.
 func (c *ListCommand) Exec(in io.Reader, out io.Writer) error {
-	text.Deprecated(out, "Use the 'service acl list' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service acl list' command instead.")
+	}
 	return c.ListCommand.Exec(in, out)
 }

pkg/commands/alias/aclentry/describe.go

@@ -24,6 +24,8 @@ func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCo
 
 // Exec implements the command interface.
 func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error {
-	text.Deprecated(out, "Use the 'service aclentry describe' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service aclentry describe' command instead.")
+	}
 	return c.DescribeCommand.Exec(in, out)
 }

pkg/commands/alias/aclentry/list.go

@@ -24,6 +24,8 @@ func NewListCommand(parent argparser.Registerer, g *global.Data) *ListCommand {
 
 // Exec implements the command interface.
 func (c *ListCommand) Exec(in io.Reader, out io.Writer) error {
-	text.Deprecated(out, "Use the 'service aclentry list' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service aclentry list' command instead.")
+	}
 	return c.ListCommand.Exec(in, out)
 }

pkg/commands/alias/alert/doc.go

@@ -1,4 +1,4 @@
-package alert
+package alerts
 
 import (
 	"io"

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

@@ -1,4 +1,4 @@
-package alert
+package alerts
 
 import (
 	"io"

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

@@ -1,4 +1,4 @@
-package alert
+package alerts
 
 import (
 	"io"
@@ -24,6 +24,8 @@ func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCo
 
 // 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.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service alert describe' command instead.")
+	}
 	return c.DescribeCommand.Exec(in, out)
 }

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

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