Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

[MCTB-5797] Fix user license reference and add retry logic for event orchestration #14

Merged
merged 1 commit into from
Sep 22, 2023
Merged

[MCTB-5797] Fix user license reference and add retry logic for event orchestration #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pagerduty/resource_pagerduty_service_event_orchestration_active.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ func resourcePagerDutyServiceEventOrchestrationActiveCreate(ctx context.Context,

log.Printf("[INFO] Changing PagerDuty event orchestration status to %t for service: %s", status, service)

retryErr := resource.RetryContext(ctx, 10*time.Minute, func() *resource.RetryError {
retryErr := resource.RetryContext(ctx, 2*time.Minute, func() *resource.RetryError {
if eventOrchestrationStatus, _, err := client.ServiceEventOrchestrationActive.Create(service, eventOrchestrationActive); err != nil {
if isErrCode(err, 400) {
if isErrCode(err, 400) || isErrCode(err, 403) {
time.Sleep(2 * time.Second)
return resource.RetryableError(err)
}
Expand Down
5 changes: 4 additions & 1 deletion pagerduty/resource_pagerduty_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,10 @@ func resourcePagerDutyUserRead(ctx context.Context, d *schema.ResourceData, meta
d.Set("avatar_url", user.AvatarURL)
d.Set("description", user.Description)
d.Set("job_title", user.JobTitle)
d.Set("license", user.License.ID)

if user.License != nil {
d.Set("license", user.License.ID)
}

if err := d.Set("teams", flattenTeams(user.Teams)); err != nil {
return resource.NonRetryableError(
Expand Down
Loading