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

@@ -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: |

.gitignore

@@ -4,7 +4,7 @@
 # .tfstate files
 *.tfstate
 *.tfstate.*
-*.lock.hcl
+*.hcl
 
 # Crash log files
 crash.log

examples/adding-headers/main.tf

@@ -1,26 +1,25 @@
-# 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"
   url      = "http://localhost:8080"
 }
 
 # 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
 #

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
 #

examples/using-substitution-expressions/main.tf

@@ -1,26 +1,25 @@
-# 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"
   url      = "http://localhost:8080"
 }
 
 # 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
 #

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"
     }
   }
 }

provider.tf

@@ -18,7 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source  = "registry.terraform.io/solaceproducts/solacebroker"
-      version = "~> 1.0"
+      version = ">= 1.0"
     }
   }
 }