Skip to content

Commit eeb5e3d

Browse files
MarceloRGoncMarceloRGonc
committed
Merge branch 'dependabot/npm_and_yarn/multi-1e9045fc76' of https://github.com/openops-cloud/openops into dependabot/npm_and_yarn/multi-1e9045fc76
2 parents f8e0246 + 5d045ca commit eeb5e3d

347 files changed

Lines changed: 11822 additions & 4401 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deploy/docker-compose/docker-compose.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ services:
55
ports:
66
- '80:80'
77
- '443:443'
8+
environment:
9+
NGINX_WEBHOOK_SYNC_TIMEOUT: '${OPS_FLOW_TIMEOUT_SECONDS:-600}s'
810
volumes:
911
- ./${OPS_NGINX_CONFIG_FILE:-nginx.gateway.conf}:/etc/nginx/conf.d/default.conf
10-
- ./nginx.gateway.routing.conf:/etc/nginx/includes/routing.conf
12+
- ./nginx.gateway.routing.template:/etc/nginx/templates/gateway.routing.template
1113
- ./tls:/etc/nginx/tls
1214
depends_on:
1315
openops-tables:
@@ -36,7 +38,7 @@ services:
3638
image: public.ecr.aws/openops/openops-engine:${OPS_VERSION:-latest}
3739
restart: unless-stopped
3840
env_file: .env
39-
command: ["cp -r /var/tmp-base/. /tmp/ && node main.js; exit $?"]
41+
command: ['cp -r /var/tmp-base/. /tmp/ && node main.js; exit $?']
4042
environment:
4143
OPS_BASE_CODE_DIRECTORY: /tmp/codes
4244
OPS_COMPONENT: engine
@@ -137,7 +139,7 @@ services:
137139
volumes:
138140
- 'redis_data:/data'
139141
healthcheck:
140-
test: [ 'CMD', 'redis-cli', 'ping' ]
142+
test: ['CMD', 'redis-cli', 'ping']
141143
interval: 5s
142144
timeout: 3s
143145
retries: 3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ server {
33

44
server_name openops;
55

6-
include includes/routing.conf;
6+
include /etc/nginx/conf.d/gateway.routing;
77
}

deploy/docker-compose/nginx.gateway.routing.conf renamed to deploy/docker-compose/nginx.gateway.routing.template

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,20 @@ location /openops-tables {
6262
proxy_set_header X-Forwarded-Proto $scheme;
6363
}
6464

