Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding retry functionality to role assignment #1647

Merged
merged 3 commits into from
Jul 30, 2018
Merged

Adding retry functionality to role assignment #1647

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa687ce
Adding retry functionality to role assignment
Jul 25, 2018
fc8cb62
Fixing formatting issue
Jul 25, 2018
e5adfb5
bumping the timeout to 5m
tombuildsstuff Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion azurerm/resource_arm_role_assignment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import (
"fmt"
"log"
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)
Expand Down Expand Up @@ -105,7 +107,7 @@ func resourceArmRoleAssignmentCreate(d *schema.ResourceData, meta interface{}) e
},
}

_, err := roleAssignmentsClient.Create(ctx, scope, name, properties)
err := resource.Retry(180*time.Second, retryRoleAssignmentsClient(scope, name, properties, meta))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should probably give this a little lee-way (whilst it's 3m in normal circumstances, sometimes things can be slower) - as such I'm going to push a commit to bump this up to 5m (300s)

if err != nil {
return err
}
Expand Down Expand Up @@ -176,3 +178,19 @@ func validateRoleDefinitionName(i interface{}, k string) ([]string, []error) {
}
return nil, nil
}

func retryRoleAssignmentsClient(scope string, name string, properties authorization.RoleAssignmentCreateParameters, meta interface{}) func() *resource.RetryError {

return func() *resource.RetryError {
roleAssignmentsClient := meta.(*ArmClient).roleAssignmentsClient
ctx := meta.(*ArmClient).StopContext

_, err := roleAssignmentsClient.Create(ctx, scope, name, properties)

if err != nil {
return resource.RetryableError(err)
}
return nil

}
}