Skip to content

Commit 2e7a600

Browse files
committed
chore: Ensure local zones are not picked up when deploying examples
1 parent 696f58f commit 2e7a600

File tree

9 files changed

+64
-8
lines changed

9 files changed

+64
-8
lines changed

examples/autoscaling/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

examples/global-cluster/main.tf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,25 @@ provider "aws" {
33
}
44

55
data "aws_caller_identity" "current" {}
6+
67
data "aws_availability_zones" "primary" {
78
region = local.primary_region
9+
10+
# Exclude local zones
11+
filter {
12+
name = "opt-in-status"
13+
values = ["opt-in-not-required"]
14+
}
815
}
16+
917
data "aws_availability_zones" "secondary" {
1018
region = local.secondary_region
19+
20+
# Exclude local zones
21+
filter {
22+
name = "opt-in-status"
23+
values = ["opt-in-not-required"]
24+
}
1125
}
1226

1327
locals {

examples/limitless/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

examples/multi-az/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

examples/mysql/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

examples/postgresql/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

examples/s3-import/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

examples/serverless/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ provider "aws" {
22
region = local.region
33
}
44

5-
data "aws_availability_zones" "available" {}
5+
data "aws_availability_zones" "available" {
6+
# Exclude local zones
7+
filter {
8+
name = "opt-in-status"
9+
values = ["opt-in-not-required"]
10+
}
11+
}
612

713
locals {
814
name = "ex-${basename(path.cwd)}"

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ resource "aws_security_group" "this" {
380380
name = var.security_group_use_name_prefix ? null : local.security_group_name
381381
name_prefix = var.security_group_use_name_prefix ? "${local.security_group_name}-" : null
382382
vpc_id = var.vpc_id
383-
description = coalesce(var.security_group_description, "Control traffic to/from RDS Aurora ${var.name}")
383+
description = coalesce(var.security_group_description, "Control traffic to/from RDS Aurora ${local.create_security_group}")
384384

385385
tags = merge(
386386
var.tags,

0 commit comments

Comments
 (0)