fix: Availability Zone AZs Data Source to filter Local Zones (#1995)

patterns/agones-game-controller/main.tf

@@ -16,7 +16,13 @@ provider "helm" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/aws-vpc-cni-network-policy/main.tf

@@ -28,7 +28,13 @@ provider "helm" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/blue-green-upgrade/environment/main.tf

@@ -20,7 +20,13 @@ locals {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 module "vpc" {
  source = "terraform-aws-modules/vpc/aws"

patterns/blue-green-upgrade/modules/eks_cluster/main.tf

@@ -1,7 +1,7 @@
 # Required for public ECR where Karpenter artifacts are hosted
 provider "aws" {
  region = "us-east-1"
- alias = "virginia"
+ alias = "ecr"
 }
 
 locals {

patterns/bottlerocket/addons.tf

@@ -42,7 +42,6 @@ module "eks_blueprints_addons" {
  karpenter = {
  repository_username = data.aws_ecrpublic_authorization_token.token.user_name
  repository_password = data.aws_ecrpublic_authorization_token.token.password
- version = "v0.36"
  }
 
  enable_bottlerocket_update_operator = true

patterns/bottlerocket/main.tf

@@ -1,7 +1,13 @@
 ################################################################################
 # Providers
 ################################################################################
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 data "aws_caller_identity" "current" {}
 

patterns/ecr-pull-through-cache/main.tf

@@ -48,7 +48,14 @@ provider "helm" {
 ################################################################################
 
 data "aws_caller_identity" "current" {}
-data "aws_availability_zones" "available" {}
+
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/external-secrets/main.tf

@@ -30,7 +30,14 @@ provider "kubectl" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
+
 data "aws_caller_identity" "current" {}
 
 locals {

patterns/fargate-serverless/main.tf

@@ -28,7 +28,13 @@ provider "helm" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/fully-private-cluster/main.tf

@@ -2,7 +2,13 @@ provider "aws" {
  region = local.region
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/gitops/getting-started-argocd/main.tf

@@ -1,8 +1,16 @@
 provider "aws" {
  region = local.region
 }
+
 data "aws_caller_identity" "current" {}
-data "aws_availability_zones" "available" {}
+
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 provider "helm" {
  kubernetes {

patterns/gitops/multi-cluster-hub-spoke-argocd/hub/main.tf

@@ -1,8 +1,16 @@
 provider "aws" {
  region = local.region
 }
+
 data "aws_caller_identity" "current" {}
-data "aws_availability_zones" "available" {}
+
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 provider "helm" {
  kubernetes {

patterns/gitops/multi-cluster-hub-spoke-argocd/spokes/main.tf

@@ -1,9 +1,16 @@
 provider "aws" {
  region = local.region
 }
+
 data "aws_caller_identity" "current" {}
-data "aws_availability_zones" "available" {}
 
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 data "terraform_remote_state" "cluster_hub" {
  backend = "local"

patterns/ipv6-eks-cluster/main.tf

@@ -2,7 +2,13 @@ provider "aws" {
  region = local.region
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/istio/main.tf

@@ -28,7 +28,13 @@ provider "helm" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/karpenter-mng/main.tf

@@ -54,7 +54,7 @@ data "aws_ecrpublic_authorization_token" "token" {
 }
 
 data "aws_availability_zones" "available" {
- #Do not include local zones
+ # Do not include local zones
  filter {
  name = "opt-in-status"
  values = ["opt-in-not-required"]

patterns/karpenter/main.tf

@@ -39,7 +39,13 @@ data "aws_ecrpublic_authorization_token" "token" {
  provider = aws.ecr
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = "ex-${basename(path.cwd)}"

patterns/kubecost/main.tf

@@ -16,9 +16,16 @@ provider "helm" {
  }
 }
 
-data "aws_availability_zones" "available" {}
 data "aws_caller_identity" "current" {}
 
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
+
 locals {
  name = basename(path.cwd)
  region = "us-west-2"

patterns/ml-capacity-block/main.tf

@@ -42,7 +42,13 @@ provider "helm" {
 # Common data/locals
 ################################################################################
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/multi-tenancy-with-teams/main.tf

@@ -13,7 +13,14 @@ data "aws_eks_cluster_auth" "this" {
 }
 
 data "aws_caller_identity" "current" {}
-data "aws_availability_zones" "available" {}
+
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/nvidia-gpu-efa/main.tf

@@ -42,7 +42,13 @@ provider "helm" {
 # Common data/locals
 ################################################################################
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/private-public-ingress/main.tf

@@ -16,7 +16,13 @@ provider "helm" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/privatelink-access/main.tf

@@ -2,7 +2,13 @@ provider "aws" {
  region = local.region
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/sso-iam-identity-center/main.tf

@@ -14,7 +14,13 @@ provider "kubernetes" {
  }
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = "sso-${basename(path.cwd)}"

patterns/sso-okta/main.tf

@@ -2,7 +2,13 @@ provider "aws" {
  region = local.region
 }
 
-data "aws_availability_zones" "available" {}
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)

patterns/stateful/main.tf

@@ -29,7 +29,14 @@ provider "helm" {
 }
 
 data "aws_caller_identity" "current" {}
-data "aws_availability_zones" "available" {}
+
+data "aws_availability_zones" "available" {
+ # Do not include local zones
+ filter {
+ name = "opt-in-status"
+ values = ["opt-in-not-required"]
+ }
+}
 
 locals {
  name = basename(path.cwd)