From 01b9204ed14de715fdb329149dbd7997a87c01f4 Mon Sep 17 00:00:00 2001
From: Peter ONeill <33669114+peteroneilljr@users.noreply.github.com>
Date: Fri, 11 Oct 2024 10:58:24 -0600
Subject: [PATCH] AWS Terraform fixes for license and update output of web
 address. (#47349)

* Two small fixes

1. Changes SSM tier to Advance to support new self hosted keys that are 4k+ in size.
2. Updates output of web address to use fqdn when ACM is disabled.

* Use "Intelligent-Tiering" to allow Terraform to pick the necessary Tier.
---
 examples/aws/terraform/ha-autoscale-cluster/outputs.tf | 2 +-
 examples/aws/terraform/ha-autoscale-cluster/ssm.tf     | 1 +
 examples/aws/terraform/starter-cluster/outputs.tf      | 2 +-
 examples/aws/terraform/starter-cluster/ssm.tf          | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/aws/terraform/ha-autoscale-cluster/outputs.tf b/examples/aws/terraform/ha-autoscale-cluster/outputs.tf
index 1baaa66bd95..5d59e18eaf6 100644
--- a/examples/aws/terraform/ha-autoscale-cluster/outputs.tf
+++ b/examples/aws/terraform/ha-autoscale-cluster/outputs.tf
@@ -38,7 +38,7 @@ output "cluster_name" {
 
 output "cluster_web_address" {
   description = "Web address to access the Teleport cluster"
-  value       = "https://${var.use_acm ? aws_route53_record.proxy_acm[0].name : aws_route53_record.proxy[0].name}"
+  value       = "https://${var.use_acm ? aws_route53_record.proxy_acm[0].name : aws_route53_record.proxy[0].fqdn}"
 }
 
 output "key_name" {
diff --git a/examples/aws/terraform/ha-autoscale-cluster/ssm.tf b/examples/aws/terraform/ha-autoscale-cluster/ssm.tf
index 6077e773a22..32f92391f22 100644
--- a/examples/aws/terraform/ha-autoscale-cluster/ssm.tf
+++ b/examples/aws/terraform/ha-autoscale-cluster/ssm.tf
@@ -8,4 +8,5 @@ resource "aws_ssm_parameter" "license" {
   type      = "SecureString"
   value     = file(var.license_path)
   overwrite = true
+  tier      = "Intelligent-Tiering"
 }
diff --git a/examples/aws/terraform/starter-cluster/outputs.tf b/examples/aws/terraform/starter-cluster/outputs.tf
index 9ae4a2722ec..9b077e31691 100644
--- a/examples/aws/terraform/starter-cluster/outputs.tf
+++ b/examples/aws/terraform/starter-cluster/outputs.tf
@@ -10,7 +10,7 @@ output "cluster_name" {
 
 output "cluster_web_address" {
   description = "Web address to access the Teleport cluster"
-  value       = "https://${var.use_acm ? aws_route53_record.cluster_acm[0].name : aws_route53_record.cluster[0].name}"
+  value       = "https://${var.use_acm ? aws_route53_record.cluster_acm[0].name : aws_route53_record.cluster[0].fqdn}"
 }
 
 output "key_name" {
diff --git a/examples/aws/terraform/starter-cluster/ssm.tf b/examples/aws/terraform/starter-cluster/ssm.tf
index 499791e29b7..b6e1589c171 100644
--- a/examples/aws/terraform/starter-cluster/ssm.tf
+++ b/examples/aws/terraform/starter-cluster/ssm.tf
@@ -5,4 +5,5 @@ resource "aws_ssm_parameter" "license" {
   type      = "SecureString"
   value     = file(var.license_path)
   overwrite = true
+  tier      = "Intelligent-Tiering"
 }