From 9b69b20175aa9f32db45502a74d29137ebd2ce39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:36:51 -0800 Subject: [PATCH 1/3] build(deps): bump the github-actions group across 1 directory with 2 updates (#2472) Bumps the github-actions group with 2 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action) and [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action). Updates `github/codeql-action` from 3.27.0 to 3.27.5 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/662472033e021d55d94146f66f6058822b0b39fd...f09c1c0a94de965c15400f5634aa42fac8fb8f88) Updates `goreleaser/goreleaser-action` from 6.0.0 to 6.1.0 - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/286f3b13b1b49da4ac219696163fb8c1c93e1200...9ed2f89a662bf1735a48bc8557fd212fa902bebf) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 5efadab1fe..b78f487ffc 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -34,14 +34,14 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 + uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 with: languages: ${{ matrix.language }} - name: Autobuild - uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 + uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0 + uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 91f4b1bb7a..58111722a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: passphrase: ${{ secrets.PASSPHRASE }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 + uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0 with: args: release --clean version: latest From 3866012af7e156a7c40b6fd97ec1338f7e6eff88 Mon Sep 17 00:00:00 2001 From: Takumi Sue <23391543+mikutas@users.noreply.github.com> Date: Tue, 26 Nov 2024 09:15:14 +0900 Subject: [PATCH 2/3] docs: describe how `actor_id` / `integration_id` can be found (#2474) * update r/repository_ruleset * Update website/docs/r/repository_ruleset.html.markdown * Update website/docs/r/repository_ruleset.html.markdown --------- Co-authored-by: Keegan Campbell --- website/docs/r/repository_ruleset.html.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/website/docs/r/repository_ruleset.html.markdown b/website/docs/r/repository_ruleset.html.markdown index b047fbc119..c26d5759ef 100644 --- a/website/docs/r/repository_ruleset.html.markdown +++ b/website/docs/r/repository_ruleset.html.markdown @@ -49,7 +49,7 @@ resource "github_repository_ruleset" "example" { required_deployment_environments = ["test"] } - + } } ``` @@ -104,7 +104,7 @@ The `rules` block supports the following: * `required_code_scanning` - (Optional) (Block List, Max: 1) Define which tools must provide code scanning results before the reference is updated. When configured, code scanning must be enabled and have results for both the commit and the reference being updated. Multiple code scanning tools can be specified. (see [below for nested schema](#rules.required_code_scanning)) * `update` - (Optional) (Boolean) Only allow users with bypass permission to update matching refs. - + * `update_allows_fetch_and_merge` - (Optional) (Boolean) Branch can pull changes from its upstream repository. This is only applicable to forked repositories. Requires `update` to be set to `true`. Note: behaviour is affected by a known bug on the GitHub side which may cause issues when using this parameter. #### rules.branch_name_pattern #### @@ -179,7 +179,7 @@ The `rules` block supports the following: * `context` - (Required) (String) The status check context name that must be present on the commit. -* `integration_id` - (Optional) (Number) The optional integration ID that this status check must originate from. +* `integration_id` - (Optional) (Number) The optional integration ID that this status check must originate from. It's a GitHub App ID, which can be obtained by following instructions from the [Get an App API docs](https://docs.github.com/en/rest/apps/apps?apiVersion=2022-11-28#get-an-app). #### rules.tag_name_pattern #### @@ -205,7 +205,7 @@ The `rules` block supports the following: #### bypass_actors #### -* `actor_id` - (Required) (Number) The ID of the actor that can bypass a ruleset. +* `actor_id` - (Required) (Number) The ID of the actor that can bypass a ruleset. If `actor_type` is `Integration`, `actor_id` is a GitHub App ID. App ID can be obtained by following instructions from the [Get an App API docs](https://docs.github.com/en/rest/apps/apps?apiVersion=2022-11-28#get-an-app) * `actor_type` (String) The type of actor that can bypass a ruleset. Can be one of: `RepositoryRole`, `Team`, `Integration`, `OrganizationAdmin`. From 1c11053126129f2c9ca6dae160e9d3617bcba997 Mon Sep 17 00:00:00 2001 From: Viacheslav Kudinov Date: Tue, 26 Nov 2024 01:24:08 +0100 Subject: [PATCH 3/3] Fix documentation mistake for github_repository_dependabot_security_update resource to use GitHub repository name (#2439) Co-authored-by: Keegan Campbell --- .../r/repository_dependabot_security_updates.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/r/repository_dependabot_security_updates.html.markdown b/website/docs/r/repository_dependabot_security_updates.html.markdown index e2d143e85d..0a029929c1 100644 --- a/website/docs/r/repository_dependabot_security_updates.html.markdown +++ b/website/docs/r/repository_dependabot_security_updates.html.markdown @@ -25,7 +25,7 @@ resource "github_repository" "repo" { resource "github_repository_dependabot_security_updates" "example" { - repository = github_repository.test.id + repository = github_repository.test.name enabled = true } ``` @@ -34,7 +34,7 @@ resource "github_repository_dependabot_security_updates" "example" { The following arguments are supported: -* `repository` - (Required) The repository to manage. +* `repository` - (Required) The name of the GitHub repository. * `enabled` - (Required) The state of the automated security fixes.