Skip to content

Commit

Permalink
breaking(products): Remove support for NGWAF product. (#1338)
Browse files Browse the repository at this point in the history
The support added for the NGWAF product in version 10.15.0 did not
work, and is being removed so that it can be redesigned. Since the
feature was non-operational, no users of the CLI could have relied on
it, so the major version number is not being incremented in spite of
the breaking nature of the change.
  • Loading branch information
kpfleming authored Nov 7, 2024
1 parent 76b21f5 commit b92f022
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
8 changes: 2 additions & 6 deletions pkg/commands/products/products_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ brotli_compression false
domain_inspector false
fanout false
image_optimizer false
ngwaf false
origin_inspector false
websockets false
`,
Expand All @@ -54,20 +53,19 @@ brotli_compression true
domain_inspector true
fanout true
image_optimizer true
ngwaf true
origin_inspector true
websockets true
`,
},
{
Name: "validate flag parsing error for enabling product",
Args: "--service-id 123 --enable foo",
WantError: "error parsing arguments: enum value must be one of bot_management,brotli_compression,domain_inspector,fanout,image_optimizer,ngwaf,origin_inspector,websockets, got 'foo'",
WantError: "error parsing arguments: enum value must be one of bot_management,brotli_compression,domain_inspector,fanout,image_optimizer,origin_inspector,websockets, got 'foo'",
},
{
Name: "validate flag parsing error for disabling product",
Args: "--service-id 123 --disable foo",
WantError: "error parsing arguments: enum value must be one of bot_management,brotli_compression,domain_inspector,fanout,image_optimizer,ngwaf,origin_inspector,websockets, got 'foo'",
WantError: "error parsing arguments: enum value must be one of bot_management,brotli_compression,domain_inspector,fanout,image_optimizer,origin_inspector,websockets, got 'foo'",
},
{
Name: "validate success for enabling product",
Expand Down Expand Up @@ -108,7 +106,6 @@ websockets true
"domain_inspector": false,
"fanout": false,
"image_optimizer": false,
"ngwaf": false,
"origin_inspector": false,
"websockets": false
}`,
Expand All @@ -127,7 +124,6 @@ websockets true
"domain_inspector": true,
"fanout": true,
"image_optimizer": true,
"ngwaf": true,
"origin_inspector": true,
"websockets": true
}`,
Expand Down
11 changes: 0 additions & 11 deletions pkg/commands/products/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ var ProductEnablementOptions = []string{
"domain_inspector",
"fanout",
"image_optimizer",
"ngwaf",
"origin_inspector",
"websockets",
}
Expand Down Expand Up @@ -143,12 +142,6 @@ func (c *RootCommand) Exec(_ io.Reader, out io.Writer) error {
}); err == nil {
ps.ImageOptimizer = true
}
if _, err = ac.GetProduct(&fastly.ProductEnablementInput{
ProductID: fastly.ProductNGWAF,
ServiceID: serviceID,
}); err == nil {
ps.NGWAF = true
}
if _, err = ac.GetProduct(&fastly.ProductEnablementInput{
ProductID: fastly.ProductOriginInspector,
ServiceID: serviceID,
Expand All @@ -173,7 +166,6 @@ func (c *RootCommand) Exec(_ io.Reader, out io.Writer) error {
t.AddLine(fastly.ProductDomainInspector, ps.DomainInspector)
t.AddLine(fastly.ProductFanout, ps.Fanout)
t.AddLine(fastly.ProductImageOptimizer, ps.ImageOptimizer)
t.AddLine(fastly.ProductNGWAF, ps.NGWAF)
t.AddLine(fastly.ProductOriginInspector, ps.OriginInspector)
t.AddLine(fastly.ProductWebSockets, ps.WebSockets)
t.Print()
Expand All @@ -192,8 +184,6 @@ func identifyProduct(product string) fastly.Product {
return fastly.ProductFanout
case "image_optimizer":
return fastly.ProductImageOptimizer
case "ngwaf":
return fastly.ProductNGWAF
case "origin_inspector":
return fastly.ProductOriginInspector
case "websockets":
Expand All @@ -210,7 +200,6 @@ type ProductStatus struct {
DomainInspector bool `json:"domain_inspector"`
Fanout bool `json:"fanout"`
ImageOptimizer bool `json:"image_optimizer"`
NGWAF bool `json:"ngwaf"`
OriginInspector bool `json:"origin_inspector"`
WebSockets bool `json:"websockets"`
}

0 comments on commit b92f022

Please sign in to comment.