Merge pull request #1249 from pascal-hofmann/main

gitlab_projects(s): Add suggestion_commit_message

Author: timofurrer

docs/data-sources/project.md

@@ -82,6 +82,7 @@ data "gitlab_project" "example" {
 - `snippets_enabled` (Boolean) Enable snippets for the project.
 - `squash_commit_template` (String) Template used to create squash commit message in merge requests. (Introduced in GitLab 14.6.)
 - `ssh_url_to_repo` (String) URL that can be provided to `git clone` to clone the
+- `suggestion_commit_message` (String) The commit message used to apply merge request suggestions.
 - `topics` (Set of String) The list of topics for the project.
 - `visibility_level` (String) Repositories are created as private by default.
 - `web_url` (String) URL that can be used to find the project in a browser.

docs/data-sources/projects.md

@@ -158,6 +158,7 @@ Read-Only:
 - `ssh_url_to_repo` (String)
 - `star_count` (Number)
 - `statistics` (Map of Number)
+- `suggestion_commit_message` (String)
 - `tag_list` (Set of String)
 - `topics` (Set of String)
 - `visibility` (String)

docs/resources/project.md

@@ -144,6 +144,7 @@ This attribute is only used during resource creation, thus changes are suppresse
 - `snippets_enabled` (Boolean) Enable snippets for the project.
 - `squash_commit_template` (String) Template used to create squash commit message in merge requests. (Introduced in GitLab 14.6.)
 - `squash_option` (String) Squash commits when merge request. Valid values are `never`, `always`, `default_on`, or `default_off`. The default value is `default_off`. [GitLab >= 14.1]
+- `suggestion_commit_message` (String) The commit message used to apply merge request suggestions.
 - `tags` (Set of String) The list of tags for a project; put array of tags, that should be finally assigned to a project. Use topics instead.
 - `template_name` (String) When used without use_custom_template, name of a built-in project template. When used with use_custom_template, name of a custom project template. This option is mutually exclusive with `template_project_id`.
 - `template_project_id` (Number) When used with use_custom_template, project ID of a custom project template. This is preferable to using template_name since template_name may be ambiguous (enterprise edition). This option is mutually exclusive with `template_name`. See `gitlab_group_project_file_template` to set a project as a template project. If a project has not been set as a template, using it here will result in an error.

internal/provider/data_source_gitlab_project.go

@@ -267,6 +267,11 @@ var _ = registerDataSource("gitlab_project", func() *schema.Resource {
 				Type:        schema.TypeString,
 				Computed:    true,
 			},
+			"suggestion_commit_message": {
+				Description: "The commit message used to apply merge request suggestions.",
+				Type:        schema.TypeString,
+				Computed:    true,
+			},
 			"topics": {
 				Description: "The list of topics for the project.",
 				Type:        schema.TypeSet,
@@ -434,6 +439,7 @@ func dataSourceGitlabProjectRead(ctx context.Context, d *schema.ResourceData, me
 	d.Set("requirements_access_level", string(found.RequirementsAccessLevel))
 	d.Set("security_and_compliance_access_level", string(found.SecurityAndComplianceAccessLevel))
 	d.Set("snippets_access_level", string(found.SnippetsAccessLevel))
+	d.Set("suggestion_commit_message", found.SuggestionCommitMessage)
 	if err := d.Set("topics", found.Topics); err != nil {
 		return diag.Errorf("error setting topics: %v", err)
 	}

internal/provider/data_source_gitlab_projects.go

@@ -186,6 +186,7 @@ func flattenProjects(projects []*gitlab.Project) (values []map[string]interface{
 				"requirements_access_level":                        string(project.RequirementsAccessLevel),
 				"security_and_compliance_access_level":             string(project.SecurityAndComplianceAccessLevel),
 				"snippets_access_level":                            string(project.SnippetsAccessLevel),
+				"suggestion_commit_message":                        project.SuggestionCommitMessage,
 				"topics":                                           project.Topics,
 				"wiki_access_level":                                string(project.WikiAccessLevel),
 				"squash_commit_template":                           project.SquashCommitTemplate,
@@ -923,6 +924,11 @@ var _ = registerDataSource("gitlab_projects", func() *schema.Resource {
 							Type:        schema.TypeString,
 							Computed:    true,
 						},
+						"suggestion_commit_message": {
+							Description: "The commit message used to apply merge request suggestions.",
+							Type:        schema.TypeString,
+							Computed:    true,
+						},
 						"topics": {
 							Description: "The list of topics for the project.",
 							Type:        schema.TypeSet,

internal/provider/resource_gitlab_project.go

@@ -564,6 +564,11 @@ var resourceGitLabProjectSchema = map[string]*schema.Schema{
 		Computed:         true,
 		ValidateDiagFunc: validation.ToDiagFunc(validation.StringInSlice(validProjectAccessLevels, false)),
 	},
+	"suggestion_commit_message": {
+		Description: "The commit message used to apply merge request suggestions.",
+		Type:        schema.TypeString,
+		Optional:    true,
+	},
 	"topics": {
 		Description: "The list of topics for the project.",
 		Type:        schema.TypeSet,
@@ -769,6 +774,7 @@ func resourceGitlabProjectSetToState(ctx context.Context, client *gitlab.Client,
 	d.Set("requirements_access_level", string(project.RequirementsAccessLevel))
 	d.Set("security_and_compliance_access_level", string(project.SecurityAndComplianceAccessLevel))
 	d.Set("snippets_access_level", string(project.SnippetsAccessLevel))
+	d.Set("suggestion_commit_message", project.SuggestionCommitMessage)
 	if err := d.Set("topics", project.Topics); err != nil {
 		return fmt.Errorf("error setting topics: %v", err)
 	}
@@ -974,6 +980,10 @@ func resourceGitlabProjectCreate(ctx context.Context, d *schema.ResourceData, me
 		options.SnippetsAccessLevel = stringToAccessControlValue(v.(string))
 	}
 
+	if v, ok := d.GetOk("suggestion_commit_message"); ok {
+		options.SuggestionCommitMessage = gitlab.String(v.(string))
+	}
+
 	if v, ok := d.GetOk("topics"); ok {
 		options.Topics = stringSetToStringSlice(v.(*schema.Set))
 	}
@@ -1514,6 +1524,10 @@ func resourceGitlabProjectUpdate(ctx context.Context, d *schema.ResourceData, me
 		options.SnippetsAccessLevel = stringToAccessControlValue(d.Get("snippets_access_level").(string))
 	}
 
+	if d.HasChange("suggestion_commit_message") {
+		options.SuggestionCommitMessage = gitlab.String(d.Get("suggestion_commit_message").(string))
+	}
+
 	if d.HasChange("topics") {
 		options.Topics = stringSetToStringSlice(d.Get("topics").(*schema.Set))
 	}

internal/provider/resource_gitlab_project_test.go

@@ -109,6 +109,7 @@ func TestAccGitlabProject_basic(t *testing.T) {
 		RepositoryStorage:                "default",
 		SecurityAndComplianceAccessLevel: gitlab.EnabledAccessControl,
 		SnippetsAccessLevel:              gitlab.EnabledAccessControl,
+		SuggestionCommitMessage:          "hello suggestion",
 		Topics:                           []string{"foo", "bar"},
 		WikiAccessLevel:                  gitlab.EnabledAccessControl,
 		SquashCommitTemplate:             "hello squash",
@@ -1754,6 +1755,7 @@ resource "gitlab_project" "foo" {
   repository_storage = "default"
   security_and_compliance_access_level = "enabled"
   snippets_access_level = "enabled"
+  suggestion_commit_message = "hello suggestion"
   topics = ["foo", "bar"]
   wiki_access_level = "enabled"
   squash_commit_template = "hello squash"
@@ -1996,6 +1998,7 @@ resource "gitlab_project" "foo" {
   repository_storage = "default"
   security_and_compliance_access_level = "enabled"
   snippets_access_level = "enabled"
+  suggestion_commit_message = "hello suggestion"
   topics = ["foo", "bar"]
   wiki_access_level = "enabled"
   squash_commit_template = "hello squash"
@@ -2191,6 +2194,7 @@ resource "gitlab_project" "foo" {
   repository_storage = "default"
   security_and_compliance_access_level = "enabled"
   snippets_access_level = "enabled"
+  suggestion_commit_message = "hello suggestion"
   topics = ["foo", "bar"]
   wiki_access_level = "enabled"
   squash_commit_template = "hello squash"