GA release 1.0.0 (#73)

.github/workflows/cli-test-pipeline.yml

@@ -22,7 +22,7 @@ jobs:
         run: |
           mkdir -p $HOME/solace; chmod 777 $HOME/solace
           docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
-            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
+            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.8.1.126"
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Use local provider

.github/workflows/prep-internal-release.yml

@@ -85,7 +85,7 @@ jobs:
           sed -i "s/productName=.*$/productName=${{ github.event.repository.name }}/g" ci/whitesource/whitesource-agent.config
           sed -i "s/projectName=.*$/projectName=${{ github.event.repository.name }}/g" ci/whitesource/whitesource-agent.config
           cat ci/whitesource/whitesource-agent.config | grep productVersion
-          curl https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar --output /ci/whitesource/wss-unified-agent.jar
+          curl https://unified-agent.s3.amazonaws.com/wss-unified-agent.jar --output ci/whitesource/wss-unified-agent.jar
           export WS_APIKEY="${{ secrets.WSS_API_KEY }}"
           export WS_WSS_URL="https://saas.whitesourcesoftware.com/agent"
           export WS_PRODUCTNAME="${{ github.event.repository.name }}"

.github/workflows/provider-test-pipeline.yml

@@ -22,7 +22,7 @@ jobs:
         run: |
           mkdir -p $HOME/solace; chmod 777 $HOME/solace
           docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
-            --env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
+            --env system_scaling_maxconnectioncount="1000" --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.8.1.126"
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Use local provider
@@ -69,6 +69,13 @@ jobs:
           terraform import solacebroker_msg_vpn.newone new
           popd
 
+      - name: Test broker object attributes override
+        run: |
+          pushd ci/brokertest
+          terraform apply -auto-approve
+          terraform plan | grep "No changes"
+          popd
+
       - name: Test larger config
         run: |
           pushd ci/bigtest
@@ -86,24 +93,23 @@ jobs:
           cat results.out | grep "401 Unauthorized"
           popd
 
-      # Skipping state upgrade test until using new SEMP schema
-      # - name: Test state upgrade
-      #   run: |
-      #     pushd ci/state_upgrade
-      #     bash -c "terraform plan &> results.out" || echo "Expecting terraform plan to fail"
-      #     cat results.out | grep "Found deprecated state key 'deprecated_att"
-      #     cp terraform.tfstate terraform.tfstate.bak
-      #     sed -i '/deprecated_att/d' terraform.tfstate # remove deprecated non-null attributes from state
-      #     terraform plan | grep "3 to add"
-      #     terraform apply -auto-approve | grep "Apply complete"
-      #     # TODO: GH actions fails on following commands, need to investigate
-      #     # diff terraform.tfstate terraform.tfstate.bak > diff.out
-      #     # ls -l
-      #     # cat diff.out
-      #     # grep ">           \"schema_version\": 0," diff.out | wc -l | grep 3 # verify schema has been upgraded
-      #     # grep ">             \"deprecated1\": null," diff.out # verify deprecated has been removed
-      #     # grep ">               \"deprecated2\": null," diff.out # verify deprecated has been removed
-      #     # grep "<               \"clear_percent\": 20," diff.out # verify string has been converted to number
-      #     # grep "<             \"egress_enabled\": true," diff.out # verify string has been converted to bool
-      #     # terraform destroy -auto-approve
-      #     popd
+      - name: Test state upgrade
+        run: |
+          pushd ci/state_upgrade
+          bash -c "terraform plan &> results.out" || echo "Expecting terraform plan to fail"
+          cat results.out | grep "Found deprecated state key 'deprecated_att"
+          cp terraform.tfstate terraform.tfstate.bak
+          sed -i '/deprecated_att/d' terraform.tfstate # remove deprecated non-null attributes from state
+          terraform plan | grep "3 to add"
+          terraform apply -auto-approve | grep "Apply complete"
+          # GH actions fails on following commands, need to investigate. Passes locally.
+          # diff terraform.tfstate terraform.tfstate.bak > diff.out
+          # ls -l
+          # cat diff.out
+          # grep ">           \"schema_version\": 0," diff.out | wc -l | grep 3 # verify schema has been upgraded
+          # grep ">             \"deprecated1\": null," diff.out # verify deprecated has been removed
+          # grep ">               \"deprecated2\": null," diff.out # verify deprecated has been removed
+          # grep "<               \"clear_percent\": 20," diff.out # verify string has been converted to number
+          # grep "<             \"egress_enabled\": true," diff.out # verify string has been converted to bool
+          # terraform destroy -auto-approve
+          popd

.github/workflows/verify-registry-release.yml

@@ -29,7 +29,7 @@ jobs:
         run: |
           mkdir -p $HOME/solace; chmod 777 $HOME/solace
           docker run -d -p 8080:8080 -p 55555:55555 --shm-size=1g --env username_admin_globalaccesslevel=admin --env username_admin_password=admin --env system_scaling_maxkafkabridgecount="10" --name=solace \
-            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.6.1.52"
+            --mount type=bind,source=$HOME/solace,destination=/var/lib/solace,ro=false solace/solace-pubsub-standard:"10.8.1.126"
           while ! curl -s localhost:8080 | grep aurelia ; do sleep 1 ; done
 
       - name: Set up Terraform latest - public

README.md

@@ -9,6 +9,10 @@ The provider is available from the [Terraform Providers Registry](https://regist
 
 The minimum required PubSub+ Software Event Broker version is 10.4.
 
+## Limitations
+
+> This version of the PubSub+ Terraform provider is generally available for production services contained within a Message VPN.  Use of any resource not contained within a Message VPN is not supported in production by Solace.
+
 ## Quick Start
 
 1. Ensure you have admin access to a Solace PubSub+ Software Event Broker. Options include [local deployment of a containerized version](https://docs.solace.com/Software-Broker/SW-Broker-Set-Up/Containers/Set-Up-Container-Image.htm) or use of a free broker from [PubSub+ Cloud](https://docs.solace.com/Cloud/cloud-lp.htm).

ci/brokertest/testconfig.tf

@@ -0,0 +1,16 @@
+terraform {
+  required_providers {
+    solacebroker = {
+      source = "registry.terraform.io/solaceproducts/solacebroker"
+    }
+  }
+}
+
+provider solacebroker {
+  username       = "admin"
+  password       = "admin"
+  url            = "http://localhost:8080"
+}
+
+resource "solacebroker_broker" "default" {
+}