diff --git a/builtin/providers/aws/resource_aws_route53_zone.go b/builtin/providers/aws/resource_aws_route53_zone.go index 52a7976c0..0702b8903 100644 --- a/builtin/providers/aws/resource_aws_route53_zone.go +++ b/builtin/providers/aws/resource_aws_route53_zone.go @@ -39,9 +39,10 @@ func resourceAwsRoute53Zone() *schema.Resource { }, "vpc_id": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ConflictsWith: []string{"delegation_set_id"}, }, "vpc_region": &schema.Schema{ @@ -57,9 +58,10 @@ func resourceAwsRoute53Zone() *schema.Resource { }, "delegation_set_id": &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ForceNew: true, + Type: schema.TypeString, + Optional: true, + ForceNew: true, + ConflictsWith: []string{"vpc_id"}, }, "name_servers": &schema.Schema{ diff --git a/website/source/docs/providers/aws/r/route53_zone.html.markdown b/website/source/docs/providers/aws/r/route53_zone.html.markdown index ed8ad5416..79543a46f 100644 --- a/website/source/docs/providers/aws/r/route53_zone.html.markdown +++ b/website/source/docs/providers/aws/r/route53_zone.html.markdown @@ -57,8 +57,10 @@ The following arguments are supported: * `comment` - (Optional) A comment for the hosted zone. Defaults to 'Managed by Terraform'. * `tags` - (Optional) A mapping of tags to assign to the zone. * `vpc_id` - (Optional) The VPC to associate with a private hosted zone. Specifying `vpc_id` will create a private hosted zone. + Conflicts w/ `delegation_set_id` as delegation sets can only be used for public zones. * `vpc_region` - (Optional) The VPC's region. Defaults to the region of the AWS provider. * `delegation_set_id` - (Optional) The ID of the reusable delgation set whose NS records you want to assign to the hosted zone. + Conflicts w/ `vpc_id` as delegation sets can only be used for public zones. ## Attributes Reference