Merge branch 'main' into feat-refactor-project-team-#817

env0 · Apr 7, 2024 · b4e84e8 · b4e84e8
2 parents 9538b03 + fc3f9a5
commit b4e84e8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/docs/resources/team_environment_assignment.md b/docs/resources/team_environment_assignment.md
@@ -38,11 +38,17 @@ resource "env0_custom_role" "custom_role" {
   ]
 }
 
-resource "env0_team_environment_assignment" "assignment" {
+resource "env0_team_environment_assignment" "custom_role_assignment" {
   team_id        = env0_team.team.id
   environment_id = env0_environment.environment.id
   role_id        = env0_custom_role.custom_role.id
 }
+
+resource "env0_team_environment_assignment" "builtin_role_assignment" {
+  team_id        = env0_team.team.id
+  environment_id = env0_environment.environment.id
+  role_id        = "Viewer"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -51,7 +57,7 @@ resource "env0_team_environment_assignment" "assignment" {
 ### Required
 
 - `environment_id` (String) id of the environment
-- `role_id` (String) id of the assigned role
+- `role_id` (String) id of the assigned custom role. The following built-in roles can be passed as well: `Viewer`, `Planner`, `Deployer`, `Admin`
 - `team_id` (String) id of the team
 
 ### Read-Only

diff --git a/docs/resources/team_organization_assignment.md b/docs/resources/team_organization_assignment.md
@@ -25,18 +25,23 @@ resource "env0_custom_role" "custom_role" {
   ]
 }
 
-resource "env0_team_organization_assignment" "assignment" {
+resource "env0_team_organization_assignment" "custom_role_assignment" {
   team_id = env0_team.team.id
   role_id = env0_custom_role.custom_role.id
 }
+
+resource "env0_team_organization_assignment" "builtin_role_assignment" {
+  team_id = env0_team.team.id
+  role_id = "Admin"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
 ### Required
 
-- `role_id` (String) id of the assigned role
+- `role_id` (String) id of the assigned custom role. The following built-in roles can be passed as well: `User`, `Admin`
 - `team_id` (String) id of the team
 
 ### Read-Only

diff --git a/env0/resource_team_environment_assignment.go b/env0/resource_team_environment_assignment.go
@@ -31,7 +31,7 @@ func resourceTeamEnvironmentAssignment() *schema.Resource {
 			},
 			"role_id": {
 				Type:             schema.TypeString,
-				Description:      "id of the assigned role",
+				Description:      "id of the assigned custom role. The following built-in roles can be passed as well: `Viewer`, `Planner`, `Deployer`, `Admin`",
 				Required:         true,
 				ValidateDiagFunc: ValidateNotEmptyString,
 			},

diff --git a/env0/resource_team_organization_assignment.go b/env0/resource_team_organization_assignment.go
@@ -27,7 +27,7 @@ func resourceTeamOrganizationAssignment() *schema.Resource {
 			},
 			"role_id": {
 				Type:             schema.TypeString,
-				Description:      "id of the assigned role",
+				Description:      "id of the assigned custom role. The following built-in roles can be passed as well: `User`, `Admin`",
 				Required:         true,
 				ValidateDiagFunc: ValidateNotEmptyString,
 			},

diff --git a/examples/resources/env0_team_environment_assignment/resource.tf b/examples/resources/env0_team_environment_assignment/resource.tf
@@ -23,8 +23,14 @@ resource "env0_custom_role" "custom_role" {
   ]
 }
 
-resource "env0_team_environment_assignment" "assignment" {
+resource "env0_team_environment_assignment" "custom_role_assignment" {
   team_id        = env0_team.team.id
   environment_id = env0_environment.environment.id
   role_id        = env0_custom_role.custom_role.id
 }
+
+resource "env0_team_environment_assignment" "builtin_role_assignment" {
+  team_id        = env0_team.team.id
+  environment_id = env0_environment.environment.id
+  role_id        = "Viewer"
+}
diff --git a/examples/resources/env0_team_organization_assignment/resource.tf b/examples/resources/env0_team_organization_assignment/resource.tf
@@ -10,7 +10,12 @@ resource "env0_custom_role" "custom_role" {
   ]
 }
 
-resource "env0_team_organization_assignment" "assignment" {
+resource "env0_team_organization_assignment" "custom_role_assignment" {
   team_id = env0_team.team.id
   role_id = env0_custom_role.custom_role.id
 }
+
+resource "env0_team_organization_assignment" "builtin_role_assignment" {
+  team_id = env0_team.team.id
+  role_id = "Admin"
+}