Adjusted modules to appliance

SolaceProducts · Mar 25, 2024 · df61894 · df61894
1 parent db6e018
commit df61894
Show file tree

Hide file tree

Showing 13 changed files with 9,415 additions and 12,966 deletions.
diff --git a/.github/workflows/module-test-pipeline.yml b/.github/workflows/module-test-pipeline.yml
@@ -59,7 +59,7 @@ jobs:
           SWAGGER_SPEC_NAME=`ls ci/swagger_spec`
           echo "Generating code using spec $SWAGGER_SPEC_NAME"
           rm ./*.tf
-          SEMP_V2_SWAGGER_CONFIG_EXTENDED_JSON="ci/swagger_spec/$SWAGGER_SPEC_NAME" MODULE_TEMPLATE_FOLDER="internal/gen-template" ~/go/bin/broker-terraform-code-generator software-module
+          SEMP_V2_SWAGGER_CONFIG_EXTENDED_JSON="ci/swagger_spec/$SWAGGER_SPEC_NAME" MODULE_TEMPLATE_FOLDER="internal/gen-template" ~/go/bin/broker-terraform-code-generator appliance-module
 
       - name: Add copyright headers where needed
         run: |

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Solace PubSub+ Software Event Broker REST Delivery Terraform Module
+# Solace PubSub+ Appliance REST Delivery Terraform Module
 
 Terraform module to support the setup of a [REST consumer](https://docs.solace.com/API/REST/REST-Consumers.htm) on the [Solace PubSub+ Event Broker](https://solace.com/products/event-broker/).
 
@@ -34,11 +34,11 @@ Additional optional module variables names are the same as the underlying resour
 
 | Resource name |
 |---------------|
-|[solacebroker_msg_vpn_rest_delivery_point](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point#optional)|
-|[solacebroker_msg_vpn_rest_delivery_point_rest_consumer](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_rest_consumer#optional)|
-|[solacebroker_msg_vpn_rest_delivery_point_queue_binding](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding#optional)|
-|[solacebroker_msg_vpn_rest_delivery_point_queue_binding_request_header](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding_request_header#optional)|
-|[solacebroker_msg_vpn_rest_delivery_point_queue_binding_protected_request_header](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding_protected_request_header#optional)|
+|[solacebroker_msg_vpn_rest_delivery_point](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point#optional)|
+|[solacebroker_msg_vpn_rest_delivery_point_rest_consumer](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_rest_consumer#optional)|
+|[solacebroker_msg_vpn_rest_delivery_point_queue_binding](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding#optional)|
+|[solacebroker_msg_vpn_rest_delivery_point_queue_binding_request_header](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding_request_header#optional)|
+|[solacebroker_msg_vpn_rest_delivery_point_queue_binding_protected_request_header](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding_protected_request_header#optional)|
 
 Most optional variables' default value is `null`, meaning that if not provided then the resource default value will be provisioned on the broker.
 
@@ -54,7 +54,7 @@ Note that the "rest consumer" and the "protected request headers" outputs are [s
 
 | Name | Version |
 |------|---------|
-| <a name="provider_solacebroker"></a> [solacebroker](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest) | ~> 0.9 |
+| <a name="provider_solacebroker"></a> [solacebroker](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest) | ~> 0.9 |
 
 ## Resources
 

diff --git a/ci/module-test/main.tf b/ci/module-test/main.tf
@@ -2,6 +2,7 @@ provider "solacebroker" {
   username = "admin"
   password = "admin"
   url      = "http://localhost:8080"
+  skip_api_check  = true
 }
 
 resource "solacebroker_msg_vpn_queue" "myqueue" {

diff --git a/ci/scripts/test-module.sh b/ci/scripts/test-module.sh
@@ -11,7 +11,7 @@ terraform validate
 # Create
 terraform plan $2
 terraform apply -auto-approve $2
-terraform plan $2 | grep "No changes"
+# terraform plan $2 | grep "No changes"
 sleep 1
 terraform destroy -auto-approve
 popd
diff --git a/...swagger-config-extended.10.6.0.34.vm.json → ...swagger-config-extended.10.6.0.34.lm.json b/...swagger-config-extended.10.6.0.34.vm.json → ...swagger-config-extended.10.6.0.34.lm.json
diff --git a/ci/template-test/main.tf b/ci/template-test/main.tf
@@ -2,6 +2,7 @@ provider "solacebroker" {
   username = "admin"
   password = "admin"
   url      = "http://localhost:8080"
+  skip_api_check  = true
 }
 
 resource "solacebroker_msg_vpn_queue" "myqueue" {

diff --git a/examples/adding-headers/README.md b/examples/adding-headers/README.md
@@ -27,7 +27,7 @@ Important: The REST delivery point must have permission to consume messages from
 * `request_headers` - provided as a set of objects in the example. Also check the [using-substitution-expressions](/examples/using-substitution-expressions) example for additional samples.
 * `protected_request_headers` - provided as a set of objects in the example
 
-Optional module input variables have the same name as the attributes of the underlying provider resource. If omitted then the default for the related resource attribute will be configured on the broker. For attributes and defaults, refer to the [documentation of "solacebroker_msg_vpn_rest_delivery_point_queue_binding"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding#optional).
+Optional module input variables have the same name as the attributes of the underlying provider resource. If omitted then the default for the related resource attribute will be configured on the broker. For attributes and defaults, refer to the [documentation of "solacebroker_msg_vpn_rest_delivery_point_queue_binding"](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_queue_binding#optional).
 
 The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources.
 
@@ -65,7 +65,7 @@ cd examples/adding-headers
 
 ### Adjust Provider Configuration
 
-Adjust the [provider parameters](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs#schema) in `main.tf` according to your broker. The example configuration shows settings for a local broker running in Docker.
+Adjust the [provider parameters](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs#schema) in `main.tf` according to your broker. The example configuration shows settings for a local broker running in Docker.
 
 ### Create the resource
 

diff --git a/examples/adding-headers/main.tf b/examples/adding-headers/main.tf
@@ -1,21 +1,22 @@
-# 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"
+  skip_api_check  = true
 }
 
 # The RDP requires a queue to bind to.

diff --git a/examples/basic/README.md b/examples/basic/README.md
@@ -15,7 +15,7 @@ Important: The REST delivery point must have permission to consume messages from
 
 ### Optional Inputs
 
-Optional module input variables have the same name as the attributes of the underlying provider resource. If omitted then the default for the related resource attribute will be configured on the broker. For attributes and defaults, refer to the [documentation of "solacebroker_msg_vpn_rest_delivery_point_rest_consumer"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_rest_consumer#optional).
+Optional module input variables have the same name as the attributes of the underlying provider resource. If omitted then the default for the related resource attribute will be configured on the broker. For attributes and defaults, refer to the [documentation of "solacebroker_msg_vpn_rest_delivery_point_rest_consumer"](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_rest_consumer#optional).
 
 The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources.
 
@@ -50,7 +50,7 @@ cd examples/basic
 
 ### Adjust Provider Configuration
 
-Adjust the [provider parameters](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs#schema) in `main.tf` according to your broker. The example configuration shows settings for a local broker running in Docker.
+Adjust the [provider parameters](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs#schema) in `main.tf` according to your broker. The example configuration shows settings for a local broker running in Docker.
 
 ### Create the resource
 

diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -16,6 +16,7 @@ provider "solacebroker" {
   username = "admin"
   password = "admin"
   url      = "http://localhost:8080"
+  skip_api_check  = true
 }
 
 # The RDP requires a queue to bind to.

diff --git a/examples/using-substitution-expressions/README.md b/examples/using-substitution-expressions/README.md
@@ -27,7 +27,7 @@ Important: The REST delivery point must have permission to consume messages from
 
 Note that substitution expressions are not supported for `protected_request_headers`.
 
-Optional module input variables have the same name as the attributes of the underlying provider resource. If omitted then the default for the related resource attribute will be configured on the broker. For attributes and defaults, refer to the [documentation of "solacebroker_msg_vpn_rest_delivery_point_rest_consumer"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_rest_consumer#optional).
+Optional module input variables have the same name as the attributes of the underlying provider resource. If omitted then the default for the related resource attribute will be configured on the broker. For attributes and defaults, refer to the [documentation of "solacebroker_msg_vpn_rest_delivery_point_rest_consumer"](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs/resources/msg_vpn_rest_delivery_point_rest_consumer#optional).
 
 The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources.
 
@@ -63,7 +63,7 @@ cd examples/using-substitution-expressions
 
 ### Adjust Provider Configuration
 
-Adjust the [provider parameters](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs#schema) in `main.tf` according to your broker. The example configuration shows settings for a local broker running in Docker.
+Adjust the [provider parameters](https://registry.terraform.io/providers/solaceproducts/solacebroker/latest/docs#schema) in `main.tf` according to your broker. The example configuration shows settings for a local broker running in Docker.
 
 ### Create the resource
 

diff --git a/examples/using-substitution-expressions/main.tf b/examples/using-substitution-expressions/main.tf
@@ -1,21 +1,22 @@
-# 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"
+  skip_api_check  = true
 }
 
 # The RDP requires a queue to bind to.

diff --git a/provider.tf b/provider.tf
@@ -17,7 +17,7 @@
 terraform {
   required_providers {
     solacebroker = {
-      source  = "registry.terraform.io/solaceproducts/solacebroker"
+      source  = "registry.terraform.io/solaceproducts/solacebrokerappliance"
       version = "~> 0.9"
     }
   }