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

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

This commit is contained in:
stack72 2016-12-01 16:46:01 +02:00
parent 04aa35c516
commit 7497a295b8
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,16 +82,10 @@ func resourceAwsIamRole() *schema.Resource {
ForceNew: true,
},
<<<<<<< HEAD
"assume_role_policy": {
Type: schema.TypeString,
Required: true,
=======
"assume_role_policy": &schema.Schema{
Type: schema.TypeString,
Required: true,
DiffSuppressFunc: suppressEquivalentAwsPolicyDiffs,
>>>>>>> daaae09... Add DiffSuppressFunc to support heredocs for aws_iam_role.assume_role_policy and aws_iam_policy.policy
},
"create_date": {
@ -190,15 +184,15 @@ func resourceAwsIamRoleReadResult(d *schema.ResourceData, role *iam.Role) error
if err := d.Set("unique_id", role.RoleId); err != nil {
return err
}
<<<<<<< HEAD
if err := d.Set("create_date", role.CreateDate.Format(time.RFC3339)); err != nil {
=======
return err
}
assumRolePolicy, err := url.QueryUnescape(*role.AssumeRolePolicyDocument)
if err != nil {
return err
}
if err := d.Set("assume_role_policy", assumRolePolicy); err != nil {
>>>>>>> 9c051a5... Tests for importing various iam resources
return err
}
return nil