feat(iam): add tags on applications, groups, users and policies (#3499)

scaleway-bot · Codelax · web-flow · commit b71a60fd2ced · 2023-11-23T08:32:36.000Z
Co-authored-by: Jules Castéran &lt;jcasteran@scaleway.com&gt;
diff --git a/cmd/scw/testdata/test-all-usage-iam-application-create-usage.golden b/cmd/scw/testdata/test-all-usage-iam-application-create-usage.golden
@@ -8,6 +8,7 @@ USAGE:
 ARGS:
   name=<generated>    Name of the application to create (max length is 64 characters)
   [description]       Description of the application (max length is 200 characters)
+  [tags.{index}]      Tags associated with the application (maximum of 10 tags)
   [organization-id]   Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-iam-application-list-usage.golden b/cmd/scw/testdata/test-all-usage-iam-application-list-usage.golden
@@ -10,6 +10,7 @@ ARGS:
   [name]                                      Name of the application to filter
   [editable]                                  Defines whether to filter out editable applications or not
   [application-ids.{index}]                   Filter by list of IDs
+  [tag]                                       Filter by tags containing a given string
   [organization-id=<retrieved from config>]   Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-iam-application-update-usage.golden b/cmd/scw/testdata/test-all-usage-iam-application-update-usage.golden
@@ -9,6 +9,7 @@ ARGS:
   application-id   ID of the application to update
   [name]           New name for the application (max length is 64 chars)
   [description]    New description for the application (max length is 200 chars)
+  [tags.{index}]   New tags for the application (maximum of 10 tags)
 
 FLAGS:
   -h, --help   help for update
diff --git a/cmd/scw/testdata/test-all-usage-iam-group-create-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-create-usage.golden
@@ -12,6 +12,7 @@ EXAMPLES:
 ARGS:
   name=<generated>    Name of the group to create (max length is 64 chars). MUST be unique inside an Organization
   [description]       Description of the group to create (max length is 200 chars)
+  [tags.{index}]      Tags associated with the group (maximum of 10 tags)
   [organization-id]   Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-iam-group-list-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-list-usage.golden
@@ -11,6 +11,7 @@ ARGS:
   [application-ids.{index}]                   Filter by a list of application IDs
   [user-ids.{index}]                          Filter by a list of user IDs
   [group-ids.{index}]                         Filter by a list of group IDs
+  [tag]                                       Filter by tags containing a given string
   [organization-id=<retrieved from config>]   Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-iam-group-update-usage.golden b/cmd/scw/testdata/test-all-usage-iam-group-update-usage.golden
@@ -6,9 +6,10 @@ USAGE:
   scw iam group update <group-id ...> [arg=value ...]
 
 ARGS:
-  group-id        ID of the group to update
-  [name]          New name for the group (max length is 64 chars). MUST be unique inside an Organization
-  [description]   New description for the group (max length is 200 chars)
+  group-id         ID of the group to update
+  [name]           New name for the group (max length is 64 chars). MUST be unique inside an Organization
+  [description]    New description for the group (max length is 200 chars)
+  [tags.{index}]   New tags for the group (maximum of 10 tags)
 
 FLAGS:
   -h, --help   help for update
diff --git a/cmd/scw/testdata/test-all-usage-iam-policy-create-usage.golden b/cmd/scw/testdata/test-all-usage-iam-policy-create-usage.golden
@@ -15,6 +15,7 @@ ARGS:
   [rules.{index}.permission-set-names.{index}]   Names of permission sets bound to the rule
   [rules.{index}.project-ids.{index}]            List of Project IDs the rule is scoped to
   [rules.{index}.organization-id]                ID of Organization the rule is scoped to
+  [tags.{index}]                                 Tags associated with the policy (maximum of 10 tags)
   [user-id]                                      ID of user attributed to the policy
   [group-id]                                     ID of group attributed to the policy
   [application-id]                               ID of application attributed to the policy
diff --git a/cmd/scw/testdata/test-all-usage-iam-policy-list-usage.golden b/cmd/scw/testdata/test-all-usage-iam-policy-list-usage.golden
@@ -13,6 +13,7 @@ ARGS:
   [application-ids.{index}]                   Filter by a list of application IDs
   [no-principal]                              Defines whether or not the policy is attributed to a principal
   [policy-name]                               Name of the policy to fetch
+  [tag]                                       Filter by tags containing a given string
   [organization-id=<retrieved from config>]   Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-iam-policy-update-usage.golden b/cmd/scw/testdata/test-all-usage-iam-policy-update-usage.golden
@@ -9,6 +9,7 @@ ARGS:
   policy-id          Id of policy to update
   [name]             New name for the policy (max length is 64 characters)
   [description]      New description of policy (max length is 200 characters)
+  [tags.{index}]     New tags for the policy (maximum of 10 tags)
   [user-id]          New ID of user attributed to the policy
   [group-id]         New ID of group attributed to the policy
   [application-id]   New ID of application attributed to the policy
diff --git a/cmd/scw/testdata/test-all-usage-iam-user-create-usage.golden b/cmd/scw/testdata/test-all-usage-iam-user-create-usage.golden
@@ -7,6 +7,7 @@ USAGE:
 
 ARGS:
   email               Email of the user
+  [tags.{index}]      Tags associated with the user
   [organization-id]   Organization ID to use. If none is passed the default organization ID will be used
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-iam-user-list-usage.golden b/cmd/scw/testdata/test-all-usage-iam-user-list-usage.golden
@@ -9,6 +9,7 @@ ARGS:
   [order-by=created_at_asc]                 Criteria for sorting results (created_at_asc | created_at_desc | updated_at_asc | updated_at_desc | email_asc | email_desc | last_login_asc | last_login_desc)
   [user-ids.{index}]                        Filter by list of IDs
   [mfa]                                     Filter by MFA status
+  [tag]                                     Filter by tags containing a given string
   organization-id=<retrieved from config>   ID of the Organization to filter
 
 FLAGS:
diff --git a/docs/commands/iam.md b/docs/commands/iam.md
@@ -201,6 +201,7 @@ scw iam application create [arg=value ...]
 |------|---|-------------|
 | name | Required<br />Default: `<generated>` | Name of the application to create (max length is 64 characters) |
 | description |  | Description of the application (max length is 200 characters) |
+| tags.{index} |  | Tags associated with the application (maximum of 10 tags) |
 | organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
 
 
@@ -262,6 +263,7 @@ scw iam application list [arg=value ...]
 | name |  | Name of the application to filter |
 | editable |  | Defines whether to filter out editable applications or not |
 | application-ids.{index} |  | Filter by list of IDs |
+| tag |  | Filter by tags containing a given string |
 | organization-id | Default: `<retrieved from config>` | Organization ID to use. If none is passed the default organization ID will be used |
 
 
@@ -284,6 +286,7 @@ scw iam application update <application-id ...> [arg=value ...]
 | application-id | Required | ID of the application to update |
 | name |  | New name for the application (max length is 64 chars) |
 | description |  | New description for the application (max length is 200 chars) |
+| tags.{index} |  | New tags for the application (maximum of 10 tags) |
 
 
 
@@ -351,6 +354,7 @@ scw iam group create [arg=value ...]
 |------|---|-------------|
 | name | Required<br />Default: `<generated>` | Name of the group to create (max length is 64 chars). MUST be unique inside an Organization |
 | description |  | Description of the group to create (max length is 200 chars) |
+| tags.{index} |  | Tags associated with the group (maximum of 10 tags) |
 | organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
 
 
@@ -433,6 +437,7 @@ scw iam group list [arg=value ...]
 | application-ids.{index} |  | Filter by a list of application IDs |
 | user-ids.{index} |  | Filter by a list of user IDs |
 | group-ids.{index} |  | Filter by a list of group IDs |
+| tag |  | Filter by tags containing a given string |
 | organization-id | Default: `<retrieved from config>` | Organization ID to use. If none is passed the default organization ID will be used |
 
 
@@ -497,6 +502,7 @@ scw iam group update <group-id ...> [arg=value ...]
 | group-id | Required | ID of the group to update |
 | name |  | New name for the group (max length is 64 chars). MUST be unique inside an Organization |
 | description |  | New description for the group (max length is 200 chars) |
+| tags.{index} |  | New tags for the group (maximum of 10 tags) |
 
 
 
@@ -633,6 +639,7 @@ scw iam policy create [arg=value ...]
 | rules.{index}.permission-set-names.{index} |  | Names of permission sets bound to the rule |
 | rules.{index}.project-ids.{index} |  | List of Project IDs the rule is scoped to |
 | rules.{index}.organization-id |  | ID of Organization the rule is scoped to |
+| tags.{index} |  | Tags associated with the policy (maximum of 10 tags) |
 | user-id |  | ID of user attributed to the policy |
 | group-id |  | ID of group attributed to the policy |
 | application-id |  | ID of application attributed to the policy |
@@ -711,6 +718,7 @@ scw iam policy list [arg=value ...]
 | application-ids.{index} |  | Filter by a list of application IDs |
 | no-principal |  | Defines whether or not the policy is attributed to a principal |
 | policy-name |  | Name of the policy to fetch |
+| tag |  | Filter by tags containing a given string |
 | organization-id | Default: `<retrieved from config>` | Organization ID to use. If none is passed the default organization ID will be used |
 
 
@@ -733,6 +741,7 @@ scw iam policy update <policy-id ...> [arg=value ...]
 | policy-id | Required | Id of policy to update |
 | name |  | New name for the policy (max length is 64 characters) |
 | description |  | New description of policy (max length is 200 characters) |
+| tags.{index} |  | New tags for the policy (maximum of 10 tags) |
 | user-id |  | New ID of user attributed to the policy |
 | group-id |  | New ID of group attributed to the policy |
 | application-id |  | New ID of application attributed to the policy |
@@ -947,6 +956,7 @@ scw iam user create [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | email | Required | Email of the user |
+| tags.{index} |  | Tags associated with the user |
 | organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
 
 
@@ -1007,6 +1017,7 @@ scw iam user list [arg=value ...]
 | order-by | Default: `created_at_asc`<br />One of: `created_at_asc`, `created_at_desc`, `updated_at_asc`, `updated_at_desc`, `email_asc`, `email_desc`, `last_login_asc`, `last_login_desc` | Criteria for sorting results |
 | user-ids.{index} |  | Filter by list of IDs |
 | mfa |  | Filter by MFA status |
+| tag |  | Filter by tags containing a given string |
 | organization-id | Required<br />Default: `<retrieved from config>` | ID of the Organization to filter |
 
 
diff --git a/internal/namespaces/iam/v1alpha1/iam_cli.go b/internal/namespaces/iam/v1alpha1/iam_cli.go
@@ -452,6 +452,13 @@ func iamUserList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tag",
+				Short:      `Filter by tags containing a given string`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "organization-id",
 				Short:      `ID of the Organization to filter`,
@@ -557,6 +564,13 @@ func iamUserCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags associated with the user`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -610,6 +624,13 @@ func iamApplicationList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tag",
+				Short:      `Filter by tags containing a given string`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -653,6 +674,13 @@ func iamApplicationCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags associated with the application (maximum of 10 tags)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -726,6 +754,13 @@ func iamApplicationUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `New tags for the application (maximum of 10 tags)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*iam.UpdateApplicationRequest)
@@ -820,6 +855,13 @@ func iamGroupList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tag",
+				Short:      `Filter by tags containing a given string`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -877,6 +919,13 @@ func iamGroupCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags associated with the group (maximum of 10 tags)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -970,6 +1019,13 @@ func iamGroupUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `New tags for the group (maximum of 10 tags)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*iam.UpdateGroupRequest)
@@ -1283,6 +1339,13 @@ func iamPolicyList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tag",
+				Short:      `Filter by tags containing a given string`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.OrganizationIDArgSpec(),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -1347,6 +1410,13 @@ func iamPolicyCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `Tags associated with the policy (maximum of 10 tags)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "user-id",
 				Short:      `ID of user attributed to the policy`,
@@ -1454,6 +1524,13 @@ func iamPolicyUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `New tags for the policy (maximum of 10 tags)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			{
 				Name:       "user-id",
 				Short:      `New ID of user attributed to the policy`,
