resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provider/aws: Fixing the broken build of the aws_iam_policy resource

This commit is contained in:
stack72 2016-12-01 16:44:40 +02:00
parent e8a25cb1de
commit 8369ab44ec
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/providers/aws/resource_aws_iam_policy.go
View File

@ -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,