Skip to content

Commit 2cd4997

Browse files
authored
Merge pull request #375 from hashicorp/RK/Module-management-change-requests
2 parents 60e307e + 6b22190 commit 2cd4997

File tree

18 files changed

+472
-164
lines changed

18 files changed

+472
-164
lines changed

website/data/cloud-docs-nav-data.json

+19-2
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,18 @@
196196
"title": "Create tags",
197197
"path": "workspaces/tags"
198198
},
199-
{ "title": "Explorer", "path": "workspaces/explorer" },
200199
{ "title": "Browse workspaces", "path": "workspaces/browse"},
200+
{ "title": "Explorer", "path": "workspaces/explorer" },
201+
{
202+
"title": "Change requests",
203+
"routes": [
204+
{ "title": "Overview", "path": "workspaces/change-requests" },
205+
{
206+
"title": "Manage change requests",
207+
"path": "workspaces/change-requests/manage"
208+
}
209+
]
210+
},
201211
{
202212
"title": "Terraform Configurations",
203213
"path": "workspaces/configurations"
@@ -297,7 +307,14 @@
297307
"title": "Users, Teams, Organizations",
298308
"routes": [
299309
{ "title": "Users", "path": "users-teams-organizations/users" },
300-
{ "title": "Teams", "path": "users-teams-organizations/teams" },
310+
{
311+
"title": "Teams",
312+
"routes": [
313+
{"title": "Overview","path": "users-teams-organizations/teams"},
314+
{ "title": "Manage teams", "path": "users-teams-organizations/teams/manage" },
315+
{ "title": "Notifications", "path": "users-teams-organizations/teams/notifications" }
316+
]
317+
},
301318
{
302319
"title": "Organizations",
303320
"routes": [

website/docs/cloud-docs/api-docs/project-team-access.mdx

+4-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ description: >-
4444

4545
The team access APIs are used to associate a team to permissions on a project. A single `team-project` resource contains the relationship between the Team and Project, including the privileges the team has on the project.
4646

47-
-> **Note**: A `team-project` resource represents a team's _local_ permissions on a specific project. Teams can also have _organization-level_ permissions that grant access to projects, and HCP Terraform uses whichever access level is higher. (For example: a team with the "manage projects" permission has admin access on all projects, even if their `team-project` on a particular project only grants read access.) For more information, see [Managing Project Access](/terraform/cloud-docs/users-teams-organizations/teams#managing-project-access).
47+
## Resource permissions
4848

49-
Any member of an organization can view team access relative to their own team memberships, including secret teams of which they are a member. Organization owners and project admins can modify team access or view the full set of secret team accesses. The organization token and the owners team token can act as an owner on these endpoints. ([More about permissions.](/terraform/cloud-docs/users-teams-organizations/permissions))
49+
A `team-project` resource represents a team's local permissions on a specific project. Teams can also have organization-level permissions that grant access to projects. HCP Terraform uses the more restrictive access level. For example, a team with the **Manage projects** permission enabled has admin access on all projects, even if their `team-project` on a particular project only grants read access. For more information, refer to [Managing Project Access](/terraform/cloud-docs/users-teams-organizations/teams/manage#managing-project-access).
50+
51+
Any member of an organization can view team access relative to their own team memberships, including secret teams of which they are a member. Organization owners and project admins can modify team access or view the full set of secret team accesses. The organization token and the owners team token can act as an owner on these endpoints. Refer to [Permissions](/terraform/cloud-docs/users-teams-organizations/permissions) for additional information.
5052

5153
## Project Team Access Levels
5254
| Access Level | Description |

website/docs/cloud-docs/api-docs/team-access.mdx

+4-2
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ description: >-
4444

4545
The team access APIs are used to associate a team to permissions on a workspace. A single `team-workspace` resource contains the relationship between the Team and Workspace, including the privileges the team has on the workspace.
4646

47-
-> **Note**: A `team-workspace` resource represents a team's _local_ permissions on a specific workspace. Teams can also have _organization-level_ permissions that grant access to workspaces, and HCP Terraform uses whichever access level is higher. (For example: a team with the "manage workspaces" permission has admin access on all workspaces, even if their `team-workspace` on a particular workspace only grants read access.) For more information, see [Managing Workspace Access](/terraform/cloud-docs/users-teams-organizations/teams#managing-workspace-access).
47+
## Resource permissions
4848

49-
Any member of an organization can view team access relative to their own team memberships, including secret teams of which they are a member. Organization owners and workspace admins can modify team access or view the full set of secret team accesses. The organization token and the owners team token can act as an owner on these endpoints. ([More about permissions.](/terraform/cloud-docs/users-teams-organizations/permissions))
49+
A `team-workspace` resource represents a team's local permissions on a specific workspace. Teams can also have organization-level permissions that grant access to workspaces. HCP Terraform uses the more restrictive access level. For example, a team with the "**Manage workspaces** permission enabled has admin access on all workspaces, even if their `team-workspace` on a particular workspace only grants read access. For more information, refer to [Managing Workspace Access](/terraform/cloud-docs/users-teams-organizations/teams/manage#managing-workspace-access).
50+
51+
Any member of an organization can view team access relative to their own team memberships, including secret teams of which they are a member. Organization owners and workspace admins can modify team access or view the full set of secret team accesses. The organization token and the owners team token can act as an owner on these endpoints. Refer to [Permissions](/terraform/cloud-docs/users-teams-organizations/permissions) for additional information.
5052
5153
## List Team Access to a Workspace
5254

website/docs/cloud-docs/api-docs/variable-sets.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ description: >-
88

99
A [variable set](/terraform/cloud-docs/workspaces/variables#scope) is a resource that allows you to reuse the same variables across multiple workspaces and projects. For example, you could define a variable set of provider credentials and automatically apply it to a selection of workspaces, all workspaces in a project, or all workspaces in an organization.
1010

11-
You need [`read variables` permission](/terraform/cloud-docs/users-teams-organizations/permissions#general-workspace-permissions) to view the variables for a particular workspace and to view the variable sets in the owning organization. To create or edit variable sets, your team must have [`Manage Workspace` organization access](/terraform/cloud-docs/users-teams-organizations/teams#managing-organization-access).
11+
You need [**Read** variables permission](/terraform/cloud-docs/users-teams-organizations/permissions#general-workspace-permissions) to view the variables for a particular workspace and to view the variable sets in the owning organization. To create or edit variable sets, your team must have [**Manage all workspaces** organization access](/terraform/cloud-docs/users-teams-organizations/teams/manage#managing-organization-access).
1212

1313
## Create a Variable Set
1414

website/docs/cloud-docs/projects/manage.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This topic describes how to create and manage projects in HCP Terraform and Terr
1414
You must have the following permissions to manage projects:
1515

1616
- You must be a member of a team with the **Manage all Projects** permissions enabled to create a project. Refer to [Organization Permissions](/terraform/cloud-docs/users-teams-organizations/permissions#organization-permissions) for additional information.
17-
- You must be a member of a team with the **Visible** option enabled under **Visibility** in the organization settings to configure a new team's access to the project. Refer to [Team Visibility](/terraform/cloud-docs/users-teams-organizations/teams#team-visibility) for additional information.
17+
- You must be a member of a team with the **Visible** option enabled under **Visibility** in the organization settings to configure a new team's access to the project. Refer to [Team Visibility](/terraform/cloud-docs/users-teams-organizations/teams/manage#team-visibility) for additional information.
1818
- You must be a member of a team with update and delete permissions to be able to update and delete teams respectively.
1919

2020
To delete tags on a project, you must be member of a team with the **Admin** permission group enabled for the project.

website/docs/cloud-docs/users-teams-organizations/organizations/index.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ You can perform the following actions in the **Tags** tab:
148148
All users in an organization can access the **Teams** page, which displays a list of [teams][] within the organization.
149149

150150
Organization owners and users with the [include secret teams permission](/terraform/cloud-docs/users-teams-organizations/permissions#include-secret-teams) can:
151-
* view all [secret teams](/terraform/cloud-docs/users-teams-organizations/teams#team-visibility)
151+
* view all [secret teams](/terraform/cloud-docs/users-teams-organizations/teams/manage#team-visibility)
152152
* view each team's membership
153153
* manage team API tokens
154154

website/docs/cloud-docs/users-teams-organizations/permissions.mdx

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Admin permissions include the highest level of general permissions for the works
104104
Workspace admins have all [General Workspace Permissions](#general-workspace-permissions), as well as the ability to do the following tasks:
105105

106106
- Read and write workspace settings. This includes general settings, notification configurations, run triggers, and more.
107-
- Set or remove workspace permissions for visible teams. Workspace admins cannot view or manage teams that are are [Secret](/terraform/cloud-docs/users-teams-organizations/teams#team-visibility), unless they are also organization owners.
107+
- Set or remove workspace permissions for visible teams. Workspace admins cannot view or manage teams with the [**Secret**](/terraform/cloud-docs/users-teams-organizations/teams/manage#team-visibility) visibility option enabled unless they are also organization owners.
108108
- Delete the workspace
109109
- Depending on the [organization's settings](/terraform/cloud-docs/users-teams-organizations/organizations#general), workspace admins may only be able to delete the workspace if it is not actively managing infrastructure. Refer to [Deleting a Workspace With Resources Under Management](/terraform/cloud-docs/workspaces/settings#deleting-a-workspace-with-resources-under-management) for details.
110110

@@ -179,7 +179,7 @@ You can grant the following project permissions to teams on a per-project basis.
179179
- **Team management:**
180180
- **None:** — No access to view teams assigned to the project.
181181
- **Read:** — Allows users to see teams assigned to the project for visible teams.
182-
- **Manage:** — _Implies permission to read._ Allows users to set or remove project permissions for visible teams. Project admins can not view or manage [secret teams](/terraform/cloud-docs/users-teams-organizations/teams#team-visibility) unless they are also organization owners.
182+
- **Manage:** — _Implies permission to read._ Allows users to set or remove project permissions for visible teams. Project admins can not view or manage [secret teams](/terraform/cloud-docs/users-teams-organizations/teams/manage#team-visibility) unless they are also organization owners.
183183

184184
See [General Workspace Permissions](#general-workspace-permissions)for the complete list of available permissions for a project's workspaces.
185185

@@ -197,7 +197,7 @@ Members of teams with "admin" permissions for a project have [General Workspace
197197
- Delete the project.
198198
- Create workspaces in the project.
199199
- Move workspaces into or out of the project. This also requires project admin permissions for the source or destination project.
200-
- Grant or revoke project permissions for visible teams. Project admins **cannot** view or manage access for teams that are are [Secret](/terraform/cloud-docs/users-teams-organizations/teams#team-visibility), unless those admins are also organization owners.
200+
- Grant or revoke project permissions for visible teams. Project admins **cannot** view or manage access for teams that are are [Secret](/terraform/cloud-docs/users-teams-organizations/teams/manage#team-visibility), unless those admins are also organization owners.
201201

202202
#### Maintain
203203

@@ -321,7 +321,7 @@ Allows members to invite users to the organization, remove users from the organi
321321

322322
This permission grants the ability to view the list of users within the organization, and to view the organization access of other visible teams. It does not permit the creation of teams, the ability to modify the settings of existing teams, or the ability to view secret teams.
323323

324-
In order to modify the membership of a team, a user with Manage Membership permissions must have visibility into the team (i.e. the team must be ["Visible"](/terraform/cloud-docs/users-teams-organizations/teams#team-visibility), or the user must be on the team).
324+
In order to modify the membership of a team, a user with Manage Membership permissions must have visibility into the team (i.e. the team must be ["Visible"](/terraform/cloud-docs/users-teams-organizations/teams/manage#team-visibility), or the user must be on the team).
325325
In order to remove a user from the organization, the holder of this permission must have visibility into all of the teams which the user is a member of.
326326

327327
~> This permission is intended to allow owners of large organizations to delegate membership management to another trusted team, and should be granted to only teams of trusted users. **Assign with caution:** Users with this permission are able to add themselves to any visible team, and inherit the permissions of any visible team.

0 commit comments

Comments
 (0)