Skip to content

Commit aca484c

Browse files
Update docs for v17.7.0 release
1 parent 5280dd4 commit aca484c

11 files changed

+75
-7
lines changed

CHANGELOG.md

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## 17.7.0 (2024-12-19)
2+
3+
This release was tested against GitLab 17.7, 17.6, and 17.5 for both CE and EE
4+
5+
### FEATURES (1 change)
6+
7+
- resource/gitlab_instance_service_account: [Allows managing instance-level service accounts](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/0da40eceb4272d3fb856139198da777d08960711) by @ipsavitsky234 ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2220))
8+
9+
### IMPROVEMENTS (2 changes)
10+
11+
- resource/gitlab_integration_jira: [Align Jira integration resource with the API](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/e3b04f9babac66bc96244d32d79c304e639161cd) by @slaup1 ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2221))
12+
- resource/gitlab_project: [Add support for 'prevent_merge_without_jira_issue'](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/6da24d2c30b017d00f766a6bdb9deb31877be242) by @slaup1 ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2223))
13+
- resource/gitlab_branch: [Add support for `keep_on_destroy`, which will preserve a branch when a `destroy` operation is performed](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/3fa3aae0ea19a71354bc7af13196bac4bd7fdd9a) by @jae-sorcero ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2192))
14+
15+
### BUG FIXES (4 changes)
16+
17+
- resource/gitlab_group_service_account_access_token: [Fixed an issue where revoking a service account token required more permissions than the documentation suggested when using SaaS](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/b4814f9bec3cbe904cc747f98f1d4adcff3691d0) by @u120230 ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2240))
18+
- resource/gitlab_group: [Fixed an issue where older versions of GitLab may fail due to missing `DefaultBranchProtectionDefaults`](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/c12242b1c7209cd00db546817a94c72e62ff4d6f) by @PatrickRice ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2228))
19+
- resource/gitlab_application_settings: [Fixed an issue where `DefaultBranchProtectionDefaults` didn't apply properly](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/0f8c9e14e92adbee43087c483ccc6ecdfafcc35b) by @PatrickRice ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2229))
20+
- resource/gitlab_project: [Fixed an issue where `restrict_user_defined_variables` caused a perpetual plan when not included in the config](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/commit/9a371bb386650a1efd79c6b3d8d9073a9d55e81d) by @PatrickRice ([merge request](https://gitlab.com/gitlab-org/terraform-provider-gitlab/-/merge_requests/2243))
21+
122
## 17.6.1 (2024-11-27)
223

324
This release was tested against GitLab 17.6, 17.5, and 17.4 for both CE and EE
@@ -1185,7 +1206,7 @@ ENHANCEMENTS:
11851206
- Support running the provider using an OAuth token ([#686](https://github.com/gitlabhq/terraform-provider-gitlab/pull/686))
11861207
- Allow merge on skipped pipeline ([#705](https://github.com/gitlabhq/terraform-provider-gitlab/pull/705))
11871208
- support default_branch_protection on group ([#706](https://github.com/gitlabhq/terraform-provider-gitlab/pull/706))
1188-
- Bump github.com/xanzy/go-gitlab from 0.50.0 to 0.51.1 ([#718](https://github.com/gitlabhq/terraform-provider-gitlab/pull/718))
1209+
- Bump gitlab.com/gitlab-org/api/client-go from 0.50.0 to 0.51.1 ([#718](https://github.com/gitlabhq/terraform-provider-gitlab/pull/718))
11891210
- Add squash option ([#719](https://github.com/gitlabhq/terraform-provider-gitlab/pull/719))
11901211

11911212
BUGFIXES:
@@ -1227,7 +1248,7 @@ ENHANCEMENTS:
12271248
- Support the Note field in the User resource/data ([#572](https://github.com/gitlabhq/terraform-provider-gitlab/pull/572))
12281249
- add diffSuppressFunc for 'expires_at' attribute in 'deploy_token' ([#575](https://github.com/gitlabhq/terraform-provider-gitlab/pull/575))
12291250
- Update to Go 1.16 and terraform-plugin-sdk 1.16 ([#579](https://github.com/gitlabhq/terraform-provider-gitlab/pull/579))
1230-
- Bump github.com/xanzy/go-gitlab from 0.44.0 to 0.46.0 ([#586](https://github.com/gitlabhq/terraform-provider-gitlab/pull/586))
1251+
- Bump gitlab.com/gitlab-org/api/client-go from 0.44.0 to 0.46.0 ([#586](https://github.com/gitlabhq/terraform-provider-gitlab/pull/586))
12311252

12321253
BUG FIXES:
12331254

docs/data-sources/project.md

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ data "gitlab_project" "example" {
8282
- `namespace_id` (Number) The namespace (group or user) of the project. Defaults to your user.
8383
- `path` (String) The path of the repository.
8484
- `pipelines_enabled` (Boolean) Enable pipelines for the project.
85+
- `prevent_merge_without_jira_issue` (Boolean) Whether merge requests require an associated issue from Jira. Premium and Ultimate only.
8586
- `printing_merge_request_link_enabled` (Boolean) Show link to create/view merge request when pushing from the command line
8687
- `push_rules` (List of Object) Push rules for the project. Push rules are only available on Enterprise plans and if the authenticated has permissions to read them. (see [below for nested schema](#nestedatt--push_rules))
8788
- `releases_access_level` (String) Set the releases access level. Valid values are `disabled`, `private`, `enabled`.

docs/data-sources/projects.md

+1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ Read-Only:
153153
- `path` (String)
154154
- `path_with_namespace` (String)
155155
- `permissions` (List of Object) (see [below for nested schema](#nestedobjatt--projects--permissions))
156+
- `prevent_merge_without_jira_issue` (Boolean)
156157
- `public_builds` (Boolean)
157158
- `readme_url` (String)
158159
- `releases_access_level` (String)

docs/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Use the GitLab provider to interact with GitLab resources, like
99
users, groups, projects and more. You must configure the provider with
1010
the proper credentials before you can use it.
1111

12-
The provider uses the [`xanzy/go-gitlab`](https://github.com/xanzy/go-gitlab) library
12+
The provider uses the [`xanzy/go-gitlab`](https://gitlab.com/gitlab-org/api/client-go) library
1313
to interact with the [GitLab REST API](https://docs.gitlab.com/ee/api/api_resources.html).
1414

1515
Each data source and resource references the appropriate upstream GitLab REST API documentation,

docs/resources/branch.md

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ resource "gitlab_branch" "example" {
3939
- `project` (String) The ID or full path of the project which the branch is created against.
4040
- `ref` (String) The ref which the branch is created from.
4141

42+
### Optional
43+
44+
- `keep_on_destroy` (Boolean) Indicates whether the branch is kept once the resource destroyed (must be applied before a destroy).
45+
4246
### Read-Only
4347

4448
- `can_push` (Boolean) Bool, true if you can push to the branch.
+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
# generated by https://github.com/hashicorp/terraform-plugin-docs
3+
page_title: "gitlab_instance_service_account Resource - terraform-provider-gitlab"
4+
subcategory: ""
5+
description: |-
6+
The gitlab_instance_service_account resource allows creating a GitLab instance service account.
7+
~> In order for a user to create a user account, they must have admin privileges at the instance level. This makes this feature unavailable on gitlab.com
8+
Upstream API: GitLab REST API docs https://docs.gitlab.com/ee/api/user_service_accounts.html
9+
---
10+
11+
# gitlab_instance_service_account (Resource)
12+
13+
The `gitlab_instance_service_account` resource allows creating a GitLab instance service account.
14+
15+
~> In order for a user to create a user account, they must have admin privileges at the instance level. This makes this feature unavailable on `gitlab.com`
16+
17+
**Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/user_service_accounts.html)
18+
19+
20+
21+
<!-- schema generated by tfplugindocs -->
22+
## Schema
23+
24+
### Optional
25+
26+
- `name` (String) The name of the user. If not specified, the default Service account user name is used.
27+
- `timeouts` (Attributes) (see [below for nested schema](#nestedatt--timeouts))
28+
- `username` (String) The username of the user. If not specified, it’s automatically generated.
29+
30+
### Read-Only
31+
32+
- `id` (String) The ID of this Terraform resource. This matches the service account id.
33+
- `service_account_id` (String) The service account id.
34+
35+
<a id="nestedatt--timeouts"></a>
36+
### Nested Schema for `timeouts`
37+
38+
Optional:
39+
40+
- `delete` (String) A string that can be [parsed as a duration](https://pkg.go.dev/time#ParseDuration) consisting of numbers and unit suffixes, such as "30s" or "2h45m". Valid time units are "s" (seconds), "m" (minutes), "h" (hours). Setting a timeout for a Delete operation is only applicable if changes are saved into state before the destroy operation occurs.

docs/resources/integration_jira.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ resource "gitlab_integration_jira" "jira" {
4848
- `jira_auth_type` (Number) The authentication method to be used with Jira. 0 means Basic Authentication. 1 means Jira personal access token. Defaults to 0.
4949
- `jira_issue_prefix` (String) Prefix to match Jira issue keys.
5050
- `jira_issue_regex` (String) Regular expression to match Jira issue keys.
51-
- `jira_issue_transition_automatic` (Boolean) Enable automatic issue transitions. Takes precedence over jira_issue_transition_id if enabled. Defaults to false.
51+
- `jira_issue_transition_automatic` (Boolean) Enable automatic issue transitions. Takes precedence over jira_issue_transition_id if enabled. Defaults to false. This value cannot be imported, and will not perform drift detection if changed outside Terraform.
5252
- `jira_issue_transition_id` (String) The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (Administration > Issues > Workflows) by selecting View under Operations of the desired workflow of your project. By default, this ID is set to 2. *Note**: importing this field is only supported since GitLab 15.2.
5353
- `merge_requests_events` (Boolean) Enable notifications for merge request events
5454
- `project_key` (String) The short identifier for your JIRA project, all uppercase, e.g., PROJ.

docs/resources/integration_slack.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ resource "gitlab_integration_slack" "slack" {
6767
### Read-Only
6868

6969
- `id` (String) The ID of this resource.
70-
- `job_events` (Boolean) Enable notifications for job events. **ATTENTION**: This attribute is currently not being submitted to the GitLab API, due to https://github.com/xanzy/go-gitlab/issues/1354.
70+
- `job_events` (Boolean) Enable notifications for job events. **ATTENTION**: This attribute is currently not being submitted to the GitLab API, due to https://gitlab.com/gitlab-org/api/client-go/issues/1354.
7171

7272
## Import
7373

docs/resources/project.md

+1
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ resource "gitlab_project" "import_private" {
203203
- `path` (String) The path of the repository.
204204
- `pipelines_enabled` (Boolean, Deprecated) Enable pipelines for the project. The `pipelines_enabled` field is being sent as `jobs_enabled` in the GitLab API calls.
205205
- `pre_receive_secret_detection_enabled` (Boolean) Whether Secret Push Detection is enabled. Requires GitLab Ultimate and at least GitLab 17.3.
206+
- `prevent_merge_without_jira_issue` (Boolean) Set whether merge requests require an associated issue from Jira. Premium and Ultimate only.
206207
- `printing_merge_request_link_enabled` (Boolean) Show link to create/view merge request when pushing from the command line
207208
- `public_builds` (Boolean, Deprecated) If true, jobs can be viewed by non-project members.
208209
- `public_jobs` (Boolean) If true, jobs can be viewed by non-project members.

docs/resources/service_jira.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ resource "gitlab_service_jira" "jira" {
5151
- `jira_auth_type` (Number) The authentication method to be used with Jira. 0 means Basic Authentication. 1 means Jira personal access token. Defaults to 0.
5252
- `jira_issue_prefix` (String) Prefix to match Jira issue keys.
5353
- `jira_issue_regex` (String) Regular expression to match Jira issue keys.
54-
- `jira_issue_transition_automatic` (Boolean) Enable automatic issue transitions. Takes precedence over jira_issue_transition_id if enabled. Defaults to false.
54+
- `jira_issue_transition_automatic` (Boolean) Enable automatic issue transitions. Takes precedence over jira_issue_transition_id if enabled. Defaults to false. This value cannot be imported, and will not perform drift detection if changed outside Terraform.
5555
- `jira_issue_transition_id` (String) The ID of a transition that moves issues to a closed state. You can find this number under the JIRA workflow administration (Administration > Issues > Workflows) by selecting View under Operations of the desired workflow of your project. By default, this ID is set to 2. *Note**: importing this field is only supported since GitLab 15.2.
5656
- `merge_requests_events` (Boolean) Enable notifications for merge request events
5757
- `project_key` (String) The short identifier for your JIRA project, all uppercase, e.g., PROJ.

docs/resources/service_slack.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ resource "gitlab_service_slack" "slack" {
7070
### Read-Only
7171

7272
- `id` (String) The ID of this resource.
73-
- `job_events` (Boolean) Enable notifications for job events. **ATTENTION**: This attribute is currently not being submitted to the GitLab API, due to https://github.com/xanzy/go-gitlab/issues/1354.
73+
- `job_events` (Boolean) Enable notifications for job events. **ATTENTION**: This attribute is currently not being submitted to the GitLab API, due to https://gitlab.com/gitlab-org/api/client-go/issues/1354.
7474

7575
## Import
7676

0 commit comments

Comments
 (0)