Allow merge on skipped pipeline (#705)

Author: mkjmdski

docs/data-sources/projects.md

@@ -2,7 +2,7 @@
 
 Provide details about a list of projects in the Gitlab provider. Listing all projects and group projects with [project filtering](https://docs.gitlab.com/ee/api/projects.html#list-user-projects) or [group project filtering](https://docs.gitlab.com/ee/api/groups.html#list-a-groups-projects) is supported.
 
-> **NOTE**: This data source supports all available filters exposed by the `xanzy/go-gitlab` package, which might not expose all available filters exposed by the Gitlab APIs.  
+> **NOTE**: This data source supports all available filters exposed by the `xanzy/go-gitlab` package, which might not expose all available filters exposed by the Gitlab APIs.
 
 ## Example Usage
 
@@ -162,6 +162,8 @@ Projects items have the following fields:
 
 * `only_allow_merge_if_all_discussions_are_resolved`
 
+* `allow_merge_on_skipped_pipeline`
+
 * `lfs_enabled`
 
 * `request_access_enabled`

docs/resources/project.md

@@ -83,6 +83,8 @@ consult the [gitlab documentation](https://docs.gitlab.com/ee/user/project/repos
 
 * `only_allow_merge_if_all_discussions_are_resolved` - (Optional) Set to true if you want allow merges only if all discussions are resolved.
 
+* `allow_merge_on_skipped_pipeline` - (Optional) Set to true if you want to treat skipped pipelines as if they finished with success.
+
 * `shared_runners_enabled` - (Optional) Enable shared runners for this project.
 
 * `archived` - (Optional) Whether the project is in read-only mode (archived). Repositories can be archived/unarchived by toggling this parameter.

gitlab/data_source_gitlab_projects.go

@@ -145,22 +145,23 @@ func flattenProjects(projects []*gitlab.Project) (values []map[string]interface{
 				"public_builds":                         project.PublicBuilds,
 				"only_allow_merge_if_pipeline_succeeds": project.OnlyAllowMergeIfPipelineSucceeds,
 				"only_allow_merge_if_all_discussions_are_resolved": project.OnlyAllowMergeIfAllDiscussionsAreResolved,
-				"lfs_enabled":                         project.LFSEnabled,
-				"request_access_enabled":              project.RequestAccessEnabled,
-				"merge_method":                        project.MergeMethod,
-				"forked_from_project":                 flattenForkedFromProject(project.ForkedFromProject),
-				"mirror":                              project.Mirror,
-				"mirror_user_id":                      project.MirrorUserID,
-				"mirror_trigger_builds":               project.MirrorTriggerBuilds,
-				"only_mirror_protected_branches":      project.OnlyMirrorProtectedBranches,
-				"mirror_overwrites_diverged_branches": project.MirrorOverwritesDivergedBranches,
-				"shared_with_groups":                  flattenSharedWithGroupsOptions(project),
-				"statistics":                          project.Statistics,
-				"_links":                              flattenProjectLinks(project.Links),
-				"ci_config_path":                      project.CIConfigPath,
-				"custom_attributes":                   project.CustomAttributes,
-				"packages_enabled":                    project.PackagesEnabled,
-				"build_coverage_regex":                project.BuildCoverageRegex,
+				"allow_merge_on_skipped_pipeline":                  project.AllowMergeOnSkippedPipeline,
+				"lfs_enabled":                                      project.LFSEnabled,
+				"request_access_enabled":                           project.RequestAccessEnabled,
+				"merge_method":                                     project.MergeMethod,
+				"forked_from_project":                              flattenForkedFromProject(project.ForkedFromProject),
+				"mirror":                                           project.Mirror,
+				"mirror_user_id":                                   project.MirrorUserID,
+				"mirror_trigger_builds":                            project.MirrorTriggerBuilds,
+				"only_mirror_protected_branches":                   project.OnlyMirrorProtectedBranches,
+				"mirror_overwrites_diverged_branches":              project.MirrorOverwritesDivergedBranches,
+				"shared_with_groups":                               flattenSharedWithGroupsOptions(project),
+				"statistics":                                       project.Statistics,
+				"_links":                                           flattenProjectLinks(project.Links),
+				"ci_config_path":                                   project.CIConfigPath,
+				"custom_attributes":                                project.CustomAttributes,
+				"packages_enabled":                                 project.PackagesEnabled,
+				"build_coverage_regex":                             project.BuildCoverageRegex,
 			}
 			values = append(values, v)
 		}
@@ -541,6 +542,10 @@ func dataSourceGitlabProjects() *schema.Resource {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
+						"allow_merge_on_skipped_pipeline": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
 						"lfs_enabled": {
 							Type:     schema.TypeBool,
 							Computed: true,

gitlab/resource_gitlab_project.go

@@ -118,6 +118,11 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
 		Optional: true,
 		Default:  false,
 	},
+	"allow_merge_on_skipped_pipeline": {
+		Type:     schema.TypeBool,
+		Optional: true,
+		Default:  false,
+	},
 	"ssh_url_to_repo": {
 		Type:     schema.TypeString,
 		Computed: true,
@@ -316,6 +321,7 @@ func resourceGitlabProjectSetToState(d *schema.ResourceData, project *gitlab.Pro
 	d.Set("merge_method", string(project.MergeMethod))
 	d.Set("only_allow_merge_if_pipeline_succeeds", project.OnlyAllowMergeIfPipelineSucceeds)
 	d.Set("only_allow_merge_if_all_discussions_are_resolved", project.OnlyAllowMergeIfAllDiscussionsAreResolved)
+	d.Set("allow_merge_on_skipped_pipeline", project.AllowMergeOnSkippedPipeline)
 	d.Set("namespace_id", project.Namespace.ID)
 	d.Set("ssh_url_to_repo", project.SSHURLToRepo)
 	d.Set("http_url_to_repo", project.HTTPURLToRepo)
@@ -356,6 +362,7 @@ func resourceGitlabProjectCreate(d *schema.ResourceData, meta interface{}) error
 		MergeMethod:                      stringToMergeMethod(d.Get("merge_method").(string)),
 		OnlyAllowMergeIfPipelineSucceeds: gitlab.Bool(d.Get("only_allow_merge_if_pipeline_succeeds").(bool)),
 		OnlyAllowMergeIfAllDiscussionsAreResolved: gitlab.Bool(d.Get("only_allow_merge_if_all_discussions_are_resolved").(bool)),
+		AllowMergeOnSkippedPipeline:               gitlab.Bool(d.Get("allow_merge_on_skipped_pipeline").(bool)),
 		SharedRunnersEnabled:                      gitlab.Bool(d.Get("shared_runners_enabled").(bool)),
 		RemoveSourceBranchAfterMerge:              gitlab.Bool(d.Get("remove_source_branch_after_merge").(bool)),
 		PackagesEnabled:                           gitlab.Bool(d.Get("packages_enabled").(bool)),
@@ -616,6 +623,10 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 		options.OnlyAllowMergeIfAllDiscussionsAreResolved = gitlab.Bool(d.Get("only_allow_merge_if_all_discussions_are_resolved").(bool))
 	}
 
+	if d.HasChange("allow_merge_on_skipped_pipeline") {
+		options.AllowMergeOnSkippedPipeline = gitlab.Bool(d.Get("allow_merge_on_skipped_pipeline").(bool))
+	}
+
 	if d.HasChange("request_access_enabled") {
 		options.RequestAccessEnabled = gitlab.Bool(d.Get("request_access_enabled").(bool))
 	}

gitlab/resource_gitlab_project_test.go

@@ -44,11 +44,12 @@ func TestAccGitlabProject_basic(t *testing.T) {
 		MergeMethod:                      gitlab.FastForwardMerge,
 		OnlyAllowMergeIfPipelineSucceeds: true,
 		OnlyAllowMergeIfAllDiscussionsAreResolved: true,
-		Archived:           false, // needless, but let's make this explicit
-		PackagesEnabled:    true,
-		PagesAccessLevel:   gitlab.PublicAccessControl,
-		BuildCoverageRegex: "foo",
-		CIConfigPath:       ".gitlab-ci.yml@mynamespace/myproject",
+		AllowMergeOnSkippedPipeline:               false,
+		Archived:                                  false, // needless, but let's make this explicit
+		PackagesEnabled:                           true,
+		PagesAccessLevel:                          gitlab.PublicAccessControl,
+		BuildCoverageRegex:                        "foo",
+		CIConfigPath:                              ".gitlab-ci.yml@mynamespace/myproject",
 	}
 
 	defaultsMainBranch = defaults
@@ -88,10 +89,11 @@ func TestAccGitlabProject_basic(t *testing.T) {
 						MergeMethod:                      gitlab.FastForwardMerge,
 						OnlyAllowMergeIfPipelineSucceeds: true,
 						OnlyAllowMergeIfAllDiscussionsAreResolved: true,
-						Archived:           true,
-						PackagesEnabled:    false,
-						PagesAccessLevel:   gitlab.DisabledAccessControl,
-						BuildCoverageRegex: "bar",
+						AllowMergeOnSkippedPipeline:               true,
+						Archived:                                  true,
+						PackagesEnabled:                           false,
+						PagesAccessLevel:                          gitlab.DisabledAccessControl,
+						BuildCoverageRegex:                        "bar",
 					}, &received),
 				),
 			},
@@ -999,6 +1001,7 @@ resource "gitlab_project" "foo" {
   only_allow_merge_if_all_discussions_are_resolved = true
   pages_access_level = "public"
   build_coverage_regex = "foo"
+  allow_merge_on_skipped_pipeline = false
   ci_config_path = ".gitlab-ci.yml@mynamespace/myproject"
 }
 	`, rInt, rInt, defaultBranchStatement)
@@ -1053,6 +1056,7 @@ resource "gitlab_project" "foo" {
   merge_method = "ff"
   only_allow_merge_if_pipeline_succeeds = true
   only_allow_merge_if_all_discussions_are_resolved = true
+  allow_merge_on_skipped_pipeline = true
 
   request_access_enabled = false
   issues_enabled = false