Merge branch 'main' of github.com:Moon1706/terraform-provider-gitlab into main

Author: SharaevN

.gitpod.yml

@@ -1,6 +1,11 @@
 image: gitpod/workspace-go
 tasks:
-  - init: go get
+# Retrieve our go dependencies. Also inject several vscode settings that are specifically helpful to a GitPod environment and not needed when opening the repo locally.
+# The reason the settings are copied to a temp file and then moved is that applying the jq string directly to settings.json results in a blank file.
+  - init: |
+      go get
+      cat .vscode/settings.json | jq '. + {"terminal.integrated.lineHeight": 1.0,"terminal.integrated.letterSpacing": 1.0,"terminal.integrated.scrollback": 5000}'  > .vscode/temp.json
+      mv .vscode/temp.json .vscode/settings.json
   - name: Start acceptance Test Environment
     command: make testacc-up
     openMode: split-right

.vscode/settings.json

@@ -1,8 +1,8 @@
 {
-    "go.testEnvVars": {
-        "TF_ACC": "1",
-        "GITLAB_TOKEN": "ACCTEST1234567890123",
-        "GITLAB_BASE_URL": "http://127.0.0.1:8080"
-    },
-    "go.testFlags": ["-count=1", "-v"]
-}
+  "go.testEnvVars": {
+    "TF_ACC": "1",
+    "GITLAB_TOKEN": "ACCTEST1234567890123",
+    "GITLAB_BASE_URL": "http://127.0.0.1:8080"
+  },
+  "go.testFlags": ["-count=1", "-v", "-timeout=30m"]
+}

CHANGELOG.md

