Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New release v0.1.0-rc.4 #9

Merged
merged 8 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/verify-registry-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.0-rc.3
0.1.0-rc.4
4 changes: 3 additions & 1 deletion ci/module-test/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/template-test/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions examples/adding-headers/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/gen-template/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
Loading