@adobe/spacecat-shared-data-access 3.75.2 → 3.75.4

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [@adobe/spacecat-shared-data-access-v3.75.4](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.75.3...@adobe/spacecat-shared-data-access-v3.75.4) (2026-06-16)
+
+### Bug Fixes
+
+* **data-access:** batch suggestion-grant lookups to avoid 414 URI Too Long ([#1684](https://github.com/adobe/spacecat-shared/issues/1684)) ([941660c](https://github.com/adobe/spacecat-shared/commit/941660cea9ea37cc2e4bf50528923f9f051b540e))
+
+## [@adobe/spacecat-shared-data-access-v3.75.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.75.2...@adobe/spacecat-shared-data-access-v3.75.3) (2026-06-16)
+
+### Bug Fixes
+
+* add EBUSY retry support to S3Client via custom retry strategy ([#1677](https://github.com/adobe/spacecat-shared/issues/1677)) ([04e5504](https://github.com/adobe/spacecat-shared/commit/04e550481cdff0e7545036320aaa43ed64e99ce3)), closes [#1659](https://github.com/adobe/spacecat-shared/issues/1659) [#1659](https://github.com/adobe/spacecat-shared/issues/1659)
+
 ## [@adobe/spacecat-shared-data-access-v3.75.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.75.1...@adobe/spacecat-shared-data-access-v3.75.2) (2026-06-16)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "3.75.2",
+  "version": "3.75.4",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {
@@ -44,6 +44,7 @@
     "@adobe/spacecat-shared-utils": "1.105.0",
     "@supabase/postgrest-js": "2.106.2",
     "@aws-sdk/client-s3": "^3.940.0",
+    "@smithy/util-retry": "^4.0.0",
     "@types/joi": "17.2.3",
     "aws-xray-sdk": "3.12.0",
     "joi": "18.2.1",

package/src/models/configuration/configuration.collection.js

@@ -27,6 +27,10 @@ const S3_CONFIG_KEY = 'config/spacecat/global-config.json';
  * Unlike other collections, this uses S3 instead of PostgREST.
  * Configuration is stored as a versioned JSON object in S3.
  *
+ * The S3Client is configured with a custom retry strategy (EbusyRetryStrategy) that extends
+ * the AWS SDK's StandardRetryStrategy to also retry EBUSY DNS errors. This handles the chronic
+ * DNS resolver exhaustion issue in Lambda without adding application-level retry logic.
+ *
  * @class ConfigurationCollection
  */
 class ConfigurationCollection {

package/src/models/suggestion-grant/suggestion-grant.collection.js

@@ -27,8 +27,18 @@ import DataAccessError from '../../errors/data-access.error.js';
 class SuggestionGrantCollection extends BaseCollection {
   static COLLECTION_NAME = 'SuggestionGrantCollection';
 
+  /**
+   * Max suggestion IDs per PostgREST request. PostgREST serializes `.in()` into the request
+   * URL (`suggestion_id=in.(<uuid>,<uuid>,...)`); each UUID costs ~39 chars, so 100 IDs keeps
+   * the query string near ~4KB — comfortably under the ~8KB limit that otherwise triggers a
+   * `414 URI Too Long` and fails the whole lookup.
+   */
+  static FIND_BY_SUGGESTION_IDS_CHUNK_SIZE = 100;
+
   /**
    * Finds all grant rows for the given suggestion IDs (suggestion_id, grant_id only).
+   * Lookups are chunked to avoid `414 URI Too Long` from PostgREST GET URLs when many
+   * suggestion IDs are supplied.
    *
    * @async
    * @param {string[]} suggestionIds - Suggestion IDs to look up.
@@ -39,16 +49,28 @@ class SuggestionGrantCollection extends BaseCollection {
     if (!Array.isArray(suggestionIds) || suggestionIds.length === 0) {
       return [];
     }
-    const { data, error } = await this.postgrestService
-      .from(this.tableName)
-      .select('suggestion_id,grant_id')
-      .in('suggestion_id', suggestionIds);
 
-    if (error) {
-      throw new DataAccessError('Failed to find grants by suggestion IDs', this, error);
+    const chunkSize = SuggestionGrantCollection.FIND_BY_SUGGESTION_IDS_CHUNK_SIZE;
+    const rows = [];
+
+    for (let i = 0; i < suggestionIds.length; i += chunkSize) {
+      const chunk = suggestionIds.slice(i, i + chunkSize);
+      // eslint-disable-next-line no-await-in-loop
+      const { data, error } = await this.postgrestService
+        .from(this.tableName)
+        .select('suggestion_id,grant_id')
+        .in('suggestion_id', chunk);
+
+      if (error) {
+        throw new DataAccessError('Failed to find grants by suggestion IDs', this, error);
+      }
+
+      if (data) {
+        rows.push(...data);
+      }
     }
 
-    return data ?? [];
+    return rows;
   }
 
   /**

package/src/service/index.js

@@ -13,6 +13,7 @@
 import { S3Client } from '@aws-sdk/client-s3';
 import { PostgrestClient } from '@supabase/postgrest-js';
 import { h1NoCache, keepAliveNoCache } from '@adobe/fetch';
+import { StandardRetryStrategy } from '@smithy/util-retry';
 
 import { instrumentAWSClient } from '@adobe/spacecat-shared-utils';
 import { EntityRegistry } from '../models/index.js';
@@ -78,6 +79,37 @@ const createPostgrestService = (config, client = undefined) => {
   });
 };
 
+/**
+ * Custom retry strategy that extends StandardRetryStrategy to include EBUSY errors.
+ * The AWS SDK's default retry strategy handles ECONNRESET, ETIMEDOUT, ENOTFOUND, etc.,
+ * but does NOT retry EBUSY DNS errors. This class adds EBUSY to the retryable set.
+ *
+ * StandardRetryStrategy implements RetryStrategyV2 interface, which uses
+ * refreshRetryTokenForRetry() rather than retry(). The SDK's retry middleware
+ * calls this method to determine if an error should be retried.
+ */
+export class EbusyRetryStrategy extends StandardRetryStrategy {
+  constructor(maxAttempts = 4) {
+    super(maxAttempts);
+  }
+
+  async refreshRetryTokenForRetry(token, errorInfo) {
+    const { error } = errorInfo;
+
+    // Check if this is an EBUSY error (code or message)
+    const isEbusy = error?.code === 'EBUSY'
+      || (error?.message?.includes('getaddrinfo') && error?.message?.includes('EBUSY'));
+
+    if (isEbusy) {
+      // Reclassify EBUSY as TRANSIENT so StandardRetryStrategy will retry it
+      return super.refreshRetryTokenForRetry(token, { ...errorInfo, errorType: 'TRANSIENT' });
+    }
+
+    // Delegate to StandardRetryStrategy for all other errors
+    return super.refreshRetryTokenForRetry(token, errorInfo);
+  }
+}
+
 /**
  * Creates an S3 service configuration if bucket configuration is provided.
  *
@@ -93,7 +125,11 @@ const createS3Service = (config) => {
     return null;
   }
 
-  const options = region ? { region } : {};
+  const options = {
+    ...(region ? { region } : {}),
+    maxAttempts: 4,
+    retryStrategy: new EbusyRetryStrategy(4),
+  };
   const s3Client = instrumentAWSClient(new S3Client(options));
 
   return { s3Client, s3Bucket };