feat(resource-link): Add Service Resource commands

pkg/api/interface.go

@@ -347,6 +347,10 @@ type Interface interface {
 	ListSecrets(i *fastly.ListSecretsInput) (*fastly.Secrets, error)
 
 	CreateResource(i *fastly.CreateResourceInput) (*fastly.Resource, error)
+	DeleteResource(i *fastly.DeleteResourceInput) error
+	GetResource(i *fastly.GetResourceInput) (*fastly.Resource, error)
+	ListResources(i *fastly.ListResourcesInput) ([]*fastly.Resource, error)
+	UpdateResource(i *fastly.UpdateResourceInput) (*fastly.Resource, error)
 }
 
 // RealtimeStatsInterface is the subset of go-fastly's realtime stats API used here.

pkg/app/commands.go

@@ -46,6 +46,7 @@ import (
 	"github.com/fastly/cli/pkg/commands/pop"
 	"github.com/fastly/cli/pkg/commands/profile"
 	"github.com/fastly/cli/pkg/commands/purge"
+	"github.com/fastly/cli/pkg/commands/resourcelink"
 	"github.com/fastly/cli/pkg/commands/secretstore"
 	"github.com/fastly/cli/pkg/commands/secretstoreentry"
 	"github.com/fastly/cli/pkg/commands/service"
@@ -318,6 +319,12 @@ func defineCommands(
 	profileToken := profile.NewTokenCommand(profileCmdRoot.CmdClause, g)
 	profileUpdate := profile.NewUpdateCommand(profileCmdRoot.CmdClause, profile.APIClientFactory(opts.APIClient), g)
 	purgeCmdRoot := purge.NewRootCommand(app, g, m)
+	resourcelinkCmdRoot := resourcelink.NewRootCommand(app, g)
+	resourcelinkCreate := resourcelink.NewCreateCommand(resourcelinkCmdRoot.CmdClause, g, m)
+	resourcelinkDelete := resourcelink.NewDeleteCommand(resourcelinkCmdRoot.CmdClause, g, m)
+	resourcelinkDescribe := resourcelink.NewDescribeCommand(resourcelinkCmdRoot.CmdClause, g, m)
+	resourcelinkList := resourcelink.NewListCommand(resourcelinkCmdRoot.CmdClause, g, m)
+	resourcelinkUpdate := resourcelink.NewUpdateCommand(resourcelinkCmdRoot.CmdClause, g, m)
 	secretstoreCmdRoot := secretstore.NewRootCommand(app, g)
 	secretstoreCreate := secretstore.NewCreateCommand(secretstoreCmdRoot.CmdClause, g, m)
 	secretstoreDescribe := secretstore.NewDescribeCommand(secretstoreCmdRoot.CmdClause, g, m)
@@ -648,6 +655,12 @@ func defineCommands(
 		profileToken,
 		profileUpdate,
 		purgeCmdRoot,
+		resourcelinkCmdRoot,
+		resourcelinkCreate,
+		resourcelinkDelete,
+		resourcelinkDescribe,
+		resourcelinkList,
+		resourcelinkUpdate,
 		secretstoreCreate,
 		secretstoreDescribe,
 		secretstoreDelete,

pkg/app/run_test.go

@@ -75,6 +75,7 @@ object-store-entry
 pops
 profile
 purge
+resource-link
 secret-store
 secret-store-entry
 service

pkg/commands/resourcelink/create.go

@@ -0,0 +1,120 @@
+package resourcelink
+
+import (
+	"io"
+
+	"github.com/fastly/cli/pkg/cmd"
+	fsterr "github.com/fastly/cli/pkg/errors"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/manifest"
+	"github.com/fastly/cli/pkg/text"
+	"github.com/fastly/go-fastly/v7/fastly"
+)
+
+// CreateCommand calls the Fastly API to create a resource link.
+type CreateCommand struct {
+	cmd.Base
+	jsonOutput
+
+	autoClone      cmd.OptionalAutoClone
+	input          fastly.CreateResourceInput
+	manifest       manifest.Data
+	serviceVersion cmd.OptionalServiceVersion
+}
+
+// NewCreateCommand returns a usable command registered under the parent.
+func NewCreateCommand(parent cmd.Registerer, g *global.Data, m manifest.Data) *CreateCommand {
+	c := CreateCommand{
+		Base: cmd.Base{
+			Globals: g,
+		},
+		manifest: m,
+		input: fastly.CreateResourceInput{
+			// Kingpin requires the following to be initialized.
+			ResourceID: new(string),
+			Name:       new(string),
+		},
+	}
+	c.CmdClause = parent.Command("create", "Create a Fastly service resource link").Alias("link")
+
+	// Required.
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        "resource-id",
+		Short:       'r',
+		Description: "Resource ID",
+		Dst:         c.input.ResourceID,
+		Required:    true,
+	})
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        cmd.FlagServiceIDName,
+		Short:       's',
+		Description: cmd.FlagServiceIDDesc,
+		Dst:         &c.manifest.Flag.ServiceID,
+		Required:    true,
+	})
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        cmd.FlagVersionName,
+		Description: cmd.FlagVersionDesc,
+		Dst:         &c.serviceVersion.Value,
+		Required:    true,
+	})
+
+	// Optional.
+	c.RegisterAutoCloneFlag(cmd.AutoCloneFlagOpts{
+		Action: c.autoClone.Set,
+		Dst:    &c.autoClone.Value,
+	})
+	c.RegisterFlagBool(c.jsonFlag()) // --json
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        "name",
+		Short:       'n',
+		Description: "Resource alias. Defaults to name of resource",
+		Dst:         c.input.Name,
+	})
+
+	return &c
+}
+
+// Exec invokes the application logic for the command.
+func (c *CreateCommand) Exec(_ io.Reader, out io.Writer) error {
+	if c.Globals.Verbose() && c.jsonOutput.enabled {
+		return fsterr.ErrInvalidVerboseJSONCombo
+	}
+
+	serviceID, serviceVersion, err := cmd.ServiceDetails(cmd.ServiceDetailsOpts{
+		AutoCloneFlag:      c.autoClone,
+		APIClient:          c.Globals.APIClient,
+		Manifest:           c.manifest,
+		Out:                out,
+		ServiceNameFlag:    cmd.OptionalServiceNameID{}, // ServiceID flag is required, no need to lookup service by name.
+		ServiceVersionFlag: c.serviceVersion,
+		VerboseMode:        c.Globals.Flags.Verbose,
+	})
+	if err != nil {
+		c.Globals.ErrLog.AddWithContext(err, map[string]any{
+			"Service ID":      c.manifest.Flag.ServiceID,
+			"Service Version": fsterr.ServiceVersion(serviceVersion),
+		})
+		return err
+	}
+
+	c.input.ServiceID = serviceID
+	c.input.ServiceVersion = serviceVersion.Number
+
+	resource, err := c.Globals.APIClient.CreateResource(&c.input)
+	if err != nil {
+		c.Globals.ErrLog.AddWithContext(err, map[string]any{
+			"ID":              c.input.ResourceID,
+			"Service ID":      c.input.ServiceID,
+			"Service Version": c.input.ServiceVersion,
+		})
+		return err
+	}
+
+	if ok, err := c.WriteJSON(out, resource); ok {
+		return err
+	}
+
+	text.Success(out, "Created service resource link %q (%s) on service %s version %s", resource.Name, resource.ID, resource.ServiceID, resource.ServiceVersion)
+	return nil
+}

