diff --git a/content/en/cloud/security/roles/_index.md b/content/en/cloud/security/roles/_index.md index e2383df1..96fe88e7 100644 --- a/content/en/cloud/security/roles/_index.md +++ b/content/en/cloud/security/roles/_index.md @@ -14,7 +14,7 @@ Roles map permissions to users. Roles contain any number of keychains, which con ## Provider Admin Role {{< cardpane >}} -{{% card header="### Provider Admin Role" %}} +{{% card header="Provider Admin Role" %}} ![role-provider](/cloud/security/images/role-provider-admin.svg) {{% /card %}} {{% card %}} @@ -52,12 +52,12 @@ Roles map permissions to users. Roles contain any number of keychains, which con {{< cardpane >}} {{% card %}} -![organization-administrator](/cloud/security/images/organization-roles.svg) +![organization-administrator and manager](/cloud/identity/images/organization-administrator-and-organization-billing-manager.svg) {{% /card %}} {{< /cardpane >}} {{< cardpane >}} -{{% card header="### Organization Administrator" %}} +{{% card header="### Organization Administrator" %}} **What is the purpose of this role?** @@ -81,7 +81,7 @@ Roles map permissions to users. Roles contain any number of keychains, which con - Organization Owner {{% /card %}} -{{% card header="### Organization Billing Manager" %}} +{{% card header="### Organization Billing Manager" %}} **What is the purpose of this role?** @@ -120,12 +120,12 @@ For more information, see [Organization](/cloud/identity/organizations). {{< cardpane >}} {{% card %}} -![workspace-administrator](/cloud/security/images/workspace-roles.svg) +![workspacea-administrator-and-workspace-manager](/cloud/identity/images/workspace-administrator-and-workspace-manager.svg) {{% /card %}} {{< /cardpane >}} {{< cardpane >}} -{{% card header="### Workspace Administrator" %}} +{{% card header="### Workspace Administrator" %}} **What is the purpose of this role?** @@ -148,6 +148,29 @@ For more information, see [Organization](/cloud/identity/organizations). - Organization Administrators or Workspace Owner +{{% /card %}} +{{% card header="### Workspace Manager" %}} + +**What is the purpose of this role?** + +- Management and administration of the various workspace resources + +**Who can assign this role?** + +- Organization Administrators or Workspace Administrators + +**When this role is first assigned?** + +- Manually by Organization Administrators or Workspace Administrators + +**How many instances of these roles?** + +- Min: 0, Max: many + +**Who can remove assignment of this role?** + +- Organization Administrators or Workspace Administrators + {{% /card %}} {{< /cardpane >}} @@ -163,12 +186,12 @@ The entitlement of "workspace owner" is automatically bestowed to the creator of {{< cardpane >}} {{% card %}} -![team-administrators](/cloud/security/images/team-roles.svg) +![team-admins-and-manager](/cloud/identity/images/team-admins-and-team-managers.svg) {{% /card %}} {{< /cardpane >}} {{< cardpane >}} -{{% card header="### Team Administrator" %}} +{{% card header="Team Administrator" %}} **What is the purpose of this role?** - Administration of teams @@ -183,52 +206,34 @@ The entitlement of "workspace owner" is automatically bestowed to the creator of - By default, the first Team Admin is owner (the team creator) **How many instances of these roles?** +Min: 1, Max: many -- Min: 1, Max: many - -{{% /card %}} -{{< /cardpane >}} - -{{< alert title="Owners as entitlements, not roles" >}} -It's essential to understand that owners are not roles, but entitlements. - -Team owners carry the team administrator role, and may be joined in their team administration duties by any number of other users carrying the team administrator role. However, the team owner also has the administrative privilege to delete the team. - -The entitlement of "team owner" is automatically bestowed to the creator of a team. The individual user who created a given team initially is therefore granted certain administrative privileges beyond that of other team administrators. Specifically, team owners retain the sole permission to delete the team. - -For more information, see [Teams](/cloud/identity/teams). -{{< /alert >}} - -## User Role - -{{< cardpane >}} -{{% card %}} -![user](/cloud/security/images/user-role.svg) {{% /card %}} -{{< /cardpane >}} - -{{< cardpane >}} -{{% card header="## User" %}} - +{{% card header="### Team Manager" %}} **What is the purpose of this role?** -- To grant Organization members access to basic features and resources within the context of that Organization. +- Administration of teams (without delete access) -**Who can assign this role?** +**Who can assign and unassign this role?** -- Organization Administrators, Workspace Administrators and Team Administrators +- Organization Administrators or Team Owner -**When this role first assigned?** +**When is this role first assigned?** -- Automatically assigned to members on joining an Organization. +- Manually by Organization Administrator or Team Owner **How many instances of these roles?** -- Min: 1, Max: many +- Min: 0, Max: many + {{% /card %}} + {{< /cardpane >}} -**Who can remove assignment of this role?** +{{< alert title="Owners as entitlements, not roles" >}} +It's essential to understand that owners are not roles, but entitlements. -- Organization Administrators, Workspace Administrators and Team Administrators +Team owners carry the team administrator role, and may be joined in their team administration duties by any number of other users carrying the team administrator role. However, the team owner also has the administrative privilege to delete the team. -{{% /card %}} -{{< /cardpane >}} +The entitlement of "team owner" is automatically bestowed to the creator of a team. The individual user who created a given team initially is therefore granted certain administrative privileges beyond that of other team administrators. Specifically, team owners retain the sole permission to delete the team. + +For more information, see [Teams](/cloud/identity/teams). +{{< /alert >}} \ No newline at end of file diff --git a/layouts/shortcodes/csvtable-roles.html b/layouts/shortcodes/csvtable-roles.html index cf3156b5..c9bce900 100644 --- a/layouts/shortcodes/csvtable-roles.html +++ b/layouts/shortcodes/csvtable-roles.html @@ -1,81 +1,116 @@ -{{ $data := "" }} {{ $p := "static/data/csv/keys.csv" }} {{ $excludedColumns := -slice 0 10 11 12 13 14 15 16 17 18 }} {{ if os.FileExists $p }} {{ $opts := dict -"delimiter" "," }} {{ $data = (os.ReadFile $p | transform.Unmarshal $opts) }} {{ -else }} {{ errorf "Unable to get resource %q" $p }} {{ end }} {{ if $data }} {{ -$uniqueCategories := slice }} {{ $stopAddingCategories := false }} {{ range $i, -$header := index $data 1 }} {{ if gt $i 3 }} {{if eq $header "Keychain ID"}} {{ -$stopAddingCategories = true }} {{end}} {{ if not $stopAddingCategories }} {{ if -and (ne (trim $header "") "") (not (in $uniqueCategories $header)) }} {{ -$uniqueCategories = $uniqueCategories | append $header }} {{ end }} {{ end }} {{ -end }} {{end}} {{ range $index, $category := $uniqueCategories }} -
Permission | - {{ else }} {{ if and (eq $i 2) }} -Description | - {{ end }}{{ end }} {{ end }} {{ end }} -
---|
Permission | + {{ else }} + {{ if and (eq $i 2) }} +Description | + {{ end }} + {{ end }} + {{ end }} + {{ end }} +
---|---|
{{ $functionValue }} | +{{ $featureValue }} | +
{{ $functionValue }} | -{{ $featureValue }} | -
No data available.
+ +No data available.
{{ end }}