Allow upper case letters in URL protocol scheme, documentation and te…

…sting improvements

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

@@ -47,12 +47,13 @@ jobs:
 
       - name: Setup token and patch module with release information
         run: |
+          MODULENAME=rest-delivery
           if [ "${{ github.event.inputs.public_release }}" == "false" ] ; then
             echo Internal release
-            MODULE_REF="app.terraform.io/SolaceDev/jndi/solacebroker"
+            MODULE_REF="app.terraform.io/SolaceDev/$MODULENAME/solacebroker"
           else
             echo Public release
-            MODULE_REF="SolaceProducts/jndi/solacebroker"
+            MODULE_REF="SolaceProducts/$MODULENAME/solacebroker"
           fi
           ci/scripts/test-module.sh ci/module-test/ "" $MODULE_REF "${{ github.event.inputs.release_version }}"
 

README.md

@@ -78,7 +78,7 @@ Refer to the following configuration examples:
 
 ## Module use recommendations
 
-This module is expected to be used primarily by application teams. It supports provisioning endpoints or templates required by a specific application. It may be forked and adjusted with private defaults.
+This module is expected to be used primarily by application teams. It supports provisioning rest delivery required by a specific application. It may be forked and adjusted with private defaults.
 
 ## Resources
 

VERSION

@@ -1 +1 @@
-0.1.0-rc.3
+0.1.0-rc.4

ci/module-test/main.tf

@@ -12,6 +12,7 @@ resource "solacebroker_msg_vpn_queue" "myqueue" {
 
 module "testrdp" {
   source = "../.."
+  # version = ""
 
   msg_vpn_name             = "default"
   queue_name               = solacebroker_msg_vpn_queue.myqueue.queue_name
@@ -65,10 +66,11 @@ output "protected_request_headers" {
 
 module "testrdp2" {
   source = "../../internal/gen-template"
+  # version = ""
 
   msg_vpn_name              = "default"
   queue_name                = solacebroker_msg_vpn_queue.myqueue.queue_name
-  url                       = "http://[2001:db8:3333:4444:5555:6666:7777:8888]:12345/$${msgId()}"
+  url                       = "HTTP://[2001:db8:3333:4444:5555:6666:7777:8888]:12345/$${msgId()}"
   rest_delivery_point_name  = "my_rdp2"
   request_headers           = module.testrdp.request_headers
   protected_request_headers = module.testrdp.protected_request_headers

ci/template-test/main.tf

@@ -67,7 +67,7 @@ module "testrdp2" {
 
   msg_vpn_name              = "default"
   queue_name                = solacebroker_msg_vpn_queue.myqueue.queue_name
-  url                       = "http://[2001:db8:3333:4444:5555:6666:7777:8888]:12345/$${msgId()}"
+  url                       = "HTTP://[2001:db8:3333:4444:5555:6666:7777:8888]:12345/$${msgId()}"
   rest_delivery_point_name  = "my_rdp2"
   request_headers           = module.testrdp.request_headers
   protected_request_headers = module.testrdp.protected_request_headers

examples/adding-headers/variables.tf

@@ -12,10 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-variable "protected_request_headers" {
-  type = list(object({
-    header_name  = string
-    header_value = string
-  }))
-  default = []
-}
+variable "protected_request_headers" {
+  type = list(object({
+    header_name  = string
+    header_value = string
+  }))
+  default   = []
+  sensitive = true
+}

examples/basic/main.tf

@@ -51,7 +51,7 @@ module "testrdp" {
   rest_delivery_point_name = "basic_rdp"
   url                      = "https://example.com/test"
   # queue_name               = module.rdp_queue.queue.queue_name
-  queue_name               = solacebroker_msg_vpn_queue.rdp_queue.queue_name
+  queue_name = solacebroker_msg_vpn_queue.rdp_queue.queue_name
 
   # Example configuration of a client profile. Commented out here since the "default" client profile will be used if not specified
   # client_profile_name      = "default"

internal/gen-template/variables.tf

@@ -11,7 +11,7 @@ variable "url" {
   description = "The URL that the messages should be delivered to. The path portion of the URL may contain substitution expressions"
   type        = string
   validation {
-    condition     = can(regex("https?://.*", var.url))
+    condition     = can(regex("https?://.*", lower(var.url)))
     error_message = "The URL must be a valid URL"
   }
 }

variables.tf

@@ -25,7 +25,7 @@ variable "url" {
   description = "The URL that the messages should be delivered to. The path portion of the URL may contain substitution expressions"
   type        = string
   validation {
-    condition     = can(regex("https?://.*", var.url))
+    condition     = can(regex("https?://.*", lower(var.url)))
     error_message = "The URL must be a valid URL"
   }
 }