Skip to content

Commit

Permalink
Merge branch 'main' into plugins-retries
Browse files Browse the repository at this point in the history
  • Loading branch information
tbroden84 authored Dec 12, 2023
2 parents 52ea49b + 999e0ae commit f025325
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
with:
# Allow goreleaser to access older tag information.
fetch-depth: 0
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: .go-version
- name: Build for single target with GoReleaser
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
# Allow goreleaser to access older tag information.
fetch-depth: 0
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version-file: .go-version
- name: Import GPG key
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/integration_metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ The following arguments are supported:
* `project_id` - (Optional/Computed) The project identifier.
* `private_key` - (Optional/Computed) The private access key.
* `client_email` - (Optional/Computed) The client email registered for the integration service.
* `tags` - (Optional) Tags. e.g. env=prod, region=europe.
* `tags` - (Optional) Tags. e.g. `env=prod,region=europe`.
* `queue_allowlist` - (Optional) Allowlist queues using regular expression. Leave empty to include all queues.
* `vhost_allowlist` - (Optional) Allowlist vhost using regular expression. Leave empty to include all vhosts.
* `queue_whitelist` - **Deprecated** Use queue_allowlist instead
Expand Down
1 change: 1 addition & 0 deletions docs/resources/vpc_gcp_peering.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ This resouce creates a VPC peering configuration for the CloudAMQP instance. The
<summary>
<i>Default VPC peering firewall rule</i>
</summary>

```hcl
rules {
Description = "VPC peer request"
Expand Down

0 comments on commit f025325

Please sign in to comment.