From 0fd22cf29e3a4c6cfa7d2739cfd1b94424cfe043 Mon Sep 17 00:00:00 2001
From: Brian Flad <bflad417@gmail.com>
Date: Fri, 9 Feb 2018 15:43:01 -0500
Subject: [PATCH 1/3] test/resource/aws_sns_platform_application: Support APNS
 private key and certificate file contents

---
 ...ource_aws_sns_platform_application_test.go | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/aws/resource_aws_sns_platform_application_test.go b/aws/resource_aws_sns_platform_application_test.go
index c26eb6192f3..1bbf21d9199 100644
--- a/aws/resource_aws_sns_platform_application_test.go
+++ b/aws/resource_aws_sns_platform_application_test.go
@@ -6,6 +6,8 @@ import (
 	"log"
 	"os"
 	"regexp"
+	"strconv"
+	"strings"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/acctest"
@@ -37,7 +39,20 @@ type testAccAwsSnsPlatformApplicationPlatform struct {
 func testAccAwsSnsPlatformApplicationPlatformFromEnv(t *testing.T) []*testAccAwsSnsPlatformApplicationPlatform {
 	platforms := make([]*testAccAwsSnsPlatformApplicationPlatform, 0, 2)
 
-	if os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH") != "" {
+	if os.Getenv("APNS_SANDBOX_CREDENTIAL") != "" {
+		if os.Getenv("APNS_SANDBOX_PRINCIPAL") == "" {
+			t.Fatalf("APNS_SANDBOX_CREDENTIAL set but missing APNS_SANDBOX_PRINCIPAL")
+		}
+
+		platform := &testAccAwsSnsPlatformApplicationPlatform{
+			Name:           "APNS_SANDBOX",
+			Credential:     fmt.Sprintf("<<EOF\n%s\nEOF\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_CREDENTIAL"))),
+			CredentialHash: hashSum(fmt.Sprintf("%s\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_CREDENTIAL")))),
+			Principal:      fmt.Sprintf("<<EOF\n%s\nEOF\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_PRINCIPAL"))),
+			PrincipalHash:  hashSum(fmt.Sprintf("%s\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_PRINCIPAL")))),
+		}
+		platforms = append(platforms, platform)
+	} else if os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH") != "" {
 		if os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH") == "" {
 			t.Fatalf("APNS_SANDBOX_CREDENTIAL_PATH set but missing APNS_SANDBOX_PRINCIPAL_PATH")
 		}
