fix(iam): set organization ID filter on listing commands (#2469)

internal/core/context.go

@@ -53,16 +53,13 @@ func ExtractCommands(ctx context.Context) *Commands {
 	return extractMeta(ctx).Commands
 }
 
-func GetOrganizationIDFromContext(ctx context.Context) (organizationID string) {
+func GetOrganizationIDFromContext(ctx context.Context) string {
 	client := ExtractClient(ctx)
-	organizationID, exists := client.GetDefaultOrganizationID()
-	if !exists {
-		panic("no default organization ID found")
-	}
+	organizationID, _ := client.GetDefaultOrganizationID()
 	return organizationID
 }
 
-func GetProjectIDFromContext(ctx context.Context) (projectID string) {
+func GetProjectIDFromContext(ctx context.Context) string {
 	client := ExtractClient(ctx)
 	projectID, exists := client.GetDefaultProjectID()
 	if !exists {

internal/namespaces/iam/v1alpha1/custom.go

@@ -1,9 +1,33 @@
 package iam
 
-import "github.com/scaleway/scaleway-cli/v2/internal/core"
+import (
+	"context"
+
+	"github.com/scaleway/scaleway-cli/v2/internal/core"
+)
 
 func GetCommands() *core.Commands {
 	cmds := GetGeneratedCommands()
 
+	// These commands have an "optional" organization-id that is required for now.
+	for _, commandPath := range [][]string{
+		{"iam", "group", "list"},
+		{"iam", "api-key", "list"},
+		{"iam", "ssh-key", "list"},
+		{"iam", "user", "list"},
+		{"iam", "policy", "list"},
+		{"iam", "application", "list"},
+	} {
+		cmds.MustFind(commandPath...).Override(setOrganizationDefaultValue)
+	}
+
 	return cmds
 }
+
+func setOrganizationDefaultValue(c *core.Command) *core.Command {
+	c.ArgSpecs.GetByName("organization-id").Default = func(ctx context.Context) (value string, doc string) {
+		organizationID := core.GetOrganizationIDFromContext(ctx)
+		return organizationID, "<retrieved from config>"
+	}
+	return c
+}