Merge branch 'main' into dependabot/npm_and_yarn/multi-1e9045fc76

Author: MarceloRGonc

deploy/docker-compose/docker-compose.yml

@@ -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/nginx.gateway.conf

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

…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

@@ -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;
 }

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

@@ -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 {

karma.conf.js

@@ -14,8 +14,7 @@
       "inputs": [
         "default",
         "^production",
-        "{workspaceRoot}/jest.preset.js",
-        "{workspaceRoot}/karma.conf.js"
+        "{workspaceRoot}/jest.preset.js"
       ],
       "cache": true
     },
@@ -36,11 +35,6 @@
       "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
       "cache": true
     },
-    "@nx/angular:ng-packagr-lite": {
-      "cache": true,
-      "dependsOn": ["^build"],
-      "inputs": ["production", "^production"]
-    },
     "@nx/js:tsc": {
       "cache": true,
       "dependsOn": ["^build"],
@@ -56,7 +50,6 @@
       "!{projectRoot}/tsconfig.spec.json",
       "!{projectRoot}/jest.config.[jt]s",
       "!{projectRoot}/**/*.spec.[jt]s",
-      "!{projectRoot}/karma.conf.js",
       "!{projectRoot}/src/test-setup.[jt]s",
       "!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
       "!{projectRoot}/.storybook/**/*",
@@ -72,19 +65,6 @@
     "libsDir": "packages"
   },
   "generators": {
-    "@nx/angular:application": {
-      "style": "scss",
-      "linter": "eslint",
-      "unitTestRunner": "jest",
-      "e2eTestRunner": "none"
-    },
-    "@nx/angular:library": {
-      "linter": "eslint",
-      "unitTestRunner": "jest"
-    },
-    "@nx/angular:component": {
-      "style": "scss"
-    },
     "@nx/workspace:move": {
       "projectNameAndRootFormat": "as-provided"
     },

nx.json

@@ -38,7 +38,7 @@
     "@ai-sdk/deepinfra": "2.0.13",
     "@ai-sdk/deepseek": "2.0.8",
     "@ai-sdk/google": "3.0.10",
-    "@ai-sdk/google-vertex": "^3.0.80",
+    "@ai-sdk/google-vertex": "3.0.107",
     "@ai-sdk/groq": "3.0.11",
     "@ai-sdk/mcp": "1.0.10",
     "@ai-sdk/mistral": "3.0.9",
@@ -62,8 +62,8 @@
     "@aws-sdk/client-ssm": "3.995.0",
     "@aws-sdk/client-sts": "3.995.0",
     "@aws-sdk/util-arn-parser": "3.972.2",
-    "@babel/core": "^7.14.5",
-    "@babel/preset-react": "^7.14.5",
+    "@babel/core": "7.29.0",
+    "@babel/preset-react": "7.28.5",
     "@babel/runtime": "7.22.11",
     "@bull-board/api": "5.9.1",
     "@bull-board/fastify": "5.9.1",
@@ -165,7 +165,7 @@
     "cli-table3": "0.6.3",
     "clipboard": "2.0.11",
     "clsx": "2.1.1",
-    "cmdk": "^0.2.1",
+    "cmdk": "0.2.1",
     "codemirror": "5.65.14",
     "color": "4.2.3",
     "commander": "11.1.0",
@@ -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",
@@ -316,19 +316,19 @@
     "@nx/js": "20.5.0",
     "@nx/node": "19.8.8",
     "@nx/react": "20.5.0",
-    "@nx/storybook": "^20.0.8",
+    "@nx/storybook": "20.8.4",
     "@nx/vite": "19.8.8",
     "@nx/web": "19.8.8",
     "@nx/webpack": "20.5.0",
     "@nx/workspace": "19.8.8",
     "@playwright/test": "1.37.1",
-    "@storybook/addon-essentials": "^8.6.15",
-    "@storybook/addon-interactions": "^8.6.15",
-    "@storybook/core-server": "^8.6.15",
-    "@storybook/jest": "^0.2.3",
-    "@storybook/react-vite": "^8.6.15",
-    "@storybook/test-runner": "^0.19.1",
-    "@storybook/testing-library": "^0.2.2",
+    "@storybook/addon-essentials": "8.6.17",
+    "@storybook/addon-interactions": "8.6.17",
+    "@storybook/core-server": "8.6.17",
+    "@storybook/jest": "0.2.3",
+    "@storybook/react-vite": "8.6.17",
+    "@storybook/test-runner": "0.19.1",
+    "@storybook/testing-library": "0.2.2",
     "@swc-node/register": "1.9.2",
     "@swc/cli": "~0.5.1",
     "@swc/core": "1.5.7",
@@ -367,8 +367,8 @@
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "@typescript-eslint/utils": "7.18.0",
-    "@vitejs/plugin-react": "^4.2.0",
-    "@vitest/ui": "^1.3.1",
+    "@vitejs/plugin-react": "4.7.0",
+    "@vitest/ui": "1.6.1",
     "autoprefixer": "10.4.15",
     "babel-jest": "29.7.0",
     "cd": "0.3.3",
@@ -394,17 +394,10 @@
     "husky": "8.0.3",
     "i18next-parser": "9.0.2",
     "inquirer": "8.2.6",
-    "jasmine-core": "4.2.0",
-    "jasmine-spec-reporter": "7.0.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "jest-environment-node": "^29.7.0",
-    "jsonc-eslint-parser": "^2.1.0",
-    "karma": "6.3.17",
-    "karma-chrome-launcher": "3.1.1",
-    "karma-coverage": "2.2.1",
-    "karma-jasmine": "5.1.0",
-    "karma-jasmine-html-reporter": "2.0.0",
+    "jest-environment-node": "29.7.0",
+    "jsonc-eslint-parser": "2.4.2",
     "lint-staged": "15.2.9",
     "pino-pretty": "9.4.1",
     "postcss": "8.4.38",
@@ -413,12 +406,12 @@
     "postcss-url": "10.1.3",
     "prettier": "2.8.4",
     "prettier-plugin-organize-imports": "4.1.0",
-    "storybook": "^8.6.15",
+    "storybook": "8.6.17",
     "tailwindcss": "3.4.3",
     "ts-jest": "29.1.1",
     "ts-node": "10.9.1",
     "typescript": "5.5.4",
-    "vite": "^5.4.20",
+    "vite": "5.4.21",
     "vite-plugin-checker": "0.7.2",
     "vite-plugin-circular-dependency": "0.5.0",
     "wait-on": "7.2.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,