ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some whitespacing issues.

This commit is contained in:
Stephen Chu 2015-05-21 20:16:01 +00:00
parent f5102e9174
commit c2628d8fae
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/aws/resource_aws_route53_zone.go
View File

@ -66,10 +66,10 @@ func resourceAwsRoute53Zone() *schema.Resource {
func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) error { func resourceAwsRoute53ZoneCreate(d *schema.ResourceData, meta interface{}) error {
r53 := meta.(*AWSClient).r53conn r53 := meta.(*AWSClient).r53conn
comment := "Managed by Terraform" comment := "Managed by Terraform"
if c := d.Get("comment"); c != "" { if c := d.Get("comment"); c != "" {
comment = c.(string) comment = c.(string)
} }
req := &route53.CreateHostedZoneInput{ req := &route53.CreateHostedZoneInput{
Name: aws.String(d.Get("name").(string)), Name: aws.String(d.Get("name").(string)),
HostedZoneConfig: &route53.HostedZoneConfig{Comment: aws.String(comment)}, HostedZoneConfig: &route53.HostedZoneConfig{Comment: aws.String(comment)},

12
builtin/providers/aws/resource_aws_route53_zone_test.go
View File

@ -203,11 +203,11 @@ func testAccCheckRoute53ZoneExistsWithProvider(s *terraform.State, n string, zon
return fmt.Errorf("Hosted zone err: %v", err) return fmt.Errorf("Hosted zone err: %v", err)
} }
aws_comment := *resp.HostedZone.Config.Comment aws_comment := *resp.HostedZone.Config.Comment
rs_comment := rs.Primary.Attributes["comment"] rs_comment := rs.Primary.Attributes["comment"]
if rs_comment != "" && rs_comment != aws_comment { if rs_comment != "" && rs_comment != aws_comment {
return fmt.Errorf("Hosted zone with comment '%s' found but does not match '%s'", aws_comment, rs_comment) return fmt.Errorf("Hosted zone with comment '%s' found but does not match '%s'", aws_comment, rs_comment)
} }
if !*resp.HostedZone.Config.PrivateZone { if !*resp.HostedZone.Config.PrivateZone {
sorted_ns := make([]string, len(resp.DelegationSet.NameServers)) sorted_ns := make([]string, len(resp.DelegationSet.NameServers))
@ -278,7 +278,7 @@ func testAccLoadTagsR53(zone *route53.GetHostedZoneOutput, td *route53.ResourceT
const testAccRoute53ZoneConfig = ` const testAccRoute53ZoneConfig = `
resource "aws_route53_zone" "main" { resource "aws_route53_zone" "main" {
name = "hashicorp.com" name = "hashicorp.com"
comment = "Custom comment" comment = "Custom comment"
tags { tags {
foo = "bar" foo = "bar"