diff --git a/README.md b/README.md index 3661334..813fa7d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Specific use case details are provided in the [Examples](#examples). ### Required -* `msg_vpn_name` - REST delivery points are specific to a Message VPN on the broker +* `msg_vpn_name` - client usernames or authorization groups are specific to a Message VPN on the broker * `client_identifier_type` - One of `client_username` or `authorization_group` * `client_identifier_name` - The name of the client identifier * `acl_profile_name` - The ACL profile to be assigned for authorization diff --git a/examples/acl-profile-exceptions/README.md b/examples/acl-profile-exceptions/README.md index eeb3170..1e48053 100644 --- a/examples/acl-profile-exceptions/README.md +++ b/examples/acl-profile-exceptions/README.md @@ -28,7 +28,7 @@ Also note that topic exceptions may use [substitution variables](https://docs.so 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_client_username"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_client_username#optional). -The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources. +The module default for the `enabled` variable is true, which enables the client username. ### Output diff --git a/examples/authorization-group/README.md b/examples/authorization-group/README.md index 6dfdf08..0f6af91 100644 --- a/examples/authorization-group/README.md +++ b/examples/authorization-group/README.md @@ -16,7 +16,7 @@ Configuration in this directory creates an authorization group on the PubSub+ ev 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_authorization_group"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_authorization_group#optional). -The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources. +The module default for the `enabled` variable is true, which enables the authorization group. ### Output diff --git a/examples/basic-client-username/README.md b/examples/basic-client-username/README.md index 51f24b2..7f2e06c 100644 --- a/examples/basic-client-username/README.md +++ b/examples/basic-client-username/README.md @@ -16,11 +16,11 @@ The example shows setting the sensitive `password` variable with a `.tfvars` fil ### Optional Inputs -* `password` - this example demonstrates when the client username is also used for authentication purposes if basic authentication with internal database has been configured for the Message VPN (this is the case for the `default` VPN). In this case a password needs to be specified, which is shown in the example. +* `password` - this example demonstrates when the client username is also used for authentication purposes if basic authentication with internal database has been configured for the Message VPN. In this case a password needs to be specified, which is shown 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_client_username"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_client_username#optional). -The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources. +The module default for the `enabled` variable is true, which enables the client username. ### Output diff --git a/examples/client-username-attributes/README.md b/examples/client-username-attributes/README.md index 5eb96c2..a9904c0 100644 --- a/examples/client-username-attributes/README.md +++ b/examples/client-username-attributes/README.md @@ -18,7 +18,7 @@ This directory demonstrates configuration of a client username with additional [ 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_client_username"](https://registry.terraform.io/providers/SolaceProducts/solacebroker/latest/docs/resources/msg_vpn_client_username#optional). -The module default for the `enabled` variable is true, which enables both the RDP and the REST consumer resources. +The module default for the `enabled` variable is true, which enables the client username. ### Output diff --git a/internal/gen-template/variables.tf b/internal/gen-template/variables.tf index 167b9b2..5ff48e4 100644 --- a/internal/gen-template/variables.tf +++ b/internal/gen-template/variables.tf @@ -54,7 +54,7 @@ variable "acl_profile_subscribe_share_name_exceptions" { description = "A set of exceptions to the default action to take when a client using the ACL Profile subscribes to a share-name subscription in the Message VPN" type = set(object({ subscribe_share_name_exception = string - subscribe_share_name_exception_syntax = optional(string) + subscribe_share_name_exception_syntax = string })) default = [] } @@ -63,7 +63,7 @@ variable "acl_profile_subscribe_topic_exceptions" { description = "A set of exceptions to the default action to take when a client using the ACL Profile subscribes to a topic in the Message VPN" type = set(object({ subscribe_topic_exception = string - subscribe_topic_exception_syntax = optional(string) + subscribe_topic_exception_syntax = string })) default = [] } diff --git a/variables.tf b/variables.tf index 67df9c1..241ac2c 100644 --- a/variables.tf +++ b/variables.tf @@ -86,7 +86,6 @@ variable "subscription_manager_enabled" { default = null } - variable "acl_profile_publish_topic_exceptions" { description = "A set of exceptions to the default action to take when a client using the ACL Profile publishes to a topic in the Message VPN" type = set(object({ @@ -100,7 +99,7 @@ variable "acl_profile_subscribe_share_name_exceptions" { description = "A set of exceptions to the default action to take when a client using the ACL Profile subscribes to a share-name subscription in the Message VPN" type = set(object({ subscribe_share_name_exception = string - subscribe_share_name_exception_syntax = optional(string) + subscribe_share_name_exception_syntax = string })) default = [] } @@ -109,7 +108,7 @@ variable "acl_profile_subscribe_topic_exceptions" { description = "A set of exceptions to the default action to take when a client using the ACL Profile subscribes to a topic in the Message VPN" type = set(object({ subscribe_topic_exception = string - subscribe_topic_exception_syntax = optional(string) + subscribe_topic_exception_syntax = string })) default = [] }