@@ -63,7 +78,7 @@ func testAccAwsSnsPlatformApplicationPlatformFromEnv(t *testing.T) []*testAccAws
 	if os.Getenv("GCM_API_KEY") != "" {
 		platform := &testAccAwsSnsPlatformApplicationPlatform{
 			Name:           "GCM",
-			Credential:     os.Getenv("GCM_API_KEY"),
+			Credential:     strconv.Quote(os.Getenv("GCM_API_KEY")),
 			CredentialHash: hashSum(os.Getenv("GCM_API_KEY")),
 		}
 		platforms = append(platforms, platform)
@@ -180,16 +195,16 @@ func TestAccAwsSnsPlatformApplication_basic(t *testing.T) {
 					{
 						Config: testAccAwsSnsPlatformApplicationConfig_basic(name, &testAccAwsSnsPlatformApplicationPlatform{
 							Name:       "APNS",
-							Credential: "NOTEMPTY",
-							Principal:  "",
+							Credential: strconv.Quote("NOTEMPTY"),
+							Principal:  strconv.Quote(""),
 						}),
 						ExpectError: regexp.MustCompile(`platform_principal is required when platform =`),
 					},
 					{
 						Config: testAccAwsSnsPlatformApplicationConfig_basic(name, &testAccAwsSnsPlatformApplicationPlatform{
 							Name:       "APNS_SANDBOX",
-							Credential: "NOTEMPTY",
-							Principal:  "",
+							Credential: strconv.Quote("NOTEMPTY"),
+							Principal:  strconv.Quote(""),
 						}),
 						ExpectError: regexp.MustCompile(`platform_principal is required when platform =`),
 					},
@@ -430,7 +445,7 @@ func testAccAwsSnsPlatformApplicationConfig_basic(name string, platform *testAcc
 resource "aws_sns_platform_application" "test" {
   name                = "%s"
   platform            = "%s"
-  platform_credential = "%s"
+  platform_credential = %s
 }
 `, name, platform.Name, platform.Credential)
 	}
@@ -438,8 +453,8 @@ resource "aws_sns_platform_application" "test" {
 resource "aws_sns_platform_application" "test" {
   name                = "%s"
   platform            = "%s"
-  platform_credential = "%s"
-  platform_principal  = "%s"
+  platform_credential = %s
+  platform_principal  = %s
 }
 `, name, platform.Name, platform.Credential, platform.Principal)
 }
@@ -450,7 +465,7 @@ func testAccAwsSnsPlatformApplicationConfig_basicAttribute(name string, platform
 resource "aws_sns_platform_application" "test" {
   name                = "%s"
   platform            = "%s"
-  platform_credential = "%s"
+  platform_credential = %s
   %s                  = "%s"
 }
 `, name, platform.Name, platform.Credential, attributeKey, attributeValue)
@@ -459,8 +474,8 @@ resource "aws_sns_platform_application" "test" {
 resource "aws_sns_platform_application" "test" {
   name                = "%s"
   platform            = "%s"
-  platform_credential = "%s"
-  platform_principal  = "%s"
+  platform_credential = %s
+  platform_principal  = %s
   %s                  = "%s"
 }
 `, name, platform.Name, platform.Credential, platform.Principal, attributeKey, attributeValue)

From 517a07f74516599aaa5306c78432fc12dd13d5ba Mon Sep 17 00:00:00 2001
From: Brian Flad <bflad417@gmail.com>
Date: Fri, 9 Feb 2018 15:47:14 -0500
Subject: [PATCH 2/3] test/resource/aws_sns_platform_application: Ensure we now
 quote APNS file paths too

---
 aws/resource_aws_sns_platform_application_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aws/resource_aws_sns_platform_application_test.go b/aws/resource_aws_sns_platform_application_test.go
index 1bbf21d9199..78d52152831 100644
--- a/aws/resource_aws_sns_platform_application_test.go
+++ b/aws/resource_aws_sns_platform_application_test.go
@@ -67,9 +67,9 @@ func testAccAwsSnsPlatformApplicationPlatformFromEnv(t *testing.T) []*testAccAws
 
 		platform := &testAccAwsSnsPlatformApplicationPlatform{
 			Name:           "APNS_SANDBOX",
-			Credential:     fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH")),
+			Credential:     strconv.Quote(fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH"))),
 			CredentialHash: credentialHash,
-			Principal:      fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH")),
+			Principal:      strconv.Quote(fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH"))),
 			PrincipalHash:  principalHash,
 		}
 		platforms = append(platforms, platform)

From bf818b5cd00038ebcf881f42b97a22c69349b628 Mon Sep 17 00:00:00 2001
From: Brian Flad <bflad417@gmail.com>
Date: Fri, 9 Feb 2018 17:00:23 -0500
Subject: [PATCH 3/3] test/resource/aws_sns_platform_application: Remove
 explicit hash value checking

---
 ...ource_aws_sns_platform_application_test.go | 55 +++++--------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/aws/resource_aws_sns_platform_application_test.go b/aws/resource_aws_sns_platform_application_test.go
index 78d52152831..f86bebbc1f6 100644
--- a/aws/resource_aws_sns_platform_application_test.go
+++ b/aws/resource_aws_sns_platform_application_test.go
@@ -2,7 +2,6 @@ package aws
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
@@ -13,7 +12,6 @@ import (
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	homedir "github.com/mitchellh/go-homedir"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/sns"
@@ -29,11 +27,9 @@ import (
 **/
 
 type testAccAwsSnsPlatformApplicationPlatform struct {
-	Name           string
-	Credential     string
-	CredentialHash string
-	Principal      string
-	PrincipalHash  string
+	Name       string
+	Credential string
+	Principal  string
 }
 
 func testAccAwsSnsPlatformApplicationPlatformFromEnv(t *testing.T) []*testAccAwsSnsPlatformApplicationPlatform {
@@ -45,41 +41,28 @@ func testAccAwsSnsPlatformApplicationPlatformFromEnv(t *testing.T) []*testAccAws
 		}
 
 		platform := &testAccAwsSnsPlatformApplicationPlatform{
-			Name:           "APNS_SANDBOX",
-			Credential:     fmt.Sprintf("<<EOF\n%s\nEOF\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_CREDENTIAL"))),
-			CredentialHash: hashSum(fmt.Sprintf("%s\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_CREDENTIAL")))),
-			Principal:      fmt.Sprintf("<<EOF\n%s\nEOF\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_PRINCIPAL"))),
-			PrincipalHash:  hashSum(fmt.Sprintf("%s\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_PRINCIPAL")))),
+			Name:       "APNS_SANDBOX",
+			Credential: fmt.Sprintf("<<EOF\n%s\nEOF\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_CREDENTIAL"))),
+			Principal:  fmt.Sprintf("<<EOF\n%s\nEOF\n", strings.TrimSpace(os.Getenv("APNS_SANDBOX_PRINCIPAL"))),
 		}
 		platforms = append(platforms, platform)
 	} else if os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH") != "" {
 		if os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH") == "" {
 			t.Fatalf("APNS_SANDBOX_CREDENTIAL_PATH set but missing APNS_SANDBOX_PRINCIPAL_PATH")
 		}
