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

Jump to bottom

Fix aws elb hosted zone id add nlb ids #8384

Closed
wants to merge 15 commits into from
Closed

Fix aws elb hosted zone id add nlb ids #8384

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
cdf1944
add nlb zone id's and elb_type argument
jukie Apr 19, 2019
7306d51
Update acceptance tests to include elb_type argument
jukie Apr 19, 2019
298a522
Update docs for 'elb_type'
jukie Apr 19, 2019
b0d8391
let elb_type be optional to avoid a breaking change
jukie Apr 21, 2019
b5e06f3
add ap-east-1 region
jukie May 15, 2019
3600f41
Merge branch 'master' into fix-aws_elb_hosted_zone_id-add-nlb-ids
jukie May 15, 2019
1a4709d
Add correct hosted zone id's
jukie Sep 30, 2019
166ed15
Merge branch 'master' into fix-aws_elb_hosted_zone_id-add-nlb-ids
jukie Sep 30, 2019
1b55cd0
Update tests with correct id's
jukie Sep 30, 2019
1865a24
Merge branch 'fix-aws_elb_hosted_zone_id-add-nlb-ids' of https://gith…
jukie Sep 30, 2019
fd617b6
Update with more descriptive variable name
jukie Oct 1, 2019
47c03fa
Import package changes
jukie Oct 11, 2019
bc51e2a
Merge branch 'master' into fix-aws_elb_hosted_zone_id-add-nlb-ids
jukie Oct 11, 2019
4c0c615
merge remote-tracking branch 'upstream/master' into fix-aws_elb_hoste…
jukie May 3, 2020
e186abd
Apply website lint fixes
jukie May 3, 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
Prev Previous commit
Next Next commit
Update acceptance tests to include elb_type argument
  • Loading branch information
@jukie
jukie committed Apr 19, 2019
commit 7306d511a60ca85de0d3247b7e124c2e3191006b
7 changes: 5 additions & 2 deletions aws/data_source_aws_elb_hosted_zone_id_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,22 @@ func TestAccAWSElbHostedZoneId_basic(t *testing.T) {
{
Config: testAccCheckAwsElbHostedZoneIdExplicitRegionConfig,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("data.aws_elb_hosted_zone_id.regional", "id", "Z32O12XQLNTSW2"),
resource.TestCheckResourceAttr("data.aws_elb_hosted_zone_id.regional", "id", "Z1UDT6IFJ4EJM"),
),
},
},
})
}

const testAccCheckAwsElbHostedZoneIdConfig = `
data "aws_elb_hosted_zone_id" "main" { }
data "aws_elb_hosted_zone_id" "main" {
elb_type = "application"
}
`

const testAccCheckAwsElbHostedZoneIdExplicitRegionConfig = `
data "aws_elb_hosted_zone_id" "regional" {
region = "eu-west-1"
elb_type = "network"
}
`