Fix: timeout and remove unused states

poozlehq · Jul 29, 2023 · 40b2af4 · 40b2af4
1 parent ea78625
commit 40b2af4
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 54 deletions.
diff --git a/client/spec.go b/client/spec.go
@@ -30,13 +30,10 @@ func (s *Spec) Validate() error {
 
 func (s *Spec) SetDefaults() {
 	if s.Timeout < 1 {
-		s.Timeout = 10
+		s.Timeout = 60
 	}
 	if s.MaxRetries < 1 {
-		s.MaxRetries = 30
-	}
-	if s.PageSize < 1 {
-		s.PageSize = 10
+		s.MaxRetries = 3
 	}
 	if s.Limit < 1 {
 		s.Limit = 100

diff --git a/internal/ticketing/ticketing.go b/internal/ticketing/ticketing.go
@@ -164,8 +164,6 @@ func (s *Client) retryableRequest(ctx context.Context, integrationUrl string, pa
 			bodyStr = string(bdy)
 		}
 
-		log.Warn().Str("failed ", bodyStr).Err(err).Msg("Unknown Retry-After received")
-
 		if bodyStr == "" {
 			b, _ := json.Marshal(resp.Header)
 			bodyStr = "headers: " + string(b)

diff --git a/resources/services/collection.go b/resources/services/collection.go
@@ -53,7 +53,6 @@ func Collection() *schema.Table {
 func fetchCollection(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
 	cl := meta.(*client.Client)
 
-	key := fmt.Sprintf("ticketing-collection-%s-%s", cl.Spec.WorkspaceId, cl.Spec.IntegrationAccountId)
 	p := url.Values{}
 	p.Set("raw", "true")
 	p.Set("limit", strconv.FormatInt(cl.Spec.Limit, 10))
@@ -83,9 +82,5 @@ func fetchCollection(ctx context.Context, meta schema.ClientMeta, parent *schema
 		}
 	}
 
-	if err := cl.Backend.SetKey(ctx, key, time.Now().Format(time.RFC3339)); err != nil {
-		return fmt.Errorf("failed to store state to backend: %w", err)
-	}
-
-	return cl.Backend.Flush(ctx)
+	return nil
 }
diff --git a/resources/services/comment.go b/resources/services/comment.go
@@ -50,24 +50,9 @@ func fetchComment(ctx context.Context, meta schema.ClientMeta, parent *schema.Re
 	if !ok {
 		return fmt.Errorf("parent.Item is not of type *ticketing.Collection, it is of type %T", parent.Item)
 	}
-	key := fmt.Sprintf("ticketing-comment-%s-%s-%s", cl.Spec.WorkspaceId, cl.Spec.IntegrationAccountId, *ticket.Id)
-	p := url.Values{}
 
-	min, _ := time.Parse(time.RFC3339, cl.Spec.StartDate)
-	if cl.Backend != nil {
-		value, err := cl.Backend.GetKey(ctx, key)
+	p := url.Values{}
 
-		if err != nil {
-			return fmt.Errorf("failed to retrieve state from backend: %w", err)
-		}
-		if value != "" {
-			min, err = time.Parse(time.RFC3339, value)
-			if err != nil {
-				return fmt.Errorf("retrieved invalid state value: %q %w", value, err)
-			}
-		}
-	}
-	p.Set("since", min.Format(time.RFC3339))
 	p.Set("raw", "true")
 	p.Set("limit", strconv.FormatInt(cl.Spec.Limit, 10))
 
@@ -90,9 +75,5 @@ func fetchComment(ctx context.Context, meta schema.ClientMeta, parent *schema.Re
 		}
 	}
 
-	if err := cl.Backend.SetKey(ctx, key, time.Now().Format(time.RFC3339)); err != nil {
-		return fmt.Errorf("failed to store state to backend: %w", err)
-	}
-
-	return cl.Backend.Flush(ctx)
+	return nil
 }
diff --git a/resources/services/tag.go b/resources/services/tag.go
@@ -70,7 +70,6 @@ func fetchTag(ctx context.Context, meta schema.ClientMeta, parent *schema.Resour
 		}
 	}
 	for _, collection := range collections {
-		key := fmt.Sprintf("ticketing-tag-%s-%s-%s", cl.Spec.WorkspaceId, cl.Spec.IntegrationAccountId, *collection.Id)
 		p := url.Values{}
 		p.Set("raw", "true")
 		p.Set("limit", strconv.FormatInt(cl.Spec.Limit, 10))
@@ -100,10 +99,7 @@ func fetchTag(ctx context.Context, meta schema.ClientMeta, parent *schema.Resour
 			}
 		}
 
-		if err := cl.Backend.SetKey(ctx, key, time.Now().Format(time.RFC3339)); err != nil {
-			return fmt.Errorf("failed to store state to backend: %w", err)
-		}
 	}
 
-	return cl.Backend.Flush(ctx)
+	return nil
 }
