Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hardcoded availability zone issues (VPC-WOR) #14500

Closed
wants to merge 3 commits into from
Closed

Fix hardcoded availability zone issues (VPC-WOR) #14500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73c0b3e
Fix r/DHCP Options
YakDriver Aug 7, 2020
17a1081
Standardize use of AZ DS boilerplate
YakDriver Aug 7, 2020
44a983e
Fix hardcoded AZs
YakDriver Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions aws/data_source_aws_autoscaling_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestAccAwsAutoScalingGroupDataSource_basic(t *testing.T) {

// Lookup based on AutoScalingGroupName
func testAccAutoScalingGroupDataResourceConfig(rName string) string {
return fmt.Sprintf(`
return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
data "aws_ami" "ubuntu" {
most_recent = true

Expand All @@ -58,15 +58,6 @@ data "aws_ami" "ubuntu" {
owners = ["099720109477"] # Canonical
}

data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

resource "aws_launch_configuration" "data_source_aws_autoscaling_group_test" {
name = "%[1]s"
image_id = data.aws_ami.ubuntu.id
Expand Down
22 changes: 2 additions & 20 deletions aws/data_source_aws_autoscaling_groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func testAccCheckAwsAutoscalingGroupsAvailable(attrs map[string]string) ([]strin
}

func testAccCheckAwsAutoscalingGroupsConfig(rInt1, rInt2, rInt3 int) string {
return fmt.Sprintf(`
return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
data "aws_ami" "test_ami" {
most_recent = true
owners = ["amazon"]
Expand All @@ -92,15 +92,6 @@ data "aws_ami" "test_ami" {
}
}

data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

resource "aws_launch_configuration" "foobar" {
image_id = data.aws_ami.test_ami.id
instance_type = "t1.micro"
Expand Down Expand Up @@ -163,7 +154,7 @@ resource "aws_autoscaling_group" "barbaz" {
}

func testAccCheckAwsAutoscalingGroupsConfigWithDataSource(rInt1, rInt2, rInt3 int) string {
return fmt.Sprintf(`
return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
data "aws_ami" "test_ami" {
most_recent = true
owners = ["amazon"]
Expand All @@ -174,15 +165,6 @@ data "aws_ami" "test_ami" {
}
}

data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

resource "aws_launch_configuration" "foobar" {
image_id = data.aws_ami.test_ami.id
instance_type = "t1.micro"
Expand Down
60 changes: 12 additions & 48 deletions aws/data_source_aws_availability_zone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

func TestAccDataSourceAwsAvailabilityZone_AllAvailabilityZones(t *testing.T) {
availabilityZonesDataSourceName := "data.aws_availability_zones.test"
availabilityZonesDataSourceName := "data.aws_availability_zones.available"
dataSourceName := "data.aws_availability_zone.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -32,7 +32,7 @@ func TestAccDataSourceAwsAvailabilityZone_AllAvailabilityZones(t *testing.T) {
}

func TestAccDataSourceAwsAvailabilityZone_Filter(t *testing.T) {
availabilityZonesDataSourceName := "data.aws_availability_zones.test"
availabilityZonesDataSourceName := "data.aws_availability_zones.available"
dataSourceName := "data.aws_availability_zone.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -56,7 +56,7 @@ func TestAccDataSourceAwsAvailabilityZone_Filter(t *testing.T) {
}

func TestAccDataSourceAwsAvailabilityZone_Name(t *testing.T) {
availabilityZonesDataSourceName := "data.aws_availability_zones.test"
availabilityZonesDataSourceName := "data.aws_availability_zones.available"
dataSourceName := "data.aws_availability_zone.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -80,7 +80,7 @@ func TestAccDataSourceAwsAvailabilityZone_Name(t *testing.T) {
}

func TestAccDataSourceAwsAvailabilityZone_ZoneId(t *testing.T) {
availabilityZonesDataSourceName := "data.aws_availability_zones.test"
availabilityZonesDataSourceName := "data.aws_availability_zones.available"
dataSourceName := "data.aws_availability_zone.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -104,73 +104,37 @@ func TestAccDataSourceAwsAvailabilityZone_ZoneId(t *testing.T) {
}

func testAccDataSourceAwsAvailabilityZoneConfigAllAvailabilityZones() string {
return `
data "aws_availability_zones" "test" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + `
data "aws_availability_zone" "test" {
all_availability_zones = true
name = data.aws_availability_zones.test.names[0]
name = data.aws_availability_zones.available.names[0]
}
`
}

func testAccDataSourceAwsAvailabilityZoneConfigFilter() string {
return `
data "aws_availability_zones" "test" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + `
data "aws_availability_zone" "test" {
filter {
name = "zone-name"
values = [data.aws_availability_zones.test.names[0]]
values = [data.aws_availability_zones.available.names[0]]
}
}
`
}

func testAccDataSourceAwsAvailabilityZoneConfigName() string {
return `
data "aws_availability_zones" "test" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + `
data "aws_availability_zone" "test" {
name = data.aws_availability_zones.test.names[0]
name = data.aws_availability_zones.available.names[0]
}
`
}

func testAccDataSourceAwsAvailabilityZoneConfigZoneId() string {
return `
data "aws_availability_zones" "test" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + `
data "aws_availability_zone" "test" {
zone_id = data.aws_availability_zones.test.zone_ids[0]
zone_id = data.aws_availability_zones.available.zone_ids[0]
}
`
}
11 changes: 1 addition & 10 deletions aws/data_source_aws_cloudhsm2_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,12 @@ func TestAccDataSourceCloudHsmV2Cluster_basic(t *testing.T) {
})
}

var testAccCheckCloudHsmV2ClusterDataSourceConfig = fmt.Sprintf(`
var testAccCheckCloudHsmV2ClusterDataSourceConfig = testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
variable "subnets" {
default = ["10.0.1.0/24", "10.0.2.0/24"]
type = "list"
}

data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

resource "aws_vpc" "cloudhsm_v2_test_vpc" {
cidr_block = "10.0.0.0/16"

Expand Down
33 changes: 3 additions & 30 deletions aws/data_source_aws_db_cluster_snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,7 @@ func testAccCheckAwsDbClusterSnapshotDataSourceExists(dataSourceName string) res
}

func testAccCheckAwsDbClusterSnapshotDataSourceConfig_DbClusterSnapshotIdentifier(rName string) string {
return fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "192.168.0.0/16"

Expand Down Expand Up @@ -176,16 +167,7 @@ data "aws_db_cluster_snapshot" "test" {
}

func testAccCheckAwsDbClusterSnapshotDataSourceConfig_DbClusterIdentifier(rName string) string {
return fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "192.168.0.0/16"

Expand Down Expand Up @@ -235,16 +217,7 @@ data "aws_db_cluster_snapshot" "test" {
}

func testAccCheckAwsDbClusterSnapshotDataSourceConfig_MostRecent(rName string) string {
return fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
resource "aws_vpc" "test" {
cidr_block = "192.168.0.0/16"

Expand Down
22 changes: 2 additions & 20 deletions aws/data_source_aws_directory_service_directory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,7 @@ data "aws_directory_service_directory" "test" {
`

func testAccDataSourceAwsDirectoryServiceDirectoryConfig_Prerequisites(adType string) string {
return fmt.Sprintf(`
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
resource "aws_vpc" "main" {
cidr_block = "10.0.0.0/16"

Expand Down Expand Up @@ -204,16 +195,7 @@ data "aws_directory_service_directory" "test-microsoft-ad" {
`, alias)
}

const testAccDataSourceDirectoryServiceDirectoryConfig_connector = `
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

var testAccDataSourceDirectoryServiceDirectoryConfig_connector = testAccAvailableAZsNoOptInConfig() + `
resource "aws_directory_service_directory" "test" {
name = "corp.notexample.com"
password = "SuperSecretPassw0rd"
Expand Down
33 changes: 3 additions & 30 deletions aws/data_source_aws_ebs_snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,7 @@ func testAccCheckAwsEbsSnapshotDataSourceID(n string) resource.TestCheckFunc {
}
}

const testAccCheckAwsEbsSnapshotDataSourceConfig = `
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

var testAccCheckAwsEbsSnapshotDataSourceConfig = testAccAvailableAZsNoOptInConfig() + `
resource "aws_ebs_volume" "test" {
availability_zone = data.aws_availability_zones.available.names[0]
type = "gp2"
Expand All @@ -113,16 +104,7 @@ data "aws_ebs_snapshot" "test" {
}
`

const testAccCheckAwsEbsSnapshotDataSourceConfigFilter = `
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

var testAccCheckAwsEbsSnapshotDataSourceConfigFilter = testAccAvailableAZsNoOptInConfig() + `
resource "aws_ebs_volume" "test" {
availability_zone = data.aws_availability_zones.available.names[0]
type = "gp2"
Expand All @@ -141,16 +123,7 @@ data "aws_ebs_snapshot" "test" {
}
`

const testAccCheckAwsEbsSnapshotDataSourceConfigMostRecent = `
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

var testAccCheckAwsEbsSnapshotDataSourceConfigMostRecent = testAccAvailableAZsNoOptInConfig() + `
resource "aws_ebs_volume" "test" {
availability_zone = data.aws_availability_zones.available.names[0]
type = "gp2"
Expand Down
22 changes: 2 additions & 20 deletions aws/data_source_aws_ebs_volume_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,7 @@ func testAccCheckAwsEbsVolumeDataSourceID(n string) resource.TestCheckFunc {
}
}

const testAccCheckAwsEbsVolumeDataSourceConfig = `
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

var testAccCheckAwsEbsVolumeDataSourceConfig = testAccAvailableAZsNoOptInConfig() + `
resource "aws_ebs_volume" "test" {
availability_zone = data.aws_availability_zones.available.names[0]
type = "gp2"
Expand All @@ -101,16 +92,7 @@ data "aws_ebs_volume" "test" {
}
`

const testAccCheckAwsEbsVolumeDataSourceConfigWithMultipleFilters = `
data "aws_availability_zones" "available" {
state = "available"

filter {
name = "opt-in-status"
values = ["opt-in-not-required"]
}
}

var testAccCheckAwsEbsVolumeDataSourceConfigWithMultipleFilters = testAccAvailableAZsNoOptInConfig() + `
resource "aws_ebs_volume" "test" {
availability_zone = data.aws_availability_zones.available.names[0]
type = "gp2"
Expand Down
Loading