Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(products): Add support for Log Explorer & Insights. #1341

Merged
merged 1 commit into from
Nov 11, 2024
Merged

feat(products): Add support for Log Explorer & Insights. #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions pkg/commands/products/products_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ func TestProductEnablement(t *testing.T) {
},
},
Args: "--service-id 123",
WantOutput: `PRODUCT ENABLED
bot_management false
brotli_compression false
domain_inspector false
fanout false
image_optimizer false
origin_inspector false
websockets false
WantOutput: `PRODUCT ENABLED
bot_management false
brotli_compression false
domain_inspector false
fanout false
image_optimizer false
log_explorer_insights false
origin_inspector false
websockets false
`,
},
{
Expand All @@ -47,25 +48,26 @@ websockets false
},
},
Args: "--service-id 123",
WantOutput: `PRODUCT ENABLED
bot_management true
brotli_compression true
domain_inspector true
fanout true
image_optimizer true
origin_inspector true
websockets true
WantOutput: `PRODUCT ENABLED
bot_management true
brotli_compression true
domain_inspector true
fanout true
image_optimizer true
log_explorer_insights 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,origin_inspector,websockets, got 'foo'",
WantError: "error parsing arguments: enum value must be one of bot_management,brotli_compression,domain_inspector,fanout,image_optimizer,log_explorer_insights,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,origin_inspector,websockets, got 'foo'",
WantError: "error parsing arguments: enum value must be one of bot_management,brotli_compression,domain_inspector,fanout,image_optimizer,log_explorer_insights,origin_inspector,websockets, got 'foo'",
},
{
Name: "validate success for enabling product",
Expand Down Expand Up @@ -106,6 +108,7 @@ websockets true
"domain_inspector": false,
"fanout": false,
"image_optimizer": false,
"log_explorer_insights": false,
"origin_inspector": false,
"websockets": false
}`,
Expand All @@ -124,6 +127,7 @@ websockets true
"domain_inspector": true,
"fanout": true,
"image_optimizer": true,
"log_explorer_insights": true,
"origin_inspector": true,
"websockets": true
}`,
Expand Down
25 changes: 18 additions & 7 deletions pkg/commands/products/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var ProductEnablementOptions = []string{
"domain_inspector",
"fanout",
"image_optimizer",
"log_explorer_insights",
"origin_inspector",
"websockets",
}
Expand Down Expand Up @@ -142,6 +143,12 @@ func (c *RootCommand) Exec(_ io.Reader, out io.Writer) error {
}); err == nil {
ps.ImageOptimizer = true
}
if _, err = ac.GetProduct(&fastly.ProductEnablementInput{
ProductID: fastly.ProductLogExplorerInsights,
ServiceID: serviceID,
}); err == nil {
ps.LogExplorerInsights = true
}
if _, err = ac.GetProduct(&fastly.ProductEnablementInput{
ProductID: fastly.ProductOriginInspector,
ServiceID: serviceID,
Expand All @@ -166,6 +173,7 @@ 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.ProductLogExplorerInsights, ps.LogExplorerInsights)
t.AddLine(fastly.ProductOriginInspector, ps.OriginInspector)
t.AddLine(fastly.ProductWebSockets, ps.WebSockets)
t.Print()
Expand All @@ -184,6 +192,8 @@ func identifyProduct(product string) fastly.Product {
return fastly.ProductFanout
case "image_optimizer":
return fastly.ProductImageOptimizer
case "log_explorer_insights":
return fastly.ProductLogExplorerInsights
case "origin_inspector":
return fastly.ProductOriginInspector
case "websockets":
Expand All @@ -195,11 +205,12 @@ func identifyProduct(product string) fastly.Product {

// ProductStatus indicates the status for each product.
type ProductStatus struct {
BotManagement bool `json:"bot_management"`
BrotliCompression bool `json:"brotli_compression"`
DomainInspector bool `json:"domain_inspector"`
Fanout bool `json:"fanout"`
ImageOptimizer bool `json:"image_optimizer"`
OriginInspector bool `json:"origin_inspector"`
WebSockets bool `json:"websockets"`
BotManagement bool `json:"bot_management"`
BrotliCompression bool `json:"brotli_compression"`
DomainInspector bool `json:"domain_inspector"`
Fanout bool `json:"fanout"`
ImageOptimizer bool `json:"image_optimizer"`
LogExplorerInsights bool `json:"log_explorer_insights"`
OriginInspector bool `json:"origin_inspector"`
WebSockets bool `json:"websockets"`
}
Loading