diff --git a/resources/services/team.go b/resources/services/team.go
@@ -53,7 +53,6 @@ func Team() *schema.Table {
 func fetchTeam(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- interface{}) error {
 	cl := meta.(*client.Client)
 
-	key := fmt.Sprintf("ticketing-team-%s-%s", cl.Spec.WorkspaceId, cl.Spec.IntegrationAccountId)
 	p := url.Values{}
 	p.Set("raw", "true")
 	p.Set("limit", strconv.FormatInt(cl.Spec.Limit, 10))
@@ -83,9 +82,5 @@ func fetchTeam(ctx context.Context, meta schema.ClientMeta, parent *schema.Resou
 		}
 	}
 
-	if err := cl.Backend.SetKey(ctx, key, time.Now().Format(time.RFC3339)); err != nil {
-		return fmt.Errorf("failed to store state to backend: %w", err)
-	}
-
-	return cl.Backend.Flush(ctx)
+	return nil
 }
diff --git a/resources/services/ticket.go b/resources/services/ticket.go
@@ -73,8 +73,6 @@ func fetchTicket(ctx context.Context, meta schema.ClientMeta, parent *schema.Res
 	}
 
 	for _, collection := range collections {
-		fmt.Printf("Collection: %+v\n", collection)
-
 		key := fmt.Sprintf("ticketing-ticket-%s-%s-%s", cl.Spec.WorkspaceId, cl.Spec.IntegrationAccountId, *collection.Id)
 		p := url.Values{}
 
@@ -95,14 +93,15 @@ func fetchTicket(ctx context.Context, meta schema.ClientMeta, parent *schema.Res
 				}
 			}
 		}
-		p.Set("since", min.Format(time.RFC3339))
+		p.Set("created_after", min.Format(time.RFC3339))
 		p.Set("raw", "true")
 		p.Set("limit", strconv.FormatInt(cl.Spec.Limit, 10))
 		cursor := fmt.Sprintf("%s/%s/tickets", cl.Spec.Url, *collection.Id)
 		for {
 			ret, p, err := cl.Services.GetTicket(ctx, cursor, p)
 			if err != nil {
-				return err
+				cl.Logger().Err(err)
+				return cl.Backend.Flush(ctx)
 			}
 			now := time.Now()
 			for i := range ret.Data {

diff --git a/resources/services/user.go b/resources/services/user.go
@@ -71,7 +71,6 @@ func fetchUser(ctx context.Context, meta schema.ClientMeta, parent *schema.Resou
 	}
 
 	for _, collection := range collections {
-		key := fmt.Sprintf("ticketing-user-%s-%s-%s", cl.Spec.WorkspaceId, cl.Spec.IntegrationAccountId, *collection.Id)
 		p := url.Values{}
 		p.Set("raw", "true")
 		p.Set("limit", strconv.FormatInt(cl.Spec.Limit, 10))
@@ -101,10 +100,7 @@ func fetchUser(ctx context.Context, meta schema.ClientMeta, parent *schema.Resou
 			}
 		}
 
-		if err := cl.Backend.SetKey(ctx, key, time.Now().Format(time.RFC3339)); err != nil {
-			return fmt.Errorf("failed to store state to backend: %w", err)
-		}
 	}
 
-	return cl.Backend.Flush(ctx)
+	return nil
 }