Skip to content

Commit

Permalink
Documentation update (#2)
Browse files Browse the repository at this point in the history 
* Add output descriptions

* Remove unused var from docs
  • Loading branch information
@joshmyers
joshmyers authored Jan 21, 2019
1 parent 42bcbf1 commit 505c7e6
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 26 deletions.
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ module "amq" {
namespace = "${var.namespace}"
stage = "${var.stage}"
name = "${var.name}"
broker_name = "${var.mq_broker_name}"
apply_immediately = "${var.mq_apply_immediately}"
auto_minor_version_upgrade = "${var.mq_auto_minor_version_upgrade}"
deployment_mode = "${var.mq_deployment_mode}"
Expand Down Expand Up @@ -134,8 +133,8 @@ Available targets:
|------|-------------|
| admin_username | AmazonMQ admin username |
| application_username | AmazonMQ application username |
| broker_arn | The AmazonMQ broker ARN |
| broker_id | The AmazonMQ broker ID |
| broker_arn | AmazonMQ broker ARN |
| broker_id | AmazonMQ broker ID |
| primary_amqp_ssl_endpoint | AmazonMQ primary AMQP+SSL endpoint |
| primary_console_url | AmazonMQ active web console URL |
| primary_ip_address | AmazonMQ primary IP address |
Expand Down
1 change: 0 additions & 1 deletion README.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ usage: |-
namespace = "${var.namespace}"
stage = "${var.stage}"
name = "${var.name}"
broker_name = "${var.mq_broker_name}"
apply_immediately = "${var.mq_apply_immediately}"
auto_minor_version_upgrade = "${var.mq_auto_minor_version_upgrade}"
deployment_mode = "${var.mq_deployment_mode}"
Expand Down
4 changes: 2 additions & 2 deletions docs/terraform.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
|------|-------------|
| admin_username | AmazonMQ admin username |
| application_username | AmazonMQ application username |
| broker_arn | The AmazonMQ broker ARN |
| broker_id | The AmazonMQ broker ID |
| broker_arn | AmazonMQ broker ARN |
| broker_id | AmazonMQ broker ID |
| primary_amqp_ssl_endpoint | AmazonMQ primary AMQP+SSL endpoint |
| primary_console_url | AmazonMQ active web console URL |
| primary_ip_address | AmazonMQ primary IP address |
Expand Down
58 changes: 38 additions & 20 deletions outputs.tf
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,89 @@
output "broker_id" {
value = "${join("", aws_mq_broker.default.*.id)}"
value = "${join("", aws_mq_broker.default.*.id)}"
description = "AmazonMQ broker ID"
}

output "broker_arn" {
value = "${join("", aws_mq_broker.default.*.arn)}"
value = "${join("", aws_mq_broker.default.*.arn)}"
description = "AmazonMQ broker ARN"
}

output "primary_console_url" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.console_url, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.0.console_url, list("")), 0)}"
description = "AmazonMQ active web console URL"
}

output "primary_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.0, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.0, list("")), 0)}"
description = "AmazonMQ primary SSL endpoint"
}

output "primary_ampq_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.1, list("")), 0)}"
output "primary_amqp_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.1, list("")), 0)}"
description = "AmazonMQ primary AMQP+SSL endpoint"
}

output "primary_stomp_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.2, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.2, list("")), 0)}"
description = "AmazonMQ primary STOMP+SSL endpoint"
}

output "primary_mqtt_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.3, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.3, list("")), 0)}"
description = "AmazonMQ primary MQTT+SSL endpoint"
}

output "primary_wss_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.4, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.0.endpoints.4, list("")), 0)}"
description = "AmazonMQ primary WSS endpoint"
}

output "primary_ip_address" {
value = "${element(concat(aws_mq_broker.default.*.instances.0.ip_address, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.0.ip_address, list("")), 0)}"
description = "AmazonMQ primary IP address"
}

output "secondary_console_url" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.console_url, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.1.console_url, list("")), 0)}"
description = "AmazonMQ secondary web console URL"
}

output "secondary_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.0, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.0, list("")), 0)}"
description = "AmazonMQ secondary SSL endpoint"
}

output "secondary_ampq_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.1, list("")), 0)}"
output "secondary_amqp_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.1, list("")), 0)}"
description = "AmazonMQ secondary AMQP+SSL endpoint"
}

output "secondary_stomp_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.2, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.2, list("")), 0)}"
description = "AmazonMQ secondary STOMP+SSL endpoint"
}

output "secondary_mqtt_ssl_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.3, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.3, list("")), 0)}"
description = "AmazonMQ secondary MQTT+SSL endpoint"
}

output "secondary_wss_endpoint" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.4, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.1.endpoints.4, list("")), 0)}"
description = "AmazonMQ secondary WSS endpoint"
}

output "secondary_ip_address" {
value = "${element(concat(aws_mq_broker.default.*.instances.1.ip_address, list("")), 0)}"
value = "${element(concat(aws_mq_broker.default.*.instances.1.ip_address, list("")), 0)}"
description = "AmazonMQ secondary IP address"
}

output "admin_username" {
value = "${local.mq_admin_user}"
value = "${local.mq_admin_user}"
description = "AmazonMQ admin username"
}

output "application_username" {
value = "${local.mq_application_user}"
value = "${local.mq_application_user}"
description = "AmazonMQ application username"
}

0 comments on commit 505c7e6

Please sign in to comment.