From 8369ab44ec07a0d6eedb98e2b40067d3fd855be9 Mon Sep 17 00:00:00 2001 From: stack72 Date: Thu, 1 Dec 2016 16:44:40 +0200 Subject: [PATCH] provider/aws: Fixing the broken build of the aws_iam_policy resource --- builtin/providers/aws/resource_aws_iam_policy.go | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/builtin/providers/aws/resource_aws_iam_policy.go b/builtin/providers/aws/resource_aws_iam_policy.go index 8b2b392b7..2b1548be8 100644 --- a/builtin/providers/aws/resource_aws_iam_policy.go +++ b/builtin/providers/aws/resource_aws_iam_policy.go @@ -2,16 +2,13 @@ package aws import ( "fmt" -<<<<<<< HEAD "regexp" -======= - "net/url" ->>>>>>> 9c051a5... Tests for importing various iam resources "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" + "github.com/hashicorp/go-getter/helper/url" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" ) @@ -39,15 +36,10 @@ func resourceAwsIamPolicy() *schema.Resource { ForceNew: true, }, "policy": &schema.Schema{ -<<<<<<< HEAD - Type: schema.TypeString, - Required: true, - ValidateFunc: validateJsonString, -======= Type: schema.TypeString, Required: true, + ValidateFunc: validateJsonString, DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs, ->>>>>>> daaae09... Add DiffSuppressFunc to support heredocs for aws_iam_role.assume_role_policy and aws_iam_policy.policy }, "name": &schema.Schema{ Type: schema.TypeString,