Resolving conflicts

hashicorp · Aug 12, 2019 · 323f63e · 323f63e
1 parent 1e37372
commit 323f63e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/aws/provider.go b/aws/provider.go
@@ -250,6 +250,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_route_tables":                              dataSourceAwsRouteTables(),
 			"aws_route53_delegation_set":                    dataSourceAwsDelegationSet(),
 			"aws_route53_zone":                              dataSourceAwsRoute53Zone(),
+			"aws_route53_resolver_endpoint":                 dataSourceAwsRoute53ResolverEndpoint(),
 			"aws_s3_bucket":                                 dataSourceAwsS3Bucket(),
 			"aws_s3_bucket_object":                          dataSourceAwsS3BucketObject(),
 			"aws_s3_bucket_objects":                         dataSourceAwsS3BucketObjects(),

diff --git a/website/aws.erb b/website/aws.erb
@@ -2431,6 +2431,14 @@
                 <li>
                     <a href="#">Route53 Resolver</a>
                     <ul class="nav">
+                        <li>
+                            <a href="#">Data Sources</a>
+                            <ul class="nav nav-auto-expand">
+                                <li>
+                                    <a href="/docs/providers/aws/d/route53_resolver_endpoint.html">aws_route53_resolver_endpoint</a>
+                                </li>
+                            </ul>
+                        </li>
                         <li>
                             <a href="#">Resources</a>
                             <ul class="nav nav-auto-expand">