Skip to content

Commit 4a44fb8

Browse files
committed
Add printing_merge_request_link_enabled attribute to projects
As mentioned on gitlabhq#782, the field is available on GitLab but still not possible to use on terraform Reference: - gitlabhq#782
1 parent 8e64303 commit 4a44fb8

File tree

6 files changed

+23
-0
lines changed

6 files changed

+23
-0
lines changed

docs/data-sources/project.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ data "gitlab_project" "example" {
4343
- **namespace_id** (Number) The namespace (group or user) of the project. Defaults to your user.
4444
- **path** (String) The path of the repository.
4545
- **pipelines_enabled** (Boolean) Enable pipelines for the project.
46+
- **printing_merge_request_link_enabled** (Boolean) Show link to create/view merge request when pushing from the command line
4647
- **push_rules** (List of Object) Push rules for the project. (see [below for nested schema](#nestedatt--push_rules))
4748
- **remove_source_branch_after_merge** (Boolean) Enable `Delete source branch` option by default for all new merge requests
4849
- **request_access_enabled** (Boolean) Allow users to request member access.

docs/resources/project.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ resource "gitlab_project" "example-two" {
7272
- **pages_access_level** (String) Enable pages access control
7373
- **path** (String) The path of the repository.
7474
- **pipelines_enabled** (Boolean) Enable pipelines for the project.
75+
- **printing_merge_request_link_enabled** (Boolean) Show link to create/view merge request when pushing from the command line
7576
- **push_rules** (Block List, Max: 1) Push rules for the project. (see [below for nested schema](#nestedblock--push_rules))
7677
- **remove_source_branch_after_merge** (Boolean) Enable `Delete source branch` option by default for all new merge requests.
7778
- **request_access_enabled** (Boolean) Allow users to request member access.

examples/gitlab-managed-state/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ resource "gitlab_project" "api" {
4141
only_allow_merge_if_all_discussions_are_resolved = true
4242
only_allow_merge_if_pipeline_succeeds = true
4343
remove_source_branch_after_merge = true
44+
printing_merge_request_link_enabled = true
4445

4546
container_registry_enabled = false
4647
lfs_enabled = false

internal/provider/data_source_gitlab_project.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ var _ = registerDataSource("gitlab_project", func() *schema.Resource {
134134
Type: schema.TypeBool,
135135
Computed: true,
136136
},
137+
"printing_merge_request_link_enabled": {
138+
Description: "Show link to create/view merge request when pushing from the command line",
139+
Type: schema.TypeBool,
140+
Computed: true,
141+
},
137142
// lintignore: S031 // TODO: Resolve this tfproviderlint issue
138143
"push_rules": {
139144
Description: "Push rules for the project.",

internal/provider/resource_gitlab_project.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
204204
Type: schema.TypeBool,
205205
Optional: true,
206206
},
207+
"printing_merge_request_link_enabled": {
208+
Description: "Show link to create/view merge request when pushing from the command line",
209+
Type: schema.TypeBool,
210+
Optional: true,
211+
Default: true,
212+
},
207213
"packages_enabled": {
208214
Description: "Enable packages repository for the project.",
209215
Type: schema.TypeBool,
@@ -413,6 +419,7 @@ func resourceGitlabProjectSetToState(d *schema.ResourceData, project *gitlab.Pro
413419
d.Set("archived", project.Archived)
414420
d.Set("squash_option", project.SquashOption)
415421
d.Set("remove_source_branch_after_merge", project.RemoveSourceBranchAfterMerge)
422+
d.Set("printing_merge_request_link_enabled", project.PrintingMergeRequestLinkEnabled)
416423
d.Set("packages_enabled", project.PackagesEnabled)
417424
d.Set("pages_access_level", string(project.PagesAccessLevel))
418425
d.Set("mirror", project.Mirror)
@@ -449,6 +456,7 @@ func resourceGitlabProjectCreate(ctx context.Context, d *schema.ResourceData, me
449456
SquashOption: stringToSquashOptionValue(d.Get("squash_option").(string)),
450457
RemoveSourceBranchAfterMerge: gitlab.Bool(d.Get("remove_source_branch_after_merge").(bool)),
451458
PackagesEnabled: gitlab.Bool(d.Get("packages_enabled").(bool)),
459+
PrintingMergeRequestLinkEnabled: gitlab.Bool(d.Get("printing_merge_request_link_enabled").(bool)),
452460
Mirror: gitlab.Bool(d.Get("mirror").(bool)),
453461
MirrorTriggerBuilds: gitlab.Bool(d.Get("mirror_trigger_builds").(bool)),
454462
BuildCoverageRegex: gitlab.String(d.Get("build_coverage_regex").(string)),
@@ -773,6 +781,10 @@ func resourceGitlabProjectUpdate(ctx context.Context, d *schema.ResourceData, me
773781
options.RemoveSourceBranchAfterMerge = gitlab.Bool(d.Get("remove_source_branch_after_merge").(bool))
774782
}
775783

784+
if d.HasChange("printing_merge_request_link_enabled") {
785+
options.PrintingMergeRequestLinkEnabled = gitlab.Bool(d.Get("printing_merge_request_link_enabled").(bool))
786+
}
787+
776788
if d.HasChange("packages_enabled") {
777789
options.PackagesEnabled = gitlab.Bool(d.Get("packages_enabled").(bool))
778790
}

internal/provider/resource_gitlab_project_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func TestAccGitlabProject_basic(t *testing.T) {
4949
Archived: false, // needless, but let's make this explicit
5050
PackagesEnabled: true,
5151
PagesAccessLevel: gitlab.PublicAccessControl,
52+
PrintingMergeRequestLinkEnabled: true,
5253
BuildCoverageRegex: "foo",
5354
IssuesTemplate: "",
5455
MergeRequestsTemplate: "",
@@ -463,6 +464,7 @@ func TestAccGitlabProject_willError(t *testing.T) {
463464
SharedRunnersEnabled: true,
464465
Visibility: gitlab.PublicVisibility,
465466
MergeMethod: gitlab.FastForwardMerge,
467+
PrintingMergeRequestLinkEnabled: true,
466468
OnlyAllowMergeIfPipelineSucceeds: true,
467469
OnlyAllowMergeIfAllDiscussionsAreResolved: true,
468470
SquashOption: gitlab.SquashOptionDefaultOff,
@@ -571,6 +573,7 @@ func TestAccGitlabProject_transfer(t *testing.T) {
571573
OnlyAllowMergeIfAllDiscussionsAreResolved: false,
572574
SquashOption: gitlab.SquashOptionDefaultOff,
573575
PackagesEnabled: true,
576+
PrintingMergeRequestLinkEnabled: true,
574577
PagesAccessLevel: gitlab.PrivateAccessControl,
575578
BuildCoverageRegex: "foo",
576579
}

0 commit comments

Comments
 (0)