Adjusted modules to appliance

SolaceProducts · Mar 25, 2024 · 27efc9a · 27efc9a
1 parent 03a854a
commit 27efc9a
Show file tree

Hide file tree

Showing 23 changed files with 9,400 additions and 12,949 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 Client Terraform Module
+# Solace PubSub+ Appliance Client Terraform Module
 
 Terraform module to provision a client identifier for [authorization](https://docs.solace.com/Security/Client-Authorization-Overview.htm) when connecting to the [Solace PubSub+ Event Broker](https://solace.com/products/event-broker/). The module also provides the option to adjust the assigned ACL profile through defining ACL profile exceptions, and to define additinal attributes for client usernames.
 
@@ -28,13 +28,13 @@ Additional optional module variables names are the same as the underlying resour
 
 | Resource name |
 |---------------|
-|[solacebroker_msg_vpn_client_username](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_client_username#optional)|
-|[solacebroker_msg_vpn_authorization_group](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_authorization_group#optional)|
-|[solacebroker_msg_vpn_acl_profile_publish_topic_exception](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_acl_profile_publish_topic_exception#optional)|
-|[solacebroker_msg_vpn_acl_profile_subscribe_share_name_exception](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_acl_profile_subscribe_share_name_exception#optional)|
-|[solacebroker_msg_vpn_acl_profile_subscribe_topic_exception](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_acl_profile_subscribe_topic_exception#optional)|
-|[solacebroker_msg_vpn_acl_profile_client_connect_exception](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_acl_profile_client_connect_exception#optional)|
-|[solacebroker_msg_vpn_client_username_attribute](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_client_username_attribute#optional)|
+|[solacebroker_msg_vpn_client_username](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_client_username#optional)|
+|[solacebroker_msg_vpn_authorization_group](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_authorization_group#optional)|
+|[solacebroker_msg_vpn_acl_profile_publish_topic_exception](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_acl_profile_publish_topic_exception#optional)|
+|[solacebroker_msg_vpn_acl_profile_subscribe_share_name_exception](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_acl_profile_subscribe_share_name_exception#optional)|
+|[solacebroker_msg_vpn_acl_profile_subscribe_topic_exception](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_acl_profile_subscribe_topic_exception#optional)|
+|[solacebroker_msg_vpn_acl_profile_client_connect_exception](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_acl_profile_client_connect_exception#optional)|
+|[solacebroker_msg_vpn_client_username_attribute](https://registry.terraform.io/providers/solaceproducts/solacebrokerappliance/latest/docs/resources/msg_vpn_client_username_attribute#optional)|
 
 Most optional variables' default value is `null`, meaning that if not provided then the resource default value will be provisioned on the broker.
 
@@ -50,7 +50,7 @@ Note that the "client username" and the "authorization group" outputs are [sensi
 
 | 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 "testclientusername" {

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 $2
 terraform apply -auto-approve $2
-terraform plan $2 | grep "No changes"
+# terraform plan $2 | grep "No changes"
 sleep 1
 terraform destroy -auto-approve $2
 popd