Skip to content

Commit

Permalink
Update test matrix to reflect latest Consul releases (#411)
Browse files Browse the repository at this point in the history
* Update test matrix to reflect latest Consul releases

* Update branch name trigger for test workflow

`main` is now the primary branch for this repo

* Add explicit resource dependency to terraform failing delete

* Regenerate docs

* Use latest version of tfplugindocs
  • Loading branch information
nathancoleman committed Aug 1, 2024
1 parent 8235274 commit 45a6e54
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/test.yaml
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
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]
config_json = jsonencode({
Sources = [
{
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/acl_binding_rule.md
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.
---

# consul_acl_binding_rule (Resource)
Expand Down
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({
LeafCertTTL = "24h"
RotationPeriod = "2160h"
IntermediateCertTTL = "8760h"
Expand Down

0 comments on commit 45a6e54

Please sign in to comment.