Merge branch 'gitlabhq:main' into main

Author: Moon1706

docs/data-sources/repository_file.md

@@ -43,6 +43,7 @@ data "gitlab_repository_file" "example" {
 - `content` (String) File content. If the content is not yet base64 encoded, it will be encoded automatically. No other encoding is currently supported, because of a [GitLab API bug](https://gitlab.com/gitlab-org/gitlab/-/issues/342430).
 - `content_sha256` (String) File content sha256 digest.
 - `encoding` (String) The file content encoding.
+- `execute_filemode` (Boolean) Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
 - `file_name` (String) The filename.
 - `last_commit_id` (String) The last known commit id.
 - `size` (Number) The file size.

docs/data-sources/user.md

@@ -38,6 +38,7 @@ data "gitlab_user" "example-two" {
 
 - `email` (String) The public email address of the user. **Note**: before GitLab 14.8 the lookup was based on the users primary email address.
 - `id` (String) The ID of this resource.
+- `namespace_id` (Number) The ID of the user's namespace. Requires admin token to access this field. Available since GitLab 14.10.
 - `user_id` (Number) The ID of the user.
 - `username` (String) The username of the user.
 

docs/data-sources/users.md

@@ -74,6 +74,7 @@ Read-Only:
 - `linkedin` (String)
 - `location` (String)
 - `name` (String)
+- `namespace_id` (Number)
 - `organization` (String)
 - `projects_limit` (Number)
 - `provider` (String)

docs/resources/deploy_key.md

@@ -37,7 +37,7 @@ resource "gitlab_deploy_key" "example" {
 
 ### Optional
 
-- `can_push` (Boolean) Allow this deploy key to be used to push changes to the project.  Defaults to `false`. **NOTE::** this cannot currently be managed.
+- `can_push` (Boolean) Allow this deploy key to be used to push changes to the project. Defaults to `false`.
 - `id` (String) The ID of this resource.
 
 ## Import
@@ -46,5 +46,8 @@ Import is supported using the following syntax:
 
 ```shell
 # GitLab deploy keys can be imported using an id made up of `{project_id}:{deploy_key_id}`, e.g.
+# `project_id` can be whatever the [get single project api][get_single_project] takes for
+# its `:id` value, so for example:
 terraform import gitlab_deploy_key.test 1:3
+terraform import gitlab_deploy_key.test richardc/example:3
 ```

docs/resources/deploy_key_enable.md

@@ -50,7 +50,7 @@ resource "gitlab_deploy_key_enable" "foo" {
 
 ### Optional
 
-- `can_push` (Boolean) Can deploy key push to the project’s repository.
+- `can_push` (Boolean) Can deploy key push to the project's repository.
 - `id` (String) The ID of this resource.
 - `key` (String) Deploy key.
 - `title` (String) Deploy key's title.
@@ -61,5 +61,8 @@ Import is supported using the following syntax:
 
 ```shell
 # GitLab enabled deploy keys can be imported using an id made up of `{project_id}:{deploy_key_id}`, e.g.
+# `project_id` can be whatever the [get single project api][get_single_project] takes for
+# its `:id` value, so for example:
 terraform import gitlab_deploy_key_enable.example 12345:67890
+terraform import gitlab_deploy_key_enable.example richardc/example:67890
 ```

docs/resources/instance_variable.md

@@ -4,14 +4,14 @@ page_title: "gitlab_instance_variable Resource - terraform-provider-gitlab"
 subcategory: ""
 description: |-
   The gitlab_instance_variable resource allows to manage the lifecycle of an instance-level CI/CD variable.
-  Upstream API: GitLab REST API docs https://docs.gitlab.com/ee/api/instance_level_variables.html
+  Upstream API: GitLab REST API docs https://docs.gitlab.com/ee/api/instance_level_ci_variables.html
 ---
 
 # gitlab_instance_variable (Resource)
 
 The `gitlab_instance_variable` resource allows to manage the lifecycle of an instance-level CI/CD variable.
 
-**Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/instance_level_variables.html)
+**Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/instance_level_ci_variables.html)
 
 ## Example Usage
 

docs/resources/personal_access_token.md

@@ -0,0 +1,67 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "gitlab_personal_access_token Resource - terraform-provider-gitlab"
+subcategory: ""
+description: |-
+  The gitlab_personal_access_token resource allows to manage the lifecycle of a personal access token for a specified user.
+  -> This resource requires administration privileges.
+  Upstream API: GitLab REST API docs https://docs.gitlab.com/ee/api/personal_access_tokens.html
+---
+
+# gitlab_personal_access_token (Resource)
+
+The `gitlab_personal_access_token` resource allows to manage the lifecycle of a personal access token for a specified user.
+
+-> This resource requires administration privileges. 
+
+**Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/personal_access_tokens.html)
+
+## Example Usage
+
+```terraform
+resource "gitlab_personal_access_token" "example" {
+  user_id    = "25"
+  name       = "Example personal access token"
+  expires_at = "2020-03-14"
+
+  scopes = ["api"]
+}
+
+resource "gitlab_project_variable" "example" {
+  project = gitlab_project.example.id
+  key     = "pat"
+  value   = gitlab_personal_access_token.example.token
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `name` (String) The name of the personal access token.
+- `scopes` (Set of String) The scope for the personal access token. It determines the actions which can be performed when authenticating with this token. Valid values are: `api`, `read_user`, `read_api`, `read_repository`, `write_repository`, `read_registry`, `write_registry`, `sudo`.
+- `user_id` (Number) The id of the user.
+
+### Optional
+
+- `expires_at` (String) The token expires at midnight UTC on that date. The date must be in the format YYYY-MM-DD. Default is never.
+- `id` (String) The ID of this resource.
+
+### Read-Only
+
+- `active` (Boolean) True if the token is active.
+- `created_at` (String) Time the token has been created, RFC3339 format.
+- `revoked` (Boolean) True if the token is revoked.
+- `token` (String, Sensitive) The personal access token. This is only populated when creating a new personal access token. This attribute is not available for imported resources.
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+# A GitLab Personal Access Token can be imported using a key composed of `<user-id>:<token-id>`, e.g.
+terraform import gitlab_personal_access_token.example "12345:1"
+
+# NOTE: the `token` resource attribute is not available for imported resources as this information cannot be read from the GitLab API.
+```

docs/resources/pipeline_trigger.md

@@ -36,7 +36,7 @@ resource "gitlab_pipeline_trigger" "example" {
 
 ### Read-Only
 
-- `token` (String) The pipeline trigger token.
+- `token` (String, Sensitive) The pipeline trigger token.
 
 ## Import
 

docs/resources/project.md

@@ -5,6 +5,12 @@ subcategory: ""
 description: |-
   The gitlab_project resource allows to manage the lifecycle of a project.
   A project can either be created in a group or user namespace.
+  -> Default Branch Protection Workaround Projects are created with default branch protection.
+  Since this default branch protection is not currently managed via Terraform, to workaround this limitation,
+  you can remove the default branch protection via the API and create your desired Terraform managed branch protection.
+  In the gitlab_project resource, define a local-exec provisioner which invokes
+  the /projects/:id/protected_branches/:name API via curl to delete the branch protection on the default
+  branch using a DELETE request. Then define the desired branch protection using the gitlab_branch_protection resource.
   Upstream API: GitLab REST API docs https://docs.gitlab.com/ce/api/projects.html
 ---
 
@@ -14,6 +20,13 @@ The `gitlab_project` resource allows to manage the lifecycle of a project.
 
 A project can either be created in a group or user namespace.
 
+-> **Default Branch Protection Workaround** Projects are created with default branch protection. 
+Since this default branch protection is not currently managed via Terraform, to workaround this limitation, 
+you can remove the default branch protection via the API and create your desired Terraform managed branch protection.
+In the `gitlab_project` resource, define a `local-exec` provisioner which invokes 
+the `/projects/:id/protected_branches/:name` API via curl to delete the branch protection on the default 
+branch using a `DELETE` request. Then define the desired branch protection using the `gitlab_branch_protection` resource.
+
 **Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ce/api/projects.html)
 
 ## Example Usage
@@ -37,6 +50,17 @@ resource "gitlab_project" "example-two" {
     prevent_secrets        = true
   }
 }
+
+# Create a project for a given user (requires admin access)
+data "gitlab_user" "peter_parker" {
+  username = "peter_parker"
+}
+
+resource "gitlab_project" "peters_repo" {
+  name         = "peters-repo"
+  description  = "This is a description"
+  namespace_id = data.gitlab_user.peter_parker.namespace_id
+}
 ```
 
 <!-- schema generated by tfplugindocs -->

docs/resources/repository_file.md

@@ -75,6 +75,7 @@ resource "gitlab_repository_file" "readme" {
 
 - `author_email` (String) Email of the commit author.
 - `author_name` (String) Name of the commit author.
+- `execute_filemode` (Boolean) Enables or disables the execute flag on the file. **Note**: requires GitLab 14.10 or newer.
 - `id` (String) The ID of this resource.
 - `start_branch` (String) Name of the branch to start the new commit from.
 - `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts))