Skip to content

Commit

Permalink
Merge pull request #30 from americk0/enableMachineIdentities
Browse files Browse the repository at this point in the history
Enable machine identities
  • Loading branch information
brianantonelli committed Jan 17, 2019
2 parents a73cbbe + 3474ec8 commit 70bd960
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 16 additions & 2 deletions resource_alks_iamrole.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ func resourceAlksIamRole() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"enable_alks_access": &schema.Schema{
Type: schema.TypeBool,
Default: false,
Optional: true,
ForceNew: true,
},
},
}
}
Expand Down Expand Up @@ -83,6 +89,12 @@ func resourceAlksIamTrustRole() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"enable_alks_access": &schema.Schema{
Type: schema.TypeBool,
Default: false,
Optional: true,
ForceNew: true,
},
},
}
}
Expand All @@ -93,9 +105,10 @@ func resourceAlksIamRoleCreate(d *schema.ResourceData, meta interface{}) error {
var roleName = d.Get("name").(string)
var roleType = d.Get("type").(string)
var incDefPol = d.Get("include_default_policies").(bool)
var enableAlksAccess = d.Get("enable_alks_access").(bool)

client := meta.(*alks.Client)
resp, err := client.CreateIamRole(roleName, roleType, incDefPol)
resp, err := client.CreateIamRole(roleName, roleType, incDefPol, enableAlksAccess)

if err != nil {
return err
Expand All @@ -117,13 +130,14 @@ func resourceAlksIamTrustRoleCreate(d *schema.ResourceData, meta interface{}) er
var roleName = d.Get("name").(string)
var roleType = d.Get("type").(string)
var trustArn = d.Get("trust_arn").(string)
var enableAlksAccess = d.Get("enable_alks_access").(bool)

client := meta.(*alks.Client)

var resp *alks.IamRoleResponse
err := resource.Retry(2*time.Minute, func() *resource.RetryError {
var err error
resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn)
resp, err = client.CreateIamTrustRole(roleName, roleType, trustArn, enableAlksAccess)
if err != nil {
return resource.RetryableError(err)
}
Expand Down
16 changes: 10 additions & 6 deletions vendor/github.com/Cox-Automotive/alks-go/iam_role.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 70bd960

Please sign in to comment.