Add new options to project resource

[bilby91]

New options:

• merge_method
• only_allow_merge_if_pipeline_succeeds
• only_allow_merge_if_all_discussions_are_resolved

[bilby91]

Is there any release process in place for this project ?

[roidelapluie]

Yes but we need to wait for hashicorp end of christmas freeze

[mcanevet]

@bilby91 I go this error when trying to set merge_method => "ff":

400 {error: jobs_enabled, resolve_outdated_diff_discussions, ci_config_path, container_registry_enabled, default_branch, description, issues_enabled, lfs_enabled, merge_requests_enabled, merge_method, name, only_allow_merge_if_all_discussions_are_resolved, only_allow_merge_if_pipeline_succeeds, path, printing_merge_request_link_enabled, public_builds, request_access_enabled, shared_runners_enabled, snippets_enabled, tag_list, visibility, wiki_enabled, avatar are missing, at least one parameter must be provided}

[bilby91]

@mcanevet Can you provide more information around your tf files please ? Just by looking at the error I don't see a straight relation with merge_method.

[mcanevet]

@bilby91 here is my terraform manifest:

resource "gitlab_project" "myproject" {
  name           = "myproject"
  default_branch = "master"
}

And if I just change it to that, I have the error message:

resource "gitlab_project" "myproject" {
  name           = "myproject"
  default_branch = "master"
  merge_method   = "ff"
}

[pdecat]

Suggested change

	options.Visibility = stringToVisibilityLevel(d.Get("merge_method").(string))
	options.MergeMethod = stringToMergeMethod(d.Get("merge_method").(string))

[pdecat]

@roidelapluie this should resolve @mcanevet issue.

[roidelapluie]

Any comment on @mcanevet issue?

[mcanevet]

@pdecat your suggestion works. @bilby91 could you please add it to your PR?

[bilby91]

@mcanevet @pdecat Got that fixed! Rebased with master and fixed tests

[mcanevet]

@roidelapluie could you please merge this?

[bilby91]

@mcanevet I just realized I didn't update the docs folders. Want me to get that done before merging ?

[mcanevet]

@bilby91 I guess @roidelapluie will ask for it. So if you have some spare time to do it, then please do it.

[roidelapluie]

Yes please

[bilby91]

Ping @roidelapluie

[roidelapluie]

did you run go fmt?

[roidelapluie]

missing whiteline

[bilby91]

I think my VSCode tries to do something different than make fmt. I pushed code again and CI is passing. I'm missing something ?

[roidelapluie]

well you should run go fmt + add a blank line here :)

[bilby91]

I think we should be good now :)

[roidelapluie]

Thanks!!