From 113a001f1f4ee635e7781301401b7babdee87f63 Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Fri, 21 Jun 2024 16:00:14 -0400 Subject: [PATCH 1/4] New dev branch [skip ci] --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9c21819..fedbd0b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0-rc.1 +1.0.0-rc.2 From f55873e2e35f60d37b155ea2954a2acf26cc4428 Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Wed, 26 Jun 2024 09:36:23 -0400 Subject: [PATCH 2/4] link fixes --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d8e9591..9875483 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ Use case details are provided in the [Examples](#examples) section. ## Related modules -To use JNDI, access must be enabled on the Message VPN. You can configure this using the [Service Module](TODO:fixlink). By default, JNDI access is not enabled on Solace PubSub+ appliances, but it is enabled on Solace PubSub+ software event brokers. +To use JNDI, access must be enabled on the Message VPN. You can configure this using the [Service Module](https://registry.terraform.io/modules/SolaceProducts/service/solacebroker/latest). By default, JNDI access is not enabled on Solace PubSub+ appliances, but it is enabled on Solace PubSub+ software event brokers. -To configure JNDI managed objects (JNDI Topics and Queues) when provisioning a PubSub+ queue or topic endpoint, use the [Queues & Endpoints Module](TODO:fixlink). +To configure JNDI managed objects (JNDI Topics and Queues) when provisioning a PubSub+ queue or topic endpoint, use the [Queues & Endpoints Module](https://registry.terraform.io/modules/SolaceProducts/queue-endpoint/solacebroker/latest). ## Module input variables From f49b758f5d84c6f90323993523fd30dae80666f1 Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Wed, 26 Jun 2024 10:10:21 -0400 Subject: [PATCH 3/4] Declaring only minimum provider version --- internal/gen-template/provider.tf | 2 +- provider.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/gen-template/provider.tf b/internal/gen-template/provider.tf index f2e37c2..8155aea 100644 --- a/internal/gen-template/provider.tf +++ b/internal/gen-template/provider.tf @@ -4,7 +4,7 @@ terraform { required_providers { solacebroker = { source = "registry.terraform.io/solaceproducts/solacebroker" - version = "~> 1.0" + version = ">= 1.0" } } } diff --git a/provider.tf b/provider.tf index 0366e34..39b56af 100644 --- a/provider.tf +++ b/provider.tf @@ -18,7 +18,7 @@ terraform { required_providers { solacebroker = { source = "registry.terraform.io/solaceproducts/solacebroker" - version = "~> 1.0" + version = ">= 1.0" } } } From 942e12adfecaf14c60fa79530ee55000fa42a3de Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Wed, 26 Jun 2024 15:33:36 -0400 Subject: [PATCH 4/4] Switched to use public provider for testing --- .github/workflows/module-test-pipeline.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/module-test-pipeline.yml b/.github/workflows/module-test-pipeline.yml index 4c5db36..398a644 100644 --- a/.github/workflows/module-test-pipeline.yml +++ b/.github/workflows/module-test-pipeline.yml @@ -23,14 +23,14 @@ jobs: --env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:latest while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done - - name: Setup if private provider is required - run: | - export PRIVATE_PROVIDER_VERSION="1.0.0-rc.7" - if [ -n "$PRIVATE_PROVIDER_VERSION" ]; then - echo "Using private provider version $PRIVATE_PROVIDER_VERSION" - grep -rl 'source = "' . | xargs sed -i 's@source = ".*$@source = "app.terraform.io/SolaceDev/solacebroker"@g' - grep -rl 'version = "' . | xargs sed -i "s@ version = \".*\$@ version = \"${PRIVATE_PROVIDER_VERSION}\"@g" - fi + # - name: Setup if private provider is required + # run: | + # export PRIVATE_PROVIDER_VERSION="1.0.0-rc.7" + # if [ -n "$PRIVATE_PROVIDER_VERSION" ]; then + # echo "Using private provider version $PRIVATE_PROVIDER_VERSION" + # grep -rl 'source = "' . | xargs sed -i 's@source = ".*$@source = "app.terraform.io/SolaceDev/solacebroker"@g' + # grep -rl 'version = "' . | xargs sed -i "s@ version = \".*\$@ version = \"${PRIVATE_PROVIDER_VERSION}\"@g" + # fi - name: Test module from template on test broker run: |