From dc00c6bc093e77d8df139bd7ef08c4c1cf05bfdd Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Thu, 11 May 2017 14:53:22 +0300
Subject: [PATCH] provider/aws: Add AWS devicefarm docs to AWS navbar

---
 .../resource_aws_devicefarm_project_test.go   | 64 +++++--------------
 .../aws/r/devicefarm_project.html.markdown    | 11 ++--
 website/source/layouts/aws.erb                |  9 +++
 3 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_devicefarm_project_test.go b/builtin/providers/aws/resource_aws_devicefarm_project_test.go
index 56fe935c6..dc3a92c04 100644
--- a/builtin/providers/aws/resource_aws_devicefarm_project_test.go
+++ b/builtin/providers/aws/resource_aws_devicefarm_project_test.go
@@ -7,54 +7,38 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/devicefarm"
+	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
 
 func TestAccAWSDeviceFarmProject_basic(t *testing.T) {
-	var v devicefarm.Project
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckDeviceFarmProjectDestroy,
-		Steps: []resource.TestStep{
-			resource.TestStep{
-				Config: testAccDeviceFarmProjectConfig,
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckDeviceFarmProjectExists(
-						"aws_devicefarm_project.foo", &v),
-				),
-			},
-		},
-	})
-}
-
-func TestAccAWSDeviceFarmProject_update(t *testing.T) {
 	var afterCreate, afterUpdate devicefarm.Project
+	beforeInt := acctest.RandInt()
+	afterInt := acctest.RandInt()
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckDeviceFarmProjectDestroy,
 		Steps: []resource.TestStep{
-			resource.TestStep{
-				Config: testAccDeviceFarmProjectConfig,
+			{
+				Config: testAccDeviceFarmProjectConfig(beforeInt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDeviceFarmProjectExists(
 						"aws_devicefarm_project.foo", &afterCreate),
 					resource.TestCheckResourceAttr(
-						"aws_devicefarm_project.foo", "name", "tf-testproject-01"),
+						"aws_devicefarm_project.foo", "name", fmt.Sprintf("tf-testproject-%d", beforeInt)),
 				),
 			},
 
-			resource.TestStep{
-				Config: testAccDeviceFarmProjectConfigUpdate,
+			{
+				Config: testAccDeviceFarmProjectConfig(afterInt),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDeviceFarmProjectExists(
 						"aws_devicefarm_project.foo", &afterUpdate),
 					resource.TestCheckResourceAttr(
-						"aws_devicefarm_project.foo", "name", "tf-testproject-02"),
+						"aws_devicefarm_project.foo", "name", fmt.Sprintf("tf-testproject-%d", afterInt)),
 					testAccCheckDeviceFarmProjectNotRecreated(
 						t, &afterCreate, &afterUpdate),
 				),
@@ -119,35 +103,17 @@ func testAccCheckDeviceFarmProjectDestroy(s *terraform.State) error {
 			return nil
 		}
 
-		// Verify the error is what we want
-		dferr, ok := err.(awserr.Error)
-		if !ok {
-			return err
-		}
-		if dferr.Code() != "DeviceFarmProjectNotFoundFault" {
-			return err
+		if dferr, ok := err.(awserr.Error); ok && dferr.Code() == "DeviceFarmProjectNotFoundFault" {
+			return nil
 		}
 	}
 
 	return nil
 }
 
-const testAccDeviceFarmProjectConfig = `
-provider "aws" {
-	region = "us-west-2"
-}
-
+func testAccDeviceFarmProjectConfig(rInt int) string {
+	return fmt.Sprintf(`
 resource "aws_devicefarm_project" "foo" {
-	name = "tf-testproject-01"
+	name = "tf-testproject-%d"
+}`, rInt)
 }
-`
-
-const testAccDeviceFarmProjectConfigUpdate = `
-provider "aws" {
-	region = "us-west-2"
-}
-
-resource "aws_devicefarm_project" "foo" {
-	name = "tf-testproject-02"
-}
-`
diff --git a/website/source/docs/providers/aws/r/devicefarm_project.html.markdown b/website/source/docs/providers/aws/r/devicefarm_project.html.markdown
index 287c4481d..2f0424933 100644
--- a/website/source/docs/providers/aws/r/devicefarm_project.html.markdown
+++ b/website/source/docs/providers/aws/r/devicefarm_project.html.markdown
@@ -6,7 +6,7 @@ description: |-
   Provides a Devicefarm project
 ---
 
-# aws\_devicefarm\_project
+# aws_devicefarm_project
 
 Provides a resource to manage AWS Device Farm Projects. 
 Please keep in mind that this feature is only supported on the "us-west-2" region.
@@ -19,18 +19,19 @@ For more information about Device Farm Projects, see the AWS Documentation on
 
 
 ```hcl
-resource "aws_devicefarm_project" "awesome_devices"
+resource "aws_devicefarm_project" "awesome_devices" {
+    name = "my-device-farm"
+}
 ```
 
 ## Argument Reference
 
-There are currently no other arguments besides the name supported.
+* `name` - (Required) The name of the project
 
 ## Attributes Reference
 
 The following attributes are exported:
 
-* `name` - The name of the project
-* `arn` - The Amazon Resource Name of this project (computed)
+* `arn` - The Amazon Resource Name of this project
 
 [aws-get-project]: http://docs.aws.amazon.com/devicefarm/latest/APIReference/API_GetProject.html
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 5c3ac37ac..a00b43666 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -422,6 +422,15 @@
                     </ul>
                 </li>
 
+                <li<%= sidebar_current("docs-aws-resource-devicefarm") %>>
+                    <a href="#">Device Farm Resources</a>
+                    <ul class="nav nav-visible">
+                        <li<%= sidebar_current("docs-aws-resource-devicefarm-project") %>>
+                            <a href="/docs/providers/aws/r/devicefarm_project.html">aws_devicefarm_project</a>
+                        </li>
+                    </ul>
+                </li>
+
                 <li<%= sidebar_current("docs-aws-resource-directory-service") %>>
                     <a href="#">Directory Service Resources</a>
                     <ul class="nav nav-visible">