Skip to content

Commit 3dd2629

Browse files
authored
Merge branch 'scaleway:master' into master
2 parents 0f109eb + c3e9dd4 commit 3dd2629

File tree

8 files changed

+39
-19
lines changed

8 files changed

+39
-19
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ARGS:
1818
[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
2020
[resource-id] (Optional) ID of the Scaleway resource
21+
[principal-id] (Optional) ID of the User or IAM application at the origin of the event
22+
[source-ip] (Optional) IP address at the origin of the event
2123
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
2224
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | nl-ams)
2325

cmd/scw/testdata/test-all-usage-keymanager-key-create-usage.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Create a key in a given region specified by the `region` parameter. Keys only support symmetric encryption. You can use keys to encrypt or decrypt arbitrary payloads, or to generate data encryption keys. **Data encryption keys are not stored in Key Manager**.
3+
Create a key in a given region specified by the `region` parameter. You can use keys to encrypt or decrypt arbitrary payloads, to sign and verify messages or to generate data encryption keys. **Data encryption keys are not stored in Key Manager**.
44

55
USAGE:
66
scw keymanager key create [arg=value ...]
77

88
ARGS:
99
[project-id] Project ID to use. If none is passed the default project ID will be used
1010
[name] (Optional) Name of the key
11-
[usage.symmetric-encryption] Algorithm used to encrypt and decrypt arbitrary payloads. (unknown_symmetric_encryption | aes_256_gcm)
12-
[usage.asymmetric-encryption] (unknown_asymmetric_encryption | rsa_oaep_2048_sha256 | rsa_oaep_3072_sha256 | rsa_oaep_4096_sha256)
13-
[usage.asymmetric-signing] (unknown_asymmetric_signing | ec_p256_sha256 | ec_p384_sha384 | rsa_pss_2048_sha256 | rsa_pss_3072_sha256 | rsa_pss_4096_sha256 | rsa_pkcs1_2048_sha256 | rsa_pkcs1_3072_sha256 | rsa_pkcs1_4096_sha256)
11+
[usage.symmetric-encryption] Encrypt and decrypt arbitrary payloads using a symmetric encryption algorithm. (unknown_symmetric_encryption | aes_256_gcm)
12+
[usage.asymmetric-encryption] Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm. (unknown_asymmetric_encryption | rsa_oaep_2048_sha256 | rsa_oaep_3072_sha256 | rsa_oaep_4096_sha256)
13+
[usage.asymmetric-signing] Sign and verify arbitrary messages using an asymmetric signing algorithm. (unknown_asymmetric_signing | ec_p256_sha256 | ec_p384_sha384 | rsa_pss_2048_sha256 | rsa_pss_3072_sha256 | rsa_pss_4096_sha256 | rsa_pkcs1_2048_sha256 | rsa_pkcs1_3072_sha256 | rsa_pkcs1_4096_sha256)
1414
[description] (Optional) Description of the key
1515
[tags.{index}] (Optional) List of the key's tags
1616
[rotation-policy.rotation-period] Rotation period

docs/commands/audit-trail.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ scw audit-trail event list [arg=value ...]
4040
| 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 |
4242
| resource-id | | (Optional) ID of the Scaleway resource |
43+
| principal-id | | (Optional) ID of the User or IAM application at the origin of the event |
44+
| source-ip | | (Optional) IP address at the origin of the event |
4345
| organization-id | | Organization ID to use. If none is passed the default organization ID will be used |
4446
| 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 |
4547

docs/commands/keymanager.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Keys are logical containers which store cryptographic keys.
2727

2828
### Create a key
2929

30-
Create a key in a given region specified by the `region` parameter. Keys only support symmetric encryption. You can use keys to encrypt or decrypt arbitrary payloads, or to generate data encryption keys. **Data encryption keys are not stored in Key Manager**.
30+
Create a key in a given region specified by the `region` parameter. You can use keys to encrypt or decrypt arbitrary payloads, to sign and verify messages or to generate data encryption keys. **Data encryption keys are not stored in Key Manager**.
3131

3232
**Usage:**
3333