pkg/commands/resourcelink/delete.go

@@ -0,0 +1,120 @@
+package resourcelink
+
+import (
+	"io"
+
+	"github.com/fastly/cli/pkg/cmd"
+	fsterr "github.com/fastly/cli/pkg/errors"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/manifest"
+	"github.com/fastly/cli/pkg/text"
+	"github.com/fastly/go-fastly/v7/fastly"
+)
+
+// DeleteCommand calls the Fastly API to delete service resource links.
+type DeleteCommand struct {
+	cmd.Base
+	jsonOutput
+
+	autoClone      cmd.OptionalAutoClone
+	input          fastly.DeleteResourceInput
+	manifest       manifest.Data
+	serviceVersion cmd.OptionalServiceVersion
+}
+
+// NewDeleteCommand returns a usable command registered under the parent.
+func NewDeleteCommand(parent cmd.Registerer, g *global.Data, m manifest.Data) *DeleteCommand {
+	c := DeleteCommand{
+		Base: cmd.Base{
+			Globals: g,
+		},
+		manifest: m,
+	}
+	c.CmdClause = parent.Command("delete", "Delete a resource link for a Fastly service version").Alias("remove")
+
+	// Required.
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        "id",
+		Description: "ID of resource link",
+		Dst:         &c.input.ID,
+		Required:    true,
+	})
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        cmd.FlagServiceIDName,
+		Short:       's',
+		Description: cmd.FlagServiceIDDesc,
+		Dst:         &c.manifest.Flag.ServiceID,
+		Required:    true,
+	})
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        cmd.FlagVersionName,
+		Description: cmd.FlagVersionDesc,
+		Dst:         &c.serviceVersion.Value,
+		Required:    true,
+	})
+
+	// Optional.
+	c.RegisterAutoCloneFlag(cmd.AutoCloneFlagOpts{
+		Action: c.autoClone.Set,
+		Dst:    &c.autoClone.Value,
+	})
+	c.RegisterFlagBool(c.jsonFlag()) // --json
+
+	return &c
+}
+
+// Exec invokes the application logic for the command.
+func (c *DeleteCommand) Exec(_ io.Reader, out io.Writer) error {
+	if c.Globals.Verbose() && c.jsonOutput.enabled {
+		return fsterr.ErrInvalidVerboseJSONCombo
+	}
+
+	serviceID, serviceVersion, err := cmd.ServiceDetails(cmd.ServiceDetailsOpts{
+		AutoCloneFlag:      c.autoClone,
+		APIClient:          c.Globals.APIClient,
+		Manifest:           c.manifest,
+		Out:                out,
+		ServiceNameFlag:    cmd.OptionalServiceNameID{}, // ServiceID flag is required, no need to lookup service by name.
+		ServiceVersionFlag: c.serviceVersion,
+		VerboseMode:        c.Globals.Flags.Verbose,
+	})
+	if err != nil {
+		c.Globals.ErrLog.AddWithContext(err, map[string]any{
+			"Service ID":      c.manifest.Flag.ServiceID,
+			"Service Version": fsterr.ServiceVersion(serviceVersion),
+		})
+		return err
+	}
+
+	c.input.ServiceID = serviceID
+	c.input.ServiceVersion = serviceVersion.Number
+
+	err = c.Globals.APIClient.DeleteResource(&c.input)
+	if err != nil {
+		c.Globals.ErrLog.AddWithContext(err, map[string]any{
+			"ID":              c.input.ID,
+			"Service ID":      c.input.ServiceID,
+			"Service Version": c.input.ServiceVersion,
+		})
+		return err
+	}
+
+	if c.jsonOutput.enabled {
+		o := struct {
+			ID             string `json:"id"`
+			ServiceID      string `json:"service_id"`
+			ServiceVersion int    `json:"service_version"`
+			Deleted        bool   `json:"deleted"`
+		}{
+			c.input.ID,
+			c.input.ServiceID,
+			c.input.ServiceVersion,
+			true,
+		}
+		_, err := c.WriteJSON(out, o)
+		return err
+	}
+
+	text.Success(out, "Deleted service resource link %s from service %s version %d", c.input.ID, c.input.ServiceID, c.input.ServiceVersion)
+	return nil
+}

