Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update test matrix to reflect latest Consul releases #411

Merged
merged 5 commits into from
Aug 1, 2024
Merged

Update test matrix to reflect latest Consul releases #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c460bbd
Update test matrix to reflect latest Consul releases
nathancoleman Jul 31, 2024
c7a855b
Update branch name trigger for test workflow
nathancoleman Jul 31, 2024
79f025b
Add explicit resource dependency to terraform failing delete
nathancoleman Aug 1, 2024
c239f19
Regenerate docs
nathancoleman Aug 1, 2024
9156240
Use latest version of tfplugindocs
nathancoleman Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
test:
strategy:
fail-fast: false
matrix:
consul-version: [1.16.6, 1.17.3, 1.18.0]
consul-version: [1.17.3, 1.18.2, 1.19.1]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -41,10 +41,10 @@ jobs:
uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
- name: Install tfplugindocs
run: |
curl -LO https://github.com/hashicorp/terraform-plugin-docs/releases/download/v0.16.0/tfplugindocs_0.16.0_linux_amd64.zip
sudo unzip tfplugindocs_0.16.0_linux_amd64.zip tfplugindocs -d /usr/local/bin
rm -f tfplugindocs_0.16.0_linux_amd64.zip
- name: Generate the documentation
curl -LO https://github.com/hashicorp/terraform-plugin-docs/releases/download/v0.19.4/tfplugindocs_0.19.4_linux_amd64.zip
sudo unzip tfplugindocs_0.19.4_linux_amd64.zip tfplugindocs -d /usr/local/bin
rm -f tfplugindocs_0.19.4_linux_amd64.zip
- name: Generate the documentation'
run: |
terraform fmt -recursive .
tfplugindocs generate --ignore-deprecated true
Expand Down
2 changes: 2 additions & 0 deletions consul/resource_consul_config_entry_ce_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ resource "consul_config_entry" "service_intentions" {
name = consul_config_entry.sd.name
kind = "service-intentions"

depends_on = [consul_config_entry.jwt_provider]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This keeps tf from trying to delete the jwt provider before the service intention has been deleted. Before, the tf destroy was failing because Consul won't allow the provider to be removed if any intentions still reference it.


config_json = jsonencode({
Sources = [
{
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/acl_binding_rule.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
page_title: "consul_acl_binding_rule Resource - terraform-provider-consul"
subcategory: ""
description: |-
Starting with Consul 1.5.0, the consulaclbinding_rule resource can be used to managed Consul ACL binding rules.
Starting with Consul 1.5.0, the consul_acl_binding_rule resource can be used to managed Consul ACL binding rules.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a result of rerunning the docs generation process

---

# consul_acl_binding_rule (Resource)
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/consul_certificate_authority/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
resource "consul_certificate_authority" "connect" {
connect_provider = "consul"

config_json = jsondecode({
config_json = jsonencode({
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This appeared to be a typo from #341 , but please double-check me

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah seems like an autocomplete mixup

LeafCertTTL = "24h"
RotationPeriod = "2160h"
IntermediateCertTTL = "8760h"
Expand Down
Loading