Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Add experimental "enable Pushpin" mode ([#1509](https://github.com/fastly/cli/pull/1509))
- feat(object-storage): improve access-keys list output ([#1513](https://github.com/fastly/cli/pull/1513))
- refactor(domainv1,tools): use updated go-fastly domainmanagement imports and types ([#1517](https://github.com/fastly/cli/pull/1517))
- feat (imageoptimizerdefaults): Support for retrieving and updating Image Optimizer defaults for a given VCL service ([#1518](https://github.com/fastly/cli/pull/1518))

### Bug fixes:

Expand Down
3 changes: 3 additions & 0 deletions pkg/api/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ type Interface interface {
ValidateDomain(context.Context, *fastly.ValidateDomainInput) (*fastly.DomainValidationResult, error)
ValidateAllDomains(context.Context, *fastly.ValidateAllDomainsInput) ([]*fastly.DomainValidationResult, error)

GetImageOptimizerDefaultSettings(context.Context, *fastly.GetImageOptimizerDefaultSettingsInput) (*fastly.ImageOptimizerDefaultSettings, error)
UpdateImageOptimizerDefaultSettings(context.Context, *fastly.UpdateImageOptimizerDefaultSettingsInput) (*fastly.ImageOptimizerDefaultSettings, error)

CreateBackend(context.Context, *fastly.CreateBackendInput) (*fastly.Backend, error)
ListBackends(context.Context, *fastly.ListBackendsInput) ([]*fastly.Backend, error)
GetBackend(context.Context, *fastly.GetBackendInput) (*fastly.Backend, error)
Expand Down
1 change: 1 addition & 0 deletions pkg/app/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ dictionary-entry
domain
domain-v1
healthcheck
imageoptimizer
install
ip-list
kv-store
Expand Down
7 changes: 7 additions & 0 deletions pkg/commands/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/fastly/cli/pkg/commands/domain"
"github.com/fastly/cli/pkg/commands/domainv1"
"github.com/fastly/cli/pkg/commands/healthcheck"
"github.com/fastly/cli/pkg/commands/imageoptimizerdefaults"
"github.com/fastly/cli/pkg/commands/install"
"github.com/fastly/cli/pkg/commands/ip"
"github.com/fastly/cli/pkg/commands/kvstore"
Expand Down Expand Up @@ -212,6 +213,9 @@ func Define( // nolint:revive // function-length
healthcheckDescribe := healthcheck.NewDescribeCommand(healthcheckCmdRoot.CmdClause, data)
healthcheckList := healthcheck.NewListCommand(healthcheckCmdRoot.CmdClause, data)
healthcheckUpdate := healthcheck.NewUpdateCommand(healthcheckCmdRoot.CmdClause, data)
imageoptimizerdefaultsCmdRoot := imageoptimizerdefaults.NewRootCommand(app, data)
imageoptimizerdefaultsGet := imageoptimizerdefaults.NewGetCommand(imageoptimizerdefaultsCmdRoot.CmdClause, data)
imageoptimizerdefaultsUpdate := imageoptimizerdefaults.NewUpdateCommand(imageoptimizerdefaultsCmdRoot.CmdClause, data)
installRoot := install.NewRootCommand(app, data)
ipCmdRoot := ip.NewRootCommand(app, data)
kvstoreCmdRoot := kvstore.NewRootCommand(app, data)
Expand Down Expand Up @@ -629,6 +633,9 @@ func Define( // nolint:revive // function-length
healthcheckDescribe,
healthcheckList,
healthcheckUpdate,
imageoptimizerdefaultsCmdRoot,
imageoptimizerdefaultsGet,
imageoptimizerdefaultsUpdate,
installRoot,
ipCmdRoot,
kvstoreCreate,
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/imageoptimizerdefaults/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Package imageoptimizerdefaults contains commands to configure default settings for Fastly Image Optimizer requests.
package imageoptimizerdefaults
107 changes: 107 additions & 0 deletions pkg/commands/imageoptimizerdefaults/get.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package imageoptimizerdefaults

import (
"context"
"fmt"
"io"

"github.com/fastly/go-fastly/v11/fastly"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
)

// GetCommand calls the Fastly API to describe the Image Optimizer default settings for a service.
type GetCommand struct {
argparser.Base
argparser.JSONOutput

Input fastly.GetImageOptimizerDefaultSettingsInput
serviceName argparser.OptionalServiceNameID
serviceVersion argparser.OptionalServiceVersion
}

// NewGetCommand returns a usable command registered under the parent.
func NewGetCommand(parent argparser.Registerer, g *global.Data) *GetCommand {
c := GetCommand{
Base: argparser.Base{
Globals: g,
},
}
c.CmdClause = parent.Command("get", "Retrieve the current Image Optimizer default settings")

// Required.
c.RegisterFlag(argparser.StringFlagOpts{
Name: argparser.FlagServiceIDName,
Description: argparser.FlagServiceIDDesc,
Dst: &g.Manifest.Flag.ServiceID,
Short: 's',
Required: true,
})
c.RegisterFlag(argparser.StringFlagOpts{
Name: argparser.FlagVersionName,
Description: argparser.FlagVersionDesc,
Dst: &c.serviceVersion.Value,
Required: true,
})

// Optional.
c.RegisterFlagBool(c.JSONFlag()) // --json
c.RegisterFlag(argparser.StringFlagOpts{
Action: c.serviceName.Set,
Name: argparser.FlagServiceName,
Description: argparser.FlagServiceNameDesc,
Dst: &c.serviceName.Value,
})
return &c
}

// Exec invokes the application logic for the command.
func (c *GetCommand) Exec(_ io.Reader, out io.Writer) error {
if c.Globals.Verbose() && c.JSONOutput.Enabled {
return fsterr.ErrInvalidVerboseJSONCombo
}

serviceID, serviceVersion, err := argparser.ServiceDetails(argparser.ServiceDetailsOpts{
APIClient: c.Globals.APIClient,
Manifest: *c.Globals.Manifest,
Out: out,
ServiceNameFlag: c.serviceName,
ServiceVersionFlag: c.serviceVersion,
VerboseMode: c.Globals.Flags.Verbose,
})
if err != nil {
c.Globals.ErrLog.AddWithContext(err, map[string]any{
"Service ID": serviceID,
"Service Version": fsterr.ServiceVersion(serviceVersion),
})
return err
}

c.Input.ServiceID = serviceID
c.Input.ServiceVersion = fastly.ToValue(serviceVersion.Number)

o, err := c.Globals.APIClient.GetImageOptimizerDefaultSettings(context.TODO(), &c.Input)
if err != nil {
c.Globals.ErrLog.AddWithContext(err, map[string]any{
"Service ID": serviceID,
"Service Version": fastly.ToValue(serviceVersion.Number),
})
return err
}

if ok, err := c.WriteJSON(out, o); ok {
return err
}

fmt.Fprintf(out, "Allow Video: %t\n", o.AllowVideo)
fmt.Fprintf(out, "JPEG Quality: %d\n", o.JpegQuality)
fmt.Fprintf(out, "JPEG Type: %s\n", o.JpegType)
fmt.Fprintf(out, "Resize Filter: %s\n", o.ResizeFilter)
fmt.Fprintf(out, "Upscale: %t\n", o.Upscale)
fmt.Fprintf(out, "WebP: %t\n", o.Webp)
fmt.Fprintf(out, "WebP Quality: %d\n", o.WebpQuality)

return nil
}
Loading
Loading