[CDTOOL-1259] Move the logging command under service

CHANGELOG.md

@@ -25,6 +25,7 @@
 - feat(service/ratelimit): moved the `rate-limit` commands under the `service` command, with an unlisted and deprecated alias of `rate-limit` ([#1632](https://github.com/fastly/cli/pull/1632))
 - feat(compute/build): Remove Rust version restriction, allowing 1.93.0 and later versions to be used. ([#1633](https://github.com/fastly/cli/pull/1633))
 - feat(service/resourcelink): moved the `resource-link` commands under the `service` command, with an unlisted and deprecated alias of `resource-link` ([#1635](https://github.com/fastly/cli/pull/1635))
+- feat(service/logging): moved the `logging` commands under the `service` command, with an unlisted and deprecated alias of `logging` ([#1642](https://github.com/fastly/cli/pull/1642))
 - feat(service/auth): moved the `service-auth` commands under the `service` command and renamed to `auth`, with an unlisted and deprecated alias of `service-auth` ([#1643](https://github.com/fastly/cli/pull/1643))
 
 ### Bug fixes:

pkg/app/run_test.go

@@ -72,7 +72,6 @@ ip-list
 kv-store
 kv-store-entry
 log-tail
-logging
 ngwaf
 object-storage
 pops

pkg/commands/alias/backend/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 backend describe' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service backend describe' command instead.")
+	}
 	return c.DescribeCommand.Exec(in, out)
 }

pkg/commands/alias/backend/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 backend list' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service backend list' command instead.")
+	}
 	return c.ListCommand.Exec(in, out)
 }

pkg/commands/alias/healthcheck/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 healthcheck describe' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service healthcheck describe' command instead.")
+	}
 	return c.DescribeCommand.Exec(in, out)
 }

pkg/commands/alias/healthcheck/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 healthcheck list' command instead.")
+	if !c.JSONOutput.Enabled {
+		text.Deprecated(out, "Use the 'service healthcheck list' command instead.")
+	}
 	return c.ListCommand.Exec(in, out)
 }

pkg/commands/alias/logging/azureblob/create.go

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

pkg/commands/alias/logging/azureblob/delete.go

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

pkg/commands/alias/logging/azureblob/describe.go

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

pkg/commands/alias/logging/azureblob/doc.go

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

pkg/commands/alias/logging/azureblob/list.go

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

pkg/commands/alias/logging/azureblob/root.go

@@ -0,0 +1,31 @@
+package azureblob
+
+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 = "azureblob"
+
+// 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 version Azure Blob Storage logging endpoints").Hidden()
+	return &c
+}
+
+// Exec implements the command interface.
+func (c *RootCommand) Exec(_ io.Reader, _ io.Writer) error {
+	panic("unreachable")
+}

pkg/commands/alias/logging/azureblob/update.go

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

pkg/commands/alias/logging/bigquery/create.go

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

pkg/commands/alias/logging/bigquery/delete.go

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

pkg/commands/alias/logging/bigquery/describe.go

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

pkg/commands/alias/logging/bigquery/doc.go

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

pkg/commands/alias/logging/bigquery/list.go

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