@@ -42,9 +42,9 @@ scw keymanager key create [arg=value ...]
4242
|------|---|-------------|
4343
| project-id | | Project ID to use. If none is passed the default project ID will be used |
4444
| name | | (Optional) Name of the key |
45-
| usage.symmetric-encryption | One of: `unknown_symmetric_encryption`, `aes_256_gcm` | Algorithm used to encrypt and decrypt arbitrary payloads. |
46-
| usage.asymmetric-encryption | One of: `unknown_asymmetric_encryption`, `rsa_oaep_2048_sha256`, `rsa_oaep_3072_sha256`, `rsa_oaep_4096_sha256` | |
47-
| usage.asymmetric-signing | One of: `unknown_asymmetric_signing`, `ec_p256_sha256`, `ec_p384_sha384`, `rsa_pss_2048_sha256`, `rsa_pss_3072_sha256`, `rsa_pss_4096_sha256`, `rsa_pkcs1_2048_sha256`, `rsa_pkcs1_3072_sha256`, `rsa_pkcs1_4096_sha256` | |
45+
| usage.symmetric-encryption | One of: `unknown_symmetric_encryption`, `aes_256_gcm` | Encrypt and decrypt arbitrary payloads using a symmetric encryption algorithm. |
46+
| usage.asymmetric-encryption | One of: `unknown_asymmetric_encryption`, `rsa_oaep_2048_sha256`, `rsa_oaep_3072_sha256`, `rsa_oaep_4096_sha256` | Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm. |
47+
| usage.asymmetric-signing | One of: `unknown_asymmetric_signing`, `ec_p256_sha256`, `ec_p384_sha384`, `rsa_pss_2048_sha256`, `rsa_pss_3072_sha256`, `rsa_pss_4096_sha256`, `rsa_pkcs1_2048_sha256`, `rsa_pkcs1_3072_sha256`, `rsa_pkcs1_4096_sha256` | Sign and verify arbitrary messages using an asymmetric signing algorithm. |
4848
| description | | (Optional) Description of the key |
4949
| tags.{index} | | (Optional) List of the key's tags |
5050
| rotation-policy.rotation-period | | Rotation period |

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.6
44

