From 0c296d60fb42b34d79e486d81f5871fefc09a842 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:14 -0400 Subject: [PATCH] New release v1.0.0-rc.2 (#21) * Declaring only minimum provider version. Also updated the option to use the client module in the example * Switch to using public provider for testing --- .github/workflows/module-test-pipeline.yml | 16 +++++----- .gitignore | 2 +- ci/module-test/.terraform.lock.hcl | 25 --------------- ci/template-test/.terraform.lock.hcl | 25 --------------- examples/adding-headers/main.tf | 31 +++++++++---------- examples/basic/main.tf | 3 +- .../using-substitution-expressions/main.tf | 31 +++++++++---------- internal/gen-template/.terraform.lock.hcl | 25 --------------- internal/gen-template/provider.tf | 2 +- provider.tf | 2 +- 10 files changed, 42 insertions(+), 120 deletions(-) delete mode 100644 ci/module-test/.terraform.lock.hcl delete mode 100644 ci/template-test/.terraform.lock.hcl delete mode 100644 internal/gen-template/.terraform.lock.hcl diff --git a/.github/workflows/module-test-pipeline.yml b/.github/workflows/module-test-pipeline.yml index a34b323..685dab6 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/.gitignore b/.gitignore index 405206a..6ee7ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ # .tfstate files *.tfstate *.tfstate.* -*.lock.hcl +*.hcl # Crash log files crash.log diff --git a/ci/module-test/.terraform.lock.hcl b/ci/module-test/.terraform.lock.hcl deleted file mode 100644 index 38c5263..0000000 --- a/ci/module-test/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/solaceproducts/solacebroker" { - version = "0.9.2" - constraints = "~> 0.9" - hashes = [ - "h1:reZSrV1AqZGDLCeLYfvBOZ1RDcjTS4SDu+c60pGNcdY=", - "zh:1d4208b6998797c8e5da5363cf0f27815b421342c6d550c2a4361f94e72548b7", - "zh:226cbde0ea5c8d33e113206225766cdb277a43afb11d4b700638ba684b4f362f", - "zh:36b9db6ed06935004fd411013e25fcc5a8ba7254ecda431e4d87f1bc629ceab6", - "zh:45eb7977438e035f91f6ad5e7104c02d7da27fe353766f1433b48738ab8a8387", - "zh:58bd76797cf323dc822cb24043d10f61eba8fd45121f1729cdea66eaaa5efbf7", - "zh:6212e44baf5eebbad10666c2a0a3867972d029bde6f5548624a3487270339246", - "zh:6494f267057a2e4789aad53181bec1d06ba17a474a0a3b12209741e20147bfc1", - "zh:6da28d778057213e38fd7ee04b6330afba1d07a3cf46ed2a8d4b4fad5ada4acb", - "zh:7668aac3a1b1962fab00171987a0fe86ce82928c742b8ec36b8a027114d5d67b", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:9eb62731ed9ad7731b06cf1c0c8941a325cf231d3139750bcbcbe5eeb0726c8d", - "zh:a7279c4a309f95f0779d77bf26083ef082b7d54cc1fe04bf2da1742575861ce9", - "zh:ae19468f3ed1755fbb7a9d36e95e908b8f92684e1c168612f1a1bf291ba0a573", - "zh:b6735fdb01123b3fcc89a95be536953a492cc530d6d0f7595fdbaf127fd03c6e", - "zh:baa0d238a520b16f6592586e573fb8dbb86a13b70069d408e4aaa86532b499ae", - ] -} diff --git a/ci/template-test/.terraform.lock.hcl b/ci/template-test/.terraform.lock.hcl deleted file mode 100644 index 38c5263..0000000 --- a/ci/template-test/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/solaceproducts/solacebroker" { - version = "0.9.2" - constraints = "~> 0.9" - hashes = [ - "h1:reZSrV1AqZGDLCeLYfvBOZ1RDcjTS4SDu+c60pGNcdY=", - "zh:1d4208b6998797c8e5da5363cf0f27815b421342c6d550c2a4361f94e72548b7", - "zh:226cbde0ea5c8d33e113206225766cdb277a43afb11d4b700638ba684b4f362f", - "zh:36b9db6ed06935004fd411013e25fcc5a8ba7254ecda431e4d87f1bc629ceab6", - "zh:45eb7977438e035f91f6ad5e7104c02d7da27fe353766f1433b48738ab8a8387", - "zh:58bd76797cf323dc822cb24043d10f61eba8fd45121f1729cdea66eaaa5efbf7", - "zh:6212e44baf5eebbad10666c2a0a3867972d029bde6f5548624a3487270339246", - "zh:6494f267057a2e4789aad53181bec1d06ba17a474a0a3b12209741e20147bfc1", - "zh:6da28d778057213e38fd7ee04b6330afba1d07a3cf46ed2a8d4b4fad5ada4acb", - "zh:7668aac3a1b1962fab00171987a0fe86ce82928c742b8ec36b8a027114d5d67b", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:9eb62731ed9ad7731b06cf1c0c8941a325cf231d3139750bcbcbe5eeb0726c8d", - "zh:a7279c4a309f95f0779d77bf26083ef082b7d54cc1fe04bf2da1742575861ce9", - "zh:ae19468f3ed1755fbb7a9d36e95e908b8f92684e1c168612f1a1bf291ba0a573", - "zh:b6735fdb01123b3fcc89a95be536953a492cc530d6d0f7595fdbaf127fd03c6e", - "zh:baa0d238a520b16f6592586e573fb8dbb86a13b70069d408e4aaa86532b499ae", - ] -} diff --git a/examples/adding-headers/main.tf b/examples/adding-headers/main.tf index 62b60a3..3406f03 100644 --- a/examples/adding-headers/main.tf +++ b/examples/adding-headers/main.tf @@ -1,17 +1,17 @@ -# Copyright 2024 Solace Corporation. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# Copyright 2024 Solace Corporation. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + provider "solacebroker" { username = "admin" password = "admin" @@ -19,8 +19,7 @@ provider "solacebroker" { } # The RDP requires a queue to bind to. -# Recommended: Use the queue-endpoint module to create the queue -# TODO: Uncomment the following block and replace the resource block once the queue-endpoint module is available +# Option: Use the queue-endpoint module to create the queue. If using this option then also uncomment the queue_name in module "testrdp" below. # module "rdp_queue" { # source = SolaceProducts/queue-endpoint/solacebroker # diff --git a/examples/basic/main.tf b/examples/basic/main.tf index d24eb91..87a951b 100644 --- a/examples/basic/main.tf +++ b/examples/basic/main.tf @@ -19,8 +19,7 @@ provider "solacebroker" { } # The RDP requires a queue to bind to. -# Recommended: Use the queue-endpoint module to create the queue -# TODO: Uncomment the following block and replace the resource block once the queue-endpoint module is available +# Option: Use the queue-endpoint module to create the queue. If using this option then also uncomment the queue_name in module "testrdp" below. # module "rdp_queue" { # source = SolaceProducts/queue-endpoint/solacebroker # diff --git a/examples/using-substitution-expressions/main.tf b/examples/using-substitution-expressions/main.tf index 7aedec4..b353ee2 100644 --- a/examples/using-substitution-expressions/main.tf +++ b/examples/using-substitution-expressions/main.tf @@ -1,17 +1,17 @@ -# Copyright 2024 Solace Corporation. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# Copyright 2024 Solace Corporation. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + provider "solacebroker" { username = "admin" password = "admin" @@ -19,8 +19,7 @@ provider "solacebroker" { } # The RDP requires a queue to bind to. -# Recommended: Use the queue-endpoint module to create the queue -# TODO: Uncomment the following block and replace the resource block once the queue-endpoint module is available +# Option: Use the queue-endpoint module to create the queue. If using this option then also uncomment the queue_name in module "testrdp" below. # module "rdp_queue" { # source = SolaceProducts/queue-endpoint/solacebroker # diff --git a/internal/gen-template/.terraform.lock.hcl b/internal/gen-template/.terraform.lock.hcl deleted file mode 100644 index 38c5263..0000000 --- a/internal/gen-template/.terraform.lock.hcl +++ /dev/null @@ -1,25 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/solaceproducts/solacebroker" { - version = "0.9.2" - constraints = "~> 0.9" - hashes = [ - "h1:reZSrV1AqZGDLCeLYfvBOZ1RDcjTS4SDu+c60pGNcdY=", - "zh:1d4208b6998797c8e5da5363cf0f27815b421342c6d550c2a4361f94e72548b7", - "zh:226cbde0ea5c8d33e113206225766cdb277a43afb11d4b700638ba684b4f362f", - "zh:36b9db6ed06935004fd411013e25fcc5a8ba7254ecda431e4d87f1bc629ceab6", - "zh:45eb7977438e035f91f6ad5e7104c02d7da27fe353766f1433b48738ab8a8387", - "zh:58bd76797cf323dc822cb24043d10f61eba8fd45121f1729cdea66eaaa5efbf7", - "zh:6212e44baf5eebbad10666c2a0a3867972d029bde6f5548624a3487270339246", - "zh:6494f267057a2e4789aad53181bec1d06ba17a474a0a3b12209741e20147bfc1", - "zh:6da28d778057213e38fd7ee04b6330afba1d07a3cf46ed2a8d4b4fad5ada4acb", - "zh:7668aac3a1b1962fab00171987a0fe86ce82928c742b8ec36b8a027114d5d67b", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:9eb62731ed9ad7731b06cf1c0c8941a325cf231d3139750bcbcbe5eeb0726c8d", - "zh:a7279c4a309f95f0779d77bf26083ef082b7d54cc1fe04bf2da1742575861ce9", - "zh:ae19468f3ed1755fbb7a9d36e95e908b8f92684e1c168612f1a1bf291ba0a573", - "zh:b6735fdb01123b3fcc89a95be536953a492cc530d6d0f7595fdbaf127fd03c6e", - "zh:baa0d238a520b16f6592586e573fb8dbb86a13b70069d408e4aaa86532b499ae", - ] -} 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" } } }