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
4 changes: 1 addition & 3 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ func Execute() {
err := rootCmd.Execute()
if err != nil {
switch {
case errors.Is(err, errs.ErrForbidden),
errors.Is(err, errs.ErrInvalidBaseURI),
errors.Is(err, errs.ErrUnauthorized):
case errors.Is(err, errs.Error{}):
fmt.Fprintln(os.Stderr, err.Error())
default:
fmt.Println(err.Error())
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/charmbracelet/lipgloss v0.10.0
github.com/launchdarkly/api-client-go/v14 v14.0.0
github.com/muesli/reflow v0.3.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down
53 changes: 48 additions & 5 deletions internal/errors/errors.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,52 @@
package errors

import "errors"
import (
"github.com/pkg/errors"

var (
ErrForbidden = errors.New("You do not have permission to make this request")
ErrInvalidBaseURI = errors.New("baseUri is invalid")
ErrUnauthorized = errors.New("You are not authorized to make this request")
ldapi "github.com/launchdarkly/api-client-go/v14"
)

var ErrInvalidBaseURI = NewError("baseUri is invalid")

type Error struct {
err error
message string
}

func (e Error) Error() string {
return e.message
}

func (e Error) Unwrap() error {
return e.err
}

func (e Error) Is(err error) bool {
_, ok := err.(Error)

return ok
}

func NewError(message string) error {
return errors.WithStack(Error{
err: errors.New(message),
message: message,
})
}

func NewErrorWrapped(message string, underlying error) error {
return errors.WithStack(Error{
err: underlying,
message: message,
})
}

func NewAPIError(err error) error {
var ldErr *ldapi.GenericOpenAPIError
ok := errors.As(err, &ldErr)
if ok {
return NewErrorWrapped(string(ldErr.Body()), ldErr)
}

return err
}
15 changes: 5 additions & 10 deletions internal/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package flags
import (
"context"
"encoding/json"
"ldcli/internal/errors"

ldapi "github.com/launchdarkly/api-client-go/v14"

"ldcli/internal/errors"
)

type Client interface {
Expand Down Expand Up @@ -37,14 +38,8 @@ func (c FlagsClient) Create(
post := ldapi.NewFeatureFlagBody(name, key)
flag, _, err := c.client.FeatureFlagsApi.PostFeatureFlag(ctx, projectKey).FeatureFlagBody(*post).Execute()
if err != nil {
switch err.Error() {
case "401 Unauthorized":
return nil, errors.ErrUnauthorized
case "403 Forbidden":
return nil, errors.ErrForbidden
default:
return nil, err
}
return nil, errors.NewAPIError(err)

}

responseJSON, err := json.Marshal(flag)
Expand All @@ -66,7 +61,7 @@ func (c FlagsClient) Update(
PatchWithComment(*ldapi.NewPatchWithComment(patch)).
Execute()
if err != nil {
return nil, err
return nil, errors.NewAPIError(err)
}

responseJSON, err := json.Marshal(flag)
Expand Down
11 changes: 2 additions & 9 deletions internal/projects/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (c ProjectsClient) Create(ctx context.Context, name string, key string) ([]
projectPost := ldapi.NewProjectPost(name, key)
project, _, err := c.client.ProjectsApi.PostProject(ctx).ProjectPost(*projectPost).Execute()
if err != nil {
return nil, err
return nil, errors.NewAPIError(err)
}
projectJSON, err := json.Marshal(project)
if err != nil {
Expand All @@ -48,14 +48,7 @@ func (c ProjectsClient) List(ctx context.Context) ([]byte, error) {
Limit(2).
Execute()
if err != nil {
switch err.Error() {
case "401 Unauthorized":
return nil, errors.ErrUnauthorized
case "403 Forbidden":
return nil, errors.ErrForbidden
default:
return nil, err
}
return nil, errors.NewAPIError(err)
}

projectsJSON, err := json.Marshal(projects)
Expand Down
4 changes: 2 additions & 2 deletions internal/projects/projects_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ func (c MockClient) Create(ctx context.Context, name string, key string) ([]byte

func (c MockClient) List(ctx context.Context) ([]byte, error) {
if c.hasForbiddenErr {
return nil, errors.ErrForbidden
return nil, errors.NewError("You do not have permission to make this request")
}
if c.hasUnauthorizedErr {
return nil, errors.ErrUnauthorized
return nil, errors.NewError("You are not authorized to make this request")
}

return []byte(`{
Expand Down
24 changes: 24 additions & 0 deletions vendor/github.com/pkg/errors/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions vendor/github.com/pkg/errors/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions vendor/github.com/pkg/errors/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions vendor/github.com/pkg/errors/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions vendor/github.com/pkg/errors/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/github.com/pkg/errors/appveyor.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading