update outputs

modules/ec2/outputs.tf

@@ -48,27 +48,28 @@ output "provisioning_artifact_id" {
   value       = module.ec2.provisioning_artifact_id
 }
 
+output "stack_outputs" {
+  description = "CloudFormation stack outputs from the provisioned product"
+  value       = module.ec2.stack_outputs
+  sensitive   = true
+}
+
 output "vpc_id" {
   description = "The VPC ID where the instance will be provisioned"
-  value       = module.ec2.vpc_id
+  value       = local.vpc_id
 }
 
 output "availability_zone" {
   description = "The availability zone of the first selected subnet"
-  value       = module.ec2.availability_zone
+  value       = local.az_name
 }
 
 output "availability_zone_names" {
-  description = "VPC Availability zone name list"
-  value       = module.ec2.availability_zone_names
+  description = "Available availability zone names"
+  value       = data.aws_availability_zones.zones.names
 }
 
 output "availability_zone_ids" {
-  description = "VPC Availability zone id list"
-  value       = module.ec2.availability_zone_ids
-}
-
-output "availability_zone_suffixes" {
-  description = "VPC Availability zone suffix list"
-  value       = module.ec2.availability_zone_suffixes
+  description = "Available availability zone IDs"
+  value       = data.aws_availability_zones.zones.zone_ids
 }

modules/product/outputs.tf

@@ -47,3 +47,9 @@ output "provisioning_artifact_id" {
   description = "The ID of the provisioning artifact used"
   value       = local.provisioning_artifact_id
 }
+
+output "stack_outputs" {
+  description = "CloudFormation stack outputs from the provisioned product"
+  value       = aws_servicecatalog_provisioned_product.this.outputs
+  sensitive   = true
+}

modules/s3/outputs.tf

@@ -48,6 +48,12 @@ output "provisioning_artifact_id" {
   value       = module.s3.provisioning_artifact_id
 }
 
+output "stack_outputs" {
+  description = "CloudFormation stack outputs from the provisioned product"
+  value       = module.s3.stack_outputs
+  sensitive   = true
+}
+
 output "bucket_name" {
   description = "The actual bucket name (with account ID suffix)"
   value       = "${var.bucket_name}"