From 169c6993e9e3214fbea6012c855cae11d59e8ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 19 May 2025 14:40:00 +0200 Subject: [PATCH 1/2] Fix --- .../test-all-usage-iam-organization-usage.golden | 15 +++++++++++++++ cmd/scw/testdata/test-all-usage-iam-usage.golden | 1 + docs/commands/iam.md | 15 +++++++++++++++ internal/namespaces/iam/v1alpha1/iam_cli.go | 12 +++++++++++- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 cmd/scw/testdata/test-all-usage-iam-organization-usage.golden diff --git a/cmd/scw/testdata/test-all-usage-iam-organization-usage.golden b/cmd/scw/testdata/test-all-usage-iam-organization-usage.golden new file mode 100644 index 0000000000..bf76c3f269 --- /dev/null +++ b/cmd/scw/testdata/test-all-usage-iam-organization-usage.golden @@ -0,0 +1,15 @@ +🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲 +πŸŸ₯πŸŸ₯πŸŸ₯ STDERR️️ πŸŸ₯πŸŸ₯πŸŸ₯️ +Organization-wide management commands. + +USAGE: + scw iam organization + +FLAGS: + -h, --help help for organization + +GLOBAL FLAGS: + -c, --config string The path to the config file + -D, --debug Enable debug mode + -o, --output string Output format: json or human, see 'scw help output' for more info (default "human") + -p, --profile string The config profile to use diff --git a/cmd/scw/testdata/test-all-usage-iam-usage.golden b/cmd/scw/testdata/test-all-usage-iam-usage.golden index aadc4de48d..88ad0e7944 100644 --- a/cmd/scw/testdata/test-all-usage-iam-usage.golden +++ b/cmd/scw/testdata/test-all-usage-iam-usage.golden @@ -11,6 +11,7 @@ AVAILABLE COMMANDS: group Groups management commands jwt JWTs management commands log Log management commands + organization Organization-wide management commands permission-set Permission sets management commands policy Policies management commands rule Rules management commands diff --git a/docs/commands/iam.md b/docs/commands/iam.md index 443d2e3a20..7475009906 100644 --- a/docs/commands/iam.md +++ b/docs/commands/iam.md @@ -31,6 +31,7 @@ This API allows you to manage Identity and Access Management (IAM) across your S - [Log management commands](#log-management-commands) - [Get a log](#get-a-log) - [List logs](#list-logs) +- [Organization-wide management commands](#organization-wide-management-commands) - [Permission sets management commands](#permission-sets-management-commands) - [List permission sets](#list-permission-sets) - [Policies management commands](#policies-management-commands) @@ -629,6 +630,20 @@ scw iam log list [arg=value ...] +## Organization-wide management commands + +Organization-wide management commands. + +Organization-wide management commands. + +**Usage:** + +``` +scw iam organization +``` + + + ## Permission sets management commands Permission sets management commands. diff --git a/internal/namespaces/iam/v1alpha1/iam_cli.go b/internal/namespaces/iam/v1alpha1/iam_cli.go index ee76da0cbe..291fd04221 100644 --- a/internal/namespaces/iam/v1alpha1/iam_cli.go +++ b/internal/namespaces/iam/v1alpha1/iam_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" + "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" ) @@ -30,6 +30,7 @@ func GetGeneratedCommands() *core.Commands { iamPermissionSet(), iamJwt(), iamLog(), + iamOrganization(), iamSSHKeyList(), iamSSHKeyCreate(), iamSSHKeyGet(), @@ -176,6 +177,15 @@ func iamLog() *core.Command { } } +func iamOrganization() *core.Command { + return &core.Command{ + Short: `Organization-wide management commands`, + Long: `Organization-wide management commands.`, + Namespace: "iam", + Resource: "organization", + } +} + func iamSSHKeyList() *core.Command { return &core.Command{ Short: `List SSH keys`, From 2daac3f1737d6906d4193c5e1b1e4808bad53067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 19 May 2025 14:46:08 +0200 Subject: [PATCH 2/2] Fix --- internal/namespaces/iam/v1alpha1/iam_cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/namespaces/iam/v1alpha1/iam_cli.go b/internal/namespaces/iam/v1alpha1/iam_cli.go index 291fd04221..a61df098a9 100644 --- a/internal/namespaces/iam/v1alpha1/iam_cli.go +++ b/internal/namespaces/iam/v1alpha1/iam_cli.go @@ -8,7 +8,7 @@ import ( "reflect" "github.com/scaleway/scaleway-cli/v2/core" - "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" + iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1" "github.com/scaleway/scaleway-sdk-go/scw" )