diff --git a/CHANGELOG.md b/CHANGELOG.md index fe7df0281..196578a53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Bug Fixes: - fix(service-version): support autoclone when staging a service version. ([#1850](https://github.com/fastly/cli/pull/1850)) +- fix(logging): the `placement` flag for all loggging commands can now be reset back to `null` by setting it's value to `""` when it was previously set to another value ([#1855](https://github.com/fastly/cli/pull/1855)) ### Enhancements: @@ -16,6 +17,7 @@ - build(deps): `github.com/minio/minlz` from 1.1.1 to 1.2.0 ([#1847](https://github.com/fastly/cli/pull/1847)) - build(deps): `github.com/coreos/go-oidc/v3` from 3.19.0 to 3.20.0 ([#1847](https://github.com/fastly/cli/pull/1847)) - build(deps): `golang.org/x/net` from 0.56.0 to 0.57.0 ([#1847](https://github.com/fastly/cli/pull/1847)) +- build(deps): `github.com/fastly/go-fastly` from 16.0.1 to 17.0.0 ([#1855](https://github.com/fastly/cli/pull/1855)) ## [v15.4.0](https://github.com/fastly/cli/releases/tag/v15.4.0) (2026-07-08) diff --git a/go.mod b/go.mod index 504df4b7e..87843cb56 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( require ( 4d63.com/optional v0.2.0 github.com/creack/pty v1.1.24 - github.com/fastly/go-fastly/v16 v16.0.1 + github.com/fastly/go-fastly/v17 v17.0.0 github.com/mholt/archives v0.1.5 github.com/mitchellh/go-ps v1.0.0 ) diff --git a/go.sum b/go.sum index e2ab64544..785013532 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,8 @@ github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj6 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0 h1:aYo8nnk3ojoQkP5iErif5Xxv0Mo0Ga/FR5+ffl/7+Nk= github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0/go.mod h1:8AuBTZBRSFqEYBPYULd+NN474/zZBLP+6WeT5S9xlAc= -github.com/fastly/go-fastly/v16 v16.0.1 h1:T4prKfVlxy1gVklFkm19nlKGcUyXho8biaRkLJThVM8= -github.com/fastly/go-fastly/v16 v16.0.1/go.mod h1:1t41QyBKGsJVePO1SOdVHbuIRygkgD6/SNhzw3tS4Bk= +github.com/fastly/go-fastly/v17 v17.0.0 h1:OiKW6XRDfQXlnIye2pYjOmmC4ISFFRUaHvsfWFE1cC0= +github.com/fastly/go-fastly/v17 v17.0.0/go.mod h1:nzyLE+Eurnw5nlaaB6QJiDQaNR10tA8YOYuph/zfovw= github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible h1:FhrXlfhgGCS+uc6YwyiFUt04alnjpoX7vgDKJxS6Qbk= github.com/fastly/kingpin v2.1.12-0.20191105091915-95d230a53780+incompatible/go.mod h1:U8UynVoU1SQaqD2I4ZqgYd5lx3A1ipQYn4aSt2Y5h6c= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= diff --git a/pkg/api/interface.go b/pkg/api/interface.go index 2df8105e2..52c243064 100644 --- a/pkg/api/interface.go +++ b/pkg/api/interface.go @@ -5,7 +5,7 @@ import ( "crypto/ed25519" "net/http" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // HTTPClient models a concrete http.Client. It's a consumer contract for some diff --git a/pkg/app/run.go b/pkg/app/run.go index fa2876780..f56ed6a3c 100644 --- a/pkg/app/run.go +++ b/pkg/app/run.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/cap/oidc" "github.com/skratchdot/open-golang/open" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/kingpin" diff --git a/pkg/app/run_test.go b/pkg/app/run_test.go index aea4ab576..6b6e19fb9 100644 --- a/pkg/app/run_test.go +++ b/pkg/app/run_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/argparser/cmd.go b/pkg/argparser/cmd.go index 859352524..c3d0d3d0f 100644 --- a/pkg/argparser/cmd.go +++ b/pkg/argparser/cmd.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/kingpin" diff --git a/pkg/argparser/flags.go b/pkg/argparser/flags.go index ed8eb3272..3e037fea0 100644 --- a/pkg/argparser/flags.go +++ b/pkg/argparser/flags.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/kingpin" diff --git a/pkg/argparser/flags_test.go b/pkg/argparser/flags_test.go index 5fe31aae2..55c67bead 100644 --- a/pkg/argparser/flags_test.go +++ b/pkg/argparser/flags_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/manifest" diff --git a/pkg/commands/apisecurity/discoveredoperations/discoveredoperations_test.go b/pkg/commands/apisecurity/discoveredoperations/discoveredoperations_test.go index fd6656e40..e9a5c2f7c 100644 --- a/pkg/commands/apisecurity/discoveredoperations/discoveredoperations_test.go +++ b/pkg/commands/apisecurity/discoveredoperations/discoveredoperations_test.go @@ -13,7 +13,7 @@ import ( apisecurity "github.com/fastly/cli/pkg/commands/apisecurity" root "github.com/fastly/cli/pkg/commands/apisecurity/discoveredoperations" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" ) const ( diff --git a/pkg/commands/apisecurity/discoveredoperations/list.go b/pkg/commands/apisecurity/discoveredoperations/list.go index b33415e04..eb39f5026 100644 --- a/pkg/commands/apisecurity/discoveredoperations/list.go +++ b/pkg/commands/apisecurity/discoveredoperations/list.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/discoveredoperations/update.go b/pkg/commands/apisecurity/discoveredoperations/update.go index f03c735cf..47348fa23 100644 --- a/pkg/commands/apisecurity/discoveredoperations/update.go +++ b/pkg/commands/apisecurity/discoveredoperations/update.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/operations/addtags.go b/pkg/commands/apisecurity/operations/addtags.go index d6378a505..46ae7eb00 100644 --- a/pkg/commands/apisecurity/operations/addtags.go +++ b/pkg/commands/apisecurity/operations/addtags.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/kingpin" diff --git a/pkg/commands/apisecurity/operations/create.go b/pkg/commands/apisecurity/operations/create.go index 28b11d016..6696c32df 100644 --- a/pkg/commands/apisecurity/operations/create.go +++ b/pkg/commands/apisecurity/operations/create.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/kingpin" diff --git a/pkg/commands/apisecurity/operations/delete.go b/pkg/commands/apisecurity/operations/delete.go index bef2a6e59..1e5380037 100644 --- a/pkg/commands/apisecurity/operations/delete.go +++ b/pkg/commands/apisecurity/operations/delete.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/operations/describe.go b/pkg/commands/apisecurity/operations/describe.go index e3c790869..bc4dbd9a2 100644 --- a/pkg/commands/apisecurity/operations/describe.go +++ b/pkg/commands/apisecurity/operations/describe.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/operations/list.go b/pkg/commands/apisecurity/operations/list.go index 068bdc173..f9affd560 100644 --- a/pkg/commands/apisecurity/operations/list.go +++ b/pkg/commands/apisecurity/operations/list.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/operations/operations_test.go b/pkg/commands/apisecurity/operations/operations_test.go index 8949c99ff..d5c17d49f 100644 --- a/pkg/commands/apisecurity/operations/operations_test.go +++ b/pkg/commands/apisecurity/operations/operations_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" apisecurity "github.com/fastly/cli/pkg/commands/apisecurity" root "github.com/fastly/cli/pkg/commands/apisecurity/operations" diff --git a/pkg/commands/apisecurity/operations/update.go b/pkg/commands/apisecurity/operations/update.go index 447dd3393..8ec93d042 100644 --- a/pkg/commands/apisecurity/operations/update.go +++ b/pkg/commands/apisecurity/operations/update.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/kingpin" diff --git a/pkg/commands/apisecurity/tags/create.go b/pkg/commands/apisecurity/tags/create.go index e9d46894d..19dad5be6 100644 --- a/pkg/commands/apisecurity/tags/create.go +++ b/pkg/commands/apisecurity/tags/create.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/tags/delete.go b/pkg/commands/apisecurity/tags/delete.go index a2bdcd5f0..698435a13 100644 --- a/pkg/commands/apisecurity/tags/delete.go +++ b/pkg/commands/apisecurity/tags/delete.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/tags/get.go b/pkg/commands/apisecurity/tags/get.go index 73b927f79..a15c27371 100644 --- a/pkg/commands/apisecurity/tags/get.go +++ b/pkg/commands/apisecurity/tags/get.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/apisecurity/tags/list.go b/pkg/commands/apisecurity/tags/list.go index 98e0209b0..475dd4921 100644 --- a/pkg/commands/apisecurity/tags/list.go +++ b/pkg/commands/apisecurity/tags/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" ) // ListCommand calls the Fastly API to list all operation tags. diff --git a/pkg/commands/apisecurity/tags/tags_test.go b/pkg/commands/apisecurity/tags/tags_test.go index a00da2647..c64186055 100644 --- a/pkg/commands/apisecurity/tags/tags_test.go +++ b/pkg/commands/apisecurity/tags/tags_test.go @@ -12,7 +12,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/apisecurity/tags" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" ) const ( diff --git a/pkg/commands/apisecurity/tags/update.go b/pkg/commands/apisecurity/tags/update.go index 65f6d75d0..2f11b91ed 100644 --- a/pkg/commands/apisecurity/tags/update.go +++ b/pkg/commands/apisecurity/tags/update.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/auth/metadata.go b/pkg/commands/auth/metadata.go index 0bb3242a6..0cb86d478 100644 --- a/pkg/commands/auth/metadata.go +++ b/pkg/commands/auth/metadata.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/auth/metadata_test.go b/pkg/commands/auth/metadata_test.go index 6b009ebb6..72f53523a 100644 --- a/pkg/commands/auth/metadata_test.go +++ b/pkg/commands/auth/metadata_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" authcmd "github.com/fastly/cli/pkg/commands/auth" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/auth/revoke.go b/pkg/commands/auth/revoke.go index 457e8e0dd..57e9cfacb 100644 --- a/pkg/commands/auth/revoke.go +++ b/pkg/commands/auth/revoke.go @@ -11,7 +11,7 @@ import ( "path/filepath" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/argparser" diff --git a/pkg/commands/auth/revoke_test.go b/pkg/commands/auth/revoke_test.go index 6bb531f75..911bf365e 100644 --- a/pkg/commands/auth/revoke_test.go +++ b/pkg/commands/auth/revoke_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/auth/sso_test.go b/pkg/commands/auth/sso_test.go index 3ea212724..a4452ca69 100644 --- a/pkg/commands/auth/sso_test.go +++ b/pkg/commands/auth/sso_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/auth" authcmd "github.com/fastly/cli/pkg/commands/auth" diff --git a/pkg/commands/authtoken/authtoken_test.go b/pkg/commands/authtoken/authtoken_test.go index f80167da2..49d7e7dbd 100644 --- a/pkg/commands/authtoken/authtoken_test.go +++ b/pkg/commands/authtoken/authtoken_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/authtoken" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/authtoken/create.go b/pkg/commands/authtoken/create.go index 25b5e3bec..de8c1a5e2 100644 --- a/pkg/commands/authtoken/create.go +++ b/pkg/commands/authtoken/create.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/kingpin" diff --git a/pkg/commands/authtoken/delete.go b/pkg/commands/authtoken/delete.go index 9a31bfc4d..455e2d726 100644 --- a/pkg/commands/authtoken/delete.go +++ b/pkg/commands/authtoken/delete.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/authtoken/describe.go b/pkg/commands/authtoken/describe.go index bec2690e9..390980103 100644 --- a/pkg/commands/authtoken/describe.go +++ b/pkg/commands/authtoken/describe.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/authtoken/list.go b/pkg/commands/authtoken/list.go index 8aa4e7eb0..58e368746 100644 --- a/pkg/commands/authtoken/list.go +++ b/pkg/commands/authtoken/list.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/compute_mocks_test.go b/pkg/commands/compute/compute_mocks_test.go index 3897c405f..516a5125c 100644 --- a/pkg/commands/compute/compute_mocks_test.go +++ b/pkg/commands/compute/compute_mocks_test.go @@ -7,7 +7,7 @@ package compute_test import ( "context" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/testutil" ) diff --git a/pkg/commands/compute/computeacl/computeacl_test.go b/pkg/commands/compute/computeacl/computeacl_test.go index 086ceba17..605bc921e 100644 --- a/pkg/commands/compute/computeacl/computeacl_test.go +++ b/pkg/commands/compute/computeacl/computeacl_test.go @@ -12,7 +12,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/compute/computeacl" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" ) func TestComputeACLCreate(t *testing.T) { diff --git a/pkg/commands/compute/computeacl/create.go b/pkg/commands/compute/computeacl/create.go index e751d42ac..a6849781e 100644 --- a/pkg/commands/compute/computeacl/create.go +++ b/pkg/commands/compute/computeacl/create.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/computeacl/delete.go b/pkg/commands/compute/computeacl/delete.go index a54e13ac6..c34268316 100644 --- a/pkg/commands/compute/computeacl/delete.go +++ b/pkg/commands/compute/computeacl/delete.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/computeacl/describe.go b/pkg/commands/compute/computeacl/describe.go index 79af505ed..659b4d3f8 100644 --- a/pkg/commands/compute/computeacl/describe.go +++ b/pkg/commands/compute/computeacl/describe.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/computeacl/listacls.go b/pkg/commands/compute/computeacl/listacls.go index 699162078..e60425f5c 100644 --- a/pkg/commands/compute/computeacl/listacls.go +++ b/pkg/commands/compute/computeacl/listacls.go @@ -9,9 +9,9 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" ) // ListCommand calls the Fastly API to list all compute ACLs. diff --git a/pkg/commands/compute/computeacl/listentries.go b/pkg/commands/compute/computeacl/listentries.go index 6003bccac..1d5ef1229 100644 --- a/pkg/commands/compute/computeacl/listentries.go +++ b/pkg/commands/compute/computeacl/listentries.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/computeacl/lookup.go b/pkg/commands/compute/computeacl/lookup.go index 3ac37314c..936352a2b 100644 --- a/pkg/commands/compute/computeacl/lookup.go +++ b/pkg/commands/compute/computeacl/lookup.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/computeacl/update.go b/pkg/commands/compute/computeacl/update.go index d1a55d675..5a2bcb239 100644 --- a/pkg/commands/compute/computeacl/update.go +++ b/pkg/commands/compute/computeacl/update.go @@ -7,9 +7,9 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/deploy.go b/pkg/commands/compute/deploy.go index 1181db1ac..639a990d9 100644 --- a/pkg/commands/compute/deploy.go +++ b/pkg/commands/compute/deploy.go @@ -16,7 +16,7 @@ import ( "github.com/kennygrant/sanitize" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/argparser" diff --git a/pkg/commands/compute/deploy_test.go b/pkg/commands/compute/deploy_test.go index a25bac92d..4ebdf5edb 100644 --- a/pkg/commands/compute/deploy_test.go +++ b/pkg/commands/compute/deploy_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/commands/compute" diff --git a/pkg/commands/compute/init.go b/pkg/commands/compute/init.go index c504c2013..118f322d5 100644 --- a/pkg/commands/compute/init.go +++ b/pkg/commands/compute/init.go @@ -19,7 +19,7 @@ import ( cp "github.com/otiai10/copy" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/compute/init_test.go b/pkg/commands/compute/init_test.go index 9fcaf31d6..1669e3af2 100644 --- a/pkg/commands/compute/init_test.go +++ b/pkg/commands/compute/init_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/compute/setup/backend.go b/pkg/commands/compute/setup/backend.go index 4c2637a77..ac782ec66 100644 --- a/pkg/commands/compute/setup/backend.go +++ b/pkg/commands/compute/setup/backend.go @@ -7,7 +7,7 @@ import ( "net" "strconv" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/commands/service/backend" diff --git a/pkg/commands/compute/setup/config_store.go b/pkg/commands/compute/setup/config_store.go index 0296a8c29..68f94ae4c 100644 --- a/pkg/commands/compute/setup/config_store.go +++ b/pkg/commands/compute/setup/config_store.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/setup/domain.go b/pkg/commands/compute/setup/domain.go index 00f982f09..a90c3c7af 100644 --- a/pkg/commands/compute/setup/domain.go +++ b/pkg/commands/compute/setup/domain.go @@ -10,7 +10,7 @@ import ( petname "github.com/dustinkirkland/golang-petname" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/setup/kv_store.go b/pkg/commands/compute/setup/kv_store.go index 000599164..7bd8a49eb 100644 --- a/pkg/commands/compute/setup/kv_store.go +++ b/pkg/commands/compute/setup/kv_store.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/setup/products.go b/pkg/commands/compute/setup/products.go index f7e372465..2149ebadc 100644 --- a/pkg/commands/compute/setup/products.go +++ b/pkg/commands/compute/setup/products.go @@ -12,18 +12,18 @@ import ( fsterrors "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/manifest" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/products/apidiscovery" - "github.com/fastly/go-fastly/v16/fastly/products/botmanagement" - "github.com/fastly/go-fastly/v16/fastly/products/brotlicompression" - "github.com/fastly/go-fastly/v16/fastly/products/ddosprotection" - "github.com/fastly/go-fastly/v16/fastly/products/domaininspector" - "github.com/fastly/go-fastly/v16/fastly/products/fanout" - "github.com/fastly/go-fastly/v16/fastly/products/imageoptimizer" - "github.com/fastly/go-fastly/v16/fastly/products/logexplorerinsights" - "github.com/fastly/go-fastly/v16/fastly/products/ngwaf" - "github.com/fastly/go-fastly/v16/fastly/products/origininspector" - "github.com/fastly/go-fastly/v16/fastly/products/websockets" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/products/apidiscovery" + "github.com/fastly/go-fastly/v17/fastly/products/botmanagement" + "github.com/fastly/go-fastly/v17/fastly/products/brotlicompression" + "github.com/fastly/go-fastly/v17/fastly/products/ddosprotection" + "github.com/fastly/go-fastly/v17/fastly/products/domaininspector" + "github.com/fastly/go-fastly/v17/fastly/products/fanout" + "github.com/fastly/go-fastly/v17/fastly/products/imageoptimizer" + "github.com/fastly/go-fastly/v17/fastly/products/logexplorerinsights" + "github.com/fastly/go-fastly/v17/fastly/products/ngwaf" + "github.com/fastly/go-fastly/v17/fastly/products/origininspector" + "github.com/fastly/go-fastly/v17/fastly/products/websockets" ) // Products represents the service state related to Products defined diff --git a/pkg/commands/compute/setup/secret_store.go b/pkg/commands/compute/setup/secret_store.go index 7cf243633..be3d0fc7b 100644 --- a/pkg/commands/compute/setup/secret_store.go +++ b/pkg/commands/compute/setup/secret_store.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" fsterrors "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/compute/update.go b/pkg/commands/compute/update.go index f89992f18..15cda36eb 100644 --- a/pkg/commands/compute/update.go +++ b/pkg/commands/compute/update.go @@ -8,7 +8,7 @@ import ( "github.com/kennygrant/sanitize" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstore/configstore_test.go b/pkg/commands/configstore/configstore_test.go index eaafdb77a..a9d35003b 100644 --- a/pkg/commands/configstore/configstore_test.go +++ b/pkg/commands/configstore/configstore_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/configstore" fstfmt "github.com/fastly/cli/pkg/fmt" diff --git a/pkg/commands/configstore/create.go b/pkg/commands/configstore/create.go index 96d31620e..914898164 100644 --- a/pkg/commands/configstore/create.go +++ b/pkg/commands/configstore/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstore/delete.go b/pkg/commands/configstore/delete.go index 96d9fe634..38249f44e 100644 --- a/pkg/commands/configstore/delete.go +++ b/pkg/commands/configstore/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstore/describe.go b/pkg/commands/configstore/describe.go index bd801484c..0334c4bcf 100644 --- a/pkg/commands/configstore/describe.go +++ b/pkg/commands/configstore/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstore/helper_test.go b/pkg/commands/configstore/helper_test.go index 45607c598..ba15b26c8 100644 --- a/pkg/commands/configstore/helper_test.go +++ b/pkg/commands/configstore/helper_test.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func fmtStore(cs *fastly.ConfigStore, csm *fastly.ConfigStoreMetadata) string { diff --git a/pkg/commands/configstore/list.go b/pkg/commands/configstore/list.go index e0cb876b5..ecf70c356 100644 --- a/pkg/commands/configstore/list.go +++ b/pkg/commands/configstore/list.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstore/list_services.go b/pkg/commands/configstore/list_services.go index 7801ce0e3..0c95041c0 100644 --- a/pkg/commands/configstore/list_services.go +++ b/pkg/commands/configstore/list_services.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstore/update.go b/pkg/commands/configstore/update.go index 0e5c57ac2..8b2b495cb 100644 --- a/pkg/commands/configstore/update.go +++ b/pkg/commands/configstore/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstoreentry/configstoreentry_test.go b/pkg/commands/configstoreentry/configstoreentry_test.go index cc08c9543..282315ffd 100644 --- a/pkg/commands/configstoreentry/configstoreentry_test.go +++ b/pkg/commands/configstoreentry/configstoreentry_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/configstoreentry" fstfmt "github.com/fastly/cli/pkg/fmt" diff --git a/pkg/commands/configstoreentry/create.go b/pkg/commands/configstoreentry/create.go index 0e4318ce4..e83fd17fb 100644 --- a/pkg/commands/configstoreentry/create.go +++ b/pkg/commands/configstoreentry/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstoreentry/delete.go b/pkg/commands/configstoreentry/delete.go index e6dae76f2..71c560c4f 100644 --- a/pkg/commands/configstoreentry/delete.go +++ b/pkg/commands/configstoreentry/delete.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstoreentry/describe.go b/pkg/commands/configstoreentry/describe.go index ecf2ed6fd..b185caa93 100644 --- a/pkg/commands/configstoreentry/describe.go +++ b/pkg/commands/configstoreentry/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstoreentry/list.go b/pkg/commands/configstoreentry/list.go index d0b61e56c..fd451ed4c 100644 --- a/pkg/commands/configstoreentry/list.go +++ b/pkg/commands/configstoreentry/list.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/configstoreentry/update.go b/pkg/commands/configstoreentry/update.go index 1733c505a..2f071b8bc 100644 --- a/pkg/commands/configstoreentry/update.go +++ b/pkg/commands/configstoreentry/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dashboard/create.go b/pkg/commands/dashboard/create.go index e85e8eb34..d26ffba6a 100644 --- a/pkg/commands/dashboard/create.go +++ b/pkg/commands/dashboard/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dashboard/dashboard_test.go b/pkg/commands/dashboard/dashboard_test.go index cc4e7531c..44300f1a6 100644 --- a/pkg/commands/dashboard/dashboard_test.go +++ b/pkg/commands/dashboard/dashboard_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/dashboard" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/dashboard/delete.go b/pkg/commands/dashboard/delete.go index 791d1b8db..17f9ef780 100644 --- a/pkg/commands/dashboard/delete.go +++ b/pkg/commands/dashboard/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dashboard/describe.go b/pkg/commands/dashboard/describe.go index 1ada2bb87..b0d5f63a4 100644 --- a/pkg/commands/dashboard/describe.go +++ b/pkg/commands/dashboard/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/dashboard/printer" diff --git a/pkg/commands/dashboard/item/create.go b/pkg/commands/dashboard/item/create.go index 90823e83a..8380ca005 100644 --- a/pkg/commands/dashboard/item/create.go +++ b/pkg/commands/dashboard/item/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/dashboard/printer" diff --git a/pkg/commands/dashboard/item/delete.go b/pkg/commands/dashboard/item/delete.go index d9b27edb5..4a508c7b7 100644 --- a/pkg/commands/dashboard/item/delete.go +++ b/pkg/commands/dashboard/item/delete.go @@ -5,7 +5,7 @@ import ( "io" "slices" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dashboard/item/describe.go b/pkg/commands/dashboard/item/describe.go index 3192b1891..7ba213bee 100644 --- a/pkg/commands/dashboard/item/describe.go +++ b/pkg/commands/dashboard/item/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/dashboard/printer" diff --git a/pkg/commands/dashboard/item/item_test.go b/pkg/commands/dashboard/item/item_test.go index 1d89053a8..99fd86921 100644 --- a/pkg/commands/dashboard/item/item_test.go +++ b/pkg/commands/dashboard/item/item_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/dashboard" sub "github.com/fastly/cli/pkg/commands/dashboard/item" diff --git a/pkg/commands/dashboard/item/update.go b/pkg/commands/dashboard/item/update.go index 1971b2a2e..8236c3418 100644 --- a/pkg/commands/dashboard/item/update.go +++ b/pkg/commands/dashboard/item/update.go @@ -6,7 +6,7 @@ import ( "io" "slices" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dashboard/list.go b/pkg/commands/dashboard/list.go index ac9954072..984c4f2af 100644 --- a/pkg/commands/dashboard/list.go +++ b/pkg/commands/dashboard/list.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/dashboard/printer" diff --git a/pkg/commands/dashboard/printer/print.go b/pkg/commands/dashboard/printer/print.go index c07a147ec..c0a3dc00e 100644 --- a/pkg/commands/dashboard/printer/print.go +++ b/pkg/commands/dashboard/printer/print.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/text" ) diff --git a/pkg/commands/dashboard/update.go b/pkg/commands/dashboard/update.go index d6bebc3e3..d0cd5ee4f 100644 --- a/pkg/commands/dashboard/update.go +++ b/pkg/commands/dashboard/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/tsigkey/create.go b/pkg/commands/dns/tsigkey/create.go index 28f9d82a6..f5c37329c 100644 --- a/pkg/commands/dns/tsigkey/create.go +++ b/pkg/commands/dns/tsigkey/create.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/tsigkey/delete.go b/pkg/commands/dns/tsigkey/delete.go index a61f274ae..f6100a13b 100644 --- a/pkg/commands/dns/tsigkey/delete.go +++ b/pkg/commands/dns/tsigkey/delete.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/tsigkey/describe.go b/pkg/commands/dns/tsigkey/describe.go index 0ca893199..bacf0f1a4 100644 --- a/pkg/commands/dns/tsigkey/describe.go +++ b/pkg/commands/dns/tsigkey/describe.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/tsigkey/list.go b/pkg/commands/dns/tsigkey/list.go index 0810e5710..059451c71 100644 --- a/pkg/commands/dns/tsigkey/list.go +++ b/pkg/commands/dns/tsigkey/list.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/tsigkey/tsigkey_test.go b/pkg/commands/dns/tsigkey/tsigkey_test.go index 92b1ce99a..e97e5758e 100644 --- a/pkg/commands/dns/tsigkey/tsigkey_test.go +++ b/pkg/commands/dns/tsigkey/tsigkey_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" dnsroot "github.com/fastly/cli/pkg/commands/dns" root "github.com/fastly/cli/pkg/commands/dns/tsigkey" diff --git a/pkg/commands/dns/tsigkey/update.go b/pkg/commands/dns/tsigkey/update.go index a1cb72eee..7ad12ab04 100644 --- a/pkg/commands/dns/tsigkey/update.go +++ b/pkg/commands/dns/tsigkey/update.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/zone/create.go b/pkg/commands/dns/zone/create.go index 49d4123b7..0806067a1 100644 --- a/pkg/commands/dns/zone/create.go +++ b/pkg/commands/dns/zone/create.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/zone/delete.go b/pkg/commands/dns/zone/delete.go index e04d7bf53..2956b7347 100644 --- a/pkg/commands/dns/zone/delete.go +++ b/pkg/commands/dns/zone/delete.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/zone/describe.go b/pkg/commands/dns/zone/describe.go index 15566234f..b73d98e1a 100644 --- a/pkg/commands/dns/zone/describe.go +++ b/pkg/commands/dns/zone/describe.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/zone/list.go b/pkg/commands/dns/zone/list.go index 8077dd3dd..8a6650f99 100644 --- a/pkg/commands/dns/zone/list.go +++ b/pkg/commands/dns/zone/list.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/zone/update.go b/pkg/commands/dns/zone/update.go index 613532608..89da0a49c 100644 --- a/pkg/commands/dns/zone/update.go +++ b/pkg/commands/dns/zone/update.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/dns/zone/zone_test.go b/pkg/commands/dns/zone/zone_test.go index 55adcd99d..12c03b76d 100644 --- a/pkg/commands/dns/zone/zone_test.go +++ b/pkg/commands/dns/zone/zone_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" dnsroot "github.com/fastly/cli/pkg/commands/dns" root "github.com/fastly/cli/pkg/commands/dns/zone" diff --git a/pkg/commands/domain/common.go b/pkg/commands/domain/common.go index 8faceab12..9999406cf 100644 --- a/pkg/commands/domain/common.go +++ b/pkg/commands/domain/common.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" "github.com/fastly/cli/pkg/text" ) diff --git a/pkg/commands/domain/create.go b/pkg/commands/domain/create.go index 260970d61..a2097480b 100644 --- a/pkg/commands/domain/create.go +++ b/pkg/commands/domain/create.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/domain/delete.go b/pkg/commands/domain/delete.go index 6d665172f..0e825480e 100644 --- a/pkg/commands/domain/delete.go +++ b/pkg/commands/domain/delete.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/domain/describe.go b/pkg/commands/domain/describe.go index 2f7a122c3..96776e178 100644 --- a/pkg/commands/domain/describe.go +++ b/pkg/commands/domain/describe.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/domain/domain_test.go b/pkg/commands/domain/domain_test.go index 257904422..d270a13c4 100644 --- a/pkg/commands/domain/domain_test.go +++ b/pkg/commands/domain/domain_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" root "github.com/fastly/cli/pkg/commands/domain" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/domain/list.go b/pkg/commands/domain/list.go index a137bcdfc..fbdbec16f 100644 --- a/pkg/commands/domain/list.go +++ b/pkg/commands/domain/list.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/domain/update.go b/pkg/commands/domain/update.go index 3ec94a1b3..b4e173393 100644 --- a/pkg/commands/domain/update.go +++ b/pkg/commands/domain/update.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/domains" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/domains" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/ip/ip_test.go b/pkg/commands/ip/ip_test.go index 8b4766f02..9194bf42c 100644 --- a/pkg/commands/ip/ip_test.go +++ b/pkg/commands/ip/ip_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/ip" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/kvstore/create.go b/pkg/commands/kvstore/create.go index f5c749e70..dfacbc82c 100644 --- a/pkg/commands/kvstore/create.go +++ b/pkg/commands/kvstore/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/kvstore/delete.go b/pkg/commands/kvstore/delete.go index 5868fee91..8cae06ece 100644 --- a/pkg/commands/kvstore/delete.go +++ b/pkg/commands/kvstore/delete.go @@ -6,7 +6,7 @@ import ( "io" "strconv" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/kvstoreentry" diff --git a/pkg/commands/kvstore/describe.go b/pkg/commands/kvstore/describe.go index 17a65e8ea..875fa4794 100644 --- a/pkg/commands/kvstore/describe.go +++ b/pkg/commands/kvstore/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/kvstore/kvstore_test.go b/pkg/commands/kvstore/kvstore_test.go index 0466753c3..c5146ab43 100644 --- a/pkg/commands/kvstore/kvstore_test.go +++ b/pkg/commands/kvstore/kvstore_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/kvstore" fstfmt "github.com/fastly/cli/pkg/fmt" diff --git a/pkg/commands/kvstore/list.go b/pkg/commands/kvstore/list.go index 2da0f182f..c37f71d74 100644 --- a/pkg/commands/kvstore/list.go +++ b/pkg/commands/kvstore/list.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/kvstoreentry/create.go b/pkg/commands/kvstoreentry/create.go index 26390be60..28fedab9c 100644 --- a/pkg/commands/kvstoreentry/create.go +++ b/pkg/commands/kvstoreentry/create.go @@ -13,7 +13,7 @@ import ( "sync" "sync/atomic" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/argparser" diff --git a/pkg/commands/kvstoreentry/delete.go b/pkg/commands/kvstoreentry/delete.go index 787acdb57..95fa00eb8 100644 --- a/pkg/commands/kvstoreentry/delete.go +++ b/pkg/commands/kvstoreentry/delete.go @@ -8,7 +8,7 @@ import ( "sync" "sync/atomic" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/kvstoreentry/describe.go b/pkg/commands/kvstoreentry/describe.go index f506af473..d2ef1c789 100644 --- a/pkg/commands/kvstoreentry/describe.go +++ b/pkg/commands/kvstoreentry/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/kvstoreentry/get.go b/pkg/commands/kvstoreentry/get.go index e55447abc..962afc464 100644 --- a/pkg/commands/kvstoreentry/get.go +++ b/pkg/commands/kvstoreentry/get.go @@ -7,7 +7,7 @@ import ( "io" "strconv" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/kvstoreentry/kvstoreentry_test.go b/pkg/commands/kvstoreentry/kvstoreentry_test.go index c3901569d..a475c6888 100644 --- a/pkg/commands/kvstoreentry/kvstoreentry_test.go +++ b/pkg/commands/kvstoreentry/kvstoreentry_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/kvstoreentry" fstfmt "github.com/fastly/cli/pkg/fmt" diff --git a/pkg/commands/kvstoreentry/list.go b/pkg/commands/kvstoreentry/list.go index 6f6a8eafa..9e998821e 100644 --- a/pkg/commands/kvstoreentry/list.go +++ b/pkg/commands/kvstoreentry/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/logtail/root.go b/pkg/commands/logtail/root.go index 9331f05ee..42cfc4b3f 100644 --- a/pkg/commands/logtail/root.go +++ b/pkg/commands/logtail/root.go @@ -19,7 +19,7 @@ import ( "github.com/tomnomnom/linkheader" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/debug" diff --git a/pkg/commands/ngwaf/countrylist/countrylist_test.go b/pkg/commands/ngwaf/countrylist/countrylist_test.go index 742e9f7da..75f51341d 100644 --- a/pkg/commands/ngwaf/countrylist/countrylist_test.go +++ b/pkg/commands/ngwaf/countrylist/countrylist_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/countrylist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/countrylist/create.go b/pkg/commands/ngwaf/countrylist/create.go index aa36e09e1..258647419 100644 --- a/pkg/commands/ngwaf/countrylist/create.go +++ b/pkg/commands/ngwaf/countrylist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/countrylist/delete.go b/pkg/commands/ngwaf/countrylist/delete.go index 5bf615397..ce93e596f 100644 --- a/pkg/commands/ngwaf/countrylist/delete.go +++ b/pkg/commands/ngwaf/countrylist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/countrylist/get.go b/pkg/commands/ngwaf/countrylist/get.go index dc6b0cf8c..511807b35 100644 --- a/pkg/commands/ngwaf/countrylist/get.go +++ b/pkg/commands/ngwaf/countrylist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get an account-level country list. diff --git a/pkg/commands/ngwaf/countrylist/list.go b/pkg/commands/ngwaf/countrylist/list.go index 64af19a9e..9b46cb6c8 100644 --- a/pkg/commands/ngwaf/countrylist/list.go +++ b/pkg/commands/ngwaf/countrylist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all country lists for your API token. diff --git a/pkg/commands/ngwaf/countrylist/update.go b/pkg/commands/ngwaf/countrylist/update.go index 18868e705..cf87e10da 100644 --- a/pkg/commands/ngwaf/countrylist/update.go +++ b/pkg/commands/ngwaf/countrylist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/customsignal/create.go b/pkg/commands/ngwaf/customsignal/create.go index 99af5e09f..fc0f86e63 100644 --- a/pkg/commands/ngwaf/customsignal/create.go +++ b/pkg/commands/ngwaf/customsignal/create.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/customsignal/customsignal_test.go b/pkg/commands/ngwaf/customsignal/customsignal_test.go index f1cc2efe2..6e83b4230 100644 --- a/pkg/commands/ngwaf/customsignal/customsignal_test.go +++ b/pkg/commands/ngwaf/customsignal/customsignal_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/customsignal" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" ) const ( diff --git a/pkg/commands/ngwaf/customsignal/delete.go b/pkg/commands/ngwaf/customsignal/delete.go index 7f19cc5dd..0cfa51264 100644 --- a/pkg/commands/ngwaf/customsignal/delete.go +++ b/pkg/commands/ngwaf/customsignal/delete.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/customsignal/get.go b/pkg/commands/ngwaf/customsignal/get.go index c0a32b04b..d0c3feaae 100644 --- a/pkg/commands/ngwaf/customsignal/get.go +++ b/pkg/commands/ngwaf/customsignal/get.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/customsignal/list.go b/pkg/commands/ngwaf/customsignal/list.go index 3847b34e7..ad93b7f22 100644 --- a/pkg/commands/ngwaf/customsignal/list.go +++ b/pkg/commands/ngwaf/customsignal/list.go @@ -9,10 +9,10 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" ) // ListCommand calls the Fastly API to list all account-level custom signals for your API token. diff --git a/pkg/commands/ngwaf/customsignal/update.go b/pkg/commands/ngwaf/customsignal/update.go index 3ec9dd0ca..4b92b877b 100644 --- a/pkg/commands/ngwaf/customsignal/update.go +++ b/pkg/commands/ngwaf/customsignal/update.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/iplist/create.go b/pkg/commands/ngwaf/iplist/create.go index e28b5f45e..9d581b4db 100644 --- a/pkg/commands/ngwaf/iplist/create.go +++ b/pkg/commands/ngwaf/iplist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/iplist/delete.go b/pkg/commands/ngwaf/iplist/delete.go index 577f496fd..a3443a496 100644 --- a/pkg/commands/ngwaf/iplist/delete.go +++ b/pkg/commands/ngwaf/iplist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/iplist/get.go b/pkg/commands/ngwaf/iplist/get.go index 7366fa59b..c88b5dc59 100644 --- a/pkg/commands/ngwaf/iplist/get.go +++ b/pkg/commands/ngwaf/iplist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get an account-level ip list. diff --git a/pkg/commands/ngwaf/iplist/iplist_test.go b/pkg/commands/ngwaf/iplist/iplist_test.go index e54c552bc..13ef31ec5 100644 --- a/pkg/commands/ngwaf/iplist/iplist_test.go +++ b/pkg/commands/ngwaf/iplist/iplist_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/iplist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/iplist/list.go b/pkg/commands/ngwaf/iplist/list.go index ec6939f84..af05d3500 100644 --- a/pkg/commands/ngwaf/iplist/list.go +++ b/pkg/commands/ngwaf/iplist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all ip lists for your API token. diff --git a/pkg/commands/ngwaf/iplist/update.go b/pkg/commands/ngwaf/iplist/update.go index a9771b92e..c4def6c0f 100644 --- a/pkg/commands/ngwaf/iplist/update.go +++ b/pkg/commands/ngwaf/iplist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/ngwaflist/api.go b/pkg/commands/ngwaf/ngwaflist/api.go index b5741d27a..f7adad4d4 100644 --- a/pkg/commands/ngwaf/ngwaflist/api.go +++ b/pkg/commands/ngwaf/ngwaflist/api.go @@ -7,9 +7,9 @@ import ( "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf" fsterr "github.com/fastly/cli/pkg/errors" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) type ListCreateInput struct { diff --git a/pkg/commands/ngwaf/root.go b/pkg/commands/ngwaf/root.go index e86c7b073..eb1785a64 100644 --- a/pkg/commands/ngwaf/root.go +++ b/pkg/commands/ngwaf/root.go @@ -5,7 +5,7 @@ import ( "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // RootCommand is the parent command for all subcommands in this package. diff --git a/pkg/commands/ngwaf/rule/create.go b/pkg/commands/ngwaf/rule/create.go index 6853013cd..d0aa26765 100644 --- a/pkg/commands/ngwaf/rule/create.go +++ b/pkg/commands/ngwaf/rule/create.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/rule/delete.go b/pkg/commands/ngwaf/rule/delete.go index b2b8e1486..1752a5ed7 100644 --- a/pkg/commands/ngwaf/rule/delete.go +++ b/pkg/commands/ngwaf/rule/delete.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/rule/get.go b/pkg/commands/ngwaf/rule/get.go index bbecacde6..e118c951d 100644 --- a/pkg/commands/ngwaf/rule/get.go +++ b/pkg/commands/ngwaf/rule/get.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/rule/list.go b/pkg/commands/ngwaf/rule/list.go index 0a1b9aead..94f8c802c 100644 --- a/pkg/commands/ngwaf/rule/list.go +++ b/pkg/commands/ngwaf/rule/list.go @@ -10,10 +10,10 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all account-level rules for your API token. diff --git a/pkg/commands/ngwaf/rule/rule_test.go b/pkg/commands/ngwaf/rule/rule_test.go index 60e2fa95a..922cd1ecc 100644 --- a/pkg/commands/ngwaf/rule/rule_test.go +++ b/pkg/commands/ngwaf/rule/rule_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/rule" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/rule/update.go b/pkg/commands/ngwaf/rule/update.go index 5e5616d92..934f67ea0 100644 --- a/pkg/commands/ngwaf/rule/update.go +++ b/pkg/commands/ngwaf/rule/update.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/signallist/create.go b/pkg/commands/ngwaf/signallist/create.go index 33cf9b602..a5803c830 100644 --- a/pkg/commands/ngwaf/signallist/create.go +++ b/pkg/commands/ngwaf/signallist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/signallist/delete.go b/pkg/commands/ngwaf/signallist/delete.go index d6ad83d46..70e398546 100644 --- a/pkg/commands/ngwaf/signallist/delete.go +++ b/pkg/commands/ngwaf/signallist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/signallist/get.go b/pkg/commands/ngwaf/signallist/get.go index 93ed6999f..91250be48 100644 --- a/pkg/commands/ngwaf/signallist/get.go +++ b/pkg/commands/ngwaf/signallist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get an account-level signal list. diff --git a/pkg/commands/ngwaf/signallist/list.go b/pkg/commands/ngwaf/signallist/list.go index 5c5a6e191..40868c8dd 100644 --- a/pkg/commands/ngwaf/signallist/list.go +++ b/pkg/commands/ngwaf/signallist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all signal lists for your API token. diff --git a/pkg/commands/ngwaf/signallist/signallist_test.go b/pkg/commands/ngwaf/signallist/signallist_test.go index 58a1c2e1c..b8c45d05b 100644 --- a/pkg/commands/ngwaf/signallist/signallist_test.go +++ b/pkg/commands/ngwaf/signallist/signallist_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/signallist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/signallist/update.go b/pkg/commands/ngwaf/signallist/update.go index ae5b33dfd..57a165bae 100644 --- a/pkg/commands/ngwaf/signallist/update.go +++ b/pkg/commands/ngwaf/signallist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/stringlist/create.go b/pkg/commands/ngwaf/stringlist/create.go index d28b8234d..1578b7775 100644 --- a/pkg/commands/ngwaf/stringlist/create.go +++ b/pkg/commands/ngwaf/stringlist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/stringlist/delete.go b/pkg/commands/ngwaf/stringlist/delete.go index 5262d0ec8..4872d1d09 100644 --- a/pkg/commands/ngwaf/stringlist/delete.go +++ b/pkg/commands/ngwaf/stringlist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/stringlist/get.go b/pkg/commands/ngwaf/stringlist/get.go index ef6708096..c9e0e6e65 100644 --- a/pkg/commands/ngwaf/stringlist/get.go +++ b/pkg/commands/ngwaf/stringlist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get an account-level string list. diff --git a/pkg/commands/ngwaf/stringlist/list.go b/pkg/commands/ngwaf/stringlist/list.go index edf85ff01..0ef8a9ed2 100644 --- a/pkg/commands/ngwaf/stringlist/list.go +++ b/pkg/commands/ngwaf/stringlist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all string lists for your API token. diff --git a/pkg/commands/ngwaf/stringlist/stringlist_test.go b/pkg/commands/ngwaf/stringlist/stringlist_test.go index 1379cbcaf..f97e3257b 100644 --- a/pkg/commands/ngwaf/stringlist/stringlist_test.go +++ b/pkg/commands/ngwaf/stringlist/stringlist_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/stringlist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/stringlist/update.go b/pkg/commands/ngwaf/stringlist/update.go index 929a24563..27431ce5b 100644 --- a/pkg/commands/ngwaf/stringlist/update.go +++ b/pkg/commands/ngwaf/stringlist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/timeseries/list.go b/pkg/commands/ngwaf/timeseries/list.go index 61ad0326b..f42a01d9f 100644 --- a/pkg/commands/ngwaf/timeseries/list.go +++ b/pkg/commands/ngwaf/timeseries/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - ts "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/timeseries" + "github.com/fastly/go-fastly/v17/fastly" + ts "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/timeseries" ) // ListCommand calls the Fastly API to list an account-level time series metrics. diff --git a/pkg/commands/ngwaf/timeseries/root.go b/pkg/commands/ngwaf/timeseries/root.go index 91c30f51e..9f349e24d 100644 --- a/pkg/commands/ngwaf/timeseries/root.go +++ b/pkg/commands/ngwaf/timeseries/root.go @@ -5,7 +5,7 @@ import ( "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // RootCommand is the parent command for all subcommands in this package. diff --git a/pkg/commands/ngwaf/timeseries/timeseries_test.go b/pkg/commands/ngwaf/timeseries/timeseries_test.go index e0fc0e23a..7ab94ae83 100644 --- a/pkg/commands/ngwaf/timeseries/timeseries_test.go +++ b/pkg/commands/ngwaf/timeseries/timeseries_test.go @@ -11,7 +11,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/timeseries" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - gots "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/timeseries" + gots "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/timeseries" ) var timeseriesResponse = gots.Timeseries{ diff --git a/pkg/commands/ngwaf/wildcardlist/create.go b/pkg/commands/ngwaf/wildcardlist/create.go index 452e99620..e30281e40 100644 --- a/pkg/commands/ngwaf/wildcardlist/create.go +++ b/pkg/commands/ngwaf/wildcardlist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/wildcardlist/delete.go b/pkg/commands/ngwaf/wildcardlist/delete.go index 108d8fea8..cb554ee77 100644 --- a/pkg/commands/ngwaf/wildcardlist/delete.go +++ b/pkg/commands/ngwaf/wildcardlist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/wildcardlist/get.go b/pkg/commands/ngwaf/wildcardlist/get.go index 58e1c51a6..d3edc5edb 100644 --- a/pkg/commands/ngwaf/wildcardlist/get.go +++ b/pkg/commands/ngwaf/wildcardlist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get an account-level wildcard list. diff --git a/pkg/commands/ngwaf/wildcardlist/list.go b/pkg/commands/ngwaf/wildcardlist/list.go index 139895dc0..e1b132845 100644 --- a/pkg/commands/ngwaf/wildcardlist/list.go +++ b/pkg/commands/ngwaf/wildcardlist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all wildcard lists for your API token. diff --git a/pkg/commands/ngwaf/wildcardlist/update.go b/pkg/commands/ngwaf/wildcardlist/update.go index e4ccf077c..d7239f64a 100644 --- a/pkg/commands/ngwaf/wildcardlist/update.go +++ b/pkg/commands/ngwaf/wildcardlist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/wildcardlist/wildcardlist_test.go b/pkg/commands/ngwaf/wildcardlist/wildcardlist_test.go index 5f4120ac2..f79d816c3 100644 --- a/pkg/commands/ngwaf/wildcardlist/wildcardlist_test.go +++ b/pkg/commands/ngwaf/wildcardlist/wildcardlist_test.go @@ -12,8 +12,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/wildcardlist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/datadog/create.go b/pkg/commands/ngwaf/workspace/alert/datadog/create.go index f1e0760af..a068c96b0 100644 --- a/pkg/commands/ngwaf/workspace/alert/datadog/create.go +++ b/pkg/commands/ngwaf/workspace/alert/datadog/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" ) // CreateCommand calls the Fastly API to create Datadog alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/datadog/datadog_test.go b/pkg/commands/ngwaf/workspace/alert/datadog/datadog_test.go index fe3f48cd8..bd9c43744 100644 --- a/pkg/commands/ngwaf/workspace/alert/datadog/datadog_test.go +++ b/pkg/commands/ngwaf/workspace/alert/datadog/datadog_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/datadog" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/datadog/delete.go b/pkg/commands/ngwaf/workspace/alert/datadog/delete.go index 1cab8d307..906323601 100644 --- a/pkg/commands/ngwaf/workspace/alert/datadog/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/datadog/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" ) // DeleteCommand calls the Fastly API to delete Datadog alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/datadog/get.go b/pkg/commands/ngwaf/workspace/alert/datadog/get.go index 4e46ba08e..000f14cc0 100644 --- a/pkg/commands/ngwaf/workspace/alert/datadog/get.go +++ b/pkg/commands/ngwaf/workspace/alert/datadog/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" ) // GetCommand calls the Fastly API to get Datadog alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/datadog/list.go b/pkg/commands/ngwaf/workspace/alert/datadog/list.go index 8fc736e34..925bce05b 100644 --- a/pkg/commands/ngwaf/workspace/alert/datadog/list.go +++ b/pkg/commands/ngwaf/workspace/alert/datadog/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" ) // ListCommand calls the Fastly API to list Datadog alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/datadog/update.go b/pkg/commands/ngwaf/workspace/alert/datadog/update.go index b8561e91b..bb013eeb8 100644 --- a/pkg/commands/ngwaf/workspace/alert/datadog/update.go +++ b/pkg/commands/ngwaf/workspace/alert/datadog/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" ) // UpdateCommand calls the Fastly API to update Datadog alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/jira/create.go b/pkg/commands/ngwaf/workspace/alert/jira/create.go index 0a881925a..3bef0e3f4 100644 --- a/pkg/commands/ngwaf/workspace/alert/jira/create.go +++ b/pkg/commands/ngwaf/workspace/alert/jira/create.go @@ -10,8 +10,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" ) // CreateCommand calls the Fastly API to create Jira alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/jira/delete.go b/pkg/commands/ngwaf/workspace/alert/jira/delete.go index a534fd07f..a7b3606ef 100644 --- a/pkg/commands/ngwaf/workspace/alert/jira/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/jira/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" ) // DeleteCommand calls the Fastly API to delete Jira alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/jira/get.go b/pkg/commands/ngwaf/workspace/alert/jira/get.go index 55bf21115..2f75d3043 100644 --- a/pkg/commands/ngwaf/workspace/alert/jira/get.go +++ b/pkg/commands/ngwaf/workspace/alert/jira/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" ) // GetCommand calls the Fastly API to get Jira alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/jira/jira_test.go b/pkg/commands/ngwaf/workspace/alert/jira/jira_test.go index d78361ec7..4295c57d2 100644 --- a/pkg/commands/ngwaf/workspace/alert/jira/jira_test.go +++ b/pkg/commands/ngwaf/workspace/alert/jira/jira_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/jira" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/jira/list.go b/pkg/commands/ngwaf/workspace/alert/jira/list.go index 082c72b1b..0be6a1239 100644 --- a/pkg/commands/ngwaf/workspace/alert/jira/list.go +++ b/pkg/commands/ngwaf/workspace/alert/jira/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" ) // ListCommand calls the Fastly API to list Jira alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/jira/update.go b/pkg/commands/ngwaf/workspace/alert/jira/update.go index e9217f2bd..a04046f33 100644 --- a/pkg/commands/ngwaf/workspace/alert/jira/update.go +++ b/pkg/commands/ngwaf/workspace/alert/jira/update.go @@ -10,8 +10,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" ) // UpdateCommand calls the Fastly API to update Jira alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/mailinglist/create.go b/pkg/commands/ngwaf/workspace/alert/mailinglist/create.go index 87a7ec39e..1c2319fc4 100644 --- a/pkg/commands/ngwaf/workspace/alert/mailinglist/create.go +++ b/pkg/commands/ngwaf/workspace/alert/mailinglist/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" ) // CreateCommand calls the Fastly API to create Mailing List alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/mailinglist/delete.go b/pkg/commands/ngwaf/workspace/alert/mailinglist/delete.go index ba83ebc04..d82e61baf 100644 --- a/pkg/commands/ngwaf/workspace/alert/mailinglist/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/mailinglist/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" ) // DeleteCommand calls the Fastly API to delete Mailing List alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/mailinglist/get.go b/pkg/commands/ngwaf/workspace/alert/mailinglist/get.go index 87910632f..1a57fb9a4 100644 --- a/pkg/commands/ngwaf/workspace/alert/mailinglist/get.go +++ b/pkg/commands/ngwaf/workspace/alert/mailinglist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" ) // GetCommand calls the Fastly API to get Mailing List alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/mailinglist/list.go b/pkg/commands/ngwaf/workspace/alert/mailinglist/list.go index 41fa27a2c..ade9864ce 100644 --- a/pkg/commands/ngwaf/workspace/alert/mailinglist/list.go +++ b/pkg/commands/ngwaf/workspace/alert/mailinglist/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" ) // ListCommand calls the Fastly API to list Mailing List alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/mailinglist/mailinglist_test.go b/pkg/commands/ngwaf/workspace/alert/mailinglist/mailinglist_test.go index b26409546..0d25e6e7f 100644 --- a/pkg/commands/ngwaf/workspace/alert/mailinglist/mailinglist_test.go +++ b/pkg/commands/ngwaf/workspace/alert/mailinglist/mailinglist_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/mailinglist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/mailinglist/update.go b/pkg/commands/ngwaf/workspace/alert/mailinglist/update.go index 739442676..5676d0345 100644 --- a/pkg/commands/ngwaf/workspace/alert/mailinglist/update.go +++ b/pkg/commands/ngwaf/workspace/alert/mailinglist/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" ) // UpdateCommand calls the Fastly API to update Mailing List alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/microsoftteams/create.go b/pkg/commands/ngwaf/workspace/alert/microsoftteams/create.go index 453c08407..885da2e96 100644 --- a/pkg/commands/ngwaf/workspace/alert/microsoftteams/create.go +++ b/pkg/commands/ngwaf/workspace/alert/microsoftteams/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" ) // CreateCommand calls the Fastly API to create Microsoft Teams alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/microsoftteams/delete.go b/pkg/commands/ngwaf/workspace/alert/microsoftteams/delete.go index c1698e4d8..c7ffada38 100644 --- a/pkg/commands/ngwaf/workspace/alert/microsoftteams/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/microsoftteams/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" ) // DeleteCommand calls the Fastly API to delete Microsoft Teams alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/microsoftteams/get.go b/pkg/commands/ngwaf/workspace/alert/microsoftteams/get.go index 65387938f..7765333b2 100644 --- a/pkg/commands/ngwaf/workspace/alert/microsoftteams/get.go +++ b/pkg/commands/ngwaf/workspace/alert/microsoftteams/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" ) // GetCommand calls the Fastly API to get Microsoft Teams alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/microsoftteams/list.go b/pkg/commands/ngwaf/workspace/alert/microsoftteams/list.go index 85e8db70d..bedb52f8a 100644 --- a/pkg/commands/ngwaf/workspace/alert/microsoftteams/list.go +++ b/pkg/commands/ngwaf/workspace/alert/microsoftteams/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" ) // ListCommand calls the Fastly API to list Microsoft Teams alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/microsoftteams/microsoftteams_test.go b/pkg/commands/ngwaf/workspace/alert/microsoftteams/microsoftteams_test.go index f1eac007a..94c2cb9c1 100644 --- a/pkg/commands/ngwaf/workspace/alert/microsoftteams/microsoftteams_test.go +++ b/pkg/commands/ngwaf/workspace/alert/microsoftteams/microsoftteams_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/microsoftteams" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/microsoftteams/update.go b/pkg/commands/ngwaf/workspace/alert/microsoftteams/update.go index d456fc093..ccce23779 100644 --- a/pkg/commands/ngwaf/workspace/alert/microsoftteams/update.go +++ b/pkg/commands/ngwaf/workspace/alert/microsoftteams/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" ) // UpdateCommand calls the Fastly API to update Microsoft Teams alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/opsgenie/create.go b/pkg/commands/ngwaf/workspace/alert/opsgenie/create.go index ba5883a9b..9ee158897 100644 --- a/pkg/commands/ngwaf/workspace/alert/opsgenie/create.go +++ b/pkg/commands/ngwaf/workspace/alert/opsgenie/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" ) // CreateCommand calls the Fastly API to create Opsgenie alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/opsgenie/delete.go b/pkg/commands/ngwaf/workspace/alert/opsgenie/delete.go index 4006b9f3b..d37803b41 100644 --- a/pkg/commands/ngwaf/workspace/alert/opsgenie/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/opsgenie/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" ) // DeleteCommand calls the Fastly API to delete Opsgenie alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/opsgenie/get.go b/pkg/commands/ngwaf/workspace/alert/opsgenie/get.go index 060b5b2bf..9f2b59386 100644 --- a/pkg/commands/ngwaf/workspace/alert/opsgenie/get.go +++ b/pkg/commands/ngwaf/workspace/alert/opsgenie/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" ) // GetCommand calls the Fastly API to get Opsgenie alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/opsgenie/list.go b/pkg/commands/ngwaf/workspace/alert/opsgenie/list.go index 5d3573a2b..4ac986e89 100644 --- a/pkg/commands/ngwaf/workspace/alert/opsgenie/list.go +++ b/pkg/commands/ngwaf/workspace/alert/opsgenie/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" ) // ListCommand calls the Fastly API to list Opsgenie alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/opsgenie/opsgenie_test.go b/pkg/commands/ngwaf/workspace/alert/opsgenie/opsgenie_test.go index bc3e481db..648cceb57 100644 --- a/pkg/commands/ngwaf/workspace/alert/opsgenie/opsgenie_test.go +++ b/pkg/commands/ngwaf/workspace/alert/opsgenie/opsgenie_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/opsgenie" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/opsgenie/update.go b/pkg/commands/ngwaf/workspace/alert/opsgenie/update.go index c930bc337..2e774599f 100644 --- a/pkg/commands/ngwaf/workspace/alert/opsgenie/update.go +++ b/pkg/commands/ngwaf/workspace/alert/opsgenie/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" ) // UpdateCommand calls the Fastly API to update Opsgenie alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/pagerduty/create.go b/pkg/commands/ngwaf/workspace/alert/pagerduty/create.go index 3cc37fee0..945bbc6e4 100644 --- a/pkg/commands/ngwaf/workspace/alert/pagerduty/create.go +++ b/pkg/commands/ngwaf/workspace/alert/pagerduty/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" ) // CreateCommand calls the Fastly API to create PagerDuty alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/pagerduty/delete.go b/pkg/commands/ngwaf/workspace/alert/pagerduty/delete.go index c5d5ad59a..1831c263c 100644 --- a/pkg/commands/ngwaf/workspace/alert/pagerduty/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/pagerduty/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" ) // DeleteCommand calls the Fastly API to delete PagerDuty alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/pagerduty/get.go b/pkg/commands/ngwaf/workspace/alert/pagerduty/get.go index b507234b5..48c68f599 100644 --- a/pkg/commands/ngwaf/workspace/alert/pagerduty/get.go +++ b/pkg/commands/ngwaf/workspace/alert/pagerduty/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" ) // GetCommand calls the Fastly API to get PagerDuty alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/pagerduty/list.go b/pkg/commands/ngwaf/workspace/alert/pagerduty/list.go index 9f8fcb9a4..c49ae72a3 100644 --- a/pkg/commands/ngwaf/workspace/alert/pagerduty/list.go +++ b/pkg/commands/ngwaf/workspace/alert/pagerduty/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" ) // ListCommand calls the Fastly API to list PagerDuty alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/pagerduty/pagerduty_test.go b/pkg/commands/ngwaf/workspace/alert/pagerduty/pagerduty_test.go index 9b3ee9615..53d9937f5 100644 --- a/pkg/commands/ngwaf/workspace/alert/pagerduty/pagerduty_test.go +++ b/pkg/commands/ngwaf/workspace/alert/pagerduty/pagerduty_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/pagerduty" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/pagerduty/update.go b/pkg/commands/ngwaf/workspace/alert/pagerduty/update.go index 89d04ed1f..39cc9f6c3 100644 --- a/pkg/commands/ngwaf/workspace/alert/pagerduty/update.go +++ b/pkg/commands/ngwaf/workspace/alert/pagerduty/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" ) // UpdateCommand calls the Fastly API to update PagerDuty alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/slack/create.go b/pkg/commands/ngwaf/workspace/alert/slack/create.go index d3ff21701..1c8c8c861 100644 --- a/pkg/commands/ngwaf/workspace/alert/slack/create.go +++ b/pkg/commands/ngwaf/workspace/alert/slack/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" ) // CreateCommand calls the Fastly API to create Slack alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/slack/delete.go b/pkg/commands/ngwaf/workspace/alert/slack/delete.go index b33e5f49d..da31afacf 100644 --- a/pkg/commands/ngwaf/workspace/alert/slack/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/slack/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" ) // DeleteCommand calls the Fastly API to delete Slack alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/slack/get.go b/pkg/commands/ngwaf/workspace/alert/slack/get.go index 0392fea0a..dbd149b6b 100644 --- a/pkg/commands/ngwaf/workspace/alert/slack/get.go +++ b/pkg/commands/ngwaf/workspace/alert/slack/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" ) // GetCommand calls the Fastly API to get Slack alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/slack/list.go b/pkg/commands/ngwaf/workspace/alert/slack/list.go index 55366e44e..1427212db 100644 --- a/pkg/commands/ngwaf/workspace/alert/slack/list.go +++ b/pkg/commands/ngwaf/workspace/alert/slack/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" ) // ListCommand calls the Fastly API to list Slack alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/slack/slack_test.go b/pkg/commands/ngwaf/workspace/alert/slack/slack_test.go index 2afed3513..fcdfe3216 100644 --- a/pkg/commands/ngwaf/workspace/alert/slack/slack_test.go +++ b/pkg/commands/ngwaf/workspace/alert/slack/slack_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/slack" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" ) const ( diff --git a/pkg/commands/ngwaf/workspace/alert/slack/update.go b/pkg/commands/ngwaf/workspace/alert/slack/update.go index 209b9dc7f..29c7c3753 100644 --- a/pkg/commands/ngwaf/workspace/alert/slack/update.go +++ b/pkg/commands/ngwaf/workspace/alert/slack/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" ) // UpdateCommand calls the Fastly API to update Slack alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/create.go b/pkg/commands/ngwaf/workspace/alert/webhook/create.go index fab495635..09947808b 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/create.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/create.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // CreateCommand calls the Fastly API to create Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/delete.go b/pkg/commands/ngwaf/workspace/alert/webhook/delete.go index b26be5aa4..b19a8cb0b 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/delete.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/delete.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // DeleteCommand calls the Fastly API to delete Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/get-signing-key.go b/pkg/commands/ngwaf/workspace/alert/webhook/get-signing-key.go index 84a00cf03..d81185fdd 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/get-signing-key.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/get-signing-key.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // GetSigningKeyCommand calls the Fastly API to get Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/get.go b/pkg/commands/ngwaf/workspace/alert/webhook/get.go index da2a1f8e2..d74d1a38d 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/get.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // GetCommand calls the Fastly API to get Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/list.go b/pkg/commands/ngwaf/workspace/alert/webhook/list.go index 283dc848e..78ced9ff7 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/list.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/list.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // ListCommand calls the Fastly API to list Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/rotate-signing-key.go b/pkg/commands/ngwaf/workspace/alert/webhook/rotate-signing-key.go index da11dba21..0836b8786 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/rotate-signing-key.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/rotate-signing-key.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // RotateSigningKeyCommand calls the Fastly API to get Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/update.go b/pkg/commands/ngwaf/workspace/alert/webhook/update.go index 982f9cc4b..b2ee170ea 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/update.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/update.go @@ -11,8 +11,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // UpdateCommand calls the Fastly API to update Webhook alerts. diff --git a/pkg/commands/ngwaf/workspace/alert/webhook/webhook_test.go b/pkg/commands/ngwaf/workspace/alert/webhook/webhook_test.go index a9610c365..83ec56415 100644 --- a/pkg/commands/ngwaf/workspace/alert/webhook/webhook_test.go +++ b/pkg/commands/ngwaf/workspace/alert/webhook/webhook_test.go @@ -14,7 +14,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/alert/webhook" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) const ( diff --git a/pkg/commands/ngwaf/workspace/countrylist/countrylist_test.go b/pkg/commands/ngwaf/workspace/countrylist/countrylist_test.go index f5a886234..800b3e5d7 100644 --- a/pkg/commands/ngwaf/workspace/countrylist/countrylist_test.go +++ b/pkg/commands/ngwaf/workspace/countrylist/countrylist_test.go @@ -13,8 +13,8 @@ import ( sub2 "github.com/fastly/cli/pkg/commands/ngwaf/workspace/countrylist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/countrylist/create.go b/pkg/commands/ngwaf/workspace/countrylist/create.go index 80d751fa4..5211b58c5 100644 --- a/pkg/commands/ngwaf/workspace/countrylist/create.go +++ b/pkg/commands/ngwaf/workspace/countrylist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/countrylist/delete.go b/pkg/commands/ngwaf/workspace/countrylist/delete.go index 81596468a..aa2bd5a24 100644 --- a/pkg/commands/ngwaf/workspace/countrylist/delete.go +++ b/pkg/commands/ngwaf/workspace/countrylist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/countrylist/get.go b/pkg/commands/ngwaf/workspace/countrylist/get.go index d44ab016a..9c59b4e0e 100644 --- a/pkg/commands/ngwaf/workspace/countrylist/get.go +++ b/pkg/commands/ngwaf/workspace/countrylist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get a workspace-level country list. diff --git a/pkg/commands/ngwaf/workspace/countrylist/list.go b/pkg/commands/ngwaf/workspace/countrylist/list.go index 0239899a3..66ad674e6 100644 --- a/pkg/commands/ngwaf/workspace/countrylist/list.go +++ b/pkg/commands/ngwaf/workspace/countrylist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all country lists for your workspace. diff --git a/pkg/commands/ngwaf/workspace/countrylist/update.go b/pkg/commands/ngwaf/workspace/countrylist/update.go index e711a8754..8a4b00458 100644 --- a/pkg/commands/ngwaf/workspace/countrylist/update.go +++ b/pkg/commands/ngwaf/workspace/countrylist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/create.go b/pkg/commands/ngwaf/workspace/create.go index 8f8f8ae8e..ee045b725 100644 --- a/pkg/commands/ngwaf/workspace/create.go +++ b/pkg/commands/ngwaf/workspace/create.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/customsignal/create.go b/pkg/commands/ngwaf/workspace/customsignal/create.go index c6190878d..475faed18 100644 --- a/pkg/commands/ngwaf/workspace/customsignal/create.go +++ b/pkg/commands/ngwaf/workspace/customsignal/create.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/customsignal/customsignal_test.go b/pkg/commands/ngwaf/workspace/customsignal/customsignal_test.go index eb185ff7c..b2eeb50f8 100644 --- a/pkg/commands/ngwaf/workspace/customsignal/customsignal_test.go +++ b/pkg/commands/ngwaf/workspace/customsignal/customsignal_test.go @@ -13,8 +13,8 @@ import ( sub2 "github.com/fastly/cli/pkg/commands/ngwaf/workspace/customsignal" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" ) const ( diff --git a/pkg/commands/ngwaf/workspace/customsignal/delete.go b/pkg/commands/ngwaf/workspace/customsignal/delete.go index e10401282..9466ec8ba 100644 --- a/pkg/commands/ngwaf/workspace/customsignal/delete.go +++ b/pkg/commands/ngwaf/workspace/customsignal/delete.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/customsignal/get.go b/pkg/commands/ngwaf/workspace/customsignal/get.go index 541142e45..60f32b1ae 100644 --- a/pkg/commands/ngwaf/workspace/customsignal/get.go +++ b/pkg/commands/ngwaf/workspace/customsignal/get.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/customsignal/list.go b/pkg/commands/ngwaf/workspace/customsignal/list.go index 603405053..5be09ad83 100644 --- a/pkg/commands/ngwaf/workspace/customsignal/list.go +++ b/pkg/commands/ngwaf/workspace/customsignal/list.go @@ -9,10 +9,10 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" ) // ListCommand calls the Fastly API to list all workspace-level custom signals for your API token. diff --git a/pkg/commands/ngwaf/workspace/customsignal/update.go b/pkg/commands/ngwaf/workspace/customsignal/update.go index 8d857f2d3..2f5f3fe94 100644 --- a/pkg/commands/ngwaf/workspace/customsignal/update.go +++ b/pkg/commands/ngwaf/workspace/customsignal/update.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/delete.go b/pkg/commands/ngwaf/workspace/delete.go index 26c7d1fd6..cbd28efd8 100644 --- a/pkg/commands/ngwaf/workspace/delete.go +++ b/pkg/commands/ngwaf/workspace/delete.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/get.go b/pkg/commands/ngwaf/workspace/get.go index 767a2a867..a75b15634 100644 --- a/pkg/commands/ngwaf/workspace/get.go +++ b/pkg/commands/ngwaf/workspace/get.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/iplist/create.go b/pkg/commands/ngwaf/workspace/iplist/create.go index 04bd42f06..61ada088e 100644 --- a/pkg/commands/ngwaf/workspace/iplist/create.go +++ b/pkg/commands/ngwaf/workspace/iplist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/iplist/delete.go b/pkg/commands/ngwaf/workspace/iplist/delete.go index 2b135eed8..b1419d0d2 100644 --- a/pkg/commands/ngwaf/workspace/iplist/delete.go +++ b/pkg/commands/ngwaf/workspace/iplist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/iplist/get.go b/pkg/commands/ngwaf/workspace/iplist/get.go index ad8578cc7..f6082c3f6 100644 --- a/pkg/commands/ngwaf/workspace/iplist/get.go +++ b/pkg/commands/ngwaf/workspace/iplist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get a workspace-level ip list. diff --git a/pkg/commands/ngwaf/workspace/iplist/iplist_test.go b/pkg/commands/ngwaf/workspace/iplist/iplist_test.go index 02573f9d9..f5b2d2309 100644 --- a/pkg/commands/ngwaf/workspace/iplist/iplist_test.go +++ b/pkg/commands/ngwaf/workspace/iplist/iplist_test.go @@ -13,8 +13,8 @@ import ( sub2 "github.com/fastly/cli/pkg/commands/ngwaf/workspace/iplist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/iplist/list.go b/pkg/commands/ngwaf/workspace/iplist/list.go index c5ab741bb..0f80cd534 100644 --- a/pkg/commands/ngwaf/workspace/iplist/list.go +++ b/pkg/commands/ngwaf/workspace/iplist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all ip lists for your workspace. diff --git a/pkg/commands/ngwaf/workspace/iplist/update.go b/pkg/commands/ngwaf/workspace/iplist/update.go index 698511888..d01d99919 100644 --- a/pkg/commands/ngwaf/workspace/iplist/update.go +++ b/pkg/commands/ngwaf/workspace/iplist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/list.go b/pkg/commands/ngwaf/workspace/list.go index 6616f463e..ed4192dc3 100644 --- a/pkg/commands/ngwaf/workspace/list.go +++ b/pkg/commands/ngwaf/workspace/list.go @@ -9,9 +9,9 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" ) // ListCommand calls the Fastly API to list all Workspaces for your API token. diff --git a/pkg/commands/ngwaf/workspace/redaction/create.go b/pkg/commands/ngwaf/workspace/redaction/create.go index 74de0239d..107f1489e 100644 --- a/pkg/commands/ngwaf/workspace/redaction/create.go +++ b/pkg/commands/ngwaf/workspace/redaction/create.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/redaction/delete.go b/pkg/commands/ngwaf/workspace/redaction/delete.go index 3f0d90cd9..0caab681a 100644 --- a/pkg/commands/ngwaf/workspace/redaction/delete.go +++ b/pkg/commands/ngwaf/workspace/redaction/delete.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/redaction/list.go b/pkg/commands/ngwaf/workspace/redaction/list.go index 8158fa407..b45022b1c 100644 --- a/pkg/commands/ngwaf/workspace/redaction/list.go +++ b/pkg/commands/ngwaf/workspace/redaction/list.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/redaction/redaction_test.go b/pkg/commands/ngwaf/workspace/redaction/redaction_test.go index d1b844b45..11bdd8906 100644 --- a/pkg/commands/ngwaf/workspace/redaction/redaction_test.go +++ b/pkg/commands/ngwaf/workspace/redaction/redaction_test.go @@ -13,7 +13,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/redaction" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" ) const ( diff --git a/pkg/commands/ngwaf/workspace/redaction/retrieve.go b/pkg/commands/ngwaf/workspace/redaction/retrieve.go index 710d64a93..0c1b7b699 100644 --- a/pkg/commands/ngwaf/workspace/redaction/retrieve.go +++ b/pkg/commands/ngwaf/workspace/redaction/retrieve.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/redaction/update.go b/pkg/commands/ngwaf/workspace/redaction/update.go index d4e646381..292c1e3f0 100644 --- a/pkg/commands/ngwaf/workspace/redaction/update.go +++ b/pkg/commands/ngwaf/workspace/redaction/update.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/rule/create.go b/pkg/commands/ngwaf/workspace/rule/create.go index 0d5864278..d3cdf24ae 100644 --- a/pkg/commands/ngwaf/workspace/rule/create.go +++ b/pkg/commands/ngwaf/workspace/rule/create.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/rule/delete.go b/pkg/commands/ngwaf/workspace/rule/delete.go index 30e2584c1..210ad7a06 100644 --- a/pkg/commands/ngwaf/workspace/rule/delete.go +++ b/pkg/commands/ngwaf/workspace/rule/delete.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/rule/get.go b/pkg/commands/ngwaf/workspace/rule/get.go index 14546133b..45eeb92db 100644 --- a/pkg/commands/ngwaf/workspace/rule/get.go +++ b/pkg/commands/ngwaf/workspace/rule/get.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/rule/list.go b/pkg/commands/ngwaf/workspace/rule/list.go index 9cec5156c..438938e00 100644 --- a/pkg/commands/ngwaf/workspace/rule/list.go +++ b/pkg/commands/ngwaf/workspace/rule/list.go @@ -10,10 +10,10 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all workspace-level rules for your API token. diff --git a/pkg/commands/ngwaf/workspace/rule/rule_test.go b/pkg/commands/ngwaf/workspace/rule/rule_test.go index a515d17fc..281c0fdf4 100644 --- a/pkg/commands/ngwaf/workspace/rule/rule_test.go +++ b/pkg/commands/ngwaf/workspace/rule/rule_test.go @@ -13,8 +13,8 @@ import ( sub2 "github.com/fastly/cli/pkg/commands/ngwaf/workspace/rule" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/rule/update.go b/pkg/commands/ngwaf/workspace/rule/update.go index 989e77ba6..c550d6926 100644 --- a/pkg/commands/ngwaf/workspace/rule/update.go +++ b/pkg/commands/ngwaf/workspace/rule/update.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/signallist/create.go b/pkg/commands/ngwaf/workspace/signallist/create.go index b038117f9..e65e5fd22 100644 --- a/pkg/commands/ngwaf/workspace/signallist/create.go +++ b/pkg/commands/ngwaf/workspace/signallist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/signallist/delete.go b/pkg/commands/ngwaf/workspace/signallist/delete.go index 5f562ce85..48ac54133 100644 --- a/pkg/commands/ngwaf/workspace/signallist/delete.go +++ b/pkg/commands/ngwaf/workspace/signallist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/signallist/get.go b/pkg/commands/ngwaf/workspace/signallist/get.go index 548a0be0e..5b8357197 100644 --- a/pkg/commands/ngwaf/workspace/signallist/get.go +++ b/pkg/commands/ngwaf/workspace/signallist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get a workspace-level signal list. diff --git a/pkg/commands/ngwaf/workspace/signallist/list.go b/pkg/commands/ngwaf/workspace/signallist/list.go index 8d9fba822..5633ddf9c 100644 --- a/pkg/commands/ngwaf/workspace/signallist/list.go +++ b/pkg/commands/ngwaf/workspace/signallist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all signal lists for your workspace. diff --git a/pkg/commands/ngwaf/workspace/signallist/signallist_test.go b/pkg/commands/ngwaf/workspace/signallist/signallist_test.go index dc21390e6..e5561d365 100644 --- a/pkg/commands/ngwaf/workspace/signallist/signallist_test.go +++ b/pkg/commands/ngwaf/workspace/signallist/signallist_test.go @@ -13,8 +13,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/signallist/update.go b/pkg/commands/ngwaf/workspace/signallist/update.go index b43d6bda7..c67e27c87 100644 --- a/pkg/commands/ngwaf/workspace/signallist/update.go +++ b/pkg/commands/ngwaf/workspace/signallist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/stringlist/create.go b/pkg/commands/ngwaf/workspace/stringlist/create.go index 283a64d27..cb364a08a 100644 --- a/pkg/commands/ngwaf/workspace/stringlist/create.go +++ b/pkg/commands/ngwaf/workspace/stringlist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/stringlist/delete.go b/pkg/commands/ngwaf/workspace/stringlist/delete.go index d3ecb373e..aaa117a35 100644 --- a/pkg/commands/ngwaf/workspace/stringlist/delete.go +++ b/pkg/commands/ngwaf/workspace/stringlist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/stringlist/get.go b/pkg/commands/ngwaf/workspace/stringlist/get.go index 43f313b52..76ea97c4b 100644 --- a/pkg/commands/ngwaf/workspace/stringlist/get.go +++ b/pkg/commands/ngwaf/workspace/stringlist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get a workspace-level string list. diff --git a/pkg/commands/ngwaf/workspace/stringlist/list.go b/pkg/commands/ngwaf/workspace/stringlist/list.go index 8d2cc10b6..3d475d918 100644 --- a/pkg/commands/ngwaf/workspace/stringlist/list.go +++ b/pkg/commands/ngwaf/workspace/stringlist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all string lists for your workspace. diff --git a/pkg/commands/ngwaf/workspace/stringlist/stringlist_test.go b/pkg/commands/ngwaf/workspace/stringlist/stringlist_test.go index 122f4bff1..a4a35ee33 100644 --- a/pkg/commands/ngwaf/workspace/stringlist/stringlist_test.go +++ b/pkg/commands/ngwaf/workspace/stringlist/stringlist_test.go @@ -13,8 +13,8 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/stringlist/update.go b/pkg/commands/ngwaf/workspace/stringlist/update.go index a75c1cd93..83da4c69c 100644 --- a/pkg/commands/ngwaf/workspace/stringlist/update.go +++ b/pkg/commands/ngwaf/workspace/stringlist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/threshold/create.go b/pkg/commands/ngwaf/workspace/threshold/create.go index 1c85fb4fb..0120f3e52 100644 --- a/pkg/commands/ngwaf/workspace/threshold/create.go +++ b/pkg/commands/ngwaf/workspace/threshold/create.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/threshold/delete.go b/pkg/commands/ngwaf/workspace/threshold/delete.go index 9e0f3ecc6..b46599c89 100644 --- a/pkg/commands/ngwaf/workspace/threshold/delete.go +++ b/pkg/commands/ngwaf/workspace/threshold/delete.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/threshold/get.go b/pkg/commands/ngwaf/workspace/threshold/get.go index 5e9773cc5..71e31d8bc 100644 --- a/pkg/commands/ngwaf/workspace/threshold/get.go +++ b/pkg/commands/ngwaf/workspace/threshold/get.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/threshold/list.go b/pkg/commands/ngwaf/workspace/threshold/list.go index 48be63535..d8cc18304 100644 --- a/pkg/commands/ngwaf/workspace/threshold/list.go +++ b/pkg/commands/ngwaf/workspace/threshold/list.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/threshold/threshold_test.go b/pkg/commands/ngwaf/workspace/threshold/threshold_test.go index 7f66fe91b..ca3b346d9 100644 --- a/pkg/commands/ngwaf/workspace/threshold/threshold_test.go +++ b/pkg/commands/ngwaf/workspace/threshold/threshold_test.go @@ -13,7 +13,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/threshold" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" ) const ( diff --git a/pkg/commands/ngwaf/workspace/threshold/update.go b/pkg/commands/ngwaf/workspace/threshold/update.go index 7364bdc96..160512be4 100644 --- a/pkg/commands/ngwaf/workspace/threshold/update.go +++ b/pkg/commands/ngwaf/workspace/threshold/update.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/timeseries/get.go b/pkg/commands/ngwaf/workspace/timeseries/get.go index a5aef251b..b92d3b7b6 100644 --- a/pkg/commands/ngwaf/workspace/timeseries/get.go +++ b/pkg/commands/ngwaf/workspace/timeseries/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - gots "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/timeseries" + "github.com/fastly/go-fastly/v17/fastly" + gots "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/timeseries" ) // GetCommand calls the Fastly API to get workspace-level time series metrics. diff --git a/pkg/commands/ngwaf/workspace/timeseries/timeseries_test.go b/pkg/commands/ngwaf/workspace/timeseries/timeseries_test.go index 5a3a3c1ec..ab3f8fad3 100644 --- a/pkg/commands/ngwaf/workspace/timeseries/timeseries_test.go +++ b/pkg/commands/ngwaf/workspace/timeseries/timeseries_test.go @@ -13,7 +13,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/timeseries" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - gots "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/timeseries" + gots "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/timeseries" ) const ( diff --git a/pkg/commands/ngwaf/workspace/update.go b/pkg/commands/ngwaf/workspace/update.go index 361caf1ca..259d17eb4 100644 --- a/pkg/commands/ngwaf/workspace/update.go +++ b/pkg/commands/ngwaf/workspace/update.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/virtualpatch/list.go b/pkg/commands/ngwaf/workspace/virtualpatch/list.go index f83f75e31..0f8bc93ed 100644 --- a/pkg/commands/ngwaf/workspace/virtualpatch/list.go +++ b/pkg/commands/ngwaf/workspace/virtualpatch/list.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/virtualpatches" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/virtualpatches" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/virtualpatch/retrieve.go b/pkg/commands/ngwaf/workspace/virtualpatch/retrieve.go index ac39d2c16..11cb1d7fd 100644 --- a/pkg/commands/ngwaf/workspace/virtualpatch/retrieve.go +++ b/pkg/commands/ngwaf/workspace/virtualpatch/retrieve.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/virtualpatches" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/virtualpatches" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/virtualpatch/update.go b/pkg/commands/ngwaf/workspace/virtualpatch/update.go index 47ded706b..8f2a26155 100644 --- a/pkg/commands/ngwaf/workspace/virtualpatch/update.go +++ b/pkg/commands/ngwaf/workspace/virtualpatch/update.go @@ -5,8 +5,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/virtualpatches" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/virtualpatches" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/ngwaf/workspace/virtualpatch/virtualpatch_test.go b/pkg/commands/ngwaf/workspace/virtualpatch/virtualpatch_test.go index 2b2b88794..2233a79a5 100644 --- a/pkg/commands/ngwaf/workspace/virtualpatch/virtualpatch_test.go +++ b/pkg/commands/ngwaf/workspace/virtualpatch/virtualpatch_test.go @@ -13,7 +13,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace/virtualpatch" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/virtualpatches" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/virtualpatches" ) const ( diff --git a/pkg/commands/ngwaf/workspace/wildcardlist/create.go b/pkg/commands/ngwaf/workspace/wildcardlist/create.go index 63543c0be..f36a4b202 100644 --- a/pkg/commands/ngwaf/workspace/wildcardlist/create.go +++ b/pkg/commands/ngwaf/workspace/wildcardlist/create.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/wildcardlist/delete.go b/pkg/commands/ngwaf/workspace/wildcardlist/delete.go index 6022a71ef..8ea325adf 100644 --- a/pkg/commands/ngwaf/workspace/wildcardlist/delete.go +++ b/pkg/commands/ngwaf/workspace/wildcardlist/delete.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/wildcardlist/get.go b/pkg/commands/ngwaf/workspace/wildcardlist/get.go index fd432e335..9bd968074 100644 --- a/pkg/commands/ngwaf/workspace/wildcardlist/get.go +++ b/pkg/commands/ngwaf/workspace/wildcardlist/get.go @@ -9,8 +9,8 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // GetCommand calls the Fastly API to get a workspace-level wildcard list. diff --git a/pkg/commands/ngwaf/workspace/wildcardlist/list.go b/pkg/commands/ngwaf/workspace/wildcardlist/list.go index 870aa6fef..1206dc2ce 100644 --- a/pkg/commands/ngwaf/workspace/wildcardlist/list.go +++ b/pkg/commands/ngwaf/workspace/wildcardlist/list.go @@ -10,8 +10,8 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) // ListCommand calls the Fastly API to list all wildcard lists for your API token. diff --git a/pkg/commands/ngwaf/workspace/wildcardlist/update.go b/pkg/commands/ngwaf/workspace/wildcardlist/update.go index 78b58a8a0..0be0456d2 100644 --- a/pkg/commands/ngwaf/workspace/wildcardlist/update.go +++ b/pkg/commands/ngwaf/workspace/wildcardlist/update.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/ngwaf/ngwaflist" diff --git a/pkg/commands/ngwaf/workspace/wildcardlist/wildcardlist_test.go b/pkg/commands/ngwaf/workspace/wildcardlist/wildcardlist_test.go index 8939e580a..ce4f9230d 100644 --- a/pkg/commands/ngwaf/workspace/wildcardlist/wildcardlist_test.go +++ b/pkg/commands/ngwaf/workspace/wildcardlist/wildcardlist_test.go @@ -13,8 +13,8 @@ import ( sub2 "github.com/fastly/cli/pkg/commands/ngwaf/workspace/wildcardlist" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/scope" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/scope" ) const ( diff --git a/pkg/commands/ngwaf/workspace/workspace_test.go b/pkg/commands/ngwaf/workspace/workspace_test.go index 8fa2dc610..d5a02c876 100644 --- a/pkg/commands/ngwaf/workspace/workspace_test.go +++ b/pkg/commands/ngwaf/workspace/workspace_test.go @@ -12,7 +12,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/ngwaf/workspace" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" ) const ( diff --git a/pkg/commands/objectstorage/accesskeys/accesskeys_test.go b/pkg/commands/objectstorage/accesskeys/accesskeys_test.go index 1e02471ad..a78b9005d 100644 --- a/pkg/commands/objectstorage/accesskeys/accesskeys_test.go +++ b/pkg/commands/objectstorage/accesskeys/accesskeys_test.go @@ -12,7 +12,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/objectstorage/accesskeys" fstfmt "github.com/fastly/cli/pkg/fmt" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly/objectstorage/accesskeys" + "github.com/fastly/go-fastly/v17/fastly/objectstorage/accesskeys" ) const ( diff --git a/pkg/commands/objectstorage/accesskeys/create.go b/pkg/commands/objectstorage/accesskeys/create.go index 1d2d42a08..fcda2ec17 100644 --- a/pkg/commands/objectstorage/accesskeys/create.go +++ b/pkg/commands/objectstorage/accesskeys/create.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/objectstorage/accesskeys" + "github.com/fastly/go-fastly/v17/fastly/objectstorage/accesskeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/objectstorage/accesskeys/delete.go b/pkg/commands/objectstorage/accesskeys/delete.go index 63193e2ba..5ec49a0ea 100644 --- a/pkg/commands/objectstorage/accesskeys/delete.go +++ b/pkg/commands/objectstorage/accesskeys/delete.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/objectstorage/accesskeys" + "github.com/fastly/go-fastly/v17/fastly/objectstorage/accesskeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/objectstorage/accesskeys/get.go b/pkg/commands/objectstorage/accesskeys/get.go index 68aad0dbf..37dbf4fe4 100644 --- a/pkg/commands/objectstorage/accesskeys/get.go +++ b/pkg/commands/objectstorage/accesskeys/get.go @@ -5,9 +5,9 @@ import ( "errors" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/objectstorage/accesskeys" + "github.com/fastly/go-fastly/v17/fastly/objectstorage/accesskeys" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/objectstorage/accesskeys/list.go b/pkg/commands/objectstorage/accesskeys/list.go index a31c0b47b..936a8d127 100644 --- a/pkg/commands/objectstorage/accesskeys/list.go +++ b/pkg/commands/objectstorage/accesskeys/list.go @@ -9,9 +9,9 @@ import ( fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" - "github.com/fastly/go-fastly/v16/fastly/objectstorage/accesskeys" + "github.com/fastly/go-fastly/v17/fastly/objectstorage/accesskeys" ) // ListCommand calls the Fastly API to list all access keys. diff --git a/pkg/commands/pop/pop_test.go b/pkg/commands/pop/pop_test.go index 61a7413f1..4edc0157b 100644 --- a/pkg/commands/pop/pop_test.go +++ b/pkg/commands/pop/pop_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/pop/root.go b/pkg/commands/pop/root.go index e84d0634d..33790c5b2 100644 --- a/pkg/commands/pop/root.go +++ b/pkg/commands/pop/root.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/products/root.go b/pkg/commands/products/root.go index 490a35a00..91b930c8f 100644 --- a/pkg/commands/products/root.go +++ b/pkg/commands/products/root.go @@ -6,21 +6,21 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly/products/apidiscovery" - "github.com/fastly/go-fastly/v16/fastly/products/botmanagement" - "github.com/fastly/go-fastly/v16/fastly/products/brotlicompression" - "github.com/fastly/go-fastly/v16/fastly/products/domaininspector" - "github.com/fastly/go-fastly/v16/fastly/products/fanout" - "github.com/fastly/go-fastly/v16/fastly/products/imageoptimizer" - "github.com/fastly/go-fastly/v16/fastly/products/logexplorerinsights" - "github.com/fastly/go-fastly/v16/fastly/products/origininspector" - "github.com/fastly/go-fastly/v16/fastly/products/websockets" + "github.com/fastly/go-fastly/v17/fastly/products/apidiscovery" + "github.com/fastly/go-fastly/v17/fastly/products/botmanagement" + "github.com/fastly/go-fastly/v17/fastly/products/brotlicompression" + "github.com/fastly/go-fastly/v17/fastly/products/domaininspector" + "github.com/fastly/go-fastly/v17/fastly/products/fanout" + "github.com/fastly/go-fastly/v17/fastly/products/imageoptimizer" + "github.com/fastly/go-fastly/v17/fastly/products/logexplorerinsights" + "github.com/fastly/go-fastly/v17/fastly/products/origininspector" + "github.com/fastly/go-fastly/v17/fastly/products/websockets" ) // RootCommand is the parent command for all subcommands in this package. diff --git a/pkg/commands/profile/profile_test.go b/pkg/commands/profile/profile_test.go index 559dba4ba..bc5cba7f2 100644 --- a/pkg/commands/profile/profile_test.go +++ b/pkg/commands/profile/profile_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/profile" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/secretstore/create.go b/pkg/commands/secretstore/create.go index b9ca476d4..e6f985b29 100644 --- a/pkg/commands/secretstore/create.go +++ b/pkg/commands/secretstore/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstore/delete.go b/pkg/commands/secretstore/delete.go index df4fbc46b..bc067e83d 100644 --- a/pkg/commands/secretstore/delete.go +++ b/pkg/commands/secretstore/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstore/describe.go b/pkg/commands/secretstore/describe.go index 69478b234..b3bd6dc25 100644 --- a/pkg/commands/secretstore/describe.go +++ b/pkg/commands/secretstore/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstore/helper_test.go b/pkg/commands/secretstore/helper_test.go index 412c6b91d..1aef37478 100644 --- a/pkg/commands/secretstore/helper_test.go +++ b/pkg/commands/secretstore/helper_test.go @@ -3,7 +3,7 @@ package secretstore_test import ( "bytes" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/text" ) diff --git a/pkg/commands/secretstore/list.go b/pkg/commands/secretstore/list.go index 770883168..769676469 100644 --- a/pkg/commands/secretstore/list.go +++ b/pkg/commands/secretstore/list.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstore/secretstore_test.go b/pkg/commands/secretstore/secretstore_test.go index 906cf848b..634b7ed3f 100644 --- a/pkg/commands/secretstore/secretstore_test.go +++ b/pkg/commands/secretstore/secretstore_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/commands/secretstore" diff --git a/pkg/commands/secretstoreentry/create.go b/pkg/commands/secretstoreentry/create.go index 2e48f3459..774fe6e97 100644 --- a/pkg/commands/secretstoreentry/create.go +++ b/pkg/commands/secretstoreentry/create.go @@ -10,7 +10,7 @@ import ( "net/http" "os" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstoreentry/delete.go b/pkg/commands/secretstoreentry/delete.go index 6766aa86f..d6f55ea3e 100644 --- a/pkg/commands/secretstoreentry/delete.go +++ b/pkg/commands/secretstoreentry/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstoreentry/describe.go b/pkg/commands/secretstoreentry/describe.go index 8c27b3263..d3e949f5e 100644 --- a/pkg/commands/secretstoreentry/describe.go +++ b/pkg/commands/secretstoreentry/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstoreentry/helper_test.go b/pkg/commands/secretstoreentry/helper_test.go index 2d05322bf..06e417677 100644 --- a/pkg/commands/secretstoreentry/helper_test.go +++ b/pkg/commands/secretstoreentry/helper_test.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func fmtSecret(s *fastly.Secret) string { diff --git a/pkg/commands/secretstoreentry/list.go b/pkg/commands/secretstoreentry/list.go index 30690a64b..917cb5cd3 100644 --- a/pkg/commands/secretstoreentry/list.go +++ b/pkg/commands/secretstoreentry/list.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/secretstoreentry/secretstoreentry_test.go b/pkg/commands/secretstoreentry/secretstoreentry_test.go index 1dd64b7b3..485d230d5 100644 --- a/pkg/commands/secretstoreentry/secretstoreentry_test.go +++ b/pkg/commands/secretstoreentry/secretstoreentry_test.go @@ -18,7 +18,7 @@ import ( "golang.org/x/crypto/nacl/box" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/commands/secretstoreentry" diff --git a/pkg/commands/service/acl/acl_test.go b/pkg/commands/service/acl/acl_test.go index c00ca400b..4d27dac7f 100644 --- a/pkg/commands/service/acl/acl_test.go +++ b/pkg/commands/service/acl/acl_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/acl" diff --git a/pkg/commands/service/acl/create.go b/pkg/commands/service/acl/create.go index 4598a7ce8..d5d9e7f7b 100644 --- a/pkg/commands/service/acl/create.go +++ b/pkg/commands/service/acl/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/acl/delete.go b/pkg/commands/service/acl/delete.go index 4052b7362..6e0896a5d 100644 --- a/pkg/commands/service/acl/delete.go +++ b/pkg/commands/service/acl/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/acl/describe.go b/pkg/commands/service/acl/describe.go index d8b1cb3e0..7ebfdf329 100644 --- a/pkg/commands/service/acl/describe.go +++ b/pkg/commands/service/acl/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/acl/list.go b/pkg/commands/service/acl/list.go index 818274e34..dd9e0d4de 100644 --- a/pkg/commands/service/acl/list.go +++ b/pkg/commands/service/acl/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/acl/update.go b/pkg/commands/service/acl/update.go index c20534cf5..a9d43551c 100644 --- a/pkg/commands/service/acl/update.go +++ b/pkg/commands/service/acl/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/aclentry/aclentry_test.go b/pkg/commands/service/aclentry/aclentry_test.go index f69d57278..c83fc0f13 100644 --- a/pkg/commands/service/aclentry/aclentry_test.go +++ b/pkg/commands/service/aclentry/aclentry_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/aclentry" diff --git a/pkg/commands/service/aclentry/create.go b/pkg/commands/service/aclentry/create.go index 4592e22f0..107f59c00 100644 --- a/pkg/commands/service/aclentry/create.go +++ b/pkg/commands/service/aclentry/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/aclentry/delete.go b/pkg/commands/service/aclentry/delete.go index 8e08fc8af..140d39d29 100644 --- a/pkg/commands/service/aclentry/delete.go +++ b/pkg/commands/service/aclentry/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/aclentry/describe.go b/pkg/commands/service/aclentry/describe.go index ca88037ea..912f5069f 100644 --- a/pkg/commands/service/aclentry/describe.go +++ b/pkg/commands/service/aclentry/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/aclentry/list.go b/pkg/commands/service/aclentry/list.go index 7a3f3d4d6..ad5101a2c 100644 --- a/pkg/commands/service/aclentry/list.go +++ b/pkg/commands/service/aclentry/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/aclentry/update.go b/pkg/commands/service/aclentry/update.go index 53b1727b6..bee2aa2f1 100644 --- a/pkg/commands/service/aclentry/update.go +++ b/pkg/commands/service/aclentry/update.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/alert/alert_test.go b/pkg/commands/service/alert/alert_test.go index 26797a951..e3b2395d0 100644 --- a/pkg/commands/service/alert/alert_test.go +++ b/pkg/commands/service/alert/alert_test.go @@ -10,7 +10,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/service/alert" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func TestAlertsCreate(t *testing.T) { diff --git a/pkg/commands/service/alert/common.go b/pkg/commands/service/alert/common.go index ee2f758c9..923a6e97c 100644 --- a/pkg/commands/service/alert/common.go +++ b/pkg/commands/service/alert/common.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // evaluationType is a list of supported evaluation types. diff --git a/pkg/commands/service/alert/create.go b/pkg/commands/service/alert/create.go index 33d7c70c8..6759c27a5 100644 --- a/pkg/commands/service/alert/create.go +++ b/pkg/commands/service/alert/create.go @@ -7,7 +7,7 @@ import ( "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/global" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // NewCreateCommand returns a usable command registered under the parent. diff --git a/pkg/commands/service/alert/delete.go b/pkg/commands/service/alert/delete.go index da5323f07..a55fdec6e 100644 --- a/pkg/commands/service/alert/delete.go +++ b/pkg/commands/service/alert/delete.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/alert/describe.go b/pkg/commands/service/alert/describe.go index 775990145..e61e737ca 100644 --- a/pkg/commands/service/alert/describe.go +++ b/pkg/commands/service/alert/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/alert/list.go b/pkg/commands/service/alert/list.go index b4f7b655d..5c04ce13d 100644 --- a/pkg/commands/service/alert/list.go +++ b/pkg/commands/service/alert/list.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/alert/list_history.go b/pkg/commands/service/alert/list_history.go index 2defa14e1..5d66a8c18 100644 --- a/pkg/commands/service/alert/list_history.go +++ b/pkg/commands/service/alert/list_history.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/alert/update.go b/pkg/commands/service/alert/update.go index 25f321ccb..86c5d86d3 100644 --- a/pkg/commands/service/alert/update.go +++ b/pkg/commands/service/alert/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/auth/create.go b/pkg/commands/service/auth/create.go index 95a6589cd..1acf0b50e 100644 --- a/pkg/commands/service/auth/create.go +++ b/pkg/commands/service/auth/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/auth/delete.go b/pkg/commands/service/auth/delete.go index d165dd5ce..ca9e89938 100644 --- a/pkg/commands/service/auth/delete.go +++ b/pkg/commands/service/auth/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/auth/describe.go b/pkg/commands/service/auth/describe.go index d1d603039..78211865d 100644 --- a/pkg/commands/service/auth/describe.go +++ b/pkg/commands/service/auth/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/auth/list.go b/pkg/commands/service/auth/list.go index 58c77a9ba..66ffa1c8b 100644 --- a/pkg/commands/service/auth/list.go +++ b/pkg/commands/service/auth/list.go @@ -10,7 +10,7 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/text" "github.com/fastly/cli/pkg/time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // ListCommand calls the Fastly API to list service authorizations. diff --git a/pkg/commands/service/auth/service_test.go b/pkg/commands/service/auth/service_test.go index 4089ac6e8..5796efc5a 100644 --- a/pkg/commands/service/auth/service_test.go +++ b/pkg/commands/service/auth/service_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/auth" diff --git a/pkg/commands/service/auth/update.go b/pkg/commands/service/auth/update.go index 733f375c4..fd4950e50 100644 --- a/pkg/commands/service/auth/update.go +++ b/pkg/commands/service/auth/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/backend/backend_test.go b/pkg/commands/service/backend/backend_test.go index 7da3112e6..f34b436ad 100644 --- a/pkg/commands/service/backend/backend_test.go +++ b/pkg/commands/service/backend/backend_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/backend" diff --git a/pkg/commands/service/backend/create.go b/pkg/commands/service/backend/create.go index 7e58a7f88..ad91f8d4e 100644 --- a/pkg/commands/service/backend/create.go +++ b/pkg/commands/service/backend/create.go @@ -5,7 +5,7 @@ import ( "io" "net" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/backend/delete.go b/pkg/commands/service/backend/delete.go index 1090c27d9..7f54cee50 100644 --- a/pkg/commands/service/backend/delete.go +++ b/pkg/commands/service/backend/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/backend/describe.go b/pkg/commands/service/backend/describe.go index 3aace3e2f..eddd964f3 100644 --- a/pkg/commands/service/backend/describe.go +++ b/pkg/commands/service/backend/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/backend/list.go b/pkg/commands/service/backend/list.go index ca8f6b155..4d4e2fe5b 100644 --- a/pkg/commands/service/backend/list.go +++ b/pkg/commands/service/backend/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/backend/update.go b/pkg/commands/service/backend/update.go index 0a82fab94..25640786f 100644 --- a/pkg/commands/service/backend/update.go +++ b/pkg/commands/service/backend/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/create.go b/pkg/commands/service/create.go index 8302e426d..e2f9a6e91 100644 --- a/pkg/commands/service/create.go +++ b/pkg/commands/service/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/delete.go b/pkg/commands/service/delete.go index 2772c030a..9594a25bb 100644 --- a/pkg/commands/service/delete.go +++ b/pkg/commands/service/delete.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/describe.go b/pkg/commands/service/describe.go index 566afcba4..d5531927c 100644 --- a/pkg/commands/service/describe.go +++ b/pkg/commands/service/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/dictionary/create.go b/pkg/commands/service/dictionary/create.go index 851e8cc25..c3ba57338 100644 --- a/pkg/commands/service/dictionary/create.go +++ b/pkg/commands/service/dictionary/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/dictionary/delete.go b/pkg/commands/service/dictionary/delete.go index 642b31a75..5f3bb5141 100644 --- a/pkg/commands/service/dictionary/delete.go +++ b/pkg/commands/service/dictionary/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/dictionary/describe.go b/pkg/commands/service/dictionary/describe.go index 321d1f396..aeeb981c0 100644 --- a/pkg/commands/service/dictionary/describe.go +++ b/pkg/commands/service/dictionary/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/dictionary/dictionary_test.go b/pkg/commands/service/dictionary/dictionary_test.go index a20c6d612..481e1c8cd 100644 --- a/pkg/commands/service/dictionary/dictionary_test.go +++ b/pkg/commands/service/dictionary/dictionary_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/dictionary" diff --git a/pkg/commands/service/dictionary/list.go b/pkg/commands/service/dictionary/list.go index 23d79f9e2..331a42d92 100644 --- a/pkg/commands/service/dictionary/list.go +++ b/pkg/commands/service/dictionary/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/dictionary/update.go b/pkg/commands/service/dictionary/update.go index 26364c30f..b8ca55d99 100644 --- a/pkg/commands/service/dictionary/update.go +++ b/pkg/commands/service/dictionary/update.go @@ -6,7 +6,7 @@ import ( "io" "strconv" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/dictionaryentry/create.go b/pkg/commands/service/dictionaryentry/create.go index cfa3a9da2..3d545ff75 100644 --- a/pkg/commands/service/dictionaryentry/create.go +++ b/pkg/commands/service/dictionaryentry/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/dictionaryentry/delete.go b/pkg/commands/service/dictionaryentry/delete.go index 79a19afe4..d2fafd07a 100644 --- a/pkg/commands/service/dictionaryentry/delete.go +++ b/pkg/commands/service/dictionaryentry/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/dictionaryentry/describe.go b/pkg/commands/service/dictionaryentry/describe.go index 4b36f7988..abdcddd35 100644 --- a/pkg/commands/service/dictionaryentry/describe.go +++ b/pkg/commands/service/dictionaryentry/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/dictionaryentry/dictionaryitem_test.go b/pkg/commands/service/dictionaryentry/dictionaryitem_test.go index 53409a145..23a5fbab4 100644 --- a/pkg/commands/service/dictionaryentry/dictionaryitem_test.go +++ b/pkg/commands/service/dictionaryentry/dictionaryitem_test.go @@ -13,7 +13,7 @@ import ( sub "github.com/fastly/cli/pkg/commands/service/dictionaryentry" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func TestDictionaryItemDescribe(t *testing.T) { diff --git a/pkg/commands/service/dictionaryentry/list.go b/pkg/commands/service/dictionaryentry/list.go index d66b636b0..de4593673 100644 --- a/pkg/commands/service/dictionaryentry/list.go +++ b/pkg/commands/service/dictionaryentry/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/dictionaryentry/update.go b/pkg/commands/service/dictionaryentry/update.go index 28cc4bb7b..bb2eab2e8 100644 --- a/pkg/commands/service/dictionaryentry/update.go +++ b/pkg/commands/service/dictionaryentry/update.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/domain/create.go b/pkg/commands/service/domain/create.go index 80700ab08..7bcee6cb5 100644 --- a/pkg/commands/service/domain/create.go +++ b/pkg/commands/service/domain/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/domain/delete.go b/pkg/commands/service/domain/delete.go index e3528052c..069970ee0 100644 --- a/pkg/commands/service/domain/delete.go +++ b/pkg/commands/service/domain/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/domain/describe.go b/pkg/commands/service/domain/describe.go index 00100a027..f90c555d1 100644 --- a/pkg/commands/service/domain/describe.go +++ b/pkg/commands/service/domain/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/domain/domain_test.go b/pkg/commands/service/domain/domain_test.go index c538bbf48..6ce45b438 100644 --- a/pkg/commands/service/domain/domain_test.go +++ b/pkg/commands/service/domain/domain_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/domain" diff --git a/pkg/commands/service/domain/list.go b/pkg/commands/service/domain/list.go index d9fc212b9..ec6501b2e 100644 --- a/pkg/commands/service/domain/list.go +++ b/pkg/commands/service/domain/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/domain/update.go b/pkg/commands/service/domain/update.go index afb50c8e5..e05d81acd 100644 --- a/pkg/commands/service/domain/update.go +++ b/pkg/commands/service/domain/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/domain/validate.go b/pkg/commands/service/domain/validate.go index 427fd0137..76bc767ee 100644 --- a/pkg/commands/service/domain/validate.go +++ b/pkg/commands/service/domain/validate.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/healthcheck/create.go b/pkg/commands/service/healthcheck/create.go index 8ee4e8f07..d9d2f4926 100644 --- a/pkg/commands/service/healthcheck/create.go +++ b/pkg/commands/service/healthcheck/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/healthcheck/delete.go b/pkg/commands/service/healthcheck/delete.go index 3d1e4015e..f4ddf4dc2 100644 --- a/pkg/commands/service/healthcheck/delete.go +++ b/pkg/commands/service/healthcheck/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/healthcheck/describe.go b/pkg/commands/service/healthcheck/describe.go index 5ef66417a..932c20e9b 100644 --- a/pkg/commands/service/healthcheck/describe.go +++ b/pkg/commands/service/healthcheck/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/healthcheck/healthcheck_test.go b/pkg/commands/service/healthcheck/healthcheck_test.go index b0778c700..b3afe570f 100644 --- a/pkg/commands/service/healthcheck/healthcheck_test.go +++ b/pkg/commands/service/healthcheck/healthcheck_test.go @@ -9,7 +9,7 @@ import ( root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/healthcheck" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/healthcheck/list.go b/pkg/commands/service/healthcheck/list.go index 823ce57a4..d4afe37e2 100644 --- a/pkg/commands/service/healthcheck/list.go +++ b/pkg/commands/service/healthcheck/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/healthcheck/update.go b/pkg/commands/service/healthcheck/update.go index 3b30dad61..7e26e091f 100644 --- a/pkg/commands/service/healthcheck/update.go +++ b/pkg/commands/service/healthcheck/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/imageoptimizerdefaults/get.go b/pkg/commands/service/imageoptimizerdefaults/get.go index e65dbfe27..904877741 100644 --- a/pkg/commands/service/imageoptimizerdefaults/get.go +++ b/pkg/commands/service/imageoptimizerdefaults/get.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/imageoptimizerdefaults/imageoptimizer_test.go b/pkg/commands/service/imageoptimizerdefaults/imageoptimizer_test.go index 784ddc42b..731f4688a 100644 --- a/pkg/commands/service/imageoptimizerdefaults/imageoptimizer_test.go +++ b/pkg/commands/service/imageoptimizerdefaults/imageoptimizer_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/imageoptimizerdefaults" diff --git a/pkg/commands/service/imageoptimizerdefaults/update.go b/pkg/commands/service/imageoptimizerdefaults/update.go index b015f94f4..8f22fc0da 100644 --- a/pkg/commands/service/imageoptimizerdefaults/update.go +++ b/pkg/commands/service/imageoptimizerdefaults/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/list.go b/pkg/commands/service/list.go index b3a97cc68..610c22a4a 100644 --- a/pkg/commands/service/list.go +++ b/pkg/commands/service/list.go @@ -6,7 +6,7 @@ import ( "io" "strconv" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/azureblob/azureblob_integration_test.go b/pkg/commands/service/logging/azureblob/azureblob_integration_test.go index 0df08ef62..4de13b474 100644 --- a/pkg/commands/service/logging/azureblob/azureblob_integration_test.go +++ b/pkg/commands/service/logging/azureblob/azureblob_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/azureblob/azureblob_test.go b/pkg/commands/service/logging/azureblob/azureblob_test.go index 02766db6b..70a7cc08b 100644 --- a/pkg/commands/service/logging/azureblob/azureblob_test.go +++ b/pkg/commands/service/logging/azureblob/azureblob_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/azureblob" @@ -132,7 +132,37 @@ func TestUpdateBlobStorageInput(t *testing.T) { ResponseCondition: fastly.ToPointer("new7"), MessageType: fastly.ToPointer("new8"), TimestampFormat: fastly.ToPointer("new9"), - Placement: fastly.ToPointer("new10"), + Placement: fastly.NewNullable("new10"), + ProcessingRegion: fastly.ToPointer("eu"), + PublicKey: fastly.ToPointer("new11"), + CompressionCodec: fastly.ToPointer("new12"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetBlobStorageFn: getBlobStorageOK, + }, + want: &fastly.UpdateBlobStorageInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "logs", + NewName: fastly.ToPointer("new1"), + Container: fastly.ToPointer("new2"), + AccountName: fastly.ToPointer("new3"), + SASToken: fastly.ToPointer("new4"), + Path: fastly.ToPointer("new5"), + Period: fastly.ToPointer(3601), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new6"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new7"), + MessageType: fastly.ToPointer("new8"), + TimestampFormat: fastly.ToPointer("new9"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), PublicKey: fastly.ToPointer("new11"), CompressionCodec: fastly.ToPointer("new12"), @@ -380,6 +410,12 @@ func updateCommandAll() *azureblob.UpdateCommand { } } +func updateCommandPlacementReset() *azureblob.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *azureblob.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/azureblob/create.go b/pkg/commands/service/logging/azureblob/create.go index 465833faa..b596116d1 100644 --- a/pkg/commands/service/logging/azureblob/create.go +++ b/pkg/commands/service/logging/azureblob/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/azureblob/delete.go b/pkg/commands/service/logging/azureblob/delete.go index 455a258a8..6fbc22d0f 100644 --- a/pkg/commands/service/logging/azureblob/delete.go +++ b/pkg/commands/service/logging/azureblob/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/azureblob/describe.go b/pkg/commands/service/logging/azureblob/describe.go index d0303ca22..9a71ce6ea 100644 --- a/pkg/commands/service/logging/azureblob/describe.go +++ b/pkg/commands/service/logging/azureblob/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/azureblob/list.go b/pkg/commands/service/logging/azureblob/list.go index 968007158..d3c580f26 100644 --- a/pkg/commands/service/logging/azureblob/list.go +++ b/pkg/commands/service/logging/azureblob/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/azureblob/update.go b/pkg/commands/service/logging/azureblob/update.go index d27f9548b..8a175101e 100644 --- a/pkg/commands/service/logging/azureblob/update.go +++ b/pkg/commands/service/logging/azureblob/update.go @@ -3,8 +3,9 @@ package azureblob import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -150,7 +151,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f input.TimestampFormat = &c.TimestampFormat.Value } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { input.ProcessingRegion = &c.ProcessingRegion.Value diff --git a/pkg/commands/service/logging/bigquery/bigquery_integration_test.go b/pkg/commands/service/logging/bigquery/bigquery_integration_test.go index 1f706464b..d789f9930 100644 --- a/pkg/commands/service/logging/bigquery/bigquery_integration_test.go +++ b/pkg/commands/service/logging/bigquery/bigquery_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/bigquery/bigquery_test.go b/pkg/commands/service/logging/bigquery/bigquery_test.go index 4ba23ffa2..e01d683c8 100644 --- a/pkg/commands/service/logging/bigquery/bigquery_test.go +++ b/pkg/commands/service/logging/bigquery/bigquery_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/bigquery" @@ -141,7 +141,33 @@ func TestUpdateBigQueryInput(t *testing.T) { SecretKey: fastly.ToPointer("new6"), Template: fastly.ToPointer("new7"), ResponseCondition: fastly.ToPointer("new8"), - Placement: fastly.ToPointer("new9"), + Placement: fastly.NewNullable("new9"), + ProcessingRegion: fastly.ToPointer("eu"), + Format: fastly.ToPointer("new10"), + FormatVersion: fastly.ToPointer(3), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetBigQueryFn: getBigQueryOK, + }, + want: &fastly.UpdateBigQueryInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + ProjectID: fastly.ToPointer("new2"), + Dataset: fastly.ToPointer("new3"), + Table: fastly.ToPointer("new4"), + User: fastly.ToPointer("new5"), + SecretKey: fastly.ToPointer("new6"), + Template: fastly.ToPointer("new7"), + ResponseCondition: fastly.ToPointer("new8"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), Format: fastly.ToPointer("new10"), FormatVersion: fastly.ToPointer(3), @@ -368,6 +394,12 @@ func updateCommandAll() *bigquery.UpdateCommand { } } +func updateCommandPlacementReset() *bigquery.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *bigquery.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/bigquery/create.go b/pkg/commands/service/logging/bigquery/create.go index fe02294bd..560514fa8 100644 --- a/pkg/commands/service/logging/bigquery/create.go +++ b/pkg/commands/service/logging/bigquery/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/bigquery/delete.go b/pkg/commands/service/logging/bigquery/delete.go index 54df8179a..6c0ae6300 100644 --- a/pkg/commands/service/logging/bigquery/delete.go +++ b/pkg/commands/service/logging/bigquery/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/bigquery/describe.go b/pkg/commands/service/logging/bigquery/describe.go index 3a65b207a..159385a5f 100644 --- a/pkg/commands/service/logging/bigquery/describe.go +++ b/pkg/commands/service/logging/bigquery/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/bigquery/list.go b/pkg/commands/service/logging/bigquery/list.go index f0ad59ee2..3a6845b07 100644 --- a/pkg/commands/service/logging/bigquery/list.go +++ b/pkg/commands/service/logging/bigquery/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/bigquery/update.go b/pkg/commands/service/logging/bigquery/update.go index 1756b43c2..47de78562 100644 --- a/pkg/commands/service/logging/bigquery/update.go +++ b/pkg/commands/service/logging/bigquery/update.go @@ -3,8 +3,9 @@ package bigquery import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -118,7 +119,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f input.NewName = &c.NewName.Value } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { input.ProcessingRegion = &c.ProcessingRegion.Value diff --git a/pkg/commands/service/logging/cloudfiles/cloudfiles_integration_test.go b/pkg/commands/service/logging/cloudfiles/cloudfiles_integration_test.go index 26401d8dc..4a9f4570f 100644 --- a/pkg/commands/service/logging/cloudfiles/cloudfiles_integration_test.go +++ b/pkg/commands/service/logging/cloudfiles/cloudfiles_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/cloudfiles/cloudfiles_test.go b/pkg/commands/service/logging/cloudfiles/cloudfiles_test.go index 962aa8e6d..61c43bc5e 100644 --- a/pkg/commands/service/logging/cloudfiles/cloudfiles_test.go +++ b/pkg/commands/service/logging/cloudfiles/cloudfiles_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/cloudfiles" @@ -140,7 +140,38 @@ func TestUpdateCloudfilesInput(t *testing.T) { BucketName: fastly.ToPointer("new3"), Path: fastly.ToPointer("new4"), Region: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + Period: fastly.ToPointer(3601), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new8"), + MessageType: fastly.ToPointer("new9"), + TimestampFormat: fastly.ToPointer("new10"), + PublicKey: fastly.ToPointer("new11"), + User: fastly.ToPointer("new12"), + CompressionCodec: fastly.ToPointer("new13"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetCloudfilesFn: getCloudfilesOK, + }, + want: &fastly.UpdateCloudfilesInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + AccessKey: fastly.ToPointer("new2"), + BucketName: fastly.ToPointer("new3"), + Path: fastly.ToPointer("new4"), + Region: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), Period: fastly.ToPointer(3601), GzipLevel: fastly.ToPointer(0), Format: fastly.ToPointer("new7"), @@ -382,6 +413,12 @@ func updateCommandAll() *cloudfiles.UpdateCommand { } } +func updateCommandPlacementReset() *cloudfiles.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *cloudfiles.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/cloudfiles/create.go b/pkg/commands/service/logging/cloudfiles/create.go index 13de1ff64..14207a5f7 100644 --- a/pkg/commands/service/logging/cloudfiles/create.go +++ b/pkg/commands/service/logging/cloudfiles/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/cloudfiles/delete.go b/pkg/commands/service/logging/cloudfiles/delete.go index cdf5452c6..4b2dd6262 100644 --- a/pkg/commands/service/logging/cloudfiles/delete.go +++ b/pkg/commands/service/logging/cloudfiles/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/cloudfiles/describe.go b/pkg/commands/service/logging/cloudfiles/describe.go index ed992e322..bee590c52 100644 --- a/pkg/commands/service/logging/cloudfiles/describe.go +++ b/pkg/commands/service/logging/cloudfiles/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/cloudfiles/list.go b/pkg/commands/service/logging/cloudfiles/list.go index fb45ef8e4..23ce4a9cf 100644 --- a/pkg/commands/service/logging/cloudfiles/list.go +++ b/pkg/commands/service/logging/cloudfiles/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/cloudfiles/update.go b/pkg/commands/service/logging/cloudfiles/update.go index f441ff61c..e6dc447c2 100644 --- a/pkg/commands/service/logging/cloudfiles/update.go +++ b/pkg/commands/service/logging/cloudfiles/update.go @@ -3,8 +3,9 @@ package cloudfiles import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -136,7 +137,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.Period.WasSet { diff --git a/pkg/commands/service/logging/datadog/create.go b/pkg/commands/service/logging/datadog/create.go index c9433f5a2..b0e8918ac 100644 --- a/pkg/commands/service/logging/datadog/create.go +++ b/pkg/commands/service/logging/datadog/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/datadog/datadog_integration_test.go b/pkg/commands/service/logging/datadog/datadog_integration_test.go index e618875b0..d5c7ebb29 100644 --- a/pkg/commands/service/logging/datadog/datadog_integration_test.go +++ b/pkg/commands/service/logging/datadog/datadog_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" parent "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/datadog/datadog_test.go b/pkg/commands/service/logging/datadog/datadog_test.go index 6f4aaa4ef..24645effd 100644 --- a/pkg/commands/service/logging/datadog/datadog_test.go +++ b/pkg/commands/service/logging/datadog/datadog_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/datadog" @@ -131,7 +131,29 @@ func TestUpdateDatadogInput(t *testing.T) { FormatVersion: fastly.ToPointer(3), Token: fastly.ToPointer("new4"), ResponseCondition: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetDatadogFn: getDatadogOK, + }, + want: &fastly.UpdateDatadogInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Region: fastly.ToPointer("new2"), + Format: fastly.ToPointer("new3"), + FormatVersion: fastly.ToPointer(3), + Token: fastly.ToPointer("new4"), + ResponseCondition: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -344,6 +366,12 @@ func updateCommandAll() *datadog.UpdateCommand { } } +func updateCommandPlacementReset() *datadog.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *datadog.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/datadog/delete.go b/pkg/commands/service/logging/datadog/delete.go index 99841a34b..f652f827e 100644 --- a/pkg/commands/service/logging/datadog/delete.go +++ b/pkg/commands/service/logging/datadog/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/datadog/describe.go b/pkg/commands/service/logging/datadog/describe.go index 450644bea..ad08055ee 100644 --- a/pkg/commands/service/logging/datadog/describe.go +++ b/pkg/commands/service/logging/datadog/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/datadog/list.go b/pkg/commands/service/logging/datadog/list.go index d951f9047..d242907c7 100644 --- a/pkg/commands/service/logging/datadog/list.go +++ b/pkg/commands/service/logging/datadog/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/datadog/update.go b/pkg/commands/service/logging/datadog/update.go index 0030aca80..5b85473e0 100644 --- a/pkg/commands/service/logging/datadog/update.go +++ b/pkg/commands/service/logging/datadog/update.go @@ -3,8 +3,9 @@ package datadog import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -117,7 +118,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/debug/debug_test.go b/pkg/commands/service/logging/debug/debug_test.go index e741e0210..3a100cbd7 100644 --- a/pkg/commands/service/logging/debug/debug_test.go +++ b/pkg/commands/service/logging/debug/debug_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // TestParseLoggingError validates we're correctly decoding individual logging error JSON. diff --git a/pkg/commands/service/logging/debug/root.go b/pkg/commands/service/logging/debug/root.go index 0856e91fb..0d6248c48 100644 --- a/pkg/commands/service/logging/debug/root.go +++ b/pkg/commands/service/logging/debug/root.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/logging/digitalocean/create.go b/pkg/commands/service/logging/digitalocean/create.go index 84a51f3c4..e5a49de31 100644 --- a/pkg/commands/service/logging/digitalocean/create.go +++ b/pkg/commands/service/logging/digitalocean/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/digitalocean/delete.go b/pkg/commands/service/logging/digitalocean/delete.go index 50eadb88d..843f8d165 100644 --- a/pkg/commands/service/logging/digitalocean/delete.go +++ b/pkg/commands/service/logging/digitalocean/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/digitalocean/describe.go b/pkg/commands/service/logging/digitalocean/describe.go index aaa33093b..1595f3901 100644 --- a/pkg/commands/service/logging/digitalocean/describe.go +++ b/pkg/commands/service/logging/digitalocean/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/digitalocean/digitalocean_integration_test.go b/pkg/commands/service/logging/digitalocean/digitalocean_integration_test.go index cb960b93f..477d98431 100644 --- a/pkg/commands/service/logging/digitalocean/digitalocean_integration_test.go +++ b/pkg/commands/service/logging/digitalocean/digitalocean_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/digitalocean/digitalocean_test.go b/pkg/commands/service/logging/digitalocean/digitalocean_test.go index c52121c4a..ad96e8305 100644 --- a/pkg/commands/service/logging/digitalocean/digitalocean_test.go +++ b/pkg/commands/service/logging/digitalocean/digitalocean_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/digitalocean" @@ -133,7 +133,37 @@ func TestUpdateDigitalOceanInput(t *testing.T) { ResponseCondition: fastly.ToPointer("new8"), MessageType: fastly.ToPointer("new9"), TimestampFormat: fastly.ToPointer("new10"), - Placement: fastly.ToPointer("new11"), + Placement: fastly.NewNullable("new11"), + PublicKey: fastly.ToPointer("new12"), + CompressionCodec: fastly.ToPointer("new13"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetDigitalOceanFn: getDigitalOceanOK, + }, + want: &fastly.UpdateDigitalOceanInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + BucketName: fastly.ToPointer("new2"), + Domain: fastly.ToPointer("new3"), + AccessKey: fastly.ToPointer("new4"), + SecretKey: fastly.ToPointer("new5"), + Path: fastly.ToPointer("new6"), + Period: fastly.ToPointer(3601), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new8"), + MessageType: fastly.ToPointer("new9"), + TimestampFormat: fastly.ToPointer("new10"), + Placement: fastly.NullValue[string](), PublicKey: fastly.ToPointer("new12"), CompressionCodec: fastly.ToPointer("new13"), }, @@ -378,6 +408,12 @@ func updateCommandAll() *digitalocean.UpdateCommand { } } +func updateCommandPlacementReset() *digitalocean.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *digitalocean.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/digitalocean/list.go b/pkg/commands/service/logging/digitalocean/list.go index 37ebebee3..668f405a1 100644 --- a/pkg/commands/service/logging/digitalocean/list.go +++ b/pkg/commands/service/logging/digitalocean/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/digitalocean/update.go b/pkg/commands/service/logging/digitalocean/update.go index 7b83d3f2b..44c73642b 100644 --- a/pkg/commands/service/logging/digitalocean/update.go +++ b/pkg/commands/service/logging/digitalocean/update.go @@ -3,8 +3,9 @@ package digitalocean import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -164,7 +165,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.PublicKey.WasSet { diff --git a/pkg/commands/service/logging/elasticsearch/create.go b/pkg/commands/service/logging/elasticsearch/create.go index af40dbbd9..43e355888 100644 --- a/pkg/commands/service/logging/elasticsearch/create.go +++ b/pkg/commands/service/logging/elasticsearch/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/elasticsearch/delete.go b/pkg/commands/service/logging/elasticsearch/delete.go index c75580bfc..2ed5c29b6 100644 --- a/pkg/commands/service/logging/elasticsearch/delete.go +++ b/pkg/commands/service/logging/elasticsearch/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/elasticsearch/describe.go b/pkg/commands/service/logging/elasticsearch/describe.go index 5fe4507de..2f6618623 100644 --- a/pkg/commands/service/logging/elasticsearch/describe.go +++ b/pkg/commands/service/logging/elasticsearch/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/elasticsearch/elasticsearch_integration_test.go b/pkg/commands/service/logging/elasticsearch/elasticsearch_integration_test.go index e2a51a310..3f2a44c3c 100644 --- a/pkg/commands/service/logging/elasticsearch/elasticsearch_integration_test.go +++ b/pkg/commands/service/logging/elasticsearch/elasticsearch_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/elasticsearch/elasticsearch_test.go b/pkg/commands/service/logging/elasticsearch/elasticsearch_test.go index fabe765c7..c51d104a1 100644 --- a/pkg/commands/service/logging/elasticsearch/elasticsearch_test.go +++ b/pkg/commands/service/logging/elasticsearch/elasticsearch_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/elasticsearch" @@ -129,7 +129,38 @@ func TestUpdateElasticsearchInput(t *testing.T) { Password: fastly.ToPointer("new6"), RequestMaxEntries: fastly.ToPointer(3), RequestMaxBytes: fastly.ToPointer(3), - Placement: fastly.ToPointer("new7"), + Placement: fastly.NewNullable("new7"), + Format: fastly.ToPointer("new8"), + FormatVersion: fastly.ToPointer(3), + ProcessingRegion: fastly.ToPointer("eu"), + ResponseCondition: fastly.ToPointer("new9"), + TLSCACert: fastly.ToPointer("new10"), + TLSClientCert: fastly.ToPointer("new11"), + TLSClientKey: fastly.ToPointer("new12"), + TLSHostname: fastly.ToPointer("new13"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetElasticsearchFn: getElasticsearchOK, + }, + want: &fastly.UpdateElasticsearchInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Index: fastly.ToPointer("new2"), + URL: fastly.ToPointer("new3"), + Pipeline: fastly.ToPointer("new4"), + User: fastly.ToPointer("new5"), + Password: fastly.ToPointer("new6"), + RequestMaxEntries: fastly.ToPointer(3), + RequestMaxBytes: fastly.ToPointer(3), + Placement: fastly.NullValue[string](), Format: fastly.ToPointer("new8"), FormatVersion: fastly.ToPointer(3), ProcessingRegion: fastly.ToPointer("eu"), @@ -382,6 +413,12 @@ func updateCommandAll() *elasticsearch.UpdateCommand { } } +func updateCommandPlacementReset() *elasticsearch.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *elasticsearch.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/elasticsearch/list.go b/pkg/commands/service/logging/elasticsearch/list.go index 0ac1b13dc..2c3451884 100644 --- a/pkg/commands/service/logging/elasticsearch/list.go +++ b/pkg/commands/service/logging/elasticsearch/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/elasticsearch/update.go b/pkg/commands/service/logging/elasticsearch/update.go index e067566bc..e184021fc 100644 --- a/pkg/commands/service/logging/elasticsearch/update.go +++ b/pkg/commands/service/logging/elasticsearch/update.go @@ -3,8 +3,9 @@ package elasticsearch import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -169,7 +170,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/ftp/create.go b/pkg/commands/service/logging/ftp/create.go index b5ec637c9..5a9dc421e 100644 --- a/pkg/commands/service/logging/ftp/create.go +++ b/pkg/commands/service/logging/ftp/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/ftp/delete.go b/pkg/commands/service/logging/ftp/delete.go index 285ce6c31..d8564e6c6 100644 --- a/pkg/commands/service/logging/ftp/delete.go +++ b/pkg/commands/service/logging/ftp/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/ftp/describe.go b/pkg/commands/service/logging/ftp/describe.go index 9178da964..14156caff 100644 --- a/pkg/commands/service/logging/ftp/describe.go +++ b/pkg/commands/service/logging/ftp/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/ftp/ftp_integration_test.go b/pkg/commands/service/logging/ftp/ftp_integration_test.go index 1a0544018..72f48886c 100644 --- a/pkg/commands/service/logging/ftp/ftp_integration_test.go +++ b/pkg/commands/service/logging/ftp/ftp_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/ftp/ftp_test.go b/pkg/commands/service/logging/ftp/ftp_test.go index 68dcfe8d4..09fc4c9a3 100644 --- a/pkg/commands/service/logging/ftp/ftp_test.go +++ b/pkg/commands/service/logging/ftp/ftp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/ftp" @@ -147,7 +147,37 @@ func TestUpdateFTPInput(t *testing.T) { Format: fastly.ToPointer("new6"), ResponseCondition: fastly.ToPointer("new7"), TimestampFormat: fastly.ToPointer("new8"), - Placement: fastly.ToPointer("new9"), + Placement: fastly.NewNullable("new9"), + CompressionCodec: fastly.ToPointer("new11"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetFTPFn: getFTPOK, + }, + want: &fastly.UpdateFTPInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Address: fastly.ToPointer("new2"), + Port: fastly.ToPointer(23), + PublicKey: fastly.ToPointer("new10"), + Username: fastly.ToPointer("new3"), + Password: fastly.ToPointer("new4"), + Path: fastly.ToPointer("new5"), + Period: fastly.ToPointer(3601), + ProcessingRegion: fastly.ToPointer("eu"), + FormatVersion: fastly.ToPointer(3), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new6"), + ResponseCondition: fastly.ToPointer("new7"), + TimestampFormat: fastly.ToPointer("new8"), + Placement: fastly.NullValue[string](), CompressionCodec: fastly.ToPointer("new11"), }, }, @@ -376,6 +406,12 @@ func updateCommandAll() *ftp.UpdateCommand { } } +func updateCommandPlacementReset() *ftp.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *ftp.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/ftp/list.go b/pkg/commands/service/logging/ftp/list.go index 86c4b1357..90f3f747b 100644 --- a/pkg/commands/service/logging/ftp/list.go +++ b/pkg/commands/service/logging/ftp/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/ftp/update.go b/pkg/commands/service/logging/ftp/update.go index 433486cbc..bdde1eda5 100644 --- a/pkg/commands/service/logging/ftp/update.go +++ b/pkg/commands/service/logging/ftp/update.go @@ -3,8 +3,9 @@ package ftp import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -162,7 +163,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.CompressionCodec.WasSet { diff --git a/pkg/commands/service/logging/gcs/create.go b/pkg/commands/service/logging/gcs/create.go index 4c039e920..477c2050a 100644 --- a/pkg/commands/service/logging/gcs/create.go +++ b/pkg/commands/service/logging/gcs/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/gcs/delete.go b/pkg/commands/service/logging/gcs/delete.go index 94b4252d7..37242f5b0 100644 --- a/pkg/commands/service/logging/gcs/delete.go +++ b/pkg/commands/service/logging/gcs/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/gcs/describe.go b/pkg/commands/service/logging/gcs/describe.go index 9c25b7c1e..1352e2c68 100644 --- a/pkg/commands/service/logging/gcs/describe.go +++ b/pkg/commands/service/logging/gcs/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/gcs/gcs_integration_test.go b/pkg/commands/service/logging/gcs/gcs_integration_test.go index a30b6c4e5..8f06555e7 100644 --- a/pkg/commands/service/logging/gcs/gcs_integration_test.go +++ b/pkg/commands/service/logging/gcs/gcs_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/gcs/gcs_test.go b/pkg/commands/service/logging/gcs/gcs_test.go index 8908e9180..058d90282 100644 --- a/pkg/commands/service/logging/gcs/gcs_test.go +++ b/pkg/commands/service/logging/gcs/gcs_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/gcs" @@ -144,7 +144,36 @@ func TestUpdateGCSInput(t *testing.T) { Format: fastly.ToPointer("new6"), ResponseCondition: fastly.ToPointer("new7"), TimestampFormat: fastly.ToPointer("new8"), - Placement: fastly.ToPointer("new9"), + Placement: fastly.NewNullable("new9"), + MessageType: fastly.ToPointer("new10"), + CompressionCodec: fastly.ToPointer("new11"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetGCSFn: getGCSOK, + }, + want: &fastly.UpdateGCSInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Bucket: fastly.ToPointer("new2"), + User: fastly.ToPointer("new3"), + SecretKey: fastly.ToPointer("new4"), + Path: fastly.ToPointer("new5"), + Period: fastly.ToPointer(3601), + FormatVersion: fastly.ToPointer(3), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new6"), + ResponseCondition: fastly.ToPointer("new7"), + TimestampFormat: fastly.ToPointer("new8"), + Placement: fastly.NullValue[string](), MessageType: fastly.ToPointer("new10"), CompressionCodec: fastly.ToPointer("new11"), ProcessingRegion: fastly.ToPointer("eu"), @@ -374,6 +403,12 @@ func updateCommandAll() *gcs.UpdateCommand { } } +func updateCommandPlacementReset() *gcs.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *gcs.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/gcs/list.go b/pkg/commands/service/logging/gcs/list.go index 289732764..0316a634d 100644 --- a/pkg/commands/service/logging/gcs/list.go +++ b/pkg/commands/service/logging/gcs/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/gcs/update.go b/pkg/commands/service/logging/gcs/update.go index 3debd0632..be4de53c0 100644 --- a/pkg/commands/service/logging/gcs/update.go +++ b/pkg/commands/service/logging/gcs/update.go @@ -3,8 +3,9 @@ package gcs import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -141,7 +142,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f input.Period = &c.Period.Value } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { input.ProcessingRegion = &c.ProcessingRegion.Value diff --git a/pkg/commands/service/logging/googlepubsub/create.go b/pkg/commands/service/logging/googlepubsub/create.go index d62d44d1b..b21cc98ad 100644 --- a/pkg/commands/service/logging/googlepubsub/create.go +++ b/pkg/commands/service/logging/googlepubsub/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/googlepubsub/delete.go b/pkg/commands/service/logging/googlepubsub/delete.go index 12490f38c..1b027f9f1 100644 --- a/pkg/commands/service/logging/googlepubsub/delete.go +++ b/pkg/commands/service/logging/googlepubsub/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/googlepubsub/describe.go b/pkg/commands/service/logging/googlepubsub/describe.go index 17a2ce50e..86c9b9329 100644 --- a/pkg/commands/service/logging/googlepubsub/describe.go +++ b/pkg/commands/service/logging/googlepubsub/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/googlepubsub/googlepubsub_integration_test.go b/pkg/commands/service/logging/googlepubsub/googlepubsub_integration_test.go index 42e751296..293dde19a 100644 --- a/pkg/commands/service/logging/googlepubsub/googlepubsub_integration_test.go +++ b/pkg/commands/service/logging/googlepubsub/googlepubsub_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/googlepubsub/googlepubsub_test.go b/pkg/commands/service/logging/googlepubsub/googlepubsub_test.go index 8fbb5b2e4..93ed71a2b 100644 --- a/pkg/commands/service/logging/googlepubsub/googlepubsub_test.go +++ b/pkg/commands/service/logging/googlepubsub/googlepubsub_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/googlepubsub" @@ -121,7 +121,31 @@ func TestUpdateGooglePubSubInput(t *testing.T) { SecretKey: fastly.ToPointer("new3"), ProjectID: fastly.ToPointer("new4"), Topic: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new8"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetPubsubFn: getGooglePubSubOK, + }, + want: &fastly.UpdatePubsubInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + User: fastly.ToPointer("new2"), + SecretKey: fastly.ToPointer("new3"), + ProjectID: fastly.ToPointer("new4"), + Topic: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), Format: fastly.ToPointer("new7"), FormatVersion: fastly.ToPointer(3), ResponseCondition: fastly.ToPointer("new8"), @@ -358,6 +382,12 @@ func updateCommandAll() *googlepubsub.UpdateCommand { } } +func updateCommandPlacementReset() *googlepubsub.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *googlepubsub.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/googlepubsub/list.go b/pkg/commands/service/logging/googlepubsub/list.go index 36e4921bf..cc790cabe 100644 --- a/pkg/commands/service/logging/googlepubsub/list.go +++ b/pkg/commands/service/logging/googlepubsub/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/googlepubsub/update.go b/pkg/commands/service/logging/googlepubsub/update.go index 4ac839302..4fde8897a 100644 --- a/pkg/commands/service/logging/googlepubsub/update.go +++ b/pkg/commands/service/logging/googlepubsub/update.go @@ -3,8 +3,9 @@ package googlepubsub import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -111,7 +112,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f input.NewName = &c.NewName.Value } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { input.ProcessingRegion = &c.ProcessingRegion.Value diff --git a/pkg/commands/service/logging/grafanacloudlogs/create.go b/pkg/commands/service/logging/grafanacloudlogs/create.go index 8abe695d9..45156e1a4 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/create.go +++ b/pkg/commands/service/logging/grafanacloudlogs/create.go @@ -12,7 +12,7 @@ import ( "github.com/fastly/cli/pkg/global" "github.com/fastly/cli/pkg/manifest" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // CreateCommand calls the Fastly API to create a GrafanaCloudLogs logging endpoint. diff --git a/pkg/commands/service/logging/grafanacloudlogs/delete.go b/pkg/commands/service/logging/grafanacloudlogs/delete.go index fd42e6816..85c0c62b4 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/delete.go +++ b/pkg/commands/service/logging/grafanacloudlogs/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/grafanacloudlogs/describe.go b/pkg/commands/service/logging/grafanacloudlogs/describe.go index 907a41fd8..7d6ae6158 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/describe.go +++ b/pkg/commands/service/logging/grafanacloudlogs/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/grafanacloudlogs/grafanacloud_logs_integration_test.go b/pkg/commands/service/logging/grafanacloudlogs/grafanacloud_logs_integration_test.go index ff82f631b..405107bff 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/grafanacloud_logs_integration_test.go +++ b/pkg/commands/service/logging/grafanacloudlogs/grafanacloud_logs_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" parent "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/grafanacloudlogs/grafanacloudlogs_test.go b/pkg/commands/service/logging/grafanacloudlogs/grafanacloudlogs_test.go index b10f610a4..d3ed69b3b 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/grafanacloudlogs_test.go +++ b/pkg/commands/service/logging/grafanacloudlogs/grafanacloudlogs_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/grafanacloudlogs" @@ -134,7 +134,29 @@ func TestUpdateGrafanaCloudLogsInput(t *testing.T) { FormatVersion: fastly.ToPointer(3), Format: fastly.ToPointer("new6"), ResponseCondition: fastly.ToPointer("new7"), - Placement: fastly.ToPointer("new9"), + Placement: fastly.NewNullable("new9"), + MessageType: fastly.ToPointer("new10"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetGrafanaCloudLogsFn: getGrafanaCloudLogsOK, + }, + want: &fastly.UpdateGrafanaCloudLogsInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + User: fastly.ToPointer("new3"), + FormatVersion: fastly.ToPointer(3), + Format: fastly.ToPointer("new6"), + ResponseCondition: fastly.ToPointer("new7"), + Placement: fastly.NullValue[string](), MessageType: fastly.ToPointer("new10"), ProcessingRegion: fastly.ToPointer("eu"), }, @@ -353,6 +375,12 @@ func updateCommandAll() *grafanacloudlogs.UpdateCommand { } } +func updateCommandPlacementReset() *grafanacloudlogs.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *grafanacloudlogs.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/grafanacloudlogs/list.go b/pkg/commands/service/logging/grafanacloudlogs/list.go index 685c6cfce..0373583f0 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/list.go +++ b/pkg/commands/service/logging/grafanacloudlogs/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/grafanacloudlogs/update.go b/pkg/commands/service/logging/grafanacloudlogs/update.go index 42622fc21..ee6501b05 100644 --- a/pkg/commands/service/logging/grafanacloudlogs/update.go +++ b/pkg/commands/service/logging/grafanacloudlogs/update.go @@ -3,8 +3,9 @@ package grafanacloudlogs import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -111,7 +112,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f input.NewName = &c.NewName.Value } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { input.ProcessingRegion = &c.ProcessingRegion.Value diff --git a/pkg/commands/service/logging/heroku/create.go b/pkg/commands/service/logging/heroku/create.go index 591570ca8..1d19061a6 100644 --- a/pkg/commands/service/logging/heroku/create.go +++ b/pkg/commands/service/logging/heroku/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/heroku/delete.go b/pkg/commands/service/logging/heroku/delete.go index bfa598742..67fd1b3d7 100644 --- a/pkg/commands/service/logging/heroku/delete.go +++ b/pkg/commands/service/logging/heroku/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/heroku/describe.go b/pkg/commands/service/logging/heroku/describe.go index 7a36f0db0..f8ab60443 100644 --- a/pkg/commands/service/logging/heroku/describe.go +++ b/pkg/commands/service/logging/heroku/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/heroku/heroku_integration_test.go b/pkg/commands/service/logging/heroku/heroku_integration_test.go index 1b5f428d6..529730699 100644 --- a/pkg/commands/service/logging/heroku/heroku_integration_test.go +++ b/pkg/commands/service/logging/heroku/heroku_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/heroku/heroku_test.go b/pkg/commands/service/logging/heroku/heroku_test.go index c824a2dc6..b1f54df47 100644 --- a/pkg/commands/service/logging/heroku/heroku_test.go +++ b/pkg/commands/service/logging/heroku/heroku_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/heroku" @@ -132,7 +132,29 @@ func TestUpdateHerokuInput(t *testing.T) { Token: fastly.ToPointer("new3"), URL: fastly.ToPointer("new4"), ResponseCondition: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetHerokuFn: getHerokuOK, + }, + want: &fastly.UpdateHerokuInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Format: fastly.ToPointer("new2"), + FormatVersion: fastly.ToPointer(3), + Token: fastly.ToPointer("new3"), + URL: fastly.ToPointer("new4"), + ResponseCondition: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -346,6 +368,12 @@ func updateCommandAll() *heroku.UpdateCommand { } } +func updateCommandPlacementReset() *heroku.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *heroku.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/heroku/list.go b/pkg/commands/service/logging/heroku/list.go index f6f4bd90a..2a6c7e261 100644 --- a/pkg/commands/service/logging/heroku/list.go +++ b/pkg/commands/service/logging/heroku/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/heroku/update.go b/pkg/commands/service/logging/heroku/update.go index 41702e551..6814a20ab 100644 --- a/pkg/commands/service/logging/heroku/update.go +++ b/pkg/commands/service/logging/heroku/update.go @@ -3,8 +3,9 @@ package heroku import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -117,7 +118,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/honeycomb/create.go b/pkg/commands/service/logging/honeycomb/create.go index 22c323808..95eb8efc3 100644 --- a/pkg/commands/service/logging/honeycomb/create.go +++ b/pkg/commands/service/logging/honeycomb/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/honeycomb/delete.go b/pkg/commands/service/logging/honeycomb/delete.go index bf90959a3..a32f4c378 100644 --- a/pkg/commands/service/logging/honeycomb/delete.go +++ b/pkg/commands/service/logging/honeycomb/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/honeycomb/describe.go b/pkg/commands/service/logging/honeycomb/describe.go index cfca980ab..c4ac6a284 100644 --- a/pkg/commands/service/logging/honeycomb/describe.go +++ b/pkg/commands/service/logging/honeycomb/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/honeycomb/honeycomb_integration_test.go b/pkg/commands/service/logging/honeycomb/honeycomb_integration_test.go index de159e5b4..622c28ebf 100644 --- a/pkg/commands/service/logging/honeycomb/honeycomb_integration_test.go +++ b/pkg/commands/service/logging/honeycomb/honeycomb_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" parent "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/honeycomb/honeycomb_test.go b/pkg/commands/service/logging/honeycomb/honeycomb_test.go index de703e2d2..c3f2f0a66 100644 --- a/pkg/commands/service/logging/honeycomb/honeycomb_test.go +++ b/pkg/commands/service/logging/honeycomb/honeycomb_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/honeycomb" @@ -132,7 +132,29 @@ func TestUpdateHoneycombInput(t *testing.T) { Token: fastly.ToPointer("new3"), Dataset: fastly.ToPointer("new4"), ResponseCondition: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetHoneycombFn: getHoneycombOK, + }, + want: &fastly.UpdateHoneycombInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Format: fastly.ToPointer("new2"), + FormatVersion: fastly.ToPointer(3), + Token: fastly.ToPointer("new3"), + Dataset: fastly.ToPointer("new4"), + ResponseCondition: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -346,6 +368,12 @@ func updateCommandAll() *honeycomb.UpdateCommand { } } +func updateCommandPlacementReset() *honeycomb.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *honeycomb.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/honeycomb/list.go b/pkg/commands/service/logging/honeycomb/list.go index cbd56c0dd..65f7616c7 100644 --- a/pkg/commands/service/logging/honeycomb/list.go +++ b/pkg/commands/service/logging/honeycomb/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/honeycomb/update.go b/pkg/commands/service/logging/honeycomb/update.go index 3052523a4..f312e319a 100644 --- a/pkg/commands/service/logging/honeycomb/update.go +++ b/pkg/commands/service/logging/honeycomb/update.go @@ -3,8 +3,9 @@ package honeycomb import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -117,7 +118,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/https/create.go b/pkg/commands/service/logging/https/create.go index b0f718864..1cadc3c87 100644 --- a/pkg/commands/service/logging/https/create.go +++ b/pkg/commands/service/logging/https/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/https/delete.go b/pkg/commands/service/logging/https/delete.go index b47766cf4..bc6271977 100644 --- a/pkg/commands/service/logging/https/delete.go +++ b/pkg/commands/service/logging/https/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/https/describe.go b/pkg/commands/service/logging/https/describe.go index f056df5a5..6c2c748fb 100644 --- a/pkg/commands/service/logging/https/describe.go +++ b/pkg/commands/service/logging/https/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/https/https_integration_test.go b/pkg/commands/service/logging/https/https_integration_test.go index 4957fe80e..d9de99b0f 100644 --- a/pkg/commands/service/logging/https/https_integration_test.go +++ b/pkg/commands/service/logging/https/https_integration_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/https/https_test.go b/pkg/commands/service/logging/https/https_test.go index 233478fa2..80b3da544 100644 --- a/pkg/commands/service/logging/https/https_test.go +++ b/pkg/commands/service/logging/https/https_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/https" @@ -137,7 +137,41 @@ func TestUpdateHTTPSInput(t *testing.T) { Method: fastly.ToPointer("new8"), JSONFormat: fastly.ToPointer("new9"), Period: fastly.ToPointer(5), - Placement: fastly.ToPointer("new10"), + Placement: fastly.NewNullable("new10"), + TLSCACert: fastly.ToPointer("new11"), + TLSClientCert: fastly.ToPointer("new12"), + TLSClientKey: fastly.ToPointer("new13"), + TLSHostname: fastly.ToPointer("new14"), + MessageType: fastly.ToPointer("new15"), + FormatVersion: fastly.ToPointer(3), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetHTTPSFn: getHTTPSOK, + }, + want: &fastly.UpdateHTTPSInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + ResponseCondition: fastly.ToPointer("new2"), + Format: fastly.ToPointer("new3"), + URL: fastly.ToPointer("new4"), + RequestMaxEntries: fastly.ToPointer(3), + RequestMaxBytes: fastly.ToPointer(3), + ContentType: fastly.ToPointer("new5"), + HeaderName: fastly.ToPointer("new6"), + HeaderValue: fastly.ToPointer("new7"), + Method: fastly.ToPointer("new8"), + JSONFormat: fastly.ToPointer("new9"), + Period: fastly.ToPointer(5), + Placement: fastly.NullValue[string](), TLSCACert: fastly.ToPointer("new11"), TLSClientCert: fastly.ToPointer("new12"), TLSClientKey: fastly.ToPointer("new13"), @@ -396,6 +430,12 @@ func updateCommandAll() *https.UpdateCommand { } } +func updateCommandPlacementReset() *https.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *https.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/https/list.go b/pkg/commands/service/logging/https/list.go index 6b0893a70..9f35f4440 100644 --- a/pkg/commands/service/logging/https/list.go +++ b/pkg/commands/service/logging/https/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/https/update.go b/pkg/commands/service/logging/https/update.go index 7a899336a..65784c5af 100644 --- a/pkg/commands/service/logging/https/update.go +++ b/pkg/commands/service/logging/https/update.go @@ -3,8 +3,9 @@ package https import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -187,7 +188,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.MessageType.WasSet { diff --git a/pkg/commands/service/logging/kafka/create.go b/pkg/commands/service/logging/kafka/create.go index e310eb4de..ba2580022 100644 --- a/pkg/commands/service/logging/kafka/create.go +++ b/pkg/commands/service/logging/kafka/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/kafka/delete.go b/pkg/commands/service/logging/kafka/delete.go index 535a8ac56..aabb6d9ce 100644 --- a/pkg/commands/service/logging/kafka/delete.go +++ b/pkg/commands/service/logging/kafka/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/kafka/describe.go b/pkg/commands/service/logging/kafka/describe.go index 14ee53ff8..3ef060def 100644 --- a/pkg/commands/service/logging/kafka/describe.go +++ b/pkg/commands/service/logging/kafka/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/kafka/kafka_integration_test.go b/pkg/commands/service/logging/kafka/kafka_integration_test.go index f28153e5d..73a41c226 100644 --- a/pkg/commands/service/logging/kafka/kafka_integration_test.go +++ b/pkg/commands/service/logging/kafka/kafka_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/kafka/kafka_test.go b/pkg/commands/service/logging/kafka/kafka_test.go index 971810755..8141b5801 100644 --- a/pkg/commands/service/logging/kafka/kafka_test.go +++ b/pkg/commands/service/logging/kafka/kafka_test.go @@ -5,7 +5,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/kafka" @@ -141,7 +141,41 @@ func TestUpdateKafkaInput(t *testing.T) { RequiredACKs: fastly.ToPointer("new4"), UseTLS: fastly.ToPointer(fastly.Compatibool(false)), CompressionCodec: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new8"), + TLSCACert: fastly.ToPointer("new9"), + TLSClientCert: fastly.ToPointer("new10"), + TLSClientKey: fastly.ToPointer("new11"), + TLSHostname: fastly.ToPointer("new12"), + ParseLogKeyvals: fastly.ToPointer(fastly.Compatibool(false)), + RequestMaxBytes: fastly.ToPointer(22222), + AuthMethod: fastly.ToPointer("plain"), + User: fastly.ToPointer("new13"), + Password: fastly.ToPointer("new14"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetKafkaFn: getKafkaOK, + }, + want: &fastly.UpdateKafkaInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Topic: fastly.ToPointer("new2"), + Brokers: fastly.ToPointer("new3"), + RequiredACKs: fastly.ToPointer("new4"), + UseTLS: fastly.ToPointer(fastly.Compatibool(false)), + CompressionCodec: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), Format: fastly.ToPointer("new7"), FormatVersion: fastly.ToPointer(3), ResponseCondition: fastly.ToPointer("new8"), @@ -488,6 +522,12 @@ func updateCommandAll() *kafka.UpdateCommand { } } +func updateCommandPlacementReset() *kafka.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandSASL(authMethod, user, password string) *kafka.UpdateCommand { var b bytes.Buffer diff --git a/pkg/commands/service/logging/kafka/list.go b/pkg/commands/service/logging/kafka/list.go index 36b53ed59..a4c1df02e 100644 --- a/pkg/commands/service/logging/kafka/list.go +++ b/pkg/commands/service/logging/kafka/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/kafka/update.go b/pkg/commands/service/logging/kafka/update.go index e2eb39c74..54bca1be1 100644 --- a/pkg/commands/service/logging/kafka/update.go +++ b/pkg/commands/service/logging/kafka/update.go @@ -4,8 +4,9 @@ import ( "context" "fmt" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -181,7 +182,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ParseLogKeyvals.WasSet { diff --git a/pkg/commands/service/logging/kinesis/create.go b/pkg/commands/service/logging/kinesis/create.go index 5642b2a30..9d65bd2bf 100644 --- a/pkg/commands/service/logging/kinesis/create.go +++ b/pkg/commands/service/logging/kinesis/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/kinesis/delete.go b/pkg/commands/service/logging/kinesis/delete.go index 2d070fbe4..56e1fe2d5 100644 --- a/pkg/commands/service/logging/kinesis/delete.go +++ b/pkg/commands/service/logging/kinesis/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/kinesis/describe.go b/pkg/commands/service/logging/kinesis/describe.go index 84a1fc993..c67b6fe65 100644 --- a/pkg/commands/service/logging/kinesis/describe.go +++ b/pkg/commands/service/logging/kinesis/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/kinesis/kinesis_integration_test.go b/pkg/commands/service/logging/kinesis/kinesis_integration_test.go index 4634d8c5f..78d2032f6 100644 --- a/pkg/commands/service/logging/kinesis/kinesis_integration_test.go +++ b/pkg/commands/service/logging/kinesis/kinesis_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/kinesis/kinesis_test.go b/pkg/commands/service/logging/kinesis/kinesis_test.go index 814e4d7dd..b641dea4a 100644 --- a/pkg/commands/service/logging/kinesis/kinesis_test.go +++ b/pkg/commands/service/logging/kinesis/kinesis_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/kinesis" @@ -151,7 +151,32 @@ func TestUpdateKinesisInput(t *testing.T) { Format: fastly.ToPointer("new7"), FormatVersion: fastly.ToPointer(3), ResponseCondition: fastly.ToPointer("new9"), - Placement: fastly.ToPointer("new11"), + Placement: fastly.NewNullable("new11"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetKinesisFn: getKinesisOK, + }, + want: &fastly.UpdateKinesisInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + StreamName: fastly.ToPointer("new2"), + AccessKey: fastly.ToPointer("new3"), + SecretKey: fastly.ToPointer("new4"), + IAMRole: fastly.ToPointer(""), + Region: fastly.ToPointer("new5"), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new9"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -412,6 +437,12 @@ func updateCommandAll() *kinesis.UpdateCommand { } } +func updateCommandPlacementReset() *kinesis.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *kinesis.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/kinesis/list.go b/pkg/commands/service/logging/kinesis/list.go index e73677cdd..cc6058cd9 100644 --- a/pkg/commands/service/logging/kinesis/list.go +++ b/pkg/commands/service/logging/kinesis/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/kinesis/update.go b/pkg/commands/service/logging/kinesis/update.go index b335fe7bc..16b2df210 100644 --- a/pkg/commands/service/logging/kinesis/update.go +++ b/pkg/commands/service/logging/kinesis/update.go @@ -3,8 +3,9 @@ package kinesis import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -135,7 +136,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/logflags/flags.go b/pkg/commands/service/logging/logflags/flags.go index f034fb66d..5218830a0 100644 --- a/pkg/commands/service/logging/logflags/flags.go +++ b/pkg/commands/service/logging/logflags/flags.go @@ -48,7 +48,7 @@ func CompressionCodec(command *kingpin.CmdClause, c *argparser.OptionalString) { // Placement defines the placement flag. func Placement(command *kingpin.CmdClause, c *argparser.OptionalString) { - command.Flag("placement", "Where in the generated VCL the logging call should be placed, overriding any format_version default. Can be none or waf_debug. This field is not required and has no default value").Action(c.Set).StringVar(&c.Value) + command.Flag("placement", "Where in the generated VCL the logging call should be placed, overriding any format_version default. Can be none, which suppresses the logging call (the only valid value for Compute services). This field is not required and has no default value. When updating a Delivery service, pass an empty string to reset the endpoint back to automatic placement").Action(c.Set).StringVar(&c.Value) } // ProcessingRegion defines the processing-region flag. diff --git a/pkg/commands/service/logging/loggly/create.go b/pkg/commands/service/logging/loggly/create.go index 8273a3e6a..af34c4ff2 100644 --- a/pkg/commands/service/logging/loggly/create.go +++ b/pkg/commands/service/logging/loggly/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/loggly/delete.go b/pkg/commands/service/logging/loggly/delete.go index 608a13e70..0eccaf88f 100644 --- a/pkg/commands/service/logging/loggly/delete.go +++ b/pkg/commands/service/logging/loggly/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/loggly/describe.go b/pkg/commands/service/logging/loggly/describe.go index ff15f9182..8bd679ef9 100644 --- a/pkg/commands/service/logging/loggly/describe.go +++ b/pkg/commands/service/logging/loggly/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/loggly/list.go b/pkg/commands/service/logging/loggly/list.go index a8879353b..555143336 100644 --- a/pkg/commands/service/logging/loggly/list.go +++ b/pkg/commands/service/logging/loggly/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/loggly/loggly_integration_test.go b/pkg/commands/service/logging/loggly/loggly_integration_test.go index 25b412d76..8056d3942 100644 --- a/pkg/commands/service/logging/loggly/loggly_integration_test.go +++ b/pkg/commands/service/logging/loggly/loggly_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/loggly/loggly_test.go b/pkg/commands/service/logging/loggly/loggly_test.go index b0834f51e..81aba0cb4 100644 --- a/pkg/commands/service/logging/loggly/loggly_test.go +++ b/pkg/commands/service/logging/loggly/loggly_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/loggly" @@ -129,7 +129,28 @@ func TestUpdateLogglyInput(t *testing.T) { FormatVersion: fastly.ToPointer(3), Token: fastly.ToPointer("new3"), ResponseCondition: fastly.ToPointer("new4"), - Placement: fastly.ToPointer("new5"), + Placement: fastly.NewNullable("new5"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetLogglyFn: getLogglyOK, + }, + want: &fastly.UpdateLogglyInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Format: fastly.ToPointer("new2"), + FormatVersion: fastly.ToPointer(3), + Token: fastly.ToPointer("new3"), + ResponseCondition: fastly.ToPointer("new4"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -340,6 +361,12 @@ func updateCommandAll() *loggly.UpdateCommand { } } +func updateCommandPlacementReset() *loggly.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *loggly.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/loggly/update.go b/pkg/commands/service/logging/loggly/update.go index 5d4cdb664..7fe52b903 100644 --- a/pkg/commands/service/logging/loggly/update.go +++ b/pkg/commands/service/logging/loggly/update.go @@ -3,8 +3,9 @@ package loggly import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -111,7 +112,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/logshuttle/create.go b/pkg/commands/service/logging/logshuttle/create.go index 7b17f7853..07d110097 100644 --- a/pkg/commands/service/logging/logshuttle/create.go +++ b/pkg/commands/service/logging/logshuttle/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/logshuttle/delete.go b/pkg/commands/service/logging/logshuttle/delete.go index 84580bcd8..a20ddcaf1 100644 --- a/pkg/commands/service/logging/logshuttle/delete.go +++ b/pkg/commands/service/logging/logshuttle/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/logshuttle/describe.go b/pkg/commands/service/logging/logshuttle/describe.go index f79af9b7e..287c9ca6d 100644 --- a/pkg/commands/service/logging/logshuttle/describe.go +++ b/pkg/commands/service/logging/logshuttle/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/logshuttle/list.go b/pkg/commands/service/logging/logshuttle/list.go index 9d0feb667..7ddef8040 100644 --- a/pkg/commands/service/logging/logshuttle/list.go +++ b/pkg/commands/service/logging/logshuttle/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/logshuttle/logshuttle_integration_test.go b/pkg/commands/service/logging/logshuttle/logshuttle_integration_test.go index 90eea6c5a..51ca5fe0e 100644 --- a/pkg/commands/service/logging/logshuttle/logshuttle_integration_test.go +++ b/pkg/commands/service/logging/logshuttle/logshuttle_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/logshuttle/logshuttle_test.go b/pkg/commands/service/logging/logshuttle/logshuttle_test.go index 20b7d5f48..f1696ab70 100644 --- a/pkg/commands/service/logging/logshuttle/logshuttle_test.go +++ b/pkg/commands/service/logging/logshuttle/logshuttle_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/logshuttle" @@ -132,7 +132,29 @@ func TestUpdateLogshuttleInput(t *testing.T) { Token: fastly.ToPointer("new3"), URL: fastly.ToPointer("new4"), ResponseCondition: fastly.ToPointer("new5"), - Placement: fastly.ToPointer("new6"), + Placement: fastly.NewNullable("new6"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetLogshuttleFn: getLogshuttleOK, + }, + want: &fastly.UpdateLogshuttleInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Format: fastly.ToPointer("new2"), + FormatVersion: fastly.ToPointer(3), + Token: fastly.ToPointer("new3"), + URL: fastly.ToPointer("new4"), + ResponseCondition: fastly.ToPointer("new5"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -346,6 +368,12 @@ func updateCommandAll() *logshuttle.UpdateCommand { } } +func updateCommandPlacementReset() *logshuttle.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *logshuttle.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/logshuttle/update.go b/pkg/commands/service/logging/logshuttle/update.go index 19974379f..67b7bc440 100644 --- a/pkg/commands/service/logging/logshuttle/update.go +++ b/pkg/commands/service/logging/logshuttle/update.go @@ -3,8 +3,9 @@ package logshuttle import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -118,7 +119,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/newrelic/create.go b/pkg/commands/service/logging/newrelic/create.go index 2177132be..31b7df7ee 100644 --- a/pkg/commands/service/logging/newrelic/create.go +++ b/pkg/commands/service/logging/newrelic/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/newrelic/delete.go b/pkg/commands/service/logging/newrelic/delete.go index 7d6fe9f9a..d6dc74e16 100644 --- a/pkg/commands/service/logging/newrelic/delete.go +++ b/pkg/commands/service/logging/newrelic/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/newrelic/describe.go b/pkg/commands/service/logging/newrelic/describe.go index e50e62279..297993069 100644 --- a/pkg/commands/service/logging/newrelic/describe.go +++ b/pkg/commands/service/logging/newrelic/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/newrelic/list.go b/pkg/commands/service/logging/newrelic/list.go index 60d8977a8..b1cc22e1e 100644 --- a/pkg/commands/service/logging/newrelic/list.go +++ b/pkg/commands/service/logging/newrelic/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/newrelic/newrelic_test.go b/pkg/commands/service/logging/newrelic/newrelic_test.go index 8d7940b0b..694d92d30 100644 --- a/pkg/commands/service/logging/newrelic/newrelic_test.go +++ b/pkg/commands/service/logging/newrelic/newrelic_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" serviceRoot "github.com/fastly/cli/pkg/commands/service" loggingRoot "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/newrelic/update.go b/pkg/commands/service/logging/newrelic/update.go index c33b4cf1a..4bfb92518 100644 --- a/pkg/commands/service/logging/newrelic/update.go +++ b/pkg/commands/service/logging/newrelic/update.go @@ -4,8 +4,9 @@ import ( "context" "fmt" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -151,7 +152,11 @@ func (c *UpdateCommand) constructInput(serviceID string, serviceVersion int) *fa input.NewName = &c.newName.Value } if c.placement.WasSet { - input.Placement = &c.placement.Value + if strings.TrimSpace(c.placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.placement.Value) + } } if c.processingregion.WasSet { input.ProcessingRegion = &c.processingregion.Value diff --git a/pkg/commands/service/logging/newrelicotlp/create.go b/pkg/commands/service/logging/newrelicotlp/create.go index 605dd6cf9..5fcfbff82 100644 --- a/pkg/commands/service/logging/newrelicotlp/create.go +++ b/pkg/commands/service/logging/newrelicotlp/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/newrelicotlp/delete.go b/pkg/commands/service/logging/newrelicotlp/delete.go index f2acadd85..ce3f2f1e9 100644 --- a/pkg/commands/service/logging/newrelicotlp/delete.go +++ b/pkg/commands/service/logging/newrelicotlp/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/newrelicotlp/describe.go b/pkg/commands/service/logging/newrelicotlp/describe.go index 07fc845f3..75f457469 100644 --- a/pkg/commands/service/logging/newrelicotlp/describe.go +++ b/pkg/commands/service/logging/newrelicotlp/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/newrelicotlp/list.go b/pkg/commands/service/logging/newrelicotlp/list.go index f9469209e..3acf59010 100644 --- a/pkg/commands/service/logging/newrelicotlp/list.go +++ b/pkg/commands/service/logging/newrelicotlp/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/newrelicotlp/newrelicotlp_test.go b/pkg/commands/service/logging/newrelicotlp/newrelicotlp_test.go index 63ba50464..979b71207 100644 --- a/pkg/commands/service/logging/newrelicotlp/newrelicotlp_test.go +++ b/pkg/commands/service/logging/newrelicotlp/newrelicotlp_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" serviceRoot "github.com/fastly/cli/pkg/commands/service" loggingRoot "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/newrelicotlp/update.go b/pkg/commands/service/logging/newrelicotlp/update.go index 9016e4280..983e9a2ba 100644 --- a/pkg/commands/service/logging/newrelicotlp/update.go +++ b/pkg/commands/service/logging/newrelicotlp/update.go @@ -4,8 +4,9 @@ import ( "context" "fmt" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -153,7 +154,11 @@ func (c *UpdateCommand) constructInput(serviceID string, serviceVersion int) *fa input.NewName = &c.newName.Value } if c.placement.WasSet { - input.Placement = &c.placement.Value + if strings.TrimSpace(c.placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.placement.Value) + } } if c.processingregion.WasSet { input.ProcessingRegion = &c.processingregion.Value diff --git a/pkg/commands/service/logging/openstack/create.go b/pkg/commands/service/logging/openstack/create.go index aaa1e9c08..2d4dc4414 100644 --- a/pkg/commands/service/logging/openstack/create.go +++ b/pkg/commands/service/logging/openstack/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/openstack/delete.go b/pkg/commands/service/logging/openstack/delete.go index 78e2d01db..07466b006 100644 --- a/pkg/commands/service/logging/openstack/delete.go +++ b/pkg/commands/service/logging/openstack/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/openstack/describe.go b/pkg/commands/service/logging/openstack/describe.go index 589ba033a..9d75e1ce1 100644 --- a/pkg/commands/service/logging/openstack/describe.go +++ b/pkg/commands/service/logging/openstack/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/openstack/list.go b/pkg/commands/service/logging/openstack/list.go index e4fb28e65..a1db2a4c5 100644 --- a/pkg/commands/service/logging/openstack/list.go +++ b/pkg/commands/service/logging/openstack/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/openstack/openstack_integration_test.go b/pkg/commands/service/logging/openstack/openstack_integration_test.go index de5a0014a..725fbfb23 100644 --- a/pkg/commands/service/logging/openstack/openstack_integration_test.go +++ b/pkg/commands/service/logging/openstack/openstack_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/openstack/openstack_test.go b/pkg/commands/service/logging/openstack/openstack_test.go index e79683d72..cac593b87 100644 --- a/pkg/commands/service/logging/openstack/openstack_test.go +++ b/pkg/commands/service/logging/openstack/openstack_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/openstack" @@ -135,7 +135,38 @@ func TestUpdateOpenstackInput(t *testing.T) { ResponseCondition: fastly.ToPointer("new8"), MessageType: fastly.ToPointer("new9"), TimestampFormat: fastly.ToPointer("new10"), - Placement: fastly.ToPointer("new11"), + Placement: fastly.NewNullable("new11"), + PublicKey: fastly.ToPointer("new12"), + CompressionCodec: fastly.ToPointer("new13"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetOpenstackFn: getOpenstackOK, + }, + want: &fastly.UpdateOpenstackInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + BucketName: fastly.ToPointer("new2"), + User: fastly.ToPointer("new3"), + AccessKey: fastly.ToPointer("new4"), + URL: fastly.ToPointer("new5"), + Path: fastly.ToPointer("new6"), + Period: fastly.ToPointer(3601), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new8"), + MessageType: fastly.ToPointer("new9"), + TimestampFormat: fastly.ToPointer("new10"), + Placement: fastly.NullValue[string](), PublicKey: fastly.ToPointer("new12"), CompressionCodec: fastly.ToPointer("new13"), ProcessingRegion: fastly.ToPointer("eu"), @@ -384,6 +415,12 @@ func updateCommandAll() *openstack.UpdateCommand { } } +func updateCommandPlacementReset() *openstack.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *openstack.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/openstack/update.go b/pkg/commands/service/logging/openstack/update.go index 9cdfe193f..d36a83702 100644 --- a/pkg/commands/service/logging/openstack/update.go +++ b/pkg/commands/service/logging/openstack/update.go @@ -3,8 +3,9 @@ package openstack import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -165,7 +166,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.PublicKey.WasSet { diff --git a/pkg/commands/service/logging/papertrail/create.go b/pkg/commands/service/logging/papertrail/create.go index d6d8885f8..a0c5264bd 100644 --- a/pkg/commands/service/logging/papertrail/create.go +++ b/pkg/commands/service/logging/papertrail/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/papertrail/delete.go b/pkg/commands/service/logging/papertrail/delete.go index f6b47f05f..e8fac3164 100644 --- a/pkg/commands/service/logging/papertrail/delete.go +++ b/pkg/commands/service/logging/papertrail/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/papertrail/describe.go b/pkg/commands/service/logging/papertrail/describe.go index d9b06bd4a..1e81aec04 100644 --- a/pkg/commands/service/logging/papertrail/describe.go +++ b/pkg/commands/service/logging/papertrail/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/papertrail/list.go b/pkg/commands/service/logging/papertrail/list.go index 17f9a3771..bde7f0915 100644 --- a/pkg/commands/service/logging/papertrail/list.go +++ b/pkg/commands/service/logging/papertrail/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/papertrail/papertrail_integration_test.go b/pkg/commands/service/logging/papertrail/papertrail_integration_test.go index 88ee8f3e2..3dda72b94 100644 --- a/pkg/commands/service/logging/papertrail/papertrail_integration_test.go +++ b/pkg/commands/service/logging/papertrail/papertrail_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/papertrail/papertrail_test.go b/pkg/commands/service/logging/papertrail/papertrail_test.go index 21fed7036..e2d932229 100644 --- a/pkg/commands/service/logging/papertrail/papertrail_test.go +++ b/pkg/commands/service/logging/papertrail/papertrail_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/papertrail" @@ -131,7 +131,29 @@ func TestUpdatePapertrailInput(t *testing.T) { Format: fastly.ToPointer("new3"), FormatVersion: fastly.ToPointer(3), ResponseCondition: fastly.ToPointer("new4"), - Placement: fastly.ToPointer("new5"), + Placement: fastly.NewNullable("new5"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetPapertrailFn: getPapertrailOK, + }, + want: &fastly.UpdatePapertrailInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Address: fastly.ToPointer("new2"), + Port: fastly.ToPointer(23), + Format: fastly.ToPointer("new3"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new4"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -344,6 +366,12 @@ func updateCommandAll() *papertrail.UpdateCommand { } } +func updateCommandPlacementReset() *papertrail.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *papertrail.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/papertrail/update.go b/pkg/commands/service/logging/papertrail/update.go index 83f24a01f..f3e45e3c0 100644 --- a/pkg/commands/service/logging/papertrail/update.go +++ b/pkg/commands/service/logging/papertrail/update.go @@ -3,8 +3,9 @@ package papertrail import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -122,7 +123,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/s3/create.go b/pkg/commands/service/logging/s3/create.go index b99567f42..f95950b79 100644 --- a/pkg/commands/service/logging/s3/create.go +++ b/pkg/commands/service/logging/s3/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/s3/delete.go b/pkg/commands/service/logging/s3/delete.go index 72898500b..082786b3e 100644 --- a/pkg/commands/service/logging/s3/delete.go +++ b/pkg/commands/service/logging/s3/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/s3/describe.go b/pkg/commands/service/logging/s3/describe.go index 1e638ddfd..508f57bc1 100644 --- a/pkg/commands/service/logging/s3/describe.go +++ b/pkg/commands/service/logging/s3/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/s3/list.go b/pkg/commands/service/logging/s3/list.go index 1a5308260..e3ba20ab3 100644 --- a/pkg/commands/service/logging/s3/list.go +++ b/pkg/commands/service/logging/s3/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/s3/s3_integration_test.go b/pkg/commands/service/logging/s3/s3_integration_test.go index 0f1a5fd93..81a1cdddf 100644 --- a/pkg/commands/service/logging/s3/s3_integration_test.go +++ b/pkg/commands/service/logging/s3/s3_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/s3/s3_test.go b/pkg/commands/service/logging/s3/s3_test.go index 726a71a89..9f1951c0c 100644 --- a/pkg/commands/service/logging/s3/s3_test.go +++ b/pkg/commands/service/logging/s3/s3_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/s3" @@ -165,7 +165,42 @@ func TestUpdateS3Input(t *testing.T) { MessageType: fastly.ToPointer("new8"), ResponseCondition: fastly.ToPointer("new9"), TimestampFormat: fastly.ToPointer("new10"), - Placement: fastly.ToPointer("new11"), + Placement: fastly.NewNullable("new11"), + Redundancy: fastly.ToPointer(fastly.S3RedundancyReduced), + ServerSideEncryption: fastly.ToPointer(fastly.S3ServerSideEncryptionKMS), + ServerSideEncryptionKMSKeyID: fastly.ToPointer("new12"), + PublicKey: fastly.ToPointer("new13"), + CompressionCodec: fastly.ToPointer("new14"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetS3Fn: getS3OK, + }, + want: &fastly.UpdateS3Input{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + BucketName: fastly.ToPointer("new2"), + AccessKey: fastly.ToPointer("new3"), + SecretKey: fastly.ToPointer("new4"), + IAMRole: fastly.ToPointer(""), + Domain: fastly.ToPointer("new5"), + Path: fastly.ToPointer("new6"), + Period: fastly.ToPointer(3601), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new7"), + FormatVersion: fastly.ToPointer(3), + MessageType: fastly.ToPointer("new8"), + ResponseCondition: fastly.ToPointer("new9"), + TimestampFormat: fastly.ToPointer("new10"), + Placement: fastly.NullValue[string](), Redundancy: fastly.ToPointer(fastly.S3RedundancyReduced), ServerSideEncryption: fastly.ToPointer(fastly.S3ServerSideEncryptionKMS), ServerSideEncryptionKMSKeyID: fastly.ToPointer("new12"), @@ -448,6 +483,12 @@ func updateCommandAll() *s3.UpdateCommand { } } +func updateCommandPlacementReset() *s3.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *s3.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/s3/update.go b/pkg/commands/service/logging/s3/update.go index a5f83d898..42acb7dc7 100644 --- a/pkg/commands/service/logging/s3/update.go +++ b/pkg/commands/service/logging/s3/update.go @@ -3,8 +3,9 @@ package s3 import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -182,7 +183,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/scalyr/create.go b/pkg/commands/service/logging/scalyr/create.go index 4cb385d73..75b69f914 100644 --- a/pkg/commands/service/logging/scalyr/create.go +++ b/pkg/commands/service/logging/scalyr/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/scalyr/delete.go b/pkg/commands/service/logging/scalyr/delete.go index ad6857bbe..31d7e0d1e 100644 --- a/pkg/commands/service/logging/scalyr/delete.go +++ b/pkg/commands/service/logging/scalyr/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/scalyr/describe.go b/pkg/commands/service/logging/scalyr/describe.go index 7faefad5f..7920e7b2c 100644 --- a/pkg/commands/service/logging/scalyr/describe.go +++ b/pkg/commands/service/logging/scalyr/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/scalyr/list.go b/pkg/commands/service/logging/scalyr/list.go index 8a4184580..5cc831cc9 100644 --- a/pkg/commands/service/logging/scalyr/list.go +++ b/pkg/commands/service/logging/scalyr/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/scalyr/scalyr_integration_test.go b/pkg/commands/service/logging/scalyr/scalyr_integration_test.go index 71bfd1069..643bb7223 100644 --- a/pkg/commands/service/logging/scalyr/scalyr_integration_test.go +++ b/pkg/commands/service/logging/scalyr/scalyr_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" fsterrs "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/service/logging/scalyr/scalyr_test.go b/pkg/commands/service/logging/scalyr/scalyr_test.go index 4befdcf3a..aac112c20 100644 --- a/pkg/commands/service/logging/scalyr/scalyr_test.go +++ b/pkg/commands/service/logging/scalyr/scalyr_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/scalyr" @@ -131,7 +131,30 @@ func TestUpdateScalyrInput(t *testing.T) { FormatVersion: fastly.ToPointer(3), Format: fastly.ToPointer("new3"), ResponseCondition: fastly.ToPointer("new4"), - Placement: fastly.ToPointer("new5"), + Placement: fastly.NewNullable("new5"), + Region: fastly.ToPointer("new6"), + ProjectID: fastly.ToPointer("new7"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetScalyrFn: getScalyrOK, + }, + want: &fastly.UpdateScalyrInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Token: fastly.ToPointer("new2"), + FormatVersion: fastly.ToPointer(3), + Format: fastly.ToPointer("new3"), + ResponseCondition: fastly.ToPointer("new4"), + Placement: fastly.NullValue[string](), Region: fastly.ToPointer("new6"), ProjectID: fastly.ToPointer("new7"), ProcessingRegion: fastly.ToPointer("eu"), @@ -348,6 +371,12 @@ func updateCommandAll() *scalyr.UpdateCommand { } } +func updateCommandPlacementReset() *scalyr.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *scalyr.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/scalyr/update.go b/pkg/commands/service/logging/scalyr/update.go index 4b14297de..6daf5f5bd 100644 --- a/pkg/commands/service/logging/scalyr/update.go +++ b/pkg/commands/service/logging/scalyr/update.go @@ -3,8 +3,9 @@ package scalyr import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -112,7 +113,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f input.ResponseCondition = &c.ResponseCondition.Value } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { input.ProcessingRegion = &c.ProcessingRegion.Value diff --git a/pkg/commands/service/logging/sftp/create.go b/pkg/commands/service/logging/sftp/create.go index 5763b2eeb..51ff8234b 100644 --- a/pkg/commands/service/logging/sftp/create.go +++ b/pkg/commands/service/logging/sftp/create.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/sftp/delete.go b/pkg/commands/service/logging/sftp/delete.go index 43e2e5883..61aa015bc 100644 --- a/pkg/commands/service/logging/sftp/delete.go +++ b/pkg/commands/service/logging/sftp/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/sftp/describe.go b/pkg/commands/service/logging/sftp/describe.go index 3540c331f..361299494 100644 --- a/pkg/commands/service/logging/sftp/describe.go +++ b/pkg/commands/service/logging/sftp/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/sftp/list.go b/pkg/commands/service/logging/sftp/list.go index f5164d632..d853a2221 100644 --- a/pkg/commands/service/logging/sftp/list.go +++ b/pkg/commands/service/logging/sftp/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/sftp/sftp_integration_test.go b/pkg/commands/service/logging/sftp/sftp_integration_test.go index 560852413..11a68630d 100644 --- a/pkg/commands/service/logging/sftp/sftp_integration_test.go +++ b/pkg/commands/service/logging/sftp/sftp_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/sftp/sftp_test.go b/pkg/commands/service/logging/sftp/sftp_test.go index a8baf99a7..5a18849a1 100644 --- a/pkg/commands/service/logging/sftp/sftp_test.go +++ b/pkg/commands/service/logging/sftp/sftp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/sftp" @@ -138,7 +138,40 @@ func TestUpdateSFTPInput(t *testing.T) { Format: fastly.ToPointer("new9"), ResponseCondition: fastly.ToPointer("new10"), TimestampFormat: fastly.ToPointer("new11"), - Placement: fastly.ToPointer("new12"), + Placement: fastly.NewNullable("new12"), + MessageType: fastly.ToPointer("new13"), + CompressionCodec: fastly.ToPointer("new14"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetSFTPFn: getSFTPOK, + }, + want: &fastly.UpdateSFTPInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Address: fastly.ToPointer("new2"), + Port: fastly.ToPointer(81), + User: fastly.ToPointer("new3"), + SSHKnownHosts: fastly.ToPointer("new4"), + Password: fastly.ToPointer("new5"), + PublicKey: fastly.ToPointer("new6"), + SecretKey: fastly.ToPointer("new7"), + Path: fastly.ToPointer("new8"), + Period: fastly.ToPointer(3601), + FormatVersion: fastly.ToPointer(3), + GzipLevel: fastly.ToPointer(0), + Format: fastly.ToPointer("new9"), + ResponseCondition: fastly.ToPointer("new10"), + TimestampFormat: fastly.ToPointer("new11"), + Placement: fastly.NullValue[string](), MessageType: fastly.ToPointer("new13"), CompressionCodec: fastly.ToPointer("new14"), ProcessingRegion: fastly.ToPointer("eu"), @@ -390,6 +423,12 @@ func updateCommandAll() *sftp.UpdateCommand { } } +func updateCommandPlacementReset() *sftp.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *sftp.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/sftp/update.go b/pkg/commands/service/logging/sftp/update.go index 2356d39e5..966654c39 100644 --- a/pkg/commands/service/logging/sftp/update.go +++ b/pkg/commands/service/logging/sftp/update.go @@ -3,8 +3,9 @@ package sftp import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -179,7 +180,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.CompressionCodec.WasSet { diff --git a/pkg/commands/service/logging/splunk/create.go b/pkg/commands/service/logging/splunk/create.go index f87608acf..5bf0f1e54 100644 --- a/pkg/commands/service/logging/splunk/create.go +++ b/pkg/commands/service/logging/splunk/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/splunk/delete.go b/pkg/commands/service/logging/splunk/delete.go index 0bbde22d2..b07e36da7 100644 --- a/pkg/commands/service/logging/splunk/delete.go +++ b/pkg/commands/service/logging/splunk/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/splunk/describe.go b/pkg/commands/service/logging/splunk/describe.go index 1727c28ac..1ccd3fbe1 100644 --- a/pkg/commands/service/logging/splunk/describe.go +++ b/pkg/commands/service/logging/splunk/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/splunk/list.go b/pkg/commands/service/logging/splunk/list.go index 4be792f42..80e6d20d5 100644 --- a/pkg/commands/service/logging/splunk/list.go +++ b/pkg/commands/service/logging/splunk/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/splunk/splunk_integration_test.go b/pkg/commands/service/logging/splunk/splunk_integration_test.go index 8598a52f1..992c6e948 100644 --- a/pkg/commands/service/logging/splunk/splunk_integration_test.go +++ b/pkg/commands/service/logging/splunk/splunk_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" parent "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/splunk/splunk_test.go b/pkg/commands/service/logging/splunk/splunk_test.go index 720b598e4..34c62d825 100644 --- a/pkg/commands/service/logging/splunk/splunk_test.go +++ b/pkg/commands/service/logging/splunk/splunk_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/splunk" @@ -134,7 +134,33 @@ func TestUpdateSplunkInput(t *testing.T) { Format: fastly.ToPointer("new3"), FormatVersion: fastly.ToPointer(3), ResponseCondition: fastly.ToPointer("new4"), - Placement: fastly.ToPointer("new5"), + Placement: fastly.NewNullable("new5"), + Token: fastly.ToPointer("new6"), + TLSCACert: fastly.ToPointer("new7"), + TLSHostname: fastly.ToPointer("new8"), + TLSClientCert: fastly.ToPointer("new9"), + TLSClientKey: fastly.ToPointer("new10"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetSplunkFn: getSplunkOK, + }, + want: &fastly.UpdateSplunkInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + URL: fastly.ToPointer("new2"), + Format: fastly.ToPointer("new3"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new4"), + Placement: fastly.NullValue[string](), Token: fastly.ToPointer("new6"), TLSCACert: fastly.ToPointer("new7"), TLSHostname: fastly.ToPointer("new8"), @@ -361,6 +387,12 @@ func updateCommandAll() *splunk.UpdateCommand { } } +func updateCommandPlacementReset() *splunk.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *splunk.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/splunk/update.go b/pkg/commands/service/logging/splunk/update.go index 1e3a43960..1d2691114 100644 --- a/pkg/commands/service/logging/splunk/update.go +++ b/pkg/commands/service/logging/splunk/update.go @@ -3,8 +3,9 @@ package splunk import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -69,7 +70,7 @@ func NewUpdateCommand(parent argparser.Registerer, g *global.Data) *UpdateComman c.CmdClause.Flag("new-name", "New name of the Splunk logging object").Action(c.NewName.Set).StringVar(&c.NewName.Value) logflags.Format(c.CmdClause, &c.Format) logflags.FormatVersion(c.CmdClause, &c.FormatVersion) - 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. This field is not required and has no default value").Action(c.Placement.Set).StringVar(&c.Placement.Value) + logflags.Placement(c.CmdClause, &c.Placement) logflags.ProcessingRegion(c.CmdClause, &c.ProcessingRegion, "Splunk") logflags.ResponseCondition(c.CmdClause, &c.ResponseCondition) c.RegisterFlag(argparser.StringFlagOpts{ @@ -122,7 +123,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/sumologic/create.go b/pkg/commands/service/logging/sumologic/create.go index 172473c25..61060d382 100644 --- a/pkg/commands/service/logging/sumologic/create.go +++ b/pkg/commands/service/logging/sumologic/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/sumologic/delete.go b/pkg/commands/service/logging/sumologic/delete.go index be2b829e9..8283357ad 100644 --- a/pkg/commands/service/logging/sumologic/delete.go +++ b/pkg/commands/service/logging/sumologic/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/sumologic/describe.go b/pkg/commands/service/logging/sumologic/describe.go index 541c55062..88e5101e8 100644 --- a/pkg/commands/service/logging/sumologic/describe.go +++ b/pkg/commands/service/logging/sumologic/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/sumologic/list.go b/pkg/commands/service/logging/sumologic/list.go index 75aadbf92..296af865c 100644 --- a/pkg/commands/service/logging/sumologic/list.go +++ b/pkg/commands/service/logging/sumologic/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/sumologic/sumologic_integration_test.go b/pkg/commands/service/logging/sumologic/sumologic_integration_test.go index 9fdf00ca6..cacdca0b3 100644 --- a/pkg/commands/service/logging/sumologic/sumologic_integration_test.go +++ b/pkg/commands/service/logging/sumologic/sumologic_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" parent "github.com/fastly/cli/pkg/commands/service/logging" diff --git a/pkg/commands/service/logging/sumologic/sumologic_test.go b/pkg/commands/service/logging/sumologic/sumologic_test.go index d8e92257c..6b53ee5f8 100644 --- a/pkg/commands/service/logging/sumologic/sumologic_test.go +++ b/pkg/commands/service/logging/sumologic/sumologic_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/sumologic" @@ -130,7 +130,29 @@ func TestUpdateSumologicInput(t *testing.T) { Format: fastly.ToPointer("new3"), FormatVersion: fastly.ToPointer(3), ResponseCondition: fastly.ToPointer("new4"), - Placement: fastly.ToPointer("new5"), + Placement: fastly.NewNullable("new5"), + MessageType: fastly.ToPointer("new6"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetSumologicFn: getSumologicOK, + }, + want: &fastly.UpdateSumologicInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + URL: fastly.ToPointer("new2"), + Format: fastly.ToPointer("new3"), + FormatVersion: fastly.ToPointer(3), + ResponseCondition: fastly.ToPointer("new4"), + Placement: fastly.NullValue[string](), MessageType: fastly.ToPointer("new6"), ProcessingRegion: fastly.ToPointer("eu"), }, @@ -344,6 +366,12 @@ func updateCommandAll() *sumologic.UpdateCommand { } } +func updateCommandPlacementReset() *sumologic.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *sumologic.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/sumologic/update.go b/pkg/commands/service/logging/sumologic/update.go index 047dc8080..7abd54e54 100644 --- a/pkg/commands/service/logging/sumologic/update.go +++ b/pkg/commands/service/logging/sumologic/update.go @@ -3,8 +3,9 @@ package sumologic import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -118,7 +119,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/logging/syslog/create.go b/pkg/commands/service/logging/syslog/create.go index 33c86a908..84c55b38c 100644 --- a/pkg/commands/service/logging/syslog/create.go +++ b/pkg/commands/service/logging/syslog/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/syslog/delete.go b/pkg/commands/service/logging/syslog/delete.go index 4440df2a0..fe11ffb5b 100644 --- a/pkg/commands/service/logging/syslog/delete.go +++ b/pkg/commands/service/logging/syslog/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/logging/syslog/describe.go b/pkg/commands/service/logging/syslog/describe.go index 77c7f1011..9c8178fa9 100644 --- a/pkg/commands/service/logging/syslog/describe.go +++ b/pkg/commands/service/logging/syslog/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/syslog/list.go b/pkg/commands/service/logging/syslog/list.go index fb7ade9c2..96f5cfc00 100644 --- a/pkg/commands/service/logging/syslog/list.go +++ b/pkg/commands/service/logging/syslog/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/logging/syslog/syslog_integration_test.go b/pkg/commands/service/logging/syslog/syslog_integration_test.go index f95b9ba6f..da1b1853b 100644 --- a/pkg/commands/service/logging/syslog/syslog_integration_test.go +++ b/pkg/commands/service/logging/syslog/syslog_integration_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/logging/syslog/syslog_test.go b/pkg/commands/service/logging/syslog/syslog_test.go index b57794122..eb345a0a0 100644 --- a/pkg/commands/service/logging/syslog/syslog_test.go +++ b/pkg/commands/service/logging/syslog/syslog_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/commands/service/logging/syslog" @@ -145,7 +145,36 @@ func TestUpdateSyslogInput(t *testing.T) { FormatVersion: fastly.ToPointer(3), MessageType: fastly.ToPointer("new9"), ResponseCondition: fastly.ToPointer("new10"), - Placement: fastly.ToPointer("new11"), + Placement: fastly.NewNullable("new11"), + ProcessingRegion: fastly.ToPointer("eu"), + }, + }, + { + name: "reset placement to null", + cmd: updateCommandPlacementReset(), + api: mock.API{ + GetVersionFn: testutil.GetVersion, + CloneVersionFn: testutil.CloneVersionResult(4), + GetSyslogFn: getSyslogOK, + }, + want: &fastly.UpdateSyslogInput{ + ServiceID: "123", + ServiceVersion: 4, + Name: "log", + NewName: fastly.ToPointer("new1"), + Address: fastly.ToPointer("new2"), + Port: fastly.ToPointer(23), + UseTLS: fastly.ToPointer(fastly.Compatibool(false)), + TLSCACert: fastly.ToPointer("new3"), + TLSHostname: fastly.ToPointer("new4"), + TLSClientCert: fastly.ToPointer("new5"), + TLSClientKey: fastly.ToPointer("new6"), + Token: fastly.ToPointer("new7"), + Format: fastly.ToPointer("new8"), + FormatVersion: fastly.ToPointer(3), + MessageType: fastly.ToPointer("new9"), + ResponseCondition: fastly.ToPointer("new10"), + Placement: fastly.NullValue[string](), ProcessingRegion: fastly.ToPointer("eu"), }, }, @@ -372,6 +401,12 @@ func updateCommandAll() *syslog.UpdateCommand { } } +func updateCommandPlacementReset() *syslog.UpdateCommand { + c := updateCommandAll() + c.Placement = argparser.OptionalString{Optional: argparser.Optional{WasSet: true}, Value: ""} + return c +} + func updateCommandMissingServiceID() *syslog.UpdateCommand { res := updateCommandAll() res.Manifest = manifest.Data{} diff --git a/pkg/commands/service/logging/syslog/update.go b/pkg/commands/service/logging/syslog/update.go index f6d3a024f..c38b870b1 100644 --- a/pkg/commands/service/logging/syslog/update.go +++ b/pkg/commands/service/logging/syslog/update.go @@ -3,8 +3,9 @@ package syslog import ( "context" "io" + "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" @@ -160,7 +161,11 @@ func (c *UpdateCommand) ConstructInput(serviceID string, serviceVersion int) (*f } if c.Placement.WasSet { - input.Placement = &c.Placement.Value + if strings.TrimSpace(c.Placement.Value) == "" { + input.Placement = fastly.NullValue[string]() + } else { + input.Placement = fastly.NewNullable(c.Placement.Value) + } } if c.ProcessingRegion.WasSet { diff --git a/pkg/commands/service/purge/purge.go b/pkg/commands/service/purge/purge.go index 5a0dcf24f..4d5dd0d40 100644 --- a/pkg/commands/service/purge/purge.go +++ b/pkg/commands/service/purge/purge.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sort" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/purge/purge_test.go b/pkg/commands/service/purge/purge_test.go index b135ea324..88aff5363 100644 --- a/pkg/commands/service/purge/purge_test.go +++ b/pkg/commands/service/purge/purge_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" purge "github.com/fastly/cli/pkg/commands/service/purge" diff --git a/pkg/commands/service/ratelimit/create.go b/pkg/commands/service/ratelimit/create.go index f0431bc3f..df68fbe5a 100644 --- a/pkg/commands/service/ratelimit/create.go +++ b/pkg/commands/service/ratelimit/create.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/ratelimit/delete.go b/pkg/commands/service/ratelimit/delete.go index ddbce4292..7d584f58e 100644 --- a/pkg/commands/service/ratelimit/delete.go +++ b/pkg/commands/service/ratelimit/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/ratelimit/describe.go b/pkg/commands/service/ratelimit/describe.go index 9ac5c2ca3..a261e8a85 100644 --- a/pkg/commands/service/ratelimit/describe.go +++ b/pkg/commands/service/ratelimit/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/ratelimit/list.go b/pkg/commands/service/ratelimit/list.go index 082214edc..1a464934a 100644 --- a/pkg/commands/service/ratelimit/list.go +++ b/pkg/commands/service/ratelimit/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/ratelimit/ratelimit_test.go b/pkg/commands/service/ratelimit/ratelimit_test.go index 6559baf32..f0e1e010b 100644 --- a/pkg/commands/service/ratelimit/ratelimit_test.go +++ b/pkg/commands/service/ratelimit/ratelimit_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/ratelimit" diff --git a/pkg/commands/service/ratelimit/update.go b/pkg/commands/service/ratelimit/update.go index 1b401b656..e1b0e09cb 100644 --- a/pkg/commands/service/ratelimit/update.go +++ b/pkg/commands/service/ratelimit/update.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/resourcelink/create.go b/pkg/commands/service/resourcelink/create.go index 5417fdd12..4ab077a11 100644 --- a/pkg/commands/service/resourcelink/create.go +++ b/pkg/commands/service/resourcelink/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/resourcelink/delete.go b/pkg/commands/service/resourcelink/delete.go index f9db75518..0329ab2d0 100644 --- a/pkg/commands/service/resourcelink/delete.go +++ b/pkg/commands/service/resourcelink/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/resourcelink/describe.go b/pkg/commands/service/resourcelink/describe.go index 6852eb203..1eb5464b5 100644 --- a/pkg/commands/service/resourcelink/describe.go +++ b/pkg/commands/service/resourcelink/describe.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/resourcelink/list.go b/pkg/commands/service/resourcelink/list.go index 47640fb83..e76da68da 100644 --- a/pkg/commands/service/resourcelink/list.go +++ b/pkg/commands/service/resourcelink/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/resourcelink/resourcelink_test.go b/pkg/commands/service/resourcelink/resourcelink_test.go index 99029423e..4d3d6802f 100644 --- a/pkg/commands/service/resourcelink/resourcelink_test.go +++ b/pkg/commands/service/resourcelink/resourcelink_test.go @@ -8,7 +8,7 @@ import ( root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/resourcelink" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/mock" "github.com/fastly/cli/pkg/testutil" diff --git a/pkg/commands/service/resourcelink/update.go b/pkg/commands/service/resourcelink/update.go index 75c7d22aa..fd4092780 100644 --- a/pkg/commands/service/resourcelink/update.go +++ b/pkg/commands/service/resourcelink/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/search.go b/pkg/commands/service/search.go index f55f81b04..80459b0fb 100644 --- a/pkg/commands/service/search.go +++ b/pkg/commands/service/search.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/service_test.go b/pkg/commands/service/service_test.go index 08cfb9a6e..1e23bf383 100644 --- a/pkg/commands/service/service_test.go +++ b/pkg/commands/service/service_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" root "github.com/fastly/cli/pkg/commands/service" diff --git a/pkg/commands/service/update.go b/pkg/commands/service/update.go index 8a0c335fd..233005593 100644 --- a/pkg/commands/service/update.go +++ b/pkg/commands/service/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/service/vcl/condition/condition_test.go b/pkg/commands/service/vcl/condition/condition_test.go index c93822ad4..c33e96552 100644 --- a/pkg/commands/service/vcl/condition/condition_test.go +++ b/pkg/commands/service/vcl/condition/condition_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" top "github.com/fastly/cli/pkg/commands/service" root "github.com/fastly/cli/pkg/commands/service/vcl" diff --git a/pkg/commands/service/vcl/condition/create.go b/pkg/commands/service/vcl/condition/create.go index 5c1ff9a4b..173cab12c 100644 --- a/pkg/commands/service/vcl/condition/create.go +++ b/pkg/commands/service/vcl/condition/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/condition/delete.go b/pkg/commands/service/vcl/condition/delete.go index ece581969..4bffb4740 100644 --- a/pkg/commands/service/vcl/condition/delete.go +++ b/pkg/commands/service/vcl/condition/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/condition/describe.go b/pkg/commands/service/vcl/condition/describe.go index 9a3a7105c..f0919d3b7 100644 --- a/pkg/commands/service/vcl/condition/describe.go +++ b/pkg/commands/service/vcl/condition/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/condition/list.go b/pkg/commands/service/vcl/condition/list.go index 393d77841..f725a4eaa 100644 --- a/pkg/commands/service/vcl/condition/list.go +++ b/pkg/commands/service/vcl/condition/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/condition/update.go b/pkg/commands/service/vcl/condition/update.go index 2042c8c7c..280b35ec5 100644 --- a/pkg/commands/service/vcl/condition/update.go +++ b/pkg/commands/service/vcl/condition/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/custom/create.go b/pkg/commands/service/vcl/custom/create.go index 71f11f0fe..1ac4fe575 100644 --- a/pkg/commands/service/vcl/custom/create.go +++ b/pkg/commands/service/vcl/custom/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/custom/custom_test.go b/pkg/commands/service/vcl/custom/custom_test.go index bfb6c51cf..2565da0b0 100644 --- a/pkg/commands/service/vcl/custom/custom_test.go +++ b/pkg/commands/service/vcl/custom/custom_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" top "github.com/fastly/cli/pkg/commands/service" root "github.com/fastly/cli/pkg/commands/service/vcl" diff --git a/pkg/commands/service/vcl/custom/delete.go b/pkg/commands/service/vcl/custom/delete.go index 44f6a4464..1ff45ea20 100644 --- a/pkg/commands/service/vcl/custom/delete.go +++ b/pkg/commands/service/vcl/custom/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/custom/describe.go b/pkg/commands/service/vcl/custom/describe.go index 3208983f2..a9952550a 100644 --- a/pkg/commands/service/vcl/custom/describe.go +++ b/pkg/commands/service/vcl/custom/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/custom/list.go b/pkg/commands/service/vcl/custom/list.go index c72699936..5e58ac76d 100644 --- a/pkg/commands/service/vcl/custom/list.go +++ b/pkg/commands/service/vcl/custom/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/custom/update.go b/pkg/commands/service/vcl/custom/update.go index 67564c062..6cd6372df 100644 --- a/pkg/commands/service/vcl/custom/update.go +++ b/pkg/commands/service/vcl/custom/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/describe.go b/pkg/commands/service/vcl/describe.go index 04f1b192d..d0987c0e2 100644 --- a/pkg/commands/service/vcl/describe.go +++ b/pkg/commands/service/vcl/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/snippet/create.go b/pkg/commands/service/vcl/snippet/create.go index c140d2458..131d69c2e 100644 --- a/pkg/commands/service/vcl/snippet/create.go +++ b/pkg/commands/service/vcl/snippet/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/snippet/delete.go b/pkg/commands/service/vcl/snippet/delete.go index 3f8539cc6..ed93f1c50 100644 --- a/pkg/commands/service/vcl/snippet/delete.go +++ b/pkg/commands/service/vcl/snippet/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/snippet/describe.go b/pkg/commands/service/vcl/snippet/describe.go index 010be1d6c..ec55d8dcb 100644 --- a/pkg/commands/service/vcl/snippet/describe.go +++ b/pkg/commands/service/vcl/snippet/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/snippet/list.go b/pkg/commands/service/vcl/snippet/list.go index ed0d07d57..d63436eaf 100644 --- a/pkg/commands/service/vcl/snippet/list.go +++ b/pkg/commands/service/vcl/snippet/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/vcl/snippet/snippet_test.go b/pkg/commands/service/vcl/snippet/snippet_test.go index d4f30e564..479abd7d8 100644 --- a/pkg/commands/service/vcl/snippet/snippet_test.go +++ b/pkg/commands/service/vcl/snippet/snippet_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" top "github.com/fastly/cli/pkg/commands/service" root "github.com/fastly/cli/pkg/commands/service/vcl" diff --git a/pkg/commands/service/vcl/snippet/update.go b/pkg/commands/service/vcl/snippet/update.go index 1a603c71d..be274aee1 100644 --- a/pkg/commands/service/vcl/snippet/update.go +++ b/pkg/commands/service/vcl/snippet/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/vcl/vcl_test.go b/pkg/commands/service/vcl/vcl_test.go index 8de2be833..2542320da 100644 --- a/pkg/commands/service/vcl/vcl_test.go +++ b/pkg/commands/service/vcl/vcl_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/vcl" diff --git a/pkg/commands/service/version/activate.go b/pkg/commands/service/version/activate.go index be89c1185..3efb42ce0 100644 --- a/pkg/commands/service/version/activate.go +++ b/pkg/commands/service/version/activate.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/version/clone.go b/pkg/commands/service/version/clone.go index 6184ab9ae..9e37e8ec6 100644 --- a/pkg/commands/service/version/clone.go +++ b/pkg/commands/service/version/clone.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/version/deactivate.go b/pkg/commands/service/version/deactivate.go index fd14432ed..76ff401c8 100644 --- a/pkg/commands/service/version/deactivate.go +++ b/pkg/commands/service/version/deactivate.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/version/list.go b/pkg/commands/service/version/list.go index c9d0f8cf8..8ddaa4ca6 100644 --- a/pkg/commands/service/version/list.go +++ b/pkg/commands/service/version/list.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/version/lock.go b/pkg/commands/service/version/lock.go index 6d871b122..0db0af950 100644 --- a/pkg/commands/service/version/lock.go +++ b/pkg/commands/service/version/lock.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/version/serviceversion_test.go b/pkg/commands/service/version/serviceversion_test.go index f5ebde299..f25f0e16b 100644 --- a/pkg/commands/service/version/serviceversion_test.go +++ b/pkg/commands/service/version/serviceversion_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/service" sub "github.com/fastly/cli/pkg/commands/service/version" diff --git a/pkg/commands/service/version/stage.go b/pkg/commands/service/version/stage.go index c8c22c20c..909e635e5 100644 --- a/pkg/commands/service/version/stage.go +++ b/pkg/commands/service/version/stage.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/version/unstage.go b/pkg/commands/service/version/unstage.go index fdec10623..de6501a34 100644 --- a/pkg/commands/service/version/unstage.go +++ b/pkg/commands/service/version/unstage.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "4d63.com/optional" diff --git a/pkg/commands/service/version/update.go b/pkg/commands/service/version/update.go index f485afce2..c74079ec2 100644 --- a/pkg/commands/service/version/update.go +++ b/pkg/commands/service/version/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/service/version/validate.go b/pkg/commands/service/version/validate.go index b47693611..bcbfed55b 100644 --- a/pkg/commands/service/version/validate.go +++ b/pkg/commands/service/version/validate.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/sso/sso_test.go b/pkg/commands/sso/sso_test.go index 59846cb04..6674d7a30 100644 --- a/pkg/commands/sso/sso_test.go +++ b/pkg/commands/sso/sso_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/auth" "github.com/fastly/cli/pkg/config" diff --git a/pkg/commands/stats/aggregate.go b/pkg/commands/stats/aggregate.go index e61a84af2..06e713a22 100644 --- a/pkg/commands/stats/aggregate.go +++ b/pkg/commands/stats/aggregate.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/aggregate_test.go b/pkg/commands/stats/aggregate_test.go index a1d06b902..82dd93458 100644 --- a/pkg/commands/stats/aggregate_test.go +++ b/pkg/commands/stats/aggregate_test.go @@ -7,7 +7,7 @@ import ( "io" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/domain_inspector.go b/pkg/commands/stats/domain_inspector.go index 3a3931747..12b539dd8 100644 --- a/pkg/commands/stats/domain_inspector.go +++ b/pkg/commands/stats/domain_inspector.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/domain_inspector_test.go b/pkg/commands/stats/domain_inspector_test.go index 734aab301..bbb3cf6c3 100644 --- a/pkg/commands/stats/domain_inspector_test.go +++ b/pkg/commands/stats/domain_inspector_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/historical.go b/pkg/commands/stats/historical.go index 03ed824f2..2a77c5a4e 100644 --- a/pkg/commands/stats/historical.go +++ b/pkg/commands/stats/historical.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/historical_test.go b/pkg/commands/stats/historical_test.go index 47935d1c7..88d50afd1 100644 --- a/pkg/commands/stats/historical_test.go +++ b/pkg/commands/stats/historical_test.go @@ -5,7 +5,7 @@ import ( "encoding/json" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/stats" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/stats/origin_inspector.go b/pkg/commands/stats/origin_inspector.go index 1173fc9ee..262535da2 100644 --- a/pkg/commands/stats/origin_inspector.go +++ b/pkg/commands/stats/origin_inspector.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/origin_inspector_test.go b/pkg/commands/stats/origin_inspector_test.go index 59d210388..d45640e13 100644 --- a/pkg/commands/stats/origin_inspector_test.go +++ b/pkg/commands/stats/origin_inspector_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/realtime.go b/pkg/commands/stats/realtime.go index a8f36fac6..ec93c5124 100644 --- a/pkg/commands/stats/realtime.go +++ b/pkg/commands/stats/realtime.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/argparser" diff --git a/pkg/commands/stats/regions_test.go b/pkg/commands/stats/regions_test.go index 5dfaad322..7001a2467 100644 --- a/pkg/commands/stats/regions_test.go +++ b/pkg/commands/stats/regions_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/stats" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/stats/template.go b/pkg/commands/stats/template.go index 400d1efef..197efb8b8 100644 --- a/pkg/commands/stats/template.go +++ b/pkg/commands/stats/template.go @@ -8,7 +8,7 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) var blockTemplate = template.Must(template.New("stats_block").Parse( diff --git a/pkg/commands/stats/usage.go b/pkg/commands/stats/usage.go index 5f4779850..f9313d7eb 100644 --- a/pkg/commands/stats/usage.go +++ b/pkg/commands/stats/usage.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/stats/usage_test.go b/pkg/commands/stats/usage_test.go index 347c78656..8d60702e4 100644 --- a/pkg/commands/stats/usage_test.go +++ b/pkg/commands/stats/usage_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/app" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/config/config_test.go b/pkg/commands/tls/config/config_test.go index 25e925a82..b9689a7a5 100644 --- a/pkg/commands/tls/config/config_test.go +++ b/pkg/commands/tls/config/config_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/config" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/tls/config/describe.go b/pkg/commands/tls/config/describe.go index ef2c060ff..a963d2a3e 100644 --- a/pkg/commands/tls/config/describe.go +++ b/pkg/commands/tls/config/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/config/list.go b/pkg/commands/tls/config/list.go index 091062f90..a475a00cb 100644 --- a/pkg/commands/tls/config/list.go +++ b/pkg/commands/tls/config/list.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/config/update.go b/pkg/commands/tls/config/update.go index 74e7b4074..6d3494790 100644 --- a/pkg/commands/tls/config/update.go +++ b/pkg/commands/tls/config/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/activation/activation_test.go b/pkg/commands/tls/custom/activation/activation_test.go index c1212546c..3902d58a8 100644 --- a/pkg/commands/tls/custom/activation/activation_test.go +++ b/pkg/commands/tls/custom/activation/activation_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/custom" sub "github.com/fastly/cli/pkg/commands/tls/custom/activation" diff --git a/pkg/commands/tls/custom/activation/create.go b/pkg/commands/tls/custom/activation/create.go index fb9bcf465..1b1abeead 100644 --- a/pkg/commands/tls/custom/activation/create.go +++ b/pkg/commands/tls/custom/activation/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/activation/delete.go b/pkg/commands/tls/custom/activation/delete.go index 88d5451cc..dbcda2714 100644 --- a/pkg/commands/tls/custom/activation/delete.go +++ b/pkg/commands/tls/custom/activation/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/activation/describe.go b/pkg/commands/tls/custom/activation/describe.go index f3325a207..efa9db916 100644 --- a/pkg/commands/tls/custom/activation/describe.go +++ b/pkg/commands/tls/custom/activation/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/activation/list.go b/pkg/commands/tls/custom/activation/list.go index 1ed574f41..0fda66ef8 100644 --- a/pkg/commands/tls/custom/activation/list.go +++ b/pkg/commands/tls/custom/activation/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/activation/update.go b/pkg/commands/tls/custom/activation/update.go index 35850a6f5..08baa8e13 100644 --- a/pkg/commands/tls/custom/activation/update.go +++ b/pkg/commands/tls/custom/activation/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/certificate/certificate_test.go b/pkg/commands/tls/custom/certificate/certificate_test.go index fea84cbad..2af6d05e6 100644 --- a/pkg/commands/tls/custom/certificate/certificate_test.go +++ b/pkg/commands/tls/custom/certificate/certificate_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/custom" sub "github.com/fastly/cli/pkg/commands/tls/custom/certificate" diff --git a/pkg/commands/tls/custom/certificate/create.go b/pkg/commands/tls/custom/certificate/create.go index 4273578b1..8cbc1f2b4 100644 --- a/pkg/commands/tls/custom/certificate/create.go +++ b/pkg/commands/tls/custom/certificate/create.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/certificate/delete.go b/pkg/commands/tls/custom/certificate/delete.go index c7f4325d8..9b5be6aa8 100644 --- a/pkg/commands/tls/custom/certificate/delete.go +++ b/pkg/commands/tls/custom/certificate/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/certificate/describe.go b/pkg/commands/tls/custom/certificate/describe.go index 188b70f98..0bcdd5376 100644 --- a/pkg/commands/tls/custom/certificate/describe.go +++ b/pkg/commands/tls/custom/certificate/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/certificate/list.go b/pkg/commands/tls/custom/certificate/list.go index 28a9612df..4710dc996 100644 --- a/pkg/commands/tls/custom/certificate/list.go +++ b/pkg/commands/tls/custom/certificate/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/certificate/update.go b/pkg/commands/tls/custom/certificate/update.go index b667cdc8e..11fb8d84d 100644 --- a/pkg/commands/tls/custom/certificate/update.go +++ b/pkg/commands/tls/custom/certificate/update.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/domain/domain_test.go b/pkg/commands/tls/custom/domain/domain_test.go index e382d86de..53dc68980 100644 --- a/pkg/commands/tls/custom/domain/domain_test.go +++ b/pkg/commands/tls/custom/domain/domain_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/custom" sub "github.com/fastly/cli/pkg/commands/tls/custom/domain" diff --git a/pkg/commands/tls/custom/domain/list.go b/pkg/commands/tls/custom/domain/list.go index 40349a56b..e6b7d4d67 100644 --- a/pkg/commands/tls/custom/domain/list.go +++ b/pkg/commands/tls/custom/domain/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/privatekey/create.go b/pkg/commands/tls/custom/privatekey/create.go index 12997d770..ed1e151a6 100644 --- a/pkg/commands/tls/custom/privatekey/create.go +++ b/pkg/commands/tls/custom/privatekey/create.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/privatekey/delete.go b/pkg/commands/tls/custom/privatekey/delete.go index 441503c47..35e482294 100644 --- a/pkg/commands/tls/custom/privatekey/delete.go +++ b/pkg/commands/tls/custom/privatekey/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/custom/privatekey/describe.go b/pkg/commands/tls/custom/privatekey/describe.go index 84903dba9..93ed9c359 100644 --- a/pkg/commands/tls/custom/privatekey/describe.go +++ b/pkg/commands/tls/custom/privatekey/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/privatekey/list.go b/pkg/commands/tls/custom/privatekey/list.go index ac3c8de74..9bfefa384 100644 --- a/pkg/commands/tls/custom/privatekey/list.go +++ b/pkg/commands/tls/custom/privatekey/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/custom/privatekey/privatekey_test.go b/pkg/commands/tls/custom/privatekey/privatekey_test.go index 3740fb9ea..e33f4e2a8 100644 --- a/pkg/commands/tls/custom/privatekey/privatekey_test.go +++ b/pkg/commands/tls/custom/privatekey/privatekey_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/custom" sub "github.com/fastly/cli/pkg/commands/tls/custom/privatekey" diff --git a/pkg/commands/tls/platform/create.go b/pkg/commands/tls/platform/create.go index 1f07c25f9..906757631 100644 --- a/pkg/commands/tls/platform/create.go +++ b/pkg/commands/tls/platform/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/platform/delete.go b/pkg/commands/tls/platform/delete.go index 6567f9a3e..d2ee58d87 100644 --- a/pkg/commands/tls/platform/delete.go +++ b/pkg/commands/tls/platform/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/platform/describe.go b/pkg/commands/tls/platform/describe.go index 756d3c647..24741ada6 100644 --- a/pkg/commands/tls/platform/describe.go +++ b/pkg/commands/tls/platform/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/platform/list.go b/pkg/commands/tls/platform/list.go index 3ca77d0b0..dfbf2df92 100644 --- a/pkg/commands/tls/platform/list.go +++ b/pkg/commands/tls/platform/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/platform/platform_test.go b/pkg/commands/tls/platform/platform_test.go index 2bfde6235..4458c8ad7 100644 --- a/pkg/commands/tls/platform/platform_test.go +++ b/pkg/commands/tls/platform/platform_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/platform" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/tls/platform/update.go b/pkg/commands/tls/platform/update.go index 9331deb19..daa486606 100644 --- a/pkg/commands/tls/platform/update.go +++ b/pkg/commands/tls/platform/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/subscription/create.go b/pkg/commands/tls/subscription/create.go index bc739de18..4b97ab1f8 100644 --- a/pkg/commands/tls/subscription/create.go +++ b/pkg/commands/tls/subscription/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/subscription/delete.go b/pkg/commands/tls/subscription/delete.go index 8e1b68610..8ff257388 100644 --- a/pkg/commands/tls/subscription/delete.go +++ b/pkg/commands/tls/subscription/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tls/subscription/describe.go b/pkg/commands/tls/subscription/describe.go index 35dc8d89a..ae7bd25e3 100644 --- a/pkg/commands/tls/subscription/describe.go +++ b/pkg/commands/tls/subscription/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/subscription/list.go b/pkg/commands/tls/subscription/list.go index d49829d1f..e825a55dc 100644 --- a/pkg/commands/tls/subscription/list.go +++ b/pkg/commands/tls/subscription/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tls/subscription/subscription_test.go b/pkg/commands/tls/subscription/subscription_test.go index b1cdf5ac1..e9fbb4806 100644 --- a/pkg/commands/tls/subscription/subscription_test.go +++ b/pkg/commands/tls/subscription/subscription_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/tls/subscription" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/commands/tls/subscription/update.go b/pkg/commands/tls/subscription/update.go index 100ece621..9884076a1 100644 --- a/pkg/commands/tls/subscription/update.go +++ b/pkg/commands/tls/subscription/update.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/tools/domain/status.go b/pkg/commands/tools/domain/status.go index 540aa8f54..b638aa2c1 100644 --- a/pkg/commands/tools/domain/status.go +++ b/pkg/commands/tools/domain/status.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/tools/status" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/tools/status" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tools/domain/status_test.go b/pkg/commands/tools/domain/status_test.go index dfa248bbb..b62388fba 100644 --- a/pkg/commands/tools/domain/status_test.go +++ b/pkg/commands/tools/domain/status_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/tools/status" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/tools/status" "github.com/fastly/cli/pkg/commands/tools" "github.com/fastly/cli/pkg/commands/tools/domain" diff --git a/pkg/commands/tools/domain/suggest.go b/pkg/commands/tools/domain/suggest.go index 453ce37ea..8196a6b19 100644 --- a/pkg/commands/tools/domain/suggest.go +++ b/pkg/commands/tools/domain/suggest.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/tools/suggest" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/tools/suggest" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/tools/domain/suggest_test.go b/pkg/commands/tools/domain/suggest_test.go index cb23b073c..ab30fd02a 100644 --- a/pkg/commands/tools/domain/suggest_test.go +++ b/pkg/commands/tools/domain/suggest_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/fastly/go-fastly/v16/fastly" - "github.com/fastly/go-fastly/v16/fastly/domainmanagement/v1/tools/suggest" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/go-fastly/v17/fastly/domainmanagement/v1/tools/suggest" "github.com/fastly/cli/pkg/commands/tools" "github.com/fastly/cli/pkg/commands/tools/domain" diff --git a/pkg/commands/user/create.go b/pkg/commands/user/create.go index dac85a771..bb12cdd7e 100644 --- a/pkg/commands/user/create.go +++ b/pkg/commands/user/create.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/user/delete.go b/pkg/commands/user/delete.go index 61f595397..f8f3d218f 100644 --- a/pkg/commands/user/delete.go +++ b/pkg/commands/user/delete.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/user/describe.go b/pkg/commands/user/describe.go index b9ba04739..093bf04c1 100644 --- a/pkg/commands/user/describe.go +++ b/pkg/commands/user/describe.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/user/list.go b/pkg/commands/user/list.go index b5988f06a..93a5b364f 100644 --- a/pkg/commands/user/list.go +++ b/pkg/commands/user/list.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" fsterr "github.com/fastly/cli/pkg/errors" diff --git a/pkg/commands/user/update.go b/pkg/commands/user/update.go index 28bf9de93..a837beddf 100644 --- a/pkg/commands/user/update.go +++ b/pkg/commands/user/update.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/global" diff --git a/pkg/commands/user/user_test.go b/pkg/commands/user/user_test.go index 73f64073f..98a33135d 100644 --- a/pkg/commands/user/user_test.go +++ b/pkg/commands/user/user_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" root "github.com/fastly/cli/pkg/commands/user" "github.com/fastly/cli/pkg/mock" diff --git a/pkg/errors/deduce.go b/pkg/errors/deduce.go index b9b9a9666..98663cf0c 100644 --- a/pkg/errors/deduce.go +++ b/pkg/errors/deduce.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // httpStatusError is satisfied by any error that carries an HTTP status code. diff --git a/pkg/errors/deduce_test.go b/pkg/errors/deduce_test.go index 6f6897e0a..afa008bdc 100644 --- a/pkg/errors/deduce_test.go +++ b/pkg/errors/deduce_test.go @@ -9,7 +9,7 @@ import ( "github.com/fastly/cli/pkg/api/undocumented" "github.com/fastly/cli/pkg/errors" "github.com/fastly/cli/pkg/testutil" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func TestDeduce(t *testing.T) { diff --git a/pkg/errors/log.go b/pkg/errors/log.go index d82c45164..77b38a7aa 100644 --- a/pkg/errors/log.go +++ b/pkg/errors/log.go @@ -11,7 +11,7 @@ import ( "text/template" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // LogPath is the location of the fastly CLI error log. diff --git a/pkg/mock/api.go b/pkg/mock/api.go index 1ac8d6e01..468056473 100644 --- a/pkg/mock/api.go +++ b/pkg/mock/api.go @@ -4,7 +4,7 @@ import ( "context" "crypto/ed25519" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // API is a mock implementation of api.Interface that's used for testing. diff --git a/pkg/mock/client.go b/pkg/mock/client.go index 8fbad16f5..03376a706 100644 --- a/pkg/mock/client.go +++ b/pkg/mock/client.go @@ -7,7 +7,7 @@ import ( "io" "net/http" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" ) diff --git a/pkg/mock/fastly_client.go b/pkg/mock/fastly_client.go index a9c293186..9b79708b3 100644 --- a/pkg/mock/fastly_client.go +++ b/pkg/mock/fastly_client.go @@ -1,7 +1,7 @@ package mock import ( - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func NewFastlyClient(httpClient *HTTPClient) (*fastly.Client, error) { diff --git a/pkg/testutil/api.go b/pkg/testutil/api.go index 6a46b53ee..7bcceb6f2 100644 --- a/pkg/testutil/api.go +++ b/pkg/testutil/api.go @@ -88,7 +88,7 @@ import ( "net/http" "net/http/httptest" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" authcmd "github.com/fastly/cli/pkg/commands/auth" "github.com/fastly/cli/pkg/commands/whoami" diff --git a/pkg/testutil/assert.go b/pkg/testutil/assert.go index 8aec2860a..71d38ac71 100644 --- a/pkg/testutil/assert.go +++ b/pkg/testutil/assert.go @@ -9,6 +9,8 @@ import ( "github.com/google/go-cmp/cmp" + "github.com/fastly/go-fastly/v17/fastly" + "github.com/fastly/cli/pkg/argparser" "github.com/fastly/cli/pkg/errors" ) @@ -16,7 +18,7 @@ import ( // AssertEqual fatals a test if the parameters aren't equal. func AssertEqual(t *testing.T, want, have any) { t.Helper() - if diff := cmp.Diff(want, have); diff != "" { + if diff := cmp.Diff(want, have, cmp.AllowUnexported(fastly.Nullable[string]{})); diff != "" { t.Fatal(diff) } } diff --git a/pkg/testutil/paginator.go b/pkg/testutil/paginator.go index 34167f5f0..4e64ed152 100644 --- a/pkg/testutil/paginator.go +++ b/pkg/testutil/paginator.go @@ -1,7 +1,7 @@ package testutil import ( - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // ServicesPaginator mocks the behaviour of a paginator for services. diff --git a/pkg/testutil/scenarios.go b/pkg/testutil/scenarios.go index c8071a1e5..a5af06b37 100644 --- a/pkg/testutil/scenarios.go +++ b/pkg/testutil/scenarios.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/api" "github.com/fastly/cli/pkg/app" diff --git a/pkg/text/accesskey.go b/pkg/text/accesskey.go index 276149857..24c5ccc39 100644 --- a/pkg/text/accesskey.go +++ b/pkg/text/accesskey.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/time" - "github.com/fastly/go-fastly/v16/fastly/objectstorage/accesskeys" + "github.com/fastly/go-fastly/v17/fastly/objectstorage/accesskeys" ) // PrintAccessKey displays an access key. diff --git a/pkg/text/alerts.go b/pkg/text/alerts.go index 5f8caeeb7..4742286e3 100644 --- a/pkg/text/alerts.go +++ b/pkg/text/alerts.go @@ -5,14 +5,14 @@ import ( "io" "strings" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/datadog" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/jira" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/mailinglist" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/opsgenie" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/pagerduty" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/slack" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/alerts/webhook" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/datadog" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/jira" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/mailinglist" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/microsoftteams" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/opsgenie" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/pagerduty" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/slack" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/alerts/webhook" ) // PrintAlert displays a single alert. diff --git a/pkg/text/backend.go b/pkg/text/backend.go index d52053f6e..9fc349766 100644 --- a/pkg/text/backend.go +++ b/pkg/text/backend.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // PrintBackend pretty prints a fastly.Backend structure in verbose format diff --git a/pkg/text/computeacl.go b/pkg/text/computeacl.go index 0c295bdf2..1417eb9f4 100644 --- a/pkg/text/computeacl.go +++ b/pkg/text/computeacl.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly/computeacls" + "github.com/fastly/go-fastly/v17/fastly/computeacls" ) // PrintComputeACL displays a compute ACL. diff --git a/pkg/text/configstore.go b/pkg/text/configstore.go index 4587e956a..275461dcb 100644 --- a/pkg/text/configstore.go +++ b/pkg/text/configstore.go @@ -8,7 +8,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" fsttime "github.com/fastly/cli/pkg/time" ) diff --git a/pkg/text/customsignal.go b/pkg/text/customsignal.go index b9c3b2d42..f7b483d5a 100644 --- a/pkg/text/customsignal.go +++ b/pkg/text/customsignal.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/time" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/signals" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/signals" ) // PrintCustomSignal displays an NGWAF custom signal. diff --git a/pkg/text/dictionary.go b/pkg/text/dictionary.go index 9264e1438..20fb1332d 100644 --- a/pkg/text/dictionary.go +++ b/pkg/text/dictionary.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/time" ) diff --git a/pkg/text/dictionaryitem.go b/pkg/text/dictionaryitem.go index 8cd5450b8..5f91c197a 100644 --- a/pkg/text/dictionaryitem.go +++ b/pkg/text/dictionaryitem.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/time" ) diff --git a/pkg/text/dictionaryitem_test.go b/pkg/text/dictionaryitem_test.go index 88e47b5b5..9d9f5062e 100644 --- a/pkg/text/dictionaryitem_test.go +++ b/pkg/text/dictionaryitem_test.go @@ -6,7 +6,7 @@ import ( "github.com/fastly/cli/pkg/testutil" "github.com/fastly/cli/pkg/text" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func TestPrintDictionaryItem(t *testing.T) { diff --git a/pkg/text/dnszone.go b/pkg/text/dnszone.go index 9dd0a633a..bc0026ad2 100644 --- a/pkg/text/dnszone.go +++ b/pkg/text/dnszone.go @@ -7,7 +7,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/dnszones" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/dnszones" ) // PrintDNSZone pretty prints a dnszones.Zone in verbose format to a given diff --git a/pkg/text/healthcheck.go b/pkg/text/healthcheck.go index a49ffa7dd..3f600d48d 100644 --- a/pkg/text/healthcheck.go +++ b/pkg/text/healthcheck.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // PrintHealthCheck pretty prints a fastly.HealthCheck structure in verbose diff --git a/pkg/text/kvstore.go b/pkg/text/kvstore.go index f04e7e3d0..fe007f58f 100644 --- a/pkg/text/kvstore.go +++ b/pkg/text/kvstore.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/time" ) diff --git a/pkg/text/list.go b/pkg/text/list.go index 182e65f4d..67bf6f174 100644 --- a/pkg/text/list.go +++ b/pkg/text/list.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/fastly/cli/pkg/time" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/lists" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/lists" ) // PrintList displays an NGWAF list. diff --git a/pkg/text/redaction.go b/pkg/text/redaction.go index 058ee5e3b..1b30343cd 100644 --- a/pkg/text/redaction.go +++ b/pkg/text/redaction.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/redactions" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/redactions" ) // PrintRedaction displays a single redaction. diff --git a/pkg/text/resource.go b/pkg/text/resource.go index 1cfa65391..9a767e2a1 100644 --- a/pkg/text/resource.go +++ b/pkg/text/resource.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/time" ) diff --git a/pkg/text/rule.go b/pkg/text/rule.go index 18e8cc12c..f7b0cd266 100644 --- a/pkg/text/rule.go +++ b/pkg/text/rule.go @@ -5,7 +5,7 @@ import ( "io" "github.com/fastly/cli/pkg/time" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/rules" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/rules" ) // PrintRule displays an NGWAF rule. diff --git a/pkg/text/secretstore.go b/pkg/text/secretstore.go index 701dd4845..686f0da43 100644 --- a/pkg/text/secretstore.go +++ b/pkg/text/secretstore.go @@ -7,7 +7,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) // PrintSecretStoresTbl displays store data in a table format. diff --git a/pkg/text/service.go b/pkg/text/service.go index 234386fa1..9df29673b 100644 --- a/pkg/text/service.go +++ b/pkg/text/service.go @@ -7,7 +7,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/time" ) diff --git a/pkg/text/service_test.go b/pkg/text/service_test.go index 9f726b6fe..d5bed681b 100644 --- a/pkg/text/service_test.go +++ b/pkg/text/service_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" "github.com/fastly/cli/pkg/testutil" "github.com/fastly/cli/pkg/text" diff --git a/pkg/text/stats.go b/pkg/text/stats.go index 03d112741..b1cf55514 100644 --- a/pkg/text/stats.go +++ b/pkg/text/stats.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/fastly/go-fastly/v16/fastly" + "github.com/fastly/go-fastly/v17/fastly" ) func PrintUsageTbl(out io.Writer, data *fastly.RegionsUsage) { diff --git a/pkg/text/tag.go b/pkg/text/tag.go index aeeb3dcef..b2ae4fb29 100644 --- a/pkg/text/tag.go +++ b/pkg/text/tag.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly/apisecurity/operations" + "github.com/fastly/go-fastly/v17/fastly/apisecurity/operations" ) // PrintOperationTag displays an operation tag. diff --git a/pkg/text/threshold.go b/pkg/text/threshold.go index 20b5675e6..a9c53b767 100644 --- a/pkg/text/threshold.go +++ b/pkg/text/threshold.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/thresholds" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/thresholds" ) // PrintThreshold displays a single threshold. diff --git a/pkg/text/timeseries.go b/pkg/text/timeseries.go index a2c609d3d..01f9524e5 100644 --- a/pkg/text/timeseries.go +++ b/pkg/text/timeseries.go @@ -5,8 +5,8 @@ import ( "io" "sort" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/timeseries" - wsts "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/timeseries" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/timeseries" + wsts "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/timeseries" ) // PrintTimeseries displays timeseries data points in a table. diff --git a/pkg/text/tsigkey.go b/pkg/text/tsigkey.go index 9745ee206..29209c7b9 100644 --- a/pkg/text/tsigkey.go +++ b/pkg/text/tsigkey.go @@ -6,7 +6,7 @@ import ( "github.com/segmentio/textio" - "github.com/fastly/go-fastly/v16/fastly/dns/v1/tsigkeys" + "github.com/fastly/go-fastly/v17/fastly/dns/v1/tsigkeys" ) // PrintTSIGKey pretty prints a tsigkeys.TSIGKey in verbose format to a given diff --git a/pkg/text/virtualpatch.go b/pkg/text/virtualpatch.go index bf3b6a9c1..7185c796d 100644 --- a/pkg/text/virtualpatch.go +++ b/pkg/text/virtualpatch.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces/virtualpatches" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces/virtualpatches" ) // PrintVirtualPatch displays a single virtual patch. diff --git a/pkg/text/workspace.go b/pkg/text/workspace.go index 4dc404f93..fa7591803 100644 --- a/pkg/text/workspace.go +++ b/pkg/text/workspace.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/fastly/cli/pkg/time" - "github.com/fastly/go-fastly/v16/fastly/ngwaf/v1/workspaces" + "github.com/fastly/go-fastly/v17/fastly/ngwaf/v1/workspaces" ) // PrintWorkspace displays a workspace.