Merge pull request #472 from jeremad/jrm/pages_visibility

feat(project): add the pages_access_level parameter

Author: armsnyder

docs/resources/project.md

@@ -82,6 +82,10 @@ The following arguments are supported:
 
 * `group_with_project_templates_id` - (Optional) For group-level custom templates, specifies ID of group from which all the custom project templates are sourced. Leave empty for instance-level templates. Requires use_custom_template to be true (enterprise edition).
 
+* `pages_access_level` - (Optional) Enable pages access control
+  Valid values are `disabled`, `private`, `enabled`, `public`.
+  `private` is the default.
+
 ## Attributes Reference
 
 The following additional attributes are exported:

gitlab/resource_gitlab_instance_cluster_test.go

@@ -217,7 +217,6 @@ func testAccCheckGitlabInstanceClusterAttributes(cluster *gitlab.InstanceCluster
 
 func testAccGitlabInstanceClusterConfig(rInt int, managed bool) string {
 	m := fmt.Sprintf("%t", managed)
-	fmt.Println(m)
 
 	return fmt.Sprintf(`
 variable "cert" {

gitlab/resource_gitlab_project.go

@@ -268,6 +268,12 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
 		Type:     schema.TypeInt,
 		Optional: true,
 	},
+	"pages_access_level": {
+		Type:         schema.TypeString,
+		Optional:     true,
+		Default:      "private",
+		ValidateFunc: validation.StringInSlice([]string{"public", "private", "enabled", "disabled"}, true),
+	},
 }
 
 func resourceGitlabProject() *schema.Resource {
@@ -313,6 +319,7 @@ func resourceGitlabProjectSetToState(d *schema.ResourceData, project *gitlab.Pro
 	d.Set("archived", project.Archived)
 	d.Set("remove_source_branch_after_merge", project.RemoveSourceBranchAfterMerge)
 	d.Set("packages_enabled", project.PackagesEnabled)
+	d.Set("pages_access_level", string(project.PagesAccessLevel))
 }
 
 func resourceGitlabProjectCreate(d *schema.ResourceData, meta interface{}) error {
@@ -378,6 +385,10 @@ func resourceGitlabProjectCreate(d *schema.ResourceData, meta interface{}) error
 		options.GroupWithProjectTemplatesID = gitlab.Int(v.(int))
 	}
 
+	if v, ok := d.GetOk("pages_access_level"); ok {
+		options.PagesAccessLevel = stringToAccessControlValue(v.(string))
+	}
+
 	log.Printf("[DEBUG] create gitlab project %q", *options.Name)
 
 	project, _, err := client.Projects.CreateProject(options)
@@ -558,6 +569,10 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 		options.PackagesEnabled = gitlab.Bool(d.Get("packages_enabled").(bool))
 	}
 
+	if d.HasChange("pages_access_level") {
+		options.PagesAccessLevel = stringToAccessControlValue(d.Get("pages_access_level").(string))
+	}
+
 	if *options != (gitlab.EditProjectOptions{}) {
 		log.Printf("[DEBUG] update gitlab project %s", d.Id())
 		_, _, err := client.Projects.EditProject(d.Id(), options)

gitlab/resource_gitlab_project_test.go

@@ -41,8 +41,9 @@ func TestAccGitlabProject_basic(t *testing.T) {
 		MergeMethod:                      gitlab.FastForwardMerge,
 		OnlyAllowMergeIfPipelineSucceeds: true,
 		OnlyAllowMergeIfAllDiscussionsAreResolved: true,
-		Archived:        false, // needless, but let's make this explicit
-		PackagesEnabled: true,
+		Archived:         false, // needless, but let's make this explicit
+		PackagesEnabled:  true,
+		PagesAccessLevel: gitlab.PublicAccessControl,
 	}
 
 	defaultsMasterBranch = defaults
@@ -82,8 +83,9 @@ func TestAccGitlabProject_basic(t *testing.T) {
 						MergeMethod:                      gitlab.FastForwardMerge,
 						OnlyAllowMergeIfPipelineSucceeds: true,
 						OnlyAllowMergeIfAllDiscussionsAreResolved: true,
-						Archived:        true,
-						PackagesEnabled: false,
+						Archived:         true,
+						PackagesEnabled:  false,
+						PagesAccessLevel: gitlab.DisabledAccessControl,
 					}, &received),
 				),
 			},
@@ -324,7 +326,8 @@ func TestAccGitlabProject_willError(t *testing.T) {
 		MergeMethod:                      gitlab.FastForwardMerge,
 		OnlyAllowMergeIfPipelineSucceeds: true,
 		OnlyAllowMergeIfAllDiscussionsAreResolved: true,
-		PackagesEnabled: true,
+		PackagesEnabled:  true,
+		PagesAccessLevel: gitlab.PublicAccessControl,
 	}
 	willError := defaults
 	willError.TagList = []string{"notatag"}
@@ -423,7 +426,8 @@ func TestAccGitlabProject_transfer(t *testing.T) {
 		MergeMethod:                      gitlab.NoFastForwardMerge,
 		OnlyAllowMergeIfPipelineSucceeds: false,
 		OnlyAllowMergeIfAllDiscussionsAreResolved: false,
-		PackagesEnabled: true,
+		PackagesEnabled:  true,
+		PagesAccessLevel: gitlab.PrivateAccessControl,
 	}
 
 	resource.Test(t, resource.TestCase{
@@ -746,6 +750,7 @@ resource "gitlab_project" "foo" {
   merge_method = "ff"
   only_allow_merge_if_pipeline_succeeds = true
   only_allow_merge_if_all_discussions_are_resolved = true
+  pages_access_level = "public"
 }
 	`, rInt, rInt, defaultBranchStatement)
 }
@@ -803,6 +808,7 @@ resource "gitlab_project" "foo" {
   shared_runners_enabled = false
   archived = true
   packages_enabled = false
+  pages_access_level = "disabled"
 }
 	`, rInt, rInt)
 }

gitlab/util.go

@@ -142,6 +142,21 @@ func stringToMergeMethod(s string) *gitlab.MergeMethodValue {
 	return &value
 }
 
+func stringToAccessControlValue(s string) *gitlab.AccessControlValue {
+	lookup := map[string]gitlab.AccessControlValue{
+		"disabled": gitlab.DisabledAccessControl,
+		"enabled":  gitlab.EnabledAccessControl,
+		"private":  gitlab.PrivateAccessControl,
+		"public":   gitlab.PublicAccessControl,
+	}
+
+	value, ok := lookup[s]
+	if !ok {
+		return nil
+	}
+	return &value
+}
+
 var StringIsGitlabVariableName = func(v interface{}, k string) (s []string, es []error) {
 	value, ok := v.(string)
 	if !ok {