Merge branch 'main' into dependabot/npm_and_yarn/mailparser-3.9.3

Author: MarceloRGonc

THIRD_PARTY_LICENSES.txt

@@ -5,9 +5,11 @@ services:
     ports:
       - '80:80'
       - '443:443'
+    environment:
+      NGINX_WEBHOOK_SYNC_TIMEOUT: '${OPS_FLOW_TIMEOUT_SECONDS:-600}s'
     volumes:
       - ./${OPS_NGINX_CONFIG_FILE:-nginx.gateway.conf}:/etc/nginx/conf.d/default.conf
-      - ./nginx.gateway.routing.conf:/etc/nginx/includes/routing.conf
+      - ./nginx.gateway.routing.template:/etc/nginx/templates/gateway.routing.template
       - ./tls:/etc/nginx/tls
     depends_on:
       openops-tables:
@@ -36,7 +38,7 @@ services:
     image: public.ecr.aws/openops/openops-engine:${OPS_VERSION:-latest}
     restart: unless-stopped
     env_file: .env
-    command: ["cp -r /var/tmp-base/. /tmp/ && node main.js; exit $?"]
+    command: ['cp -r /var/tmp-base/. /tmp/ && node main.js; exit $?']
     environment:
       OPS_BASE_CODE_DIRECTORY: /tmp/codes
       OPS_COMPONENT: engine
@@ -137,7 +139,7 @@ services:
     volumes:
       - 'redis_data:/data'
     healthcheck:
-      test: [ 'CMD', 'redis-cli', 'ping' ]
+      test: ['CMD', 'redis-cli', 'ping']
       interval: 5s
       timeout: 3s
       retries: 3

deploy/docker-compose/docker-compose.yml

@@ -3,5 +3,5 @@ server {
 
     server_name openops;
 
-    include includes/routing.conf;
+    include /etc/nginx/conf.d/gateway.routing;
 }

deploy/docker-compose/nginx.gateway.conf

@@ -62,6 +62,20 @@ location /openops-tables {
     proxy_set_header X-Forwarded-Proto $scheme;
 }
 
+location ~ ^/api/v1/webhooks/[^/]+/sync$ {
+    add_header X-Frame-Options DENY;
+    proxy_pass http://openops-app;
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+    proxy_connect_timeout ${NGINX_WEBHOOK_SYNC_TIMEOUT};
+    proxy_send_timeout    ${NGINX_WEBHOOK_SYNC_TIMEOUT};
+    proxy_read_timeout    ${NGINX_WEBHOOK_SYNC_TIMEOUT};
+    send_timeout          ${NGINX_WEBHOOK_SYNC_TIMEOUT};
+}
+
 location /.well-known/acme-challenge/ {
     root /etc/nginx/tls/acme;
 }

…ocker-compose/nginx.gateway.routing.conf …r-compose/nginx.gateway.routing.templatedeploy/docker-compose/nginx.gateway.routing.conf renamed to deploy/docker-compose/nginx.gateway.routing.template deploy/docker-compose/nginx.gateway.routing.conf renamed to deploy/docker-compose/nginx.gateway.routing.template

