[MCTB-5797] Fix user license reference and add retry logic for event …

…orchestration
nordcloud · Sep 22, 2023 · 23f9244 · 23f9244
1 parent 03d5e13
commit 23f9244
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/pagerduty/resource_pagerduty_service_event_orchestration_active.go b/pagerduty/resource_pagerduty_service_event_orchestration_active.go
@@ -50,8 +50,9 @@ func fetchPagerDutyServiceEventOrchestrationActive(ctx context.Context, d *schem
 
 	service := d.Get("service").(string)
 
-	return diag.FromErr(resource.RetryContext(ctx, 10*time.Minute, func() *resource.RetryError {
+	return diag.FromErr(resource.RetryContext(ctx, 2*time.Minute, func() *resource.RetryError {
 		eventOrchestrationActive, _, err := client.ServiceEventOrchestrationActive.Get(service)
+
 		if checkErr := getErrorHandler(handle404Errors)(err, d); checkErr.ShouldReturn {
 			return checkErr.ReturnVal
 		}
@@ -84,13 +85,18 @@ 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) {
 				time.Sleep(2 * time.Second)
 				return resource.RetryableError(err)
 			}
 
+			if isErrCode(err, 403) {
+				time.Sleep(2 * time.Second)
+				return resource.RetryableError(err)
+			}
+
 			return resource.NonRetryableError(err)
 		} else if eventOrchestrationStatus != nil {
 			d.SetId(fmt.Sprintf("%s:event_orchestration_status", service))

diff --git a/pagerduty/resource_pagerduty_user.go b/pagerduty/resource_pagerduty_user.go
@@ -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(