Skip to content

Commit 5e1e8ad

Browse files
authored
Merge branch 'master' into v1.6969.0
2 parents 676c1a9 + 7b988f7 commit 5e1e8ad

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.34.0.20250904135859-8624843a6792
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.10.1
29-
github.com/spf13/pflag v1.0.9
29+
github.com/spf13/pflag v1.0.10
3030
github.com/stretchr/testify v1.11.1
3131
golang.org/x/crypto v0.41.0
3232
golang.org/x/sync v0.16.0

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,9 @@ github.com/spdx/tools-golang v0.5.3 h1:ialnHeEYUC4+hkm5vJm4qz2x+oEJbS0mAMFrNXdQr
493493
github.com/spdx/tools-golang v0.5.3/go.mod h1:/ETOahiAo96Ob0/RAIBmFZw6XN0yTnyr/uFZm2NTMhI=
494494
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
495495
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
496-
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
497496
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
497+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
498+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
498499
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
499500
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
500501
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=

internal/namespaces/key_manager/v1alpha1/key_manager_cli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ The data encryption key is returned in plaintext and ciphertext but it should on
649649
func keymanagerKeyEncrypt() *core.Command {
650650
return &core.Command{
651651
Short: `Encrypt a payload`,
652-
Long: `Encrypt a payload using an existing key, specified by the ` + "`" + `key_id` + "`" + ` parameter. Only keys with a usage set to ` + "`" + `symmetric_encryption` + "`" + ` are supported by this method. The maximum payload size that can be encrypted is 64 KB of plaintext.`,
652+
Long: `Encrypt a payload using an existing key, specified by the ` + "`" + `key_id` + "`" + ` parameter. The maximum payload size that can be encrypted is 64 KB of plaintext.`,
653653
Namespace: "keymanager",
654654
Resource: "key",
655655
Verb: "encrypt",

0 commit comments

Comments
 (0)