Skip to content

Commit

Permalink
Add printing_merge_request_link_enabled attribute to projects
Browse files Browse the repository at this point in the history
As mentioned on gitlabhq#782, the field is available on GitLab but still not
possible to use on terraform

Reference:
- gitlabhq#782
  • Loading branch information
marceloboeira committed Feb 7, 2022
1 parent 8e64303 commit 4aceac6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 2 deletions.
3 changes: 1 addition & 2 deletions docs/data-sources/project.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ data "gitlab_project" "example" {
- **pipelines_enabled** (Boolean) Enable pipelines for the project.
- **push_rules** (List of Object) Push rules for the project. (see [below for nested schema](#nestedatt--push_rules))
- **remove_source_branch_after_merge** (Boolean) Enable `Delete source branch` option by default for all new merge requests
- **printing_merge_request_link_enabled** (Boolean) Show link to create/view merge request when pushing from the command line
- **request_access_enabled** (Boolean) Allow users to request member access.
- **runners_token** (String) Registration token to use during runner setup.
- **snippets_enabled** (Boolean) Enable snippets for the project.
Expand All @@ -69,5 +70,3 @@ Read-Only:
- **member_check** (Boolean)
- **prevent_secrets** (Boolean)
- **reject_unsigned_commits** (Boolean)


1 change: 1 addition & 0 deletions docs/resources/project.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ resource "gitlab_project" "example-two" {
- **pipelines_enabled** (Boolean) Enable pipelines for the project.
- **push_rules** (Block List, Max: 1) Push rules for the project. (see [below for nested schema](#nestedblock--push_rules))
- **remove_source_branch_after_merge** (Boolean) Enable `Delete source branch` option by default for all new merge requests.
- **printing_merge_request_link_enabled** (Boolean) Show link to create/view merge request when pushing from the command line
- **request_access_enabled** (Boolean) Allow users to request member access.
- **shared_runners_enabled** (Boolean) Enable shared runners for this project.
- **snippets_enabled** (Boolean) Enable snippets for the project.
Expand Down
1 change: 1 addition & 0 deletions examples/gitlab-managed-state/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ resource "gitlab_project" "api" {
only_allow_merge_if_all_discussions_are_resolved = true
only_allow_merge_if_pipeline_succeeds = true
remove_source_branch_after_merge = true
printing_merge_request_link_enabled = true

container_registry_enabled = false
lfs_enabled = false
Expand Down
5 changes: 5 additions & 0 deletions internal/provider/data_source_gitlab_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ var _ = registerDataSource("gitlab_project", func() *schema.Resource {
Type: schema.TypeBool,
Computed: true,
},
"printing_merge_request_link_enabled": {
Description: " Show link to create/view merge request when pushing from the command line",
Type: schema.TypeBool,
Optional: true,
},
// lintignore: S031 // TODO: Resolve this tfproviderlint issue
"push_rules": {
Description: "Push rules for the project.",
Expand Down
11 changes: 11 additions & 0 deletions internal/provider/resource_gitlab_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,11 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
Type: schema.TypeBool,
Optional: true,
},
"printing_merge_request_link_enabled": {
Description: " Show link to create/view merge request when pushing from the command line",
Type: schema.TypeBool,
Optional: true,
},
"packages_enabled": {
Description: "Enable packages repository for the project.",
Type: schema.TypeBool,
Expand Down Expand Up @@ -413,6 +418,7 @@ func resourceGitlabProjectSetToState(d *schema.ResourceData, project *gitlab.Pro
d.Set("archived", project.Archived)
d.Set("squash_option", project.SquashOption)
d.Set("remove_source_branch_after_merge", project.RemoveSourceBranchAfterMerge)
d.Set("printing_merge_request_link_enabled", project.PrinttingMergeRequestLinkEnabled)
d.Set("packages_enabled", project.PackagesEnabled)
d.Set("pages_access_level", string(project.PagesAccessLevel))
d.Set("mirror", project.Mirror)
Expand Down Expand Up @@ -449,6 +455,7 @@ func resourceGitlabProjectCreate(ctx context.Context, d *schema.ResourceData, me
SquashOption: stringToSquashOptionValue(d.Get("squash_option").(string)),
RemoveSourceBranchAfterMerge: gitlab.Bool(d.Get("remove_source_branch_after_merge").(bool)),
PackagesEnabled: gitlab.Bool(d.Get("packages_enabled").(bool)),
PrinttingMergeRequestLinkEnabled: gitlab.Bool(d.Get("printing_merge_request_link_enabled").(bool)),
Mirror: gitlab.Bool(d.Get("mirror").(bool)),
MirrorTriggerBuilds: gitlab.Bool(d.Get("mirror_trigger_builds").(bool)),
BuildCoverageRegex: gitlab.String(d.Get("build_coverage_regex").(string)),
Expand Down Expand Up @@ -773,6 +780,10 @@ func resourceGitlabProjectUpdate(ctx context.Context, d *schema.ResourceData, me
options.RemoveSourceBranchAfterMerge = gitlab.Bool(d.Get("remove_source_branch_after_merge").(bool))
}

if d.HasChange("printing_merge_request_link_enabled") {
options.PrinttingMergeRequestLinkEnabled = gitlab.Bool(d.Get("printing_merge_request_link_enabled").(bool))
}

if d.HasChange("packages_enabled") {
options.PackagesEnabled = gitlab.Bool(d.Get("packages_enabled").(bool))
}
Expand Down
1 change: 1 addition & 0 deletions internal/provider/resource_gitlab_project_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ func TestAccGitlabProject_willError(t *testing.T) {
SharedRunnersEnabled: true,
Visibility: gitlab.PublicVisibility,
MergeMethod: gitlab.FastForwardMerge,
PrinttingMergeRequestLinkEnabled: true,
OnlyAllowMergeIfPipelineSucceeds: true,
OnlyAllowMergeIfAllDiscussionsAreResolved: true,
SquashOption: gitlab.SquashOptionDefaultOff,
Expand Down

0 comments on commit 4aceac6

Please sign in to comment.