From e13589465a8fe8b4fa9771ec8fbd43896b76f6d0 Mon Sep 17 00:00:00 2001 From: Garth Kerr Date: Tue, 6 Aug 2019 14:54:31 -0400 Subject: [PATCH 1/3] Clarify group membership import documentation --- website/docs/r/group_membership.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/docs/r/group_membership.html.markdown b/website/docs/r/group_membership.html.markdown index 875f088b8..79ad8d2f2 100644 --- a/website/docs/r/group_membership.html.markdown +++ b/website/docs/r/group_membership.html.markdown @@ -35,8 +35,8 @@ The following arguments are supported: ## Import -GitLab group membership can be imported using an id made up of `groupid:username`, e.g. +GitLab group membership can be imported using an id made up of `group_id:user_id`, e.g. ``` -$ terraform import gitlab_group_membership.test 12345:1337 -``` \ No newline at end of file +$ terraform import gitlab_group_membership.test "12345:1337" +``` From e2c4de17e8858640b3b27b804664486ccb532305 Mon Sep 17 00:00:00 2001 From: Garth Kerr Date: Tue, 6 Aug 2019 15:10:51 -0400 Subject: [PATCH 2/3] Consistency. Add owner reference. --- website/docs/r/group_membership.html.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/docs/r/group_membership.html.markdown b/website/docs/r/group_membership.html.markdown index 79ad8d2f2..f5be2e981 100644 --- a/website/docs/r/group_membership.html.markdown +++ b/website/docs/r/group_membership.html.markdown @@ -14,10 +14,10 @@ This resource allows you to add a user to an existing group. ```hcl resource "gitlab_group_membership" "test" { -group_id = "12345" -user_id = 1337 -access_level = "guest" -expires_at = "2020-12-31" + group_id = "12345" + user_id = 1337 + access_level = "guest" + expires_at = "2020-12-31" } ``` @@ -29,7 +29,7 @@ The following arguments are supported: * `user_id` - (Required) The id of the user. -* `access_level` - (Required) Acceptable values are: guest, reporter, developer, master. +* `access_level` - (Required) Acceptable values are: guest, reporter, developer, master, owner. * `expires_at` - (Optional) Expiration date for the group membership. Format: `YYYY-MM-DD` From fb68a752b7106770f42fbb2cda2bcb18f601327a Mon Sep 17 00:00:00 2001 From: Garth Kerr Date: Tue, 6 Aug 2019 15:14:57 -0400 Subject: [PATCH 3/3] Update project_membership.html.markdown --- website/docs/r/project_membership.html.markdown | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/website/docs/r/project_membership.html.markdown b/website/docs/r/project_membership.html.markdown index 285315c2b..1ca34986e 100644 --- a/website/docs/r/project_membership.html.markdown +++ b/website/docs/r/project_membership.html.markdown @@ -14,9 +14,9 @@ This resource allows you to add a current user to an existing project with a set ```hcl resource "gitlab_project_membership" "test" { -project_id = "12345" -user_id = 1337 -access_level = "guest" + project_id = "12345" + user_id = 1337 + access_level = "guest" } ``` @@ -32,7 +32,8 @@ The following arguments are supported: ## Import -GitLab group membership can be imported using an id made up of `groupid:username`, e.g. +GitLab group membership can be imported using an id made up of `group_id:user_id`, e.g. ``` -$ terraform import gitlab_project_membership.test 12345:1337 +$ terraform import gitlab_project_membership.test "12345:1337" +```