-		credentialHash, err := testAccHashSumPath(os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		principalHash, err := testAccHashSumPath(os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH"))
-		if err != nil {
-			t.Fatal(err)
-		}
 
 		platform := &testAccAwsSnsPlatformApplicationPlatform{
-			Name:           "APNS_SANDBOX",
-			Credential:     strconv.Quote(fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH"))),
-			CredentialHash: credentialHash,
-			Principal:      strconv.Quote(fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH"))),
-			PrincipalHash:  principalHash,
+			Name:       "APNS_SANDBOX",
+			Credential: strconv.Quote(fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_CREDENTIAL_PATH"))),
+			Principal:  strconv.Quote(fmt.Sprintf("${file(pathexpand(%q))}", os.Getenv("APNS_SANDBOX_PRINCIPAL_PATH"))),
 		}
 		platforms = append(platforms, platform)
 	}
 
 	if os.Getenv("GCM_API_KEY") != "" {
 		platform := &testAccAwsSnsPlatformApplicationPlatform{
-			Name:           "GCM",
-			Credential:     strconv.Quote(os.Getenv("GCM_API_KEY")),
-			CredentialHash: hashSum(os.Getenv("GCM_API_KEY")),
+			Name:       "GCM",
+			Credential: strconv.Quote(os.Getenv("GCM_API_KEY")),
 		}
 		platforms = append(platforms, platform)
 	}
@@ -90,18 +73,6 @@ func testAccAwsSnsPlatformApplicationPlatformFromEnv(t *testing.T) []*testAccAws
 	return platforms
 }
 
-func testAccHashSumPath(path string) (string, error) {
-	path, err := homedir.Expand(path)
-	if err != nil {
-		return "", err
-	}
-	data, err := ioutil.ReadFile(path)
-	if err != nil {
-		return "", err
-	}
-	return hashSum(string(data)), nil
-}
-
 func TestDecodeResourceAwsSnsPlatformApplicationID(t *testing.T) {
 
 	var testCases = []struct {
@@ -183,7 +154,7 @@ func TestAccAwsSnsPlatformApplication_basic(t *testing.T) {
 		name := fmt.Sprintf("tf-acc-%d", acctest.RandInt())
 		platformPrincipalCheck := resource.TestCheckNoResourceAttr(resourceName, "platform_principal")
 		if platform.Principal != "" {
-			platformPrincipalCheck = resource.TestCheckResourceAttr(resourceName, "platform_principal", platform.PrincipalHash)
+			platformPrincipalCheck = resource.TestCheckResourceAttrSet(resourceName, "platform_principal")
 		}
 
 		t.Run(platform.Name, func(*testing.T) {
@@ -215,7 +186,7 @@ func TestAccAwsSnsPlatformApplication_basic(t *testing.T) {
 							resource.TestMatchResourceAttr(resourceName, "arn", regexp.MustCompile(fmt.Sprintf("^arn:[^:]+:sns:[^:]+:[^:]+:app/%s/%s$", platform.Name, name))),
 							resource.TestCheckResourceAttr(resourceName, "name", name),
 							resource.TestCheckResourceAttr(resourceName, "platform", platform.Name),
-							resource.TestCheckResourceAttr(resourceName, "platform_credential", platform.CredentialHash),
+							resource.TestCheckResourceAttrSet(resourceName, "platform_credential"),
 							platformPrincipalCheck,
 						),
 					},