pkg/commands/resourcelink/describe.go

@@ -0,0 +1,104 @@
+package resourcelink
+
+import (
+	"io"
+
+	"github.com/fastly/cli/pkg/cmd"
+	fsterr "github.com/fastly/cli/pkg/errors"
+	"github.com/fastly/cli/pkg/global"
+	"github.com/fastly/cli/pkg/manifest"
+	"github.com/fastly/cli/pkg/text"
+	"github.com/fastly/go-fastly/v7/fastly"
+)
+
+// DescribeCommand calls the Fastly API to describe a service resource link.
+type DescribeCommand struct {
+	cmd.Base
+	jsonOutput
+
+	input          fastly.GetResourceInput
+	manifest       manifest.Data
+	serviceVersion cmd.OptionalServiceVersion
+}
+
+// NewDescribeCommand returns a usable command registered under the parent.
+func NewDescribeCommand(parent cmd.Registerer, g *global.Data, m manifest.Data) *DescribeCommand {
+	c := DescribeCommand{
+		Base: cmd.Base{
+			Globals: g,
+		},
+		manifest: m,
+	}
+	c.CmdClause = parent.Command("describe", "Show detailed information about a Fastly service resource link").Alias("get")
+
+	// Required.
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        "id",
+		Description: "ID of resource link",
+		Dst:         &c.input.ID,
+		Required:    true,
+	})
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        cmd.FlagServiceIDName,
+		Short:       's',
+		Description: cmd.FlagServiceIDDesc,
+		Dst:         &c.manifest.Flag.ServiceID,
+		Required:    true,
+	})
+	c.RegisterFlag(cmd.StringFlagOpts{
+		Name:        cmd.FlagVersionName,
+		Description: cmd.FlagVersionDesc,
+		Dst:         &c.serviceVersion.Value,
+		Required:    true,
+	})
+
+	// Optional.
+	c.RegisterFlagBool(c.jsonFlag()) // --json
+
+	return &c
+}
+
+// Exec invokes the application logic for the command.
+func (c *DescribeCommand) Exec(_ io.Reader, out io.Writer) error {
+	if c.Globals.Verbose() && c.jsonOutput.enabled {
+		return fsterr.ErrInvalidVerboseJSONCombo
+	}
+
+	serviceID, source, flag, err := cmd.ServiceID(cmd.OptionalServiceNameID{}, c.manifest, c.Globals.APIClient, c.Globals.ErrLog)
+	if err != nil {
+		return err
+	}
+	if c.Globals.Verbose() {
+		cmd.DisplayServiceID(serviceID, flag, source, out)
+	}
+
+	serviceVersion, err := c.serviceVersion.Parse(serviceID, c.Globals.APIClient)
+	if err != nil {
+		return err
+	}
+
+	c.input.ServiceID = serviceID
+	c.input.ServiceVersion = serviceVersion.Number
+
+	resource, err := c.Globals.APIClient.GetResource(&c.input)
+	if err != nil {
+		c.Globals.ErrLog.AddWithContext(err, map[string]any{
+			"ID":              c.input.ID,
+			"Service ID":      c.input.ServiceID,
+			"Service Version": c.input.ServiceVersion,
+		})
+		return err
+	}
+
+	if ok, err := c.WriteJSON(out, resource); ok {
+		return err
+	}
+
+	if !c.Globals.Verbose() {
+		text.Output(out, "Service ID: %s", resource.ServiceID)
+	}
+	text.Output(out, "Service Version: %s", resource.ServiceVersion)
+	text.PrintResource(out, "", resource)
+
+	return nil
+}