65+
location ~ ^/api/v1/webhooks/[^/]+/sync$ {
66+
add_header X-Frame-Options DENY;
67+
proxy_pass http://openops-app;
68+
proxy_set_header Host $host;
69+
proxy_set_header X-Real-IP $remote_addr;
70+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
71+
proxy_set_header X-Forwarded-Proto $scheme;
72+
73+
proxy_connect_timeout ${NGINX_WEBHOOK_SYNC_TIMEOUT};
74+
proxy_send_timeout ${NGINX_WEBHOOK_SYNC_TIMEOUT};
75+
proxy_read_timeout ${NGINX_WEBHOOK_SYNC_TIMEOUT};
76+
send_timeout ${NGINX_WEBHOOK_SYNC_TIMEOUT};
77+
}
78+
6579
location /.well-known/acme-challenge/ {
6680
root /etc/nginx/tls/acme;
6781
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ server {
2424

2525
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
2626

27-
include includes/routing.conf;
27+
include /etc/nginx/conf.d/gateway.routing;
2828
}
2929

3030
server {

‎karma.conf.js‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎nx.json‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
"inputs": [
1515
"default",
1616
"^production",
17-
"{workspaceRoot}/jest.preset.js",
18-
"{workspaceRoot}/karma.conf.js"
17+
"{workspaceRoot}/jest.preset.js"
1918
],
2019
"cache": true
2120
},
@@ -36,11 +35,6 @@
3635
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
3736
"cache": true
3837
},
39-
"@nx/angular:ng-packagr-lite": {
40-
"cache": true,
41-
"dependsOn": ["^build"],
42-
"inputs": ["production", "^production"]
43-
},
4438
"@nx/js:tsc": {
4539
"cache": true,
4640
"dependsOn": ["^build"],
@@ -56,7 +50,6 @@
5650
"!{projectRoot}/tsconfig.spec.json",
5751
"!{projectRoot}/jest.config.[jt]s",
5852
"!{projectRoot}/**/*.spec.[jt]s",
59-
"!{projectRoot}/karma.conf.js",
6053
"!{projectRoot}/src/test-setup.[jt]s",
6154
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
6255
"!{projectRoot}/.storybook/**/*",
@@ -72,19 +65,6 @@
7265
"libsDir": "packages"
7366
},
7467
"generators": {
75-
"@nx/angular:application": {
76-
"style": "scss",
77-
"linter": "eslint",
78-
"unitTestRunner": "jest",
79-
"e2eTestRunner": "none"
80-
},
81-
"@nx/angular:library": {
82-
"linter": "eslint",
83-
"unitTestRunner": "jest"
84-
},
85-
"@nx/angular:component": {
86-
"style": "scss"
87-
},
8868
"@nx/workspace:move": {
8969
"projectNameAndRootFormat": "as-provided"
9070
},

‎package.json‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@ai-sdk/deepinfra": "2.0.13",
3939
"@ai-sdk/deepseek": "2.0.8",
4040
"@ai-sdk/google": "3.0.10",
41-
"@ai-sdk/google-vertex": "^3.0.80",
41+
"@ai-sdk/google-vertex": "3.0.107",
4242
"@ai-sdk/groq": "3.0.11",
4343
"@ai-sdk/mcp": "1.0.10",
4444
"@ai-sdk/mistral": "3.0.9",
@@ -62,8 +62,8 @@
6262
"@aws-sdk/client-ssm": "3.995.0",
6363
"@aws-sdk/client-sts": "3.995.0",
6464
"@aws-sdk/util-arn-parser": "3.972.2",
65-
"@babel/core": "^7.14.5",
66-
"@babel/preset-react": "^7.14.5",
65+
"@babel/core": "7.29.0",
66+
"@babel/preset-react": "7.28.5",
6767
"@babel/runtime": "7.22.11",
6868
"@bull-board/api": "5.9.1",
6969
"@bull-board/fastify": "5.9.1",
@@ -165,7 +165,7 @@
165165
"cli-table3": "0.6.3",
166166
"clipboard": "2.0.11",
167167
"clsx": "2.1.1",
168-
"cmdk": "^0.2.1",
168+
"cmdk": "0.2.1",
169169
"codemirror": "5.65.14",
170170
"color": "4.2.3",
171171
"commander": "11.1.0",
@@ -181,11 +181,11 @@
181181
"decimal.js": "10.4.3",
182182
"decompress": "4.2.1",
183183
"deepmerge-ts": "7.1.0",
184-
"dompurify": "3.2.7",
184+
"dompurify": "3.3.3",
185185
"dotenv": "16.4.5",
186186
"embla-carousel-react": "8.1.8",
187187
"fast-deep-equal": "3.1.3",
188-
"fastify": "5.4.0",
188+
"fastify": "5.8.2",
189189
"fastify-favicon": "5.0.0",
190190
"fastify-plugin": "5.0.1",
191191
"fastify-raw-body": "5.0.0",
@@ -316,19 +316,19 @@
316316
"@nx/js": "20.5.0",
317317
"@nx/node": "19.8.8",
318318
"@nx/react": "20.5.0",
319-
"@nx/storybook": "^20.0.8",
319+
"@nx/storybook": "20.8.4",
320320
"@nx/vite": "19.8.8",
321321
"@nx/web": "19.8.8",
322322
"@nx/webpack": "20.5.0",
323323
"@nx/workspace": "19.8.8",
324324
"@playwright/test": "1.37.1",
325-
"@storybook/addon-essentials": "^8.6.15",
326-
"@storybook/addon-interactions": "^8.6.15",
327-
"@storybook/core-server": "^8.6.15",
328-
"@storybook/jest": "^0.2.3",
329-
"@storybook/react-vite": "^8.6.15",
330-
"@storybook/test-runner": "^0.19.1",
331-
"@storybook/testing-library": "^0.2.2",
325+
"@storybook/addon-essentials": "8.6.17",
326+
"@storybook/addon-interactions": "8.6.17",
327+
"@storybook/core-server": "8.6.17",
328+
"@storybook/jest": "0.2.3",
329+
"@storybook/react-vite": "8.6.17",
330+
"@storybook/test-runner": "0.19.1",
331+
"@storybook/testing-library": "0.2.2",
332332
"@swc-node/register": "1.9.2",
333333
"@swc/cli": "~0.5.1",
334334
"@swc/core": "1.5.7",
@@ -367,8 +367,8 @@
367367
"@typescript-eslint/eslint-plugin": "7.18.0",
368368
"@typescript-eslint/parser": "7.18.0",
369369
"@typescript-eslint/utils": "7.18.0",
370-
"@vitejs/plugin-react": "^4.2.0",
371-
"@vitest/ui": "^1.3.1",
370+
"@vitejs/plugin-react": "4.7.0",
371+
"@vitest/ui": "1.6.1",
372372
"autoprefixer": "10.4.15",
373373
"babel-jest": "29.7.0",
374374
"cd": "0.3.3",
@@ -394,17 +394,10 @@
394394
"husky": "8.0.3",
395395
"i18next-parser": "9.0.2",
396396
"inquirer": "8.2.6",
397-
"jasmine-core": "4.2.0",
398-
"jasmine-spec-reporter": "7.0.0",
399397
"jest": "29.7.0",
400398
"jest-environment-jsdom": "29.7.0",
401-
"jest-environment-node": "^29.7.0",
402-
"jsonc-eslint-parser": "^2.1.0",
403-
"karma": "6.3.17",
404-
"karma-chrome-launcher": "3.1.1",
405-
"karma-coverage": "2.2.1",
406-
"karma-jasmine": "5.1.0",
407-
"karma-jasmine-html-reporter": "2.0.0",
399+
"jest-environment-node": "29.7.0",
400+
"jsonc-eslint-parser": "2.4.2",
408401
"lint-staged": "15.2.9",
409402
"pino-pretty": "9.4.1",
410403
"postcss": "8.4.38",
@@ -413,12 +406,12 @@
413406
"postcss-url": "10.1.3",
414407
"prettier": "2.8.4",
415408
"prettier-plugin-organize-imports": "4.1.0",
416-
"storybook": "^8.6.15",
409+
"storybook": "8.6.17",
417410
"tailwindcss": "3.4.3",
418411
"ts-jest": "29.1.1",
419412
"ts-node": "10.9.1",
420413
"typescript": "5.5.4",
421-
"vite": "^5.4.20",
414+
"vite": "5.4.21",
422415
"vite-plugin-checker": "0.7.2",
423416
"vite-plugin-circular-dependency": "0.5.0",
424417
"wait-on": "7.2.0",

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

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
amazonAuth,
44
dryRunCheckBox,
55
getAwsAccountsSingleSelectDropdown,
6-
getCredentialsListFromAuth,
6+
getCredentialsForAccount,
77
getRegionsDropdownState,
88
listAthenaDatabases,
99
runAndWaitForQueryResult,
@@ -33,10 +33,9 @@ export const runAthenaQueryAction = createAction({
3333
database: Property.Dropdown<string>({
3434
displayName: 'Database',
3535
description: 'Database that contains the table to query on',
36-
37-
refreshers: ['auth', 'accounts', 'region'],
36+
refreshers: ['auth', 'accounts', 'accounts.accounts', 'region'],
3837
required: true,
39-
options: async ({ auth, accounts, region }) => {
38+
options: async ({ auth, accounts, region }: any) => {
4039
if (!auth) {
4140
return {
4241
disabled: true,
@@ -46,24 +45,14 @@ export const runAthenaQueryAction = createAction({
4645
}
4746

4847
try {
49-
const authProp = auth as {
50-
accessKeyId: string;
51-
secretAccessKey: string;
52-
defaultRegion: string;
53-
};
54-
const selectedAccounts = (
55-
accounts as unknown as {
56-
accounts?: string[];
57-
}
58-
)?.accounts;
59-
const credentialsList = await getCredentialsListFromAuth(
60-
authProp,
61-
selectedAccounts,
48+
const credentials = await getCredentialsForAccount(
49+
auth,
50+
accounts?.['accounts'],
6251
);
6352

6453
const databases = await listAthenaDatabases(
65-
credentialsList[0],
66-
(region as string | undefined) ?? authProp.defaultRegion,
54+
credentials,
55+
(region as string | undefined) ?? auth.defaultRegion,
6756
);
6857

6958
return {
@@ -119,14 +108,13 @@ export const runAthenaQueryAction = createAction({
119108
}
120109

121110
try {
122-
const selectedAccounts = context.propsValue.accounts?.['accounts'];
123-
const credentialsList = await getCredentialsListFromAuth(
111+
const credentials = await getCredentialsForAccount(
124112
context.auth,
125-
selectedAccounts,
113+
context.propsValue.accounts?.['accounts'],
126114
);
127115

128116
return await runAndWaitForQueryResult(
129-
credentialsList[0],
117+
credentials,
130118
context.propsValue.region ?? context.auth.defaultRegion,
131119
query,
132120
database,

0 commit comments

Comments
 (0)