Skip to content

Commit

Permalink
logging: adds Loggly logging endpoint support
Browse files Browse the repository at this point in the history
Signed-off-by: Colton McCurdy <cmccurdy@fastly.com>
  • Loading branch information
mccurdyc committed May 20, 2020
1 parent 4b1d37a commit 2501252
Show file tree
Hide file tree
Showing 13 changed files with 1,117 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/api/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ type Interface interface {
UpdateScalyr(*fastly.UpdateScalyrInput) (*fastly.Scalyr, error)
DeleteScalyr(*fastly.DeleteScalyrInput) error

CreateLoggly(*fastly.CreateLogglyInput) (*fastly.Loggly, error)
ListLoggly(*fastly.ListLogglyInput) ([]*fastly.Loggly, error)
GetLoggly(*fastly.GetLogglyInput) (*fastly.Loggly, error)
UpdateLoggly(*fastly.UpdateLogglyInput) (*fastly.Loggly, error)
DeleteLoggly(*fastly.DeleteLogglyInput) error

GetUser(*fastly.GetUserInput) (*fastly.User, error)

GetRegions() (*fastly.RegionsResponse, error)
Expand Down
15 changes: 15 additions & 0 deletions pkg/app/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/fastly/cli/pkg/logging/ftp"
"github.com/fastly/cli/pkg/logging/gcs"
"github.com/fastly/cli/pkg/logging/logentries"
"github.com/fastly/cli/pkg/logging/loggly"
"github.com/fastly/cli/pkg/logging/papertrail"
"github.com/fastly/cli/pkg/logging/s3"
"github.com/fastly/cli/pkg/logging/scalyr"
Expand Down Expand Up @@ -199,6 +200,13 @@ func Run(args []string, env config.Environment, file config.File, configFilePath
scalyrUpdate := scalyr.NewUpdateCommand(scalyrRoot.CmdClause, &globals)
scalyrDelete := scalyr.NewDeleteCommand(scalyrRoot.CmdClause, &globals)

logglyRoot := loggly.NewRootCommand(loggingRoot.CmdClause, &globals)
logglyCreate := loggly.NewCreateCommand(logglyRoot.CmdClause, &globals)
logglyList := loggly.NewListCommand(logglyRoot.CmdClause, &globals)
logglyDescribe := loggly.NewDescribeCommand(logglyRoot.CmdClause, &globals)
logglyUpdate := loggly.NewUpdateCommand(logglyRoot.CmdClause, &globals)
logglyDelete := loggly.NewDeleteCommand(logglyRoot.CmdClause, &globals)

statsRoot := stats.NewRootCommand(app, &globals)
statsRegions := stats.NewRegionsCommand(statsRoot.CmdClause, &globals)
statsHistorical := stats.NewHistoricalCommand(statsRoot.CmdClause, &globals)
Expand Down Expand Up @@ -325,6 +333,13 @@ func Run(args []string, env config.Environment, file config.File, configFilePath
scalyrUpdate,
scalyrDelete,

logglyRoot,
logglyCreate,
logglyList,
logglyDescribe,
logglyUpdate,
logglyDelete,

statsRoot,
statsRegions,
statsHistorical,
Expand Down
66 changes: 66 additions & 0 deletions pkg/app/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1427,6 +1427,71 @@ COMMANDS
--version=VERSION Number of service version
-n, --name=NAME The name of the Scalyr logging object
logging loggly create --name=NAME --version=VERSION --auth-token=AUTH-TOKEN [<flags>]
Create a Loggly logging endpoint on a Fastly service version
-n, --name=NAME The name of the Loggly logging object. Used as
a primary key for API access
-s, --service-id=SERVICE-ID Service ID
--version=VERSION Number of service version
--auth-token=AUTH-TOKEN The token to use for authentication
(https://www.loggly.com/docs/customer-token-authentication-token/)
--format=FORMAT Apache style log formatting
--format-version=FORMAT-VERSION
The version of the custom logging format used
for the configured endpoint. Can be either 2
(default) or 1
--response-condition=RESPONSE-CONDITION
The name of an existing condition in the
configured endpoint, or leave blank to always
execute
--placement=PLACEMENT Where in the generated VCL the logging call
should be placed, overriding any format_version
default. Can be none or waf_debug
logging loggly list --version=VERSION [<flags>]
List Loggly endpoints on a Fastly service version
-s, --service-id=SERVICE-ID Service ID
--version=VERSION Number of service version
logging loggly describe --version=VERSION --name=NAME [<flags>]
Show detailed information about a Loggly logging endpoint on a Fastly
service version
-s, --service-id=SERVICE-ID Service ID
--version=VERSION Number of service version
-d, --name=NAME The name of the Loggly logging object
logging loggly update --version=VERSION --name=NAME [<flags>]
Update a Loggly logging endpoint on a Fastly service version
-s, --service-id=SERVICE-ID Service ID
--version=VERSION Number of service version
-n, --name=NAME The name of the Loggly logging object
--new-name=NEW-NAME New name of the Loggly logging object
--auth-token=AUTH-TOKEN The token to use for authentication
(https://www.loggly.com/docs/customer-token-authentication-token/)
--format=FORMAT Apache style log formatting
--format-version=FORMAT-VERSION
The version of the custom logging format used
for the configured endpoint. Can be either 2
(default) or 1
--response-condition=RESPONSE-CONDITION
The name of an existing condition in the
configured endpoint, or leave blank to always
execute
--placement=PLACEMENT Where in the generated VCL the logging call
should be placed, overriding any format_version
default. Can be none or waf_debug
logging loggly delete --version=VERSION --name=NAME [<flags>]
Delete a Loggly logging endpoint on a Fastly service version
-s, --service-id=SERVICE-ID Service ID
--version=VERSION Number of service version
-n, --name=NAME The name of the Loggly logging object
stats regions
List stats regions
Expand All @@ -1452,4 +1517,5 @@ For help on a specific command, try e.g.
fastly help configure
fastly configure --help
`) + "\n\n"
100 changes: 100 additions & 0 deletions pkg/logging/loggly/create.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
package loggly

import (
"io"

"github.com/fastly/cli/pkg/common"
"github.com/fastly/cli/pkg/compute/manifest"
"github.com/fastly/cli/pkg/config"
"github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/text"
"github.com/fastly/go-fastly/fastly"
)

// CreateCommand calls the Fastly API to create Loggly logging endpoints.
type CreateCommand struct {
common.Base
manifest manifest.Data

// required
EndpointName string // Can't shaddow common.Base method Name().
Token string
Version int

// optional
Format common.OptionalString
FormatVersion common.OptionalUint
ResponseCondition common.OptionalString
Placement common.OptionalString
}

// NewCreateCommand returns a usable command registered under the parent.
func NewCreateCommand(parent common.Registerer, globals *config.Data) *CreateCommand {
var c CreateCommand

c.Globals = globals
c.manifest.File.Read(manifest.Filename)
c.CmdClause = parent.Command("create", "Create a Loggly logging endpoint on a Fastly service version").Alias("add")

c.CmdClause.Flag("name", "The name of the Loggly logging object. Used as a primary key for API access").Short('n').Required().StringVar(&c.EndpointName)
c.CmdClause.Flag("service-id", "Service ID").Short('s').StringVar(&c.manifest.Flag.ServiceID)
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Version)

c.CmdClause.Flag("auth-token", "The token to use for authentication (https://www.loggly.com/docs/customer-token-authentication-token/)").Required().StringVar(&c.Token)

c.CmdClause.Flag("format", "Apache style log formatting").Action(c.Format.Set).StringVar(&c.Format.Value)
c.CmdClause.Flag("format-version", "The version of the custom logging format used for the configured endpoint. Can be either 2 (default) or 1").Action(c.FormatVersion.Set).UintVar(&c.FormatVersion.Value)
c.CmdClause.Flag("response-condition", "The name of an existing condition in the configured endpoint, or leave blank to always execute").Action(c.ResponseCondition.Set).StringVar(&c.ResponseCondition.Value)
c.CmdClause.Flag("placement", "Where in the generated VCL the logging call should be placed, overriding any format_version default. Can be none or waf_debug").Action(c.Placement.Set).StringVar(&c.Placement.Value)

return &c
}

// createInput transforms values parsed from CLI flags into an object to be used by the API client library.
func (c *CreateCommand) createInput() (*fastly.CreateLogglyInput, error) {
var input fastly.CreateLogglyInput

serviceID, source := c.manifest.ServiceID()
if source == manifest.SourceUndefined {
return nil, errors.ErrNoServiceID
}

input.Service = serviceID
input.Version = c.Version
input.Name = fastly.String(c.EndpointName)
input.Token = fastly.String(c.Token)

if c.Format.Valid {
input.Format = fastly.String(c.Format.Value)
}

if c.FormatVersion.Valid {
input.FormatVersion = fastly.Uint(c.FormatVersion.Value)
}

if c.ResponseCondition.Valid {
input.ResponseCondition = fastly.String(c.ResponseCondition.Value)
}

if c.Placement.Valid {
input.Placement = fastly.String(c.Placement.Value)
}

return &input, nil
}

// Exec invokes the application logic for the command.
func (c *CreateCommand) Exec(in io.Reader, out io.Writer) error {
input, err := c.createInput()
if err != nil {
return err
}

d, err := c.Globals.Client.CreateLoggly(input)
if err != nil {
return err
}

text.Success(out, "Created Loggly logging endpoint %s (service %s version %d)", d.Name, d.ServiceID, d.Version)
return nil
}
47 changes: 47 additions & 0 deletions pkg/logging/loggly/delete.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package loggly

import (
"io"

"github.com/fastly/cli/pkg/common"
"github.com/fastly/cli/pkg/compute/manifest"
"github.com/fastly/cli/pkg/config"
"github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/text"
"github.com/fastly/go-fastly/fastly"
)

// DeleteCommand calls the Fastly API to delete Loggly logging endpoints.
type DeleteCommand struct {
common.Base
manifest manifest.Data
Input fastly.DeleteLogglyInput
}

// NewDeleteCommand returns a usable command registered under the parent.
func NewDeleteCommand(parent common.Registerer, globals *config.Data) *DeleteCommand {
var c DeleteCommand
c.Globals = globals
c.manifest.File.Read(manifest.Filename)
c.CmdClause = parent.Command("delete", "Delete a Loggly logging endpoint on a Fastly service version").Alias("remove")
c.CmdClause.Flag("service-id", "Service ID").Short('s').StringVar(&c.manifest.Flag.ServiceID)
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.Version)
c.CmdClause.Flag("name", "The name of the Loggly logging object").Short('n').Required().StringVar(&c.Input.Name)
return &c
}

// Exec invokes the application logic for the command.
func (c *DeleteCommand) Exec(in io.Reader, out io.Writer) error {
serviceID, source := c.manifest.ServiceID()
if source == manifest.SourceUndefined {
return errors.ErrNoServiceID
}
c.Input.Service = serviceID

if err := c.Globals.Client.DeleteLoggly(&c.Input); err != nil {
return err
}

text.Success(out, "Deleted Loggly logging endpoint %s (service %s version %d)", c.Input.Name, c.Input.Service, c.Input.Version)
return nil
}
56 changes: 56 additions & 0 deletions pkg/logging/loggly/describe.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package loggly

import (
"fmt"
"io"

"github.com/fastly/cli/pkg/common"
"github.com/fastly/cli/pkg/compute/manifest"
"github.com/fastly/cli/pkg/config"
"github.com/fastly/cli/pkg/errors"
"github.com/fastly/go-fastly/fastly"
)

// DescribeCommand calls the Fastly API to describe a Loggly logging endpoint.
type DescribeCommand struct {
common.Base
manifest manifest.Data
Input fastly.GetLogglyInput
}

// NewDescribeCommand returns a usable command registered under the parent.
func NewDescribeCommand(parent common.Registerer, globals *config.Data) *DescribeCommand {
var c DescribeCommand
c.Globals = globals
c.manifest.File.Read(manifest.Filename)
c.CmdClause = parent.Command("describe", "Show detailed information about a Loggly logging endpoint on a Fastly service version").Alias("get")
c.CmdClause.Flag("service-id", "Service ID").Short('s').StringVar(&c.manifest.Flag.ServiceID)
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.Version)
c.CmdClause.Flag("name", "The name of the Loggly logging object").Short('d').Required().StringVar(&c.Input.Name)
return &c
}

// Exec invokes the application logic for the command.
func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error {
serviceID, source := c.manifest.ServiceID()
if source == manifest.SourceUndefined {
return errors.ErrNoServiceID
}
c.Input.Service = serviceID

loggly, err := c.Globals.Client.GetLoggly(&c.Input)
if err != nil {
return err
}

fmt.Fprintf(out, "Service ID: %s\n", loggly.ServiceID)
fmt.Fprintf(out, "Version: %d\n", loggly.Version)
fmt.Fprintf(out, "Name: %s\n", loggly.Name)
fmt.Fprintf(out, "Token: %s\n", loggly.Token)
fmt.Fprintf(out, "Format: %s\n", loggly.Format)
fmt.Fprintf(out, "Format version: %d\n", loggly.FormatVersion)
fmt.Fprintf(out, "Response condition: %s\n", loggly.ResponseCondition)
fmt.Fprintf(out, "Placement: %s\n", loggly.Placement)

return nil
}
3 changes: 3 additions & 0 deletions pkg/logging/loggly/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Package loggly contains commands to inspect and manipulate Fastly service Loggly
// logging endpoints.
package loggly
Loading

0 comments on commit 2501252

Please sign in to comment.