Skip to content

Add S3 action support with labels and improve action display #195

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

Open
fjerlov-cs wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add S3 action support with labels and improve action display #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d88328
Add S3 action support, labels for all actions, and clean up dead code
fjerlov-cs Feb 19, 2026
4496fb4
Redundant type conversion
fjerlov-cs Feb 19, 2026
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
11 changes: 9 additions & 2 deletions cmd/humioctl/actions_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package main

import (
"strings"

"github.com/humio/cli/internal/format"
"github.com/spf13/cobra"
)
Expand All @@ -34,10 +36,15 @@ func newActionsListCmd() *cobra.Command {
var rows [][]format.Value
for i := 0; i < len(actions); i++ {
action := actions[i]
rows = append(rows, []format.Value{format.String(action.Name), format.String(action.Type)})

rows = append(rows, []format.Value{
format.String(action.Name),
format.String(action.Type),
format.String(strings.Join(action.GetLabels(), ",")),
})
}

printOverviewTable(cmd, []string{"Name", "Type"}, rows)
printOverviewTable(cmd, []string{"Name", "Type", "Labels"}, rows)
},
}

Expand Down
3 changes: 3 additions & 0 deletions cmd/humioctl/actions_show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package main

import (
"strings"

"github.com/humio/cli/internal/format"
"github.com/spf13/cobra"
)
Expand All @@ -36,6 +38,7 @@ func newActionsShowCmd() *cobra.Command {
{format.String("Name"), format.String(action.Name)},
{format.String("Type"), format.String(action.Type)},
{format.String("ID"), format.String(action.ID)},
{format.String("Labels"), format.String(strings.Join(action.GetLabels(), ","))},
}

printDetailsTable(cmd, details)
Expand Down
1 change: 0 additions & 1 deletion cmd/humioctl/alerts_show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func newAlertsShowCmd() *cobra.Command {
{format.String("Query String"), format.String(alert.QueryString)},
{format.String("Labels"), format.String(strings.Join(alert.Labels, ", "))},
{format.String("Throttle Time Millis"), format.Int(alert.ThrottleTimeMillis)},
{format.String("Is Starred"), format.Bool(alert.IsStarred)},
{format.String("Last Error"), format.StringPtr(alert.LastError)},
{format.String("Throttle Field"), format.StringPtr(alert.ThrottleField)},
{format.String("Time Of Last Trigger"), format.Int64Ptr(alert.TimeOfLastTrigger)},
Expand Down
12 changes: 5 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/humio/cli

go 1.22.0

toolchain go1.22.6
go 1.24.0
Copy link
Contributor Author

@fjerlov-cs fjerlov-cs Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had problems generating the schema (golang.org/x/tools) with Go 1.26, so I upgraded. I can keep it at 1.22.0 if needed.


require (
github.com/Khan/genqlient v0.7.0
Expand All @@ -15,8 +13,8 @@ require (
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.18.2
github.com/vektah/gqlparser/v2 v2.5.16
golang.org/x/sync v0.8.0
golang.org/x/sys v0.23.0
golang.org/x/sync v0.19.0
golang.org/x/sys v0.41.0
golang.org/x/term v0.19.0
gopkg.in/yaml.v2 v2.4.0
)
Expand All @@ -41,9 +39,9 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/mod v0.21.0 // indirect
golang.org/x/mod v0.33.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.24.0 // indirect
golang.org/x/tools v0.42.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,18 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
Loading