From 0d895ffa96792c8658e4a63aa330bffbe12bf4e3 Mon Sep 17 00:00:00 2001
From: Paul Hinze <phinze@phinze.com>
Date: Tue, 22 Dec 2015 15:59:17 -0600
Subject: [PATCH] provider/aws: mention us-east-1 in ECR docs and tests

ECR is only available in us-east-1 for now.

Also added missing sidebar links for ECR resources.

/cc @nextrevision
---
 .../aws/resource_aws_ecr_repository_policy_test.go     |  5 +++++
 .../providers/aws/resource_aws_ecr_repository_test.go  |  5 +++++
 .../docs/providers/aws/r/ecr_repository.html.markdown  | 10 ++++++++--
 .../aws/r/ecr_repository_policy.html.markdown          |  6 ++++++
 website/source/layouts/aws.erb                         |  8 ++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_ecr_repository_policy_test.go b/builtin/providers/aws/resource_aws_ecr_repository_policy_test.go
index 5955160ee8..9ff1bffd5f 100644
--- a/builtin/providers/aws/resource_aws_ecr_repository_policy_test.go
+++ b/builtin/providers/aws/resource_aws_ecr_repository_policy_test.go
@@ -62,6 +62,11 @@ func testAccCheckAWSEcrRepositoryPolicyExists(name string) resource.TestCheckFun
 }
 
 var testAccAWSEcrRepositoryPolicy = `
+# ECR initially only available in us-east-1
+# https://aws.amazon.com/blogs/aws/ec2-container-registry-now-generally-available/
+provider "aws" {
+	region = "us-east-1"
+}
 resource "aws_ecr_repository" "foo" {
 	name = "bar"
 }
diff --git a/builtin/providers/aws/resource_aws_ecr_repository_test.go b/builtin/providers/aws/resource_aws_ecr_repository_test.go
index 57de3c0e38..79b8b3bfa5 100644
--- a/builtin/providers/aws/resource_aws_ecr_repository_test.go
+++ b/builtin/providers/aws/resource_aws_ecr_repository_test.go
@@ -71,6 +71,11 @@ func testAccCheckAWSEcrRepositoryExists(name string) resource.TestCheckFunc {
 }
 
 var testAccAWSEcrRepository = `
+# ECR initially only available in us-east-1
+# https://aws.amazon.com/blogs/aws/ec2-container-registry-now-generally-available/
+provider "aws" {
+	region = "us-east-1"
+}
 resource "aws_ecr_repository" "default" {
 	name = "foo-repository-terraform"
 }
diff --git a/website/source/docs/providers/aws/r/ecr_repository.html.markdown b/website/source/docs/providers/aws/r/ecr_repository.html.markdown
index ad49932bab..e90b796da5 100644
--- a/website/source/docs/providers/aws/r/ecr_repository.html.markdown
+++ b/website/source/docs/providers/aws/r/ecr_repository.html.markdown
@@ -3,12 +3,18 @@ layout: "aws"
 page_title: "AWS: aws_ecr_repository"
 sidebar_current: "docs-aws-resource-ecr-repository"
 description: |-
-  Provides an ECR Repository.
+  Provides an EC2 Container Registry Repository.
 ---
 
 # aws\_ecr\_repository
 
-Provides an ECR repository.
+Provides an EC2 Container Registry Repository.
+
+~> **NOTE on ECR Availability**: The EC2 Container Registry has an [initial
+launch region of
+`us-east-1`](https://aws.amazon.com/blogs/aws/ec2-container-registry-now-generally-available/).
+As more regions become available, they will be listed [in the AWS
+Docs](https://docs.aws.amazon.com/general/latest/gr/rande.html#ecr_region)
 
 ## Example Usage
 
diff --git a/website/source/docs/providers/aws/r/ecr_repository_policy.html.markdown b/website/source/docs/providers/aws/r/ecr_repository_policy.html.markdown
index 5df7d67272..cb1b954b4f 100644
--- a/website/source/docs/providers/aws/r/ecr_repository_policy.html.markdown
+++ b/website/source/docs/providers/aws/r/ecr_repository_policy.html.markdown
@@ -12,6 +12,12 @@ Provides an ECR repository policy.
 
 Note that currently only one policy may be applied to a repository.
 
+~> **NOTE on ECR Availability**: The EC2 Container Registry has an [initial
+launch region of
+`us-east-1`](https://aws.amazon.com/blogs/aws/ec2-container-registry-now-generally-available/).
+As more regions become available, they will be listed [in the AWS
+Docs](https://docs.aws.amazon.com/general/latest/gr/rande.html#ecr_region)
+
 ## Example Usage
 
 ```
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 5a12b432ee..53b7d37c9f 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -193,6 +193,14 @@
                             <a href="/docs/providers/aws/r/ecs_task_definition.html">aws_ecs_task_definition</a>
                         </li>
 
+                        <li<%= sidebar_current("docs-aws-resource-ecr-repository") %>>
+                            <a href="/docs/providers/aws/r/ecr_repository.html">aws_ecr_repository</a>
+                        </li>
+
+                        <li<%= sidebar_current("docs-aws-resource-ecr-repository-policy") %>>
+                            <a href="/docs/providers/aws/r/ecr_repository_policy.html">aws_ecr_repository_policy</a>
+                        </li>
+
                     </ul>
                 </li>