@@ -1,4 +1,32 @@
-## 3.14.0 (Unreleased)
+## 3.14.0 (2022-05-02)
+
+FEATURES:
+
+* **New Data Source:** `gitlab_project_variable` ([#990](https://github.com/gitlabhq/terraform-provider-gitlab/pull/990))
+* **New Data Source:** `gitlab_project_variables` ([#990](https://github.com/gitlabhq/terraform-provider-gitlab/pull/990))
+* **New Data Source:** `gitlab_group_variable` ([#990](https://github.com/gitlabhq/terraform-provider-gitlab/pull/990))
+* **New Data Source:** `gitlab_group_variables` ([#990](https://github.com/gitlabhq/terraform-provider-gitlab/pull/990))
+* **New Data Source:** `gitlab_instance_variable` ([#990](https://github.com/gitlabhq/terraform-provider-gitlab/pull/990))
+* **New Data Source:** `gitlab_instance_variables` ([#990](https://github.com/gitlabhq/terraform-provider-gitlab/pull/990))
+* **New Resource:** `gitlab_group_project_file_template` ([#971](https://github.com/gitlabhq/terraform-provider-gitlab/pull/971))
+* **New Resource:** `gitlab_service_external_wiki` ([#1003](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1003))
+* **New Resource:** `gitlab_project_runner_enablement` ([#1016](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1016))
+* **New Resource:** `gitlab_personal_access_token` ([#1007](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1007))
+
+IMPROVEMENTS:
+
+* resource/gitlab_deploy_key: Fully support `can_push` attribute ([#1009](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1009))
+* resource/gitlab_deploy_key_enable: Fully support `can_push` attribute ([#1009](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1009))
+* resource/gitlab_group_access_token: Support `owner` as access level ([#999](https://github.com/gitlabhq/terraform-provider-gitlab/pull/999))
+* resource/gitlab_pipeline_trigger: Mark `token` attribute as sensitive ([#1034](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1034))
+* resource/gitlab_project: Deprecate `build_coverage_regex` ([#1036](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1036))
+* resource/gitlab_project_access_token: Add `access_level` attribute ([#997](https://github.com/gitlabhq/terraform-provider-gitlab/pull/997))
+* resource/gitlab_project_protected_environment: Support multiple `deploy_access_levels` ([#1004](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1004))
+* resource/gitlab_project_mirror: Support deletion on destroy ([#988](https://github.com/gitlabhq/terraform-provider-gitlab/pull/988))
+* resource/gitlab_repository_file: Add `execute_filemode` attribute ([#1038](https://github.com/gitlabhq/terraform-provider-gitlab/pull/1038))
+* resource/gitlab_user: Add `namespace_id` attribute ([#987](https://github.com/gitlabhq/terraform-provider-gitlab/pull/987))
+* datasource/gitlab_user: Add `namespace_id` attribute ([#987](https://github.com/gitlabhq/terraform-provider-gitlab/pull/987))
+* datasource/gitlab_users: Add `namespace_id` attribute ([#987](https://github.com/gitlabhq/terraform-provider-gitlab/pull/987))
 
 BUG FIXES:
 

docs/data-sources/branch.md

@@ -37,17 +37,14 @@ data "gitlab_branch" "foo" {
 - `name` (String) The name of the branch.
 - `project` (String) The full path or id of the project.
 
-### Optional
-
-- `id` (String) The ID of this resource.
-
 ### Read-Only
 
 - `can_push` (Boolean) Bool, true if you can push to the branch.
 - `commit` (Set of Object) The commit associated with the branch ref. (see [below for nested schema](#nestedatt--commit))
 - `default` (Boolean) Bool, true if branch is the default branch for the project.
 - `developer_can_merge` (Boolean) Bool, true if developer level access allows to merge branch.
 - `developer_can_push` (Boolean) Bool, true if developer level access allows git push.
+- `id` (String) The ID of this resource.
 - `merged` (Boolean) Bool, true if the branch has been merged into it's parent.
 - `protected` (Boolean) Bool, true if branch has branch protection.
 - `web_url` (String) The url of the created branch (https.)

docs/data-sources/group.md

@@ -34,13 +34,13 @@ data "gitlab_group" "foo" {
 
 - `full_path` (String) The full path of the group.
 - `group_id` (Number) The ID of the group.
-- `id` (String) The ID of this resource.
 
 ### Read-Only
 
 - `default_branch_protection` (Number) Whether developers and maintainers can push to the applicable default branch.
 - `description` (String) The description of the group.
 - `full_name` (String) The full name of the group.
+- `id` (String) The ID of this resource.
 - `lfs_enabled` (Boolean) Boolean, is LFS enabled for projects in this group.
 - `name` (String) The name of this group.
 - `parent_id` (Number) Integer, ID of the parent group.

docs/data-sources/group_membership.md

@@ -35,10 +35,10 @@ data "gitlab_group_membership" "example" {
 - `access_level` (String) Only return members with the desired access level. Acceptable values are: `guest`, `reporter`, `developer`, `maintainer`, `owner`.
 - `full_path` (String) The full path of the group.
 - `group_id` (Number) The ID of the group.
-- `id` (String) The ID of this resource.
 
 ### Read-Only
 
+- `id` (String) The ID of this resource.
 - `members` (List of Object) The list of group members. (see [below for nested schema](#nestedatt--members))
 
 <a id="nestedatt--members"></a>

docs/data-sources/group_variable.md

@@ -26,10 +26,10 @@ The `gitlab_group_variable` data source allows to retrieve details about a group
 ### Optional
 
 - `environment_scope` (String) The environment scope of the variable. Defaults to all environment (`*`). Note that in Community Editions of Gitlab, values other than `*` will cause inconsistent plans.
-- `id` (String) The ID of this resource.
 
 ### Read-Only
 
+- `id` (String) The ID of this resource.
 - `masked` (Boolean) If set to `true`, the value of the variable will be hidden in job logs. The value must meet the [masking requirements](https://docs.gitlab.com/ee/ci/variables/#masked-variables). Defaults to `false`.
 - `protected` (Boolean) If set to `true`, the variable will be passed only to pipelines running on protected branches and tags. Defaults to `false`.
 - `value` (String) The value of the variable.

docs/data-sources/group_variables.md

@@ -25,10 +25,10 @@ The `gitlab_group_variables` data source allows to retrieve all group-level CI/C
 ### Optional
 
 - `environment_scope` (String) The environment scope of the variable. Defaults to all environment (`*`).
-- `id` (String) The ID of this resource.
 
 ### Read-Only
 
+- `id` (String) The ID of this resource.
 - `variables` (List of Object) The list of variables returned by the search (see [below for nested schema](#nestedatt--variables))
 
 <a id="nestedatt--variables"></a>

docs/data-sources/instance_deploy_keys.md

@@ -32,12 +32,12 @@ data "gitlab_instance_deploy_keys" "example" {
 
 ### Optional
 
-- `id` (String) The ID of this resource.
 - `public` (Boolean) Only return deploy keys that are public.
 
 ### Read-Only
 
 - `deploy_keys` (List of Object) The list of all deploy keys across all projects of the GitLab instance. (see [below for nested schema](#nestedatt--deploy_keys))
+- `id` (String) The ID of this resource.
 
 <a id="nestedatt--deploy_keys"></a>
 ### Nested Schema for `deploy_keys`

docs/data-sources/instance_variable.md

@@ -22,12 +22,9 @@ The `gitlab_instance_variable` data source allows to retrieve details about an i
 
 - `key` (String) The name of the variable.
 
-### Optional
-
-- `id` (String) The ID of this resource.
-
 ### Read-Only
 
+- `id` (String) The ID of this resource.
 - `masked` (Boolean) If set to `true`, the value of the variable will be hidden in job logs. The value must meet the [masking requirements](https://docs.gitlab.com/ee/ci/variables/#masked-variables). Defaults to `false`.
 - `protected` (Boolean) If set to `true`, the variable will be passed only to pipelines running on protected branches and tags. Defaults to `false`.
 - `value` (String) The value of the variable.