From 9672ae4d3af4a551caba04aa8af61a748afd59ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:56:38 -0400 Subject: [PATCH] New release v1.0.0-rc.2 (#13) * link fixes * Declaring only minimum provider version * Switched to use public provider for testing --- .github/workflows/module-test-pipeline.yml | 16 ++++++++-------- VERSION | 2 +- examples/queue-with-jndi/README.md | 2 +- examples/topic-endpoint-with-jndi/README.md | 2 +- internal/gen-template/provider.tf | 2 +- provider.tf | 2 +- 6 files changed, 13 insertions(+), 13 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: | 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 diff --git a/examples/queue-with-jndi/README.md b/examples/queue-with-jndi/README.md index beba3e6..f0b03e9 100644 --- a/examples/queue-with-jndi/README.md +++ b/examples/queue-with-jndi/README.md @@ -2,7 +2,7 @@ Configuration in this directory creates a [queue that is also exposed as a JNDI administered object](https://docs.solace.com/API/Solace-JMS-API/Managing-Solace-JNDI-Objects.htm) on the PubSub+ event broker leveraging the Queues & Endpoints Terraform module. -Note that exposing queues as JNDI objects requires that you enable JNDI at the Message VPN level and configure a connection factory. You can use the [Service Module](TODO:add link) and the [JNDI Connection Factory Module](TODO:add link) to perform these tasks. This module will not check if the requirements are in place, however, if they aren't the configuration will fail. +Note that exposing queues as JNDI objects requires that you enable JNDI at the Message VPN level and configure a connection factory. You can use the [Service Module](https://registry.terraform.io/modules/SolaceProducts/service/solacebroker/latest) and the [JNDI Connection Factory Module](https://registry.terraform.io/modules/SolaceProducts/jndi/solacebroker/latest) to perform these tasks. This module will not check if the requirements are in place, however, if they aren't the configuration will fail. ## Module Configuration in the Example diff --git a/examples/topic-endpoint-with-jndi/README.md b/examples/topic-endpoint-with-jndi/README.md index 8c2ade1..940641b 100644 --- a/examples/topic-endpoint-with-jndi/README.md +++ b/examples/topic-endpoint-with-jndi/README.md @@ -2,7 +2,7 @@ Configuration in this directory creates a [topic endpoint that is also exposed as a JNDI administered object](https://docs.solace.com/API/Solace-JMS-API/Managing-Solace-JNDI-Objects.htm) on the PubSub+ event broker leveraging the Queues & Endpoints Terraform module. -Note that exposing topics as JNDI objects requires that you enable JNDI at the Message VPN level and configure a connection factory. You can use the [Service Module](TODO:add link) and the [JNDI Connection Factory Module](TODO:add link) to perform these tasks. This module will not check if the requirements are in place, however, if they aren't the configuration will fail. +Note that exposing topics as JNDI objects requires that you enable JNDI at the Message VPN level and configure a connection factory. You can use the [Service Module](https://registry.terraform.io/modules/SolaceProducts/service/solacebroker/latest) and the [JNDI Connection Factory Module](https://registry.terraform.io/modules/SolaceProducts/jndi/solacebroker/latest) to perform these tasks. This module will not check if the requirements are in place, however, if they aren't the configuration will fail. ## Module Configuration in the Example 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" } } }