@@ -24,7 +24,7 @@ server {
 
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
 
-    include includes/routing.conf;
+    include /etc/nginx/conf.d/gateway.routing;
 }
 
 server {

deploy/docker-compose/nginx.gateway.tls.conf

@@ -151,7 +151,7 @@
     "@vercel/otel": "1.13.0",
     "@xyflow/react": "12.4.4",
     "ai": "6.0.40",
-    "ajv": "8.12.0",
+    "ajv": "8.18.0",
     "async-mutex": "0.4.0",
     "aws-lambda": "1.0.7",
     "axios": "1.13.5",
@@ -181,11 +181,11 @@
     "decimal.js": "10.4.3",
     "decompress": "4.2.1",
     "deepmerge-ts": "7.1.0",
-    "dompurify": "3.2.7",
+    "dompurify": "3.3.3",
     "dotenv": "16.4.5",
     "embla-carousel-react": "8.1.8",
     "fast-deep-equal": "3.1.3",
-    "fastify": "5.4.0",
+    "fastify": "5.8.2",
     "fastify-favicon": "5.0.0",
     "fastify-plugin": "5.0.1",
     "fastify-raw-body": "5.0.0",
@@ -272,7 +272,7 @@
     "recharts": "2.12.7",
     "redlock": "5.0.0-beta.2",
     "remark-gfm": "4.0.1",
-    "rollup": "4.24.0",
+    "rollup": "4.59.0",
     "rss-parser": "3.13.0",
     "rxjs": "7.8.1",
     "semver": "7.6.0",

package.json

@@ -3,7 +3,7 @@ import {
   amazonAuth,
   dryRunCheckBox,
   getAwsAccountsSingleSelectDropdown,
-  getCredentialsListFromAuth,
+  getCredentialsForAccount,
   getRegionsDropdownState,
   listAthenaDatabases,
   runAndWaitForQueryResult,
@@ -33,10 +33,9 @@ export const runAthenaQueryAction = createAction({
     database: Property.Dropdown<string>({
       displayName: 'Database',
       description: 'Database that contains the table to query on',
-
-      refreshers: ['auth', 'accounts', 'region'],
+      refreshers: ['auth', 'accounts', 'accounts.accounts', 'region'],
       required: true,
-      options: async ({ auth, accounts, region }) => {
+      options: async ({ auth, accounts, region }: any) => {
         if (!auth) {
           return {
             disabled: true,
@@ -46,24 +45,14 @@ export const runAthenaQueryAction = createAction({
         }
 
         try {
-          const authProp = auth as {
-            accessKeyId: string;
-            secretAccessKey: string;
-            defaultRegion: string;
-          };
-          const selectedAccounts = (
-            accounts as unknown as {
-              accounts?: string[];
-            }
-          )?.accounts;
-          const credentialsList = await getCredentialsListFromAuth(
-            authProp,
-            selectedAccounts,
+          const credentials = await getCredentialsForAccount(
+            auth,
+            accounts?.['accounts'],
           );
 
           const databases = await listAthenaDatabases(
-            credentialsList[0],
-            (region as string | undefined) ?? authProp.defaultRegion,
+            credentials,
+            (region as string | undefined) ?? auth.defaultRegion,
           );
 
           return {
@@ -119,14 +108,13 @@ export const runAthenaQueryAction = createAction({
     }
 
     try {
-      const selectedAccounts = context.propsValue.accounts?.['accounts'];
-      const credentialsList = await getCredentialsListFromAuth(
+      const credentials = await getCredentialsForAccount(
         context.auth,
-        selectedAccounts,
+        context.propsValue.accounts?.['accounts'],
       );
 
       return await runAndWaitForQueryResult(
-        credentialsList[0],
+        credentials,
         context.propsValue.region ?? context.auth.defaultRegion,
         query,
         database,

packages/blocks/aws-athena/src/lib/actions/query-athena-action.ts

@@ -1,6 +1,6 @@
 const openopsCommonMock = {
   ...jest.requireActual('@openops/common'),
-  getCredentialsListFromAuth: jest.fn(),
+  getCredentialsForAccount: jest.fn(),
   runAndWaitForQueryResult: jest.fn(),
 };
 
@@ -12,9 +12,9 @@ describe('runAthenaQueryAction tests', () => {
   beforeEach(() => {
     jest.clearAllMocks();
 
-    openopsCommonMock.getCredentialsListFromAuth.mockResolvedValue([
-      { someCreds: 'some creds' },
-    ]);
+    openopsCommonMock.getCredentialsForAccount.mockResolvedValue({
+      someCreds: 'some creds',
+    });
   });
 
   const auth = {
@@ -76,7 +76,7 @@ describe('runAthenaQueryAction tests', () => {
       ...jest.requireActual('@openops/blocks-framework'),
       auth: auth,
       propsValue: {
-        accounts: { accounts: ['some-account-id'] },
+        accounts: { accounts: 'some-account-id' },
         query: 'some query',
         database: 'some database',
         outputBucket: 'some outputBucket',
@@ -87,12 +87,10 @@ describe('runAthenaQueryAction tests', () => {
     const result = (await runAthenaQueryAction.run(context)) as any;
 
     expect(result).toEqual('mockResult');
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledTimes(
-      1,
-    );
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledWith(
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledWith(
       auth,
-      ['some-account-id'],
+      'some-account-id',
     );
   });
 
@@ -138,7 +136,6 @@ describe('runAthenaQueryAction tests', () => {
       ...jest.requireActual('@openops/blocks-framework'),
       auth: auth,
       propsValue: {
-        accounts: { accounts: ['some-account-id'] },
         region: 'some region',
         query: 'some query',
         database: 'some database',
@@ -158,12 +155,10 @@ describe('runAthenaQueryAction tests', () => {
       'some database',
       'some outputBucket',
     );
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledTimes(
-      1,
-    );
-    expect(openopsCommonMock.getCredentialsListFromAuth).toHaveBeenCalledWith(
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.getCredentialsForAccount).toHaveBeenCalledWith(
       auth,
-      ['some-account-id'],
+      undefined,
     );
   });
 

packages/blocks/aws-athena/test/athena-query-action.test.ts

@@ -3,6 +3,8 @@ import { Property, createAction } from '@openops/blocks-framework';
 import {
   amazonAuth,
   getAttributeValues,
+  getAwsAccountsSingleSelectDropdown,
+  getCredentialsForAccount,
   getCredentialsFromAuth,
   getPriceListWithCache,
   getServices,
@@ -17,12 +19,13 @@ export const getPriceAction = createAction({
   displayName: 'Get Price from Price Catalog',
   isWriteAction: false,
   props: {
+    account: getAwsAccountsSingleSelectDropdown().accounts,
     service: Property.Dropdown({
       displayName: 'Service Code',
       description: 'Service code for which to fetch the price',
-      refreshers: ['auth'],
+      refreshers: ['auth', 'account', 'account.accounts'],
       required: true,
-      options: async ({ auth }: any) => {
+      options: async ({ auth, account }: any) => {
         if (!auth) {
           return {
             disabled: true,
@@ -31,8 +34,11 @@ export const getPriceAction = createAction({
           };
         }
 
-        const credentials = await getCredentialsFromAuth(auth);
         try {
+          const credentials = await getCredentialsForAccount(
+            auth,
+            account?.['accounts'],
+          );
           const services = await getServices(credentials, PRICING_REGION);
 
           if (!services.length) {
@@ -66,8 +72,8 @@ export const getPriceAction = createAction({
       displayName: '',
       description: '',
       required: true,
-      refreshers: ['auth', 'service'],
-      props: async ({ auth, service }, { input }) => {
+      refreshers: ['auth', 'account', 'account.accounts', 'service'],
+      props: async ({ auth, account, service }, { input }) => {
         if (!auth || !service) {
           return {};
         }
@@ -101,7 +107,10 @@ export const getPriceAction = createAction({
                   };
                 }
 
-                const credentials = await getCredentialsFromAuth(auth);
+                const credentials = await getCredentialsForAccount(
+                  auth,
+                  account?.['accounts'],
+                );
                 try {
                   const attributeValues: AttributeValue[] =
                     await getAttributeValues(
@@ -139,17 +148,20 @@ export const getPriceAction = createAction({
   },
   async run(context) {
     try {
-      const { service, queryFilters } = context.propsValue;
+      const { account, service, queryFilters } = context.propsValue;
       const filters = queryFilters['queryFilters'].map((filter: any) => {
         return {
           Field: filter.attributeName,
           Type: FilterType.TERM_MATCH,
           Value: filter.attributeValue,
         };
       });
+      const credentials = account?.['accounts']
+        ? await getCredentialsForAccount(context.auth, account['accounts'])
+        : await getCredentialsFromAuth(context.auth);
 
       const priceList = getPriceListWithCache(
-        context.auth,
+        credentials,
         service.ServiceCode!,
         filters,
         PRICING_REGION,