Skip to content

Commit d27d3cb

Browse files
scaleway-botscaleway-bot
authored
feat(audit_trail): add ResourceType filter (#4981)
1 parent 08ca134 commit d27d3cb

5 files changed

Lines changed: 18 additions & 9 deletions

File tree

‎cmd/scw/testdata/test-all-usage-audit-trail-event-list-usage.golden‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ USAGE:
77

88
ARGS:
99
[project-id] (Optional) ID of the Project containing the Audit Trail events
10-
[resource-type] (Optional) Returns a paginated list of Scaleway resources' features (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot)
10+
[resource-type] (Optional) Type of the Scaleway resource (unknown_type | secm_secret | secm_secret_version | kube_cluster | kube_pool | kube_node | kube_acl | keym_key | iam_user | iam_application | iam_group | iam_policy | iam_api_key | iam_ssh_key | iam_rule | secret_manager_secret | secret_manager_version | key_manager_key | account_user | account_organization | account_project | instance_server | instance_placement_group | instance_security_group | instance_volume | instance_snapshot | instance_image | apple_silicon_server | baremetal_server | baremetal_setting | ipam_ip | sbs_volume | sbs_snapshot)
1111
[method-name] (Optional) Name of the method of the API call performed
1212
[status] (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied
1313
[recorded-after] (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default
1414
[recorded-before] (Optional) The `recorded_before` parameter defines the latest timestamp up to which Audit Trail events are retrieved. Returns `now` by default
1515
[order-by] (recorded_at_desc | recorded_at_asc)
1616
[page-size]
1717
[page-token]
18-
[product-name] (Optional) Name of the Scaleway resource in a hyphenated format
18+
[product-name] (Optional) Name of the Scaleway product in a hyphenated format
1919
[service-name] (Optional) Name of the service of the API call performed
20+
[resource-id] (Optional) ID of the Scaleway resource
2021
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
2122
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams)
2223

‎docs/commands/audit-trail.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@ scw audit-trail event list [arg=value ...]
2929
| Name | | Description |
3030
|------|---|-------------|
3131
| project-id | | (Optional) ID of the Project containing the Audit Trail events |
32-
| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot` | (Optional) Returns a paginated list of Scaleway resources' features |
32+
| resource-type | One of: `unknown_type`, `secm_secret`, `secm_secret_version`, `kube_cluster`, `kube_pool`, `kube_node`, `kube_acl`, `keym_key`, `iam_user`, `iam_application`, `iam_group`, `iam_policy`, `iam_api_key`, `iam_ssh_key`, `iam_rule`, `secret_manager_secret`, `secret_manager_version`, `key_manager_key`, `account_user`, `account_organization`, `account_project`, `instance_server`, `instance_placement_group`, `instance_security_group`, `instance_volume`, `instance_snapshot`, `instance_image`, `apple_silicon_server`, `baremetal_server`, `baremetal_setting`, `ipam_ip`, `sbs_volume`, `sbs_snapshot` | (Optional) Type of the Scaleway resource |
3333
| method-name | | (Optional) Name of the method of the API call performed |
3434
| status | | (Optional) HTTP status code of the request. Returns either `200` if the request was successful or `403` if the permission was denied |
3535
| recorded-after | | (Optional) The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default |
3636
| recorded-before | | (Optional) The `recorded_before` parameter defines the latest timestamp up to which Audit Trail events are retrieved. Returns `now` by default |
3737
| order-by | One of: `recorded_at_desc`, `recorded_at_asc` | |
3838
| page-size | | |
3939
| page-token | | |
40-
| product-name | | (Optional) Name of the Scaleway resource in a hyphenated format |
40+
| product-name | | (Optional) Name of the Scaleway product in a hyphenated format |
4141
| service-name | | (Optional) Name of the service of the API call performed |
42+
| resource-id | | (Optional) ID of the Scaleway resource |
4243
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
4344
| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams` | Region to target. If none is passed will use default region from the config |
4445

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.13.2
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250904135859-8624843a6792
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250905131541-6e08e6e09edd
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.10.1
2929
github.com/spf13/pflag v1.0.10

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
466466
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
468468
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250904135859-8624843a6792 h1:WPquMrzwOgY3RFN8m3NGVdUK+R92Fva9DMq+okbBxuY=
470-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250904135859-8624843a6792/go.mod h1:2Cfo14o/ZO3hZg9GjbyD/BHKbyri3K5BiEHq4fBcUHY=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250905131541-6e08e6e09edd h1:Ax3NpbStk0L6cprh1CTJda+qjZ/39ZMwC9DxxtAkFUI=
470+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250905131541-6e08e6e09edd/go.mod h1:2Cfo14o/ZO3hZg9GjbyD/BHKbyri3K5BiEHq4fBcUHY=
471471
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
472472
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
473473
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

‎internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func auditTrailEventList() *core.Command {
7272
},
7373
{
7474
Name: "resource-type",
75-
Short: `(Optional) Returns a paginated list of Scaleway resources' features`,
75+
Short: `(Optional) Type of the Scaleway resource`,
7676
Required: false,
7777
Deprecated: false,
7878
Positional: false,
@@ -164,7 +164,7 @@ func auditTrailEventList() *core.Command {
164164
},
165165
{
166166
Name: "product-name",
167-
Short: `(Optional) Name of the Scaleway resource in a hyphenated format`,
167+
Short: `(Optional) Name of the Scaleway product in a hyphenated format`,
168168
Required: false,
169169
Deprecated: false,
170170
Positional: false,
@@ -176,6 +176,13 @@ func auditTrailEventList() *core.Command {
176176
Deprecated: false,
177177
Positional: false,
178178
},
179+
{
180+
Name: "resource-id",
181+
Short: `(Optional) ID of the Scaleway resource`,
182+
Required: false,
183+
Deprecated: false,
184+
Positional: false,
185+
},
179186
core.OrganizationIDArgSpec(),
180187
core.RegionArgSpec(
181188
scw.RegionFrPar,

0 commit comments

Comments
 (0)