Skip to content

Commit 782b9ed

Browse files
Integralistphamann
Integralist
and
phamann
authored
Migrate to Go-Fastly 2.0.0 (#169)
* make compiler happy. * fix other files * fix domain update tests * fix service update * TODO/NOTE about client validation * fix service update * fix ftp update test * ensure when we say 'all' we mean it, as PublicKey was missed out at some point * fix failing tests due to vim deleting spaces at end of line * Refactor Valid to WasSet for clarity/less ambiguity * fix code after rebase of master * Apply suggestions from code review * go mod tidy Co-authored-by: Patrick Hamann <[email protected]>
1 parent cab7281 commit 782b9ed

File tree

226 files changed

+3580
-3508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+3580
-3508
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
1010
github.com/blang/semver v3.5.1+incompatible
1111
github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0
12-
github.com/fastly/go-fastly v1.18.0
12+
github.com/fastly/go-fastly/v2 v2.0.0
1313
github.com/fatih/color v1.7.0
1414
github.com/frankban/quicktest v1.5.0 // indirect
1515
github.com/google/go-cmp v0.3.1

‎go.sum

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0 h1:9
3030
github.com/dustinkirkland/golang-petname v0.0.0-20191129215211-8e5a1ed0cff0/go.mod h1:V+Qd57rJe8gd4eiGzZyg4h54VLHmYVVw54iMnlAMrF8=
3131
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
3232
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
33-
github.com/fastly/go-fastly v1.18.0 h1:fyVq/142VTFz5ZkNE5d57K+NkTmtwxt2K2Mh5sV5scg=
34-
github.com/fastly/go-fastly v1.18.0/go.mod h1:fwYSSnZ6zEClwRS65T0f57Yh83Tc4gL12GgttQwJZfA=
33+
github.com/fastly/go-fastly/v2 v2.0.0 h1:dCPOEbTXy8ic5CGj6YibPNvRYG01y15H7kHTlC4d57k=
34+
github.com/fastly/go-fastly/v2 v2.0.0/go.mod h1:+gom+YR+9Q5I4biSk/ZjHQGWXxqpRxC3YDVYQcRpZwQ=
3535
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
3636
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
3737
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
@@ -137,6 +137,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
137137
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
138138
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
139139
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
140+
golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
140141
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
141142
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
142143
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -168,9 +169,11 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
168169
golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
169170
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
170171
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
172+
golang.org/x/tools v0.0.0-20200624163319-25775e59acb7 h1:LqJsVIMDZN3D7MG8O2vT+ClouLDqeK3YkClIcDzImVs=
171173
golang.org/x/tools v0.0.0-20200624163319-25775e59acb7/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
172174
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
173175
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
176+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
174177
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
175178
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
176179
gopkg.in/alecthomas/kingpin.v3-unstable v3.0.0-20180810215634-df19058c872c h1:vTxShRUnK60yd8DZU+f95p1zSLj814+5CuEh7NjF2/Y=
@@ -195,4 +198,5 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
195198
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
196199
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
197200
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
201+
honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
198202
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=

‎pkg/api/interface.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package api
33
import (
44
"net/http"
55

6-
"github.com/fastly/go-fastly/fastly"
6+
"github.com/fastly/go-fastly/v2/fastly"
77
)
88

99
// HTTPClient models a concrete http.Client. It's a consumer contract for some
@@ -16,6 +16,10 @@ type HTTPClient interface {
1616

1717
// Interface models the methods of the Fastly API client that we use.
1818
// It exists to allow for easier testing, in combination with Mock.
19+
//
20+
// TODO(integralist):
21+
// There are missing methods such as GetVersion from this list so review in
22+
// future the missing features in CLI and implement here.
1923
type Interface interface {
2024
GetTokenSelf() (*fastly.Token, error)
2125

‎pkg/app/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import (
5151
"github.com/fastly/cli/pkg/update"
5252
"github.com/fastly/cli/pkg/version"
5353
"github.com/fastly/cli/pkg/whoami"
54-
"github.com/fastly/go-fastly/fastly"
54+
"github.com/fastly/go-fastly/v2/fastly"
5555
"gopkg.in/alecthomas/kingpin.v3-unstable"
5656
)
5757

‎pkg/app/run_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ COMMANDS
240240
241241
-s, --service-id=SERVICE-ID Service ID
242242
243-
service-version update --version=VERSION --comment=COMMENT [<flags>]
243+
service-version update --version=VERSION [<flags>]
244244
Update a Fastly service version
245245
246246
-s, --service-id=SERVICE-ID Service ID

‎pkg/backend/backend_test.go

+30-30
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/fastly/cli/pkg/mock"
1414
"github.com/fastly/cli/pkg/testutil"
1515
"github.com/fastly/cli/pkg/update"
16-
"github.com/fastly/go-fastly/fastly"
16+
"github.com/fastly/go-fastly/v2/fastly"
1717
)
1818

1919
func TestBackendCreate(t *testing.T) {
@@ -186,7 +186,7 @@ func TestBackendUpdate(t *testing.T) {
186186
wantError: errTest.Error(),
187187
},
188188
{
189-
args: []string{"backend", "update", "--service-id", "123", "--version", "1", "--name", "www.test.com", "--new-name", "www.example.com"},
189+
args: []string{"backend", "update", "--service-id", "123", "--version", "1", "--name", "www.test.com", "--new-name", "www.example.com", "--comment", ""},
190190
api: mock.API{
191191
GetBackendFn: getBackendOK,
192192
UpdateBackendFn: updateBackendOK,
@@ -259,10 +259,10 @@ var errTest = errors.New("fixture error")
259259

260260
func createBackendOK(i *fastly.CreateBackendInput) (*fastly.Backend, error) {
261261
return &fastly.Backend{
262-
ServiceID: i.Service,
263-
Version: i.Version,
264-
Name: i.Name,
265-
Comment: i.Comment,
262+
ServiceID: i.ServiceID,
263+
ServiceVersion: i.ServiceVersion,
264+
Name: i.Name,
265+
Comment: i.Comment,
266266
}, nil
267267
}
268268

@@ -272,21 +272,21 @@ func createBackendError(i *fastly.CreateBackendInput) (*fastly.Backend, error) {
272272

273273
func listBackendsOK(i *fastly.ListBackendsInput) ([]*fastly.Backend, error) {
274274
return []*fastly.Backend{
275-
&fastly.Backend{
276-
ServiceID: i.Service,
277-
Version: i.Version,
278-
Name: "test.com",
279-
Address: "www.test.com",
280-
Port: 80,
281-
Comment: "test",
275+
{
276+
ServiceID: i.ServiceID,
277+
ServiceVersion: i.ServiceVersion,
278+
Name: "test.com",
279+
Address: "www.test.com",
280+
Port: 80,
281+
Comment: "test",
282282
},
283-
&fastly.Backend{
284-
ServiceID: i.Service,
285-
Version: i.Version,
286-
Name: "example.com",
287-
Address: "www.example.com",
288-
Port: 443,
289-
Comment: "example",
283+
{
284+
ServiceID: i.ServiceID,
285+
ServiceVersion: i.ServiceVersion,
286+
Name: "example.com",
287+
Address: "www.example.com",
288+
Port: 443,
289+
Comment: "example",
290290
},
291291
}, nil
292292
}
@@ -358,12 +358,12 @@ var listBackendsVerboseOutput = strings.Join([]string{
358358

359359
func getBackendOK(i *fastly.GetBackendInput) (*fastly.Backend, error) {
360360
return &fastly.Backend{
361-
ServiceID: i.Service,
362-
Version: i.Version,
363-
Name: "test.com",
364-
Address: "www.test.com",
365-
Port: 80,
366-
Comment: "test",
361+
ServiceID: i.ServiceID,
362+
ServiceVersion: i.ServiceVersion,
363+
Name: "test.com",
364+
Address: "www.test.com",
365+
Port: 80,
366+
Comment: "test",
367367
}, nil
368368
}
369369

@@ -401,10 +401,10 @@ var describeBackendOutput = strings.Join([]string{
401401

402402
func updateBackendOK(i *fastly.UpdateBackendInput) (*fastly.Backend, error) {
403403
return &fastly.Backend{
404-
ServiceID: i.Service,
405-
Version: i.Version,
406-
Name: i.NewName,
407-
Comment: i.Comment,
404+
ServiceID: i.ServiceID,
405+
ServiceVersion: i.ServiceVersion,
406+
Name: *i.NewName,
407+
Comment: *i.Comment,
408408
}, nil
409409
}
410410

‎pkg/backend/create.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/fastly/cli/pkg/common"
77
"github.com/fastly/cli/pkg/config"
88
"github.com/fastly/cli/pkg/text"
9-
"github.com/fastly/go-fastly/fastly"
9+
"github.com/fastly/go-fastly/v2/fastly"
1010
)
1111

1212
// CreateCommand calls the Fastly API to create backends.
@@ -27,8 +27,8 @@ func NewCreateCommand(parent common.Registerer, globals *config.Data) *CreateCom
2727
c.Globals = globals
2828
c.CmdClause = parent.Command("create", "Create a backend on a Fastly service version").Alias("add")
2929

30-
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.Service)
31-
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.Version)
30+
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.ServiceID)
31+
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.ServiceVersion)
3232
c.CmdClause.Flag("name", "Backend name").Short('n').Required().StringVar(&c.Input.Name)
3333
c.CmdClause.Flag("address", "A hostname, IPv4, or IPv6 address for the backend").Required().StringVar(&c.Input.Address)
3434

@@ -63,15 +63,15 @@ func (c *CreateCommand) Exec(in io.Reader, out io.Writer) error {
6363
// Sadly, go-fastly uses custom a `Compatibool` type as a boolean value that
6464
// marshalls to 0/1 instead of true/false for compatability with the API.
6565
// Therefore, we need to cast our real flag bool to a fastly.Compatibool.
66-
c.Input.AutoLoadbalance = fastly.CBool(c.AutoLoadbalance)
67-
c.Input.UseSSL = fastly.CBool(c.UseSSL)
68-
c.Input.SSLCheckCert = fastly.CBool(c.SSLCheckCert)
66+
c.Input.AutoLoadbalance = fastly.Compatibool(c.AutoLoadbalance)
67+
c.Input.UseSSL = fastly.Compatibool(c.UseSSL)
68+
c.Input.SSLCheckCert = fastly.Compatibool(c.SSLCheckCert)
6969

7070
b, err := c.Globals.Client.CreateBackend(&c.Input)
7171
if err != nil {
7272
return err
7373
}
7474

75-
text.Success(out, "Created backend %s (service %s version %d)", b.Name, b.ServiceID, b.Version)
75+
text.Success(out, "Created backend %s (service %s version %d)", b.Name, b.ServiceID, b.ServiceVersion)
7676
return nil
7777
}

‎pkg/backend/delete.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/fastly/cli/pkg/common"
77
"github.com/fastly/cli/pkg/config"
88
"github.com/fastly/cli/pkg/text"
9-
"github.com/fastly/go-fastly/fastly"
9+
"github.com/fastly/go-fastly/v2/fastly"
1010
)
1111

1212
// DeleteCommand calls the Fastly API to delete backends.
@@ -20,8 +20,8 @@ func NewDeleteCommand(parent common.Registerer, globals *config.Data) *DeleteCom
2020
var c DeleteCommand
2121
c.Globals = globals
2222
c.CmdClause = parent.Command("delete", "Delete a backend on a Fastly service version").Alias("remove")
23-
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.Service)
24-
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.Version)
23+
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.ServiceID)
24+
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.ServiceVersion)
2525
c.CmdClause.Flag("name", "Backend name").Short('n').Required().StringVar(&c.Input.Name)
2626
return &c
2727
}
@@ -32,6 +32,6 @@ func (c *DeleteCommand) Exec(in io.Reader, out io.Writer) error {
3232
return err
3333
}
3434

35-
text.Success(out, "Deleted backend %s (service %s version %d)", c.Input.Name, c.Input.Service, c.Input.Version)
35+
text.Success(out, "Deleted backend %s (service %s version %d)", c.Input.Name, c.Input.ServiceID, c.Input.ServiceVersion)
3636
return nil
3737
}

