From bcd99db1a2a18dce4f8b1383cdbe83845569e1b0 Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Fri, 21 Jun 2024 15:59:58 -0400 Subject: [PATCH 1/3] 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 34717c746a02b3b9c53f389208e810b4c17d27c7 Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Wed, 26 Jun 2024 10:09:53 -0400 Subject: [PATCH 2/3] 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 ab47f4481cad4ddfc304ce9ace76b3a3568c4a90 Mon Sep 17 00:00:00 2001 From: Balazs Czoma Date: Wed, 26 Jun 2024 15:33:52 -0400 Subject: [PATCH 3/3] 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 7ec6f92..c31ca25 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: |