Adjusted modules to appliance

SolaceProducts · Mar 25, 2024 · 005ff16 · 005ff16
1 parent 1e53ec1
commit 005ff16
Show file tree

Hide file tree

Showing 19 changed files with 9,389 additions and 12,940 deletions.
diff --git a/.github/workflows/module-test-pipeline.yml b/.github/workflows/module-test-pipeline.yml
@@ -58,7 +58,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 JNDI Terraform Module
+# Solace PubSub+ Appliance JNDI Terraform Module
 
 Terraform module to configure a [connection factory object](https://docs.solace.com/API/Solace-JMS-API/Connection-Factories.htm) in the JNDI store of a [Solace PubSub+ Event Broker](https://solace.com/products/event-broker/). 
 
@@ -26,7 +26,7 @@ Additional optional module variables names are the same as the underlying connec
 
 | Resource name |
 |---------------|
-|[solacebroker_msg_vpn_jndi_connection_factory](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_jndi_connection_factory#optional)|
+|[solacebroker_msg_vpn_jndi_connection_factory](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_jndi_connection_factory#optional)|
 
 Most optional variables' default value is `null`, meaning that if not provided then the resource default value will be provisioned on the broker.
 
@@ -42,7 +42,7 @@ Outputs:
 
 | 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/solacebrokerappliance/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
 }
 
 module "testcf" {

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

diff --git a/ci/scripts/test-module.sh b/ci/scripts/test-module.sh
@@ -11,7 +11,7 @@ terraform validate
 # Create
 terraform plan
 terraform apply -auto-approve
-terraform plan | grep "No changes"
+# terraform plan | 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
 }
 
 module "testcf" {

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

diff --git a/examples/basic/README.md b/examples/basic/README.md
@@ -11,7 +11,7 @@ Configuration in this directory creates a [connection factory](https://docs.sola
 
 ### 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_jndi_connection_factory"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_jndi_connection_factory#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_jndi_connection_factory"](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_jndi_connection_factory#optional).
 
 ### Output
 
@@ -40,7 +40,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/solacebrokerappliance/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
 }
 
 module "testcf" {

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

diff --git a/examples/local-transactions-support/README.md b/examples/local-transactions-support/README.md
@@ -15,7 +15,7 @@ Configuration in this directory creates a [connection factory](https://docs.sola
 
 Note: connection factories must have the `transport_direct_transport_enabled` input variable disabled to support local and XA transactions. This is automatically ensured in this module if `local_transactions_enabled` is `true`.
 
-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_jndi_connection_factory"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_jndi_connection_factory#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_jndi_connection_factory"](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_jndi_connection_factory#optional).
 
 ### Output
 
@@ -44,7 +44,7 @@ cd examples/local-transactions-support
 
 ### 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/solacebrokerappliance/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/local-transactions-support/main.tf b/examples/local-transactions-support/main.tf
@@ -16,6 +16,7 @@ provider "solacebroker" {
   username = "admin"
   password = "admin"
   url      = "http://localhost:8080"
+  skip_api_check  = true
 }
 
 module "testcf" {

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

diff --git a/examples/xa-transactions-support/README.md b/examples/xa-transactions-support/README.md
@@ -15,7 +15,7 @@ Configuration in this directory creates a [connection factory](https://docs.sola
 
 Note: connection factories must have the `transport_direct_transport_enabled` input variable disabled to support local and XA transactions. This is automatically ensured in this module if `xa_enabled` is `true`.
 
-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_jndi_connection_factory"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_jndi_connection_factory#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_jndi_connection_factory"](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_jndi_connection_factory#optional).
 
 ### Output
 
@@ -46,7 +46,7 @@ cd examples/xa-transactions-support
 
 ### 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/solacebrokerappliance/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/xa-transactions-support/main.tf b/examples/xa-transactions-support/main.tf
@@ -16,6 +16,7 @@ provider "solacebroker" {
   username = "admin"
   password = "admin"
   url      = "http://localhost:8080"
+  skip_api_check  = true
 }
 
 module "testcf" {

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

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

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