Merge branch 'main' into workflow/release-notes

Author: timofurrer

.github/workflows/issue-opened.yml

@@ -23,7 +23,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Only add triage labels if they are NOT a collaborator.
       # This prevents the needs-triage label from being added.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         if: ${{ failure() }}
       - uses: github/[email protected]
         if: ${{ failure() }}

.github/workflows/pr-acceptance-ce.yml

@@ -22,7 +22,7 @@ jobs:
     outputs:
       go-version: ${{ steps.go-version.outputs.go-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Read the .go-version file and output it for other jobs to use.
       - id: go-version
         run: echo "::set-output name=go-version::$(cat .go-version)"
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules.
       - uses: actions/cache@v2
         with:

.github/workflows/pr-acceptance-ee.yml

@@ -38,7 +38,7 @@ jobs:
       go-version: ${{ steps.go-version.outputs.go-version }}
     steps:
       # Check out the pull request code (as opposed to the target project).
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false
@@ -72,7 +72,7 @@ jobs:
           go-version: ${{ needs.go-version.outputs.go-version }}
       # Check out the target project (as opposed to the pull request code).
       # Yes, this is intentional. We are using trusted code while working with the GitLab license.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.repository.default_branch }}
           persist-credentials: false
@@ -84,7 +84,7 @@ jobs:
       # Check out the pull request code (as opposed to the target project).
       # This overwrites the entire directory and deleted the unencrypted GitLab license file. The
       # service has already started and continues using the license even though the file is deleted.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false

.github/workflows/pr-lint.yml

@@ -14,7 +14,7 @@ jobs:
     outputs:
       go-version: ${{ steps.go-version.outputs.go-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Read the .go-version file and output it for other jobs to use.
       - id: go-version
         run: echo "::set-output name=go-version::$(cat .go-version)"
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules and compiled tools for the specific lint target.
       - uses: actions/cache@v2
         with:
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules.
       - uses: actions/cache@v2
         with:

.github/workflows/pr-target.yml

@@ -13,7 +13,7 @@ jobs:
   labels:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/labeler@v3
         with:
           configuration-path: .github/labeler-pr-triage.yml

.github/workflows/push.yml

@@ -26,7 +26,7 @@ jobs:
     outputs:
       go-version: ${{ steps.go-version.outputs.go-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Read the .go-version file and output it for other jobs to use.
       - id: go-version
         run: echo "::set-output name=go-version::$(cat .go-version)"
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules and compiled tools for the specific lint target.
       - uses: actions/cache@v2
         with:
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules.
       - uses: actions/cache@v2
         with:
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules.
       - uses: actions/cache@v2
         with:
@@ -118,7 +118,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: ${{ needs.go-version.outputs.go-version }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Cache the Go modules.
       - uses: actions/cache@v2
         with:

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     outputs:
       go-version: ${{ steps.go-version.outputs.go-version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Read the .go-version file and output it for other jobs to use.
       - id: go-version
         run: echo "::set-output name=go-version::$(cat .go-version)"
@@ -29,7 +29,7 @@ jobs:
     needs: [go-version]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Set up Go
@@ -50,7 +50,7 @@ jobs:
           sed -n "/## $LATEST_TAG/,/## $PREVIOUS_TAG"'/{//!p;}' CHANGELOG.md > /tmp/RELEASE-NOTES.md
           cat /tmp/RELEASE-NOTES.md
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2.8.1
+        uses: goreleaser/goreleaser-action@v2.9.1
         with:
           version: latest
           args: release --release-notes /tmp/RELEASE-NOTES.md --rm-dist

docs/data-sources/project_tag.md

@@ -0,0 +1,78 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "gitlab_project_tag Data Source - terraform-provider-gitlab"
+subcategory: ""
+description: |-
+  The gitlab_project_tag data source allows details of a project tag to be retrieved by its name.
+  Upstream API : GitLab API docs https://docs.gitlab.com/ee/api/tags.html
+---
+
+# gitlab_project_tag (Data Source)
+
+The `gitlab_project_tag` data source allows details of a project tag to be retrieved by its name.
+
+**Upstream API** : [GitLab API docs](https://docs.gitlab.com/ee/api/tags.html)
+
+## Example Usage
+
+```terraform
+# By project ID
+data "gitlab_project_tag" "foo" {
+  name    = "example"
+  project = "12345"
+}
+
+# By project full path
+data "gitlab_project_tag" "foo" {
+  name    = "example"
+  project = "foo/bar"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- **name** (String) The name of a tag.
+- **project** (String) The ID or URL-encoded path of the project owned by the authenticated user.
+
+### Optional
+
+- **id** (String) The ID of this resource.
+
+### Read-Only
+
+- **commit** (Set of Object) The commit associated with the tag ref. (see [below for nested schema](#nestedatt--commit))
+- **message** (String) Creates annotated tag.
+- **protected** (Boolean) Bool, true if tag has tag protection.
+- **release** (Set of Object) The release associated with the tag. (see [below for nested schema](#nestedatt--release))
+- **target** (String) The unique id assigned to the commit by Gitlab.
+
+<a id="nestedatt--commit"></a>
+### Nested Schema for `commit`
+
+Read-Only:
+
+- **author_email** (String)
+- **author_name** (String)
+- **authored_date** (String)
+- **committed_date** (String)
+- **committer_email** (String)
+- **committer_name** (String)
+- **id** (String)
+- **message** (String)
+- **parent_ids** (Set of String)
+- **short_id** (String)
+- **title** (String)
+
+
+<a id="nestedatt--release"></a>
+### Nested Schema for `release`
+
+Read-Only:
+
+- **description** (String)
+- **tag_name** (String)
+
+

docs/resources/project_approval_rule.md

@@ -54,6 +54,14 @@ resource "gitlab_project_approval_rule" "example-three" {
   approvals_required = 3
   user_ids           = [for user in data.gitlab_user.users : user.id]
 }
+
+# Example using `approval_rule`
+resource "gitlab_branch_protection" "any-approver" {
+  project            = 5
+  name               = "Any name"
+  rule_type          = "any_approver"
+  approvals_required = 1
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -70,6 +78,7 @@ resource "gitlab_project_approval_rule" "example-three" {
 - **group_ids** (Set of Number) A list of group IDs whose members can approve of the merge request.
 - **id** (String) The ID of this resource.
 - **protected_branch_ids** (Set of Number) A list of protected branch IDs (not branch names) for which the rule applies.
+- **rule_type** (String) String, defaults to 'regular'. The type of rule. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Valid values are `regular`, `any_approver`.
 - **user_ids** (Set of Number) A list of specific User IDs to add to the list of approvers.
 
 ## Import

docs/resources/project_tag.md

@@ -0,0 +1,89 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "gitlab_project_tag Resource - terraform-provider-gitlab"
+subcategory: ""
+description: |-
+  The gitlab_project_tag resource allows to manage the lifecycle of a tag in a project.
+  Upstream API : GitLab API docs https://docs.gitlab.com/ee/api/tags.html
+---
+
+# gitlab_project_tag (Resource)
+
+The `gitlab_project_tag` resource allows to manage the lifecycle of a tag in a project.
+
+**Upstream API** : [GitLab API docs](https://docs.gitlab.com/ee/api/tags.html)
+
+## Example Usage
+
+```terraform
+# Create a project for the tag to use
+resource "gitlab_project" "example" {
+  name         = "example"
+  description  = "An example project"
+  namespace_id = gitlab_group.example.id
+}
+
+resource "gitlab_project_tag" "example" {
+  name    = "example"
+  ref     = "main"
+  project = gitlab_project.example.id
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- **name** (String) The name of a tag.
+- **project** (String) The ID or URL-encoded path of the project owned by the authenticated user.
+- **ref** (String) Create tag using commit SHA, another tag name, or branch name. This attribute is not available for imported resources.
+
+### Optional
+
+- **id** (String) The ID of this resource.
+- **message** (String) Creates annotated tag.
+
+### Read-Only
+
+- **commit** (Set of Object) The commit associated with the tag. (see [below for nested schema](#nestedatt--commit))
+- **protected** (Boolean) Bool, true if tag has tag protection.
+- **release** (Set of Object) The release associated with the tag. (see [below for nested schema](#nestedatt--release))
+- **target** (String) The unique id assigned to the commit by Gitlab.
+
+<a id="nestedatt--commit"></a>
+### Nested Schema for `commit`
+
+Read-Only:
+
+- **author_email** (String)
+- **author_name** (String)
+- **authored_date** (String)
+- **committed_date** (String)
+- **committer_email** (String)
+- **committer_name** (String)
+- **id** (String)
+- **message** (String)
+- **parent_ids** (Set of String)
+- **short_id** (String)
+- **title** (String)
+
+
+<a id="nestedatt--release"></a>
+### Nested Schema for `release`
+
+Read-Only:
+
+- **description** (String)
+- **tag_name** (String)
+
+## Import
+
+Import is supported using the following syntax:
+
+```shell
+# Gitlab project tags can be imported with a key composed of `<project_id>:<tag_name>`, e.g.
+terraform import gitlab_project_tag.example "12345:develop"
+
+# NOTE: the `ref` attribute won't be available for imported `gitlab_project_tag` resources.
+```