‎pkg/backend/describe.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/fastly/cli/pkg/common"
88
"github.com/fastly/cli/pkg/config"
99
"github.com/fastly/cli/pkg/text"
10-
"github.com/fastly/go-fastly/fastly"
10+
"github.com/fastly/go-fastly/v2/fastly"
1111
)
1212

1313
// DescribeCommand calls the Fastly API to describe a backend.
@@ -21,8 +21,8 @@ func NewDescribeCommand(parent common.Registerer, globals *config.Data) *Describ
2121
var c DescribeCommand
2222
c.Globals = globals
2323
c.CmdClause = parent.Command("describe", "Show detailed information about a backend on a Fastly service version").Alias("get")
24-
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.Service)
25-
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.Version)
24+
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.ServiceID)
25+
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.ServiceVersion)
2626
c.CmdClause.Flag("name", "Name of backend").Short('n').Required().StringVar(&c.Input.Name)
2727
return &c
2828
}
@@ -35,7 +35,7 @@ func (c *DescribeCommand) Exec(in io.Reader, out io.Writer) error {
3535
}
3636

3737
fmt.Fprintf(out, "Service ID: %s\n", backend.ServiceID)
38-
fmt.Fprintf(out, "Version: %d\n", backend.Version)
38+
fmt.Fprintf(out, "Version: %d\n", backend.ServiceVersion)
3939
text.PrintBackend(out, "", backend)
4040

4141
return nil

‎pkg/backend/list.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/fastly/cli/pkg/common"
88
"github.com/fastly/cli/pkg/config"
99
"github.com/fastly/cli/pkg/text"
10-
"github.com/fastly/go-fastly/fastly"
10+
"github.com/fastly/go-fastly/v2/fastly"
1111
)
1212

1313
// ListCommand calls the Fastly API to list backends.
@@ -21,8 +21,8 @@ func NewListCommand(parent common.Registerer, globals *config.Data) *ListCommand
2121
var c ListCommand
2222
c.Globals = globals
2323
c.CmdClause = parent.Command("list", "List backends on a Fastly service version")
24-
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.Service)
25-
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.Version)
24+
c.CmdClause.Flag("service-id", "Service ID").Short('s').Required().StringVar(&c.Input.ServiceID)
25+
c.CmdClause.Flag("version", "Number of service version").Required().IntVar(&c.Input.ServiceVersion)
2626
return &c
2727
}
2828

@@ -37,14 +37,14 @@ func (c *ListCommand) Exec(in io.Reader, out io.Writer) error {
3737
tw := text.NewTable(out)
3838
tw.AddHeader("SERVICE", "VERSION", "NAME", "ADDRESS", "PORT", "COMMENT")
3939
for _, backend := range backends {
40-
tw.AddLine(backend.ServiceID, backend.Version, backend.Name, backend.Address, backend.Port, backend.Comment)
40+
tw.AddLine(backend.ServiceID, backend.ServiceVersion, backend.Name, backend.Address, backend.Port, backend.Comment)
4141
}
4242
tw.Print()
4343
return nil
4444
}
4545

46-
fmt.Fprintf(out, "Service ID: %s\n", c.Input.Service)
47-
fmt.Fprintf(out, "Version: %d\n", c.Input.Version)
46+
fmt.Fprintf(out, "Service ID: %s\n", c.Input.ServiceID)
47+
fmt.Fprintf(out, "Version: %d\n", c.Input.ServiceVersion)
4848
for i, backend := range backends {
4949
fmt.Fprintf(out, "\tBackend %d/%d\n", i+1, len(backends))
5050
text.PrintBackend(out, "\t\t", backend)

0 commit comments

Comments
 (0)