55
require (
66
github.com/aws/aws-sdk-go-v2 v1.39.0
7-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0
7+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1
88
github.com/buildpacks/pack v0.38.2
99
github.com/c-bata/go-prompt v0.2.6
1010
github.com/charmbracelet/bubbletea v1.3.8
@@ -14,7 +14,7 @@ require (
1414
github.com/docker/docker v28.4.0+incompatible
1515
github.com/dustin/go-humanize v1.0.1
1616
github.com/fatih/color v1.18.0
17-
github.com/getsentry/sentry-go v0.35.1
17+
github.com/getsentry/sentry-go v0.35.2
1818
github.com/ghodss/yaml v1.0.0
1919
github.com/gorilla/websocket v1.5.3
2020
github.com/hashicorp/go-version v1.7.0
@@ -23,7 +23,7 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.24.0
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250909122954-71c9aae6a7e3
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250911091431-3c6786e253d0
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 h1:mLgc5QIgO
9191
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7/go.mod h1:wXb/eQnqt8mDQIQTTmcw58B5mYGxzLGZGK8PWNFZ0BA=
9292
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7 h1:u3VbDKUCWarWiU+aIUK4gjTr/wQFXV17y3hgNno9fcA=
9393
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.7/go.mod h1:/OuMQwhSyRapYxq6ZNpPer8juGNrB4P5Oz8bZ2cgjQE=
94-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0 h1:k5JXPr+2SrPDwM3PdygZUenn0lVPLa3KOs7cCYqinFs=
95-
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.0/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po=
94+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1 h1:+RpGuaQ72qnU83qBKVwxkznewEdAGhIWo/PQCmkhhog=
95+
github.com/aws/aws-sdk-go-v2/service/s3 v1.88.1/go.mod h1:xajPTguLoeQMAOE44AAP2RQoUhF8ey1g5IFHARv71po=
9696
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1 h1:8OLZnVJPvjnrxEwHFg9hVUof/P4sibH+Ea4KKuqAGSg=
9797
github.com/aws/aws-sdk-go-v2/service/sso v1.29.1/go.mod h1:27M3BpVi0C02UiQh1w9nsBEit6pLhlaH3NHna6WUbDE=
9898
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.2 h1:gKWSTnqudpo8dAxqBqZnDoDWCiEh/40FziUjr/mo6uA=
@@ -231,8 +231,8 @@ github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uh
231231
github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
232232
github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys=
233233
github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo=
234-
github.com/getsentry/sentry-go v0.35.1 h1:iopow6UVLE2aXu46xKVIs8Z9D/YZkJrHkgozrxa+tOQ=
235-
github.com/getsentry/sentry-go v0.35.1/go.mod h1:C55omcY9ChRQIUcVcGcs+Zdy4ZpQGvNJ7JYHIoSWOtE=
234+
github.com/getsentry/sentry-go v0.35.2 h1:jKuujpRwa8FFRYMIwwZpu83Xh0voll9bmvyc6310WBM=
235+
github.com/getsentry/sentry-go v0.35.2/go.mod h1:mdL49ixwT2yi57k5eh7mpnDyPybixPzlzEJFu0Z76QA=
236236
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
237237
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
238238
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
@@ -460,8 +460,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7
460460
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
461461
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
462462
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
463-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250909122954-71c9aae6a7e3 h1:bUgIIouQdnYoZ95+pB/WYEZh20P/So2sUZ44NaWEIBU=
464-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250909122954-71c9aae6a7e3/go.mod h1:2Cfo14o/ZO3hZg9GjbyD/BHKbyri3K5BiEHq4fBcUHY=
463+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250911091431-3c6786e253d0 h1:EOCbW0MnUjNKndDwoWiGwXix7no3Fe74sVDiXp8wMag=
464+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250911091431-3c6786e253d0/go.mod h1:47B1d/YXmSAxlJxUJxClzHR6b3T4M1WyCvwENPQNBWc=
465465
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
466466
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
467467
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,20 @@ func auditTrailEventList() *core.Command {
192192
Deprecated: false,
193193
Positional: false,
194194
},
195+
{
196+
Name: "principal-id",
197+
Short: `(Optional) ID of the User or IAM application at the origin of the event`,
198+
Required: false,
199+
Deprecated: false,
200+
Positional: false,
201+
},
202+
{
203+
Name: "source-ip",
204+
Short: `(Optional) IP address at the origin of the event`,
205+
Required: false,
206+
Deprecated: false,
207+
Positional: false,
208+
},
195209
core.OrganizationIDArgSpec(),
196210
core.RegionArgSpec(
197211
scw.RegionFrPar,

internal/namespaces/key_manager/v1alpha1/key_manager_cli.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func keymanagerKey() *core.Command {
5959
func keymanagerKeyCreate() *core.Command {
6060
return &core.Command{
6161
Short: `Create a key`,
62-
Long: `Create a key in a given region specified by the ` + "`" + `region` + "`" + ` parameter. Keys only support symmetric encryption. You can use keys to encrypt or decrypt arbitrary payloads, or to generate data encryption keys. **Data encryption keys are not stored in Key Manager**.`,
62+
Long: `Create a key in a given region specified by the ` + "`" + `region` + "`" + ` parameter. You can use keys to encrypt or decrypt arbitrary payloads, to sign and verify messages or to generate data encryption keys. **Data encryption keys are not stored in Key Manager**.`,
6363
Namespace: "keymanager",
6464
Resource: "key",
6565
Verb: "create",
@@ -76,7 +76,7 @@ func keymanagerKeyCreate() *core.Command {
7676
},
7777
{
7878
Name: "usage.symmetric-encryption",
79-
Short: `Algorithm used to encrypt and decrypt arbitrary payloads.`,
79+
Short: `Encrypt and decrypt arbitrary payloads using a symmetric encryption algorithm.`,
8080
Required: false,
8181
Deprecated: false,
8282
Positional: false,
@@ -87,6 +87,7 @@ func keymanagerKeyCreate() *core.Command {
8787
},
8888
{
8989
Name: "usage.asymmetric-encryption",
90+
Short: `Encrypt and decrypt arbitrary payloads using an asymmetric encryption algorithm.`,
9091
Required: false,
9192
Deprecated: false,
9293
Positional: false,
@@ -99,6 +100,7 @@ func keymanagerKeyCreate() *core.Command {
99100
},
100101
{
101102
Name: "usage.asymmetric-signing",
103+
Short: `Sign and verify arbitrary messages using an asymmetric signing algorithm.`,
102104
Required: false,
103105
Deprecated: false,
104106
Positional: false,

0 commit comments

Comments
 (0)