Skip to content

Commit 1b0a39e

Browse files
lyubov-voloshkolyubov-voloshko
committed
Merge branch 'main' into empty-state-triggers
2 parents 259563a + ea9da9b commit 1b0a39e

83 files changed

Lines changed: 12176 additions & 3102 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.

‎.github/workflows/build-agent.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ jobs:
6767
name: bake-meta
6868
path: /tmp
6969

70-
- name: Set up QEMU
71-
uses: docker/setup-qemu-action@v3
72-
7370
- name: Set up Docker Buildx
7471
uses: docker/setup-buildx-action@v3
7572

@@ -84,6 +81,7 @@ jobs:
8481
uses: docker/bake-action@v5
8582
with:
8683
sbom: true
84+
provenance: true
8785
files: |
8886
./docker-bake-agent.hcl
8987
/tmp/bake-meta.json
@@ -108,14 +106,18 @@ jobs:
108106
retention-days: 1
109107

110108
- name: Attest Build Provenance
111-
uses: actions/attest-build-provenance@v1
109+
uses: actions/attest-build-provenance@v2
112110
with:
113111
subject-digest: "${{ fromJSON(steps.bake.outputs.metadata).image['containerimage.digest'] }}"
114112
push-to-registry: false
115113
subject-name: ${{ env.REGISTRY_IMAGE }}
116114

117115
merge:
118116
runs-on: ubuntu-latest
117+
permissions:
118+
id-token: write
119+
contents: read
120+
attestations: write
119121
needs:
120122
- build
121123
steps:
@@ -147,6 +149,20 @@ jobs:
147149
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ env.REGISTRY_IMAGE }}")) | "-t " + .) | join(" ")' /tmp/bake-meta.json) \
148150
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
149151
152+
- name: Get merged manifest digest
153+
id: manifest
154+
run: |
155+
TAG=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' /tmp/bake-meta.json)
156+
DIGEST="sha256:$(docker buildx imagetools inspect "${{ env.REGISTRY_IMAGE }}:${TAG}" --raw | sha256sum | cut -d ' ' -f1)"
157+
echo "digest=${DIGEST}" >> $GITHUB_OUTPUT
158+
159+
- name: Attest Merged Manifest Provenance
160+
uses: actions/attest-build-provenance@v2
161+
with:
162+
subject-digest: ${{ steps.manifest.outputs.digest }}
163+
subject-name: ${{ env.REGISTRY_IMAGE }}
164+
push-to-registry: false
165+
150166
- name: Inspect image
151167
run: |
152168
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' /tmp/bake-meta.json)

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ jobs:
6868
name: bake-meta
6969
path: /tmp
7070

71-
- name: Set up QEMU
72-
uses: docker/setup-qemu-action@v3
73-
7471
- name: Set up Docker Buildx
7572
uses: docker/setup-buildx-action@v3
7673

@@ -85,6 +82,7 @@ jobs:
8582
uses: docker/bake-action@v5
8683
with:
8784
sbom: true
85+
provenance: true
8886
files: |
8987
./docker-bake.hcl
9088
/tmp/bake-meta.json
@@ -109,14 +107,18 @@ jobs:
109107
retention-days: 1
110108

111109
- name: Attest Build Provenance
112-
uses: actions/attest-build-provenance@v1
110+
uses: actions/attest-build-provenance@v2
113111
with:
114112
subject-digest: "${{ fromJSON(steps.bake.outputs.metadata).image['containerimage.digest'] }}"
115113
push-to-registry: false
116-
subject-name: ${{ env.REGISTRY_IMAGE }}
114+
subject-name: ${{ env.REGISTRY_IMAGE }}
117115

118116
merge:
119117
runs-on: ubuntu-latest
118+
permissions:
119+
id-token: write
120+
contents: read
121+
attestations: write
120122
needs:
121123
- build
122124
steps:
@@ -148,6 +150,20 @@ jobs:
148150
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ env.REGISTRY_IMAGE }}")) | "-t " + .) | join(" ")' /tmp/bake-meta.json) \
149151
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
150152
153+
- name: Get merged manifest digest
154+
id: manifest
155+
run: |
156+
TAG=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' /tmp/bake-meta.json)
157+
DIGEST="sha256:$(docker buildx imagetools inspect "${{ env.REGISTRY_IMAGE }}:${TAG}" --raw | sha256sum | cut -d ' ' -f1)"
158+
echo "digest=${DIGEST}" >> $GITHUB_OUTPUT
159+
160+
- name: Attest Merged Manifest Provenance
161+
uses: actions/attest-build-provenance@v2
162+
with:
163+
subject-digest: ${{ steps.manifest.outputs.digest }}
164+
subject-name: ${{ env.REGISTRY_IMAGE }}
165+
push-to-registry: false
166+
151167
- name: Inspect image
152168
run: |
153169
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' /tmp/bake-meta.json)

‎.github/workflows/quay.yml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
uses: docker/bake-action@v5
9393
with:
9494
sbom: true
95+
provenance: true
9596
files: |
9697
./docker-bake.hcl
9798
/tmp/bake-meta.json
@@ -116,14 +117,18 @@ jobs:
116117
retention-days: 1
117118

118119
- name: Attest Build Provenance
119-
uses: actions/attest-build-provenance@v1
120+
uses: actions/attest-build-provenance@v2
120121
with:
121122
subject-digest: "${{ fromJSON(steps.bake.outputs.metadata).image['containerimage.digest'] }}"
122123
push-to-registry: false
123124
subject-name: ${{ env.REGISTRY_IMAGE }}
124125

125126
merge:
126127
runs-on: ubuntu-latest
128+
permissions:
129+
id-token: write
130+
contents: read
131+
attestations: write
127132
needs:
128133
- build
129134
steps:
@@ -156,6 +161,20 @@ jobs:
156161
docker buildx imagetools create $(jq -cr '.target."docker-metadata-action".tags | map(select(startswith("${{ env.REGISTRY_IMAGE }}")) | "-t " + .) | join(" ")' /tmp/bake-meta.json) \
157162
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
158163
164+
- name: Get merged manifest digest
165+
id: manifest
166+
run: |
167+
TAG=$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' /tmp/bake-meta.json)
168+
DIGEST="sha256:$(docker buildx imagetools inspect "${{ env.REGISTRY_IMAGE }}:${TAG}" --raw | sha256sum | cut -d ' ' -f1)"
169+
echo "digest=${DIGEST}" >> $GITHUB_OUTPUT
170+
171+
- name: Attest Merged Manifest Provenance
172+
uses: actions/attest-build-provenance@v2
173+
with:
174+
subject-digest: ${{ steps.manifest.outputs.digest }}
175+
subject-name: ${{ env.REGISTRY_IMAGE }}
176+
push-to-registry: false
177+
159178
- name: Inspect image
160179
run: |
161180
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:$(jq -r '.target."docker-metadata-action".args.DOCKER_META_VERSION' /tmp/bake-meta.json)

‎.github/workflows/saas.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
permissions:
2828
contents: read
2929
packages: write
30+
attestations: write
3031
# This is used to complete the identity challenge
3132
# with sigstore/fulcio when running outside of PRs.
3233
id-token: write
@@ -92,6 +93,16 @@ jobs:
9293
labels: ${{ steps.meta.outputs.labels }}
9394
cache-from: type=gha
9495
cache-to: type=gha,mode=max
96+
sbom: true
97+
provenance: true
98+
99+
- name: Attest Build Provenance
100+
if: ${{ github.event_name != 'pull_request' }}
101+
uses: actions/attest-build-provenance@v2
102+
with:
103+
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
104+
subject-digest: ${{ steps.build-and-push.outputs.digest }}
105+
push-to-registry: true
95106

96107
# Sign the resulting Docker image digest except on PRs.
97108
# This will only write to the public Rekor transparency log when the Docker

‎.github/workflows/ws-server.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
permissions:
2828
contents: read
2929
packages: write
30+
attestations: write
3031
# This is used to complete the identity challenge
3132
# with sigstore/fulcio when running outside of PRs.
3233
id-token: write
@@ -80,6 +81,16 @@ jobs:
8081
labels: ${{ steps.meta.outputs.labels }}
8182
cache-from: type=gha
8283
cache-to: type=gha,mode=max
84+
sbom: true
85+
provenance: true
86+
87+
- name: Attest Build Provenance
88+
if: ${{ github.event_name != 'pull_request' }}
89+
uses: actions/attest-build-provenance@v2
90+
with:
91+
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
92+
subject-digest: ${{ steps.build-and-push.outputs.digest }}
93+
push-to-registry: true
8394

8495
# Sign the resulting Docker image digest except on PRs.
8596
# This will only write to the public Rekor transparency log when the Docker

‎backend/package.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,38 @@
2525
},
2626
"dependencies": {
2727
"@amplitude/node": "1.10.2",
28-
"@aws-sdk/client-bedrock-runtime": "^3.990.0",
29-
"@aws-sdk/client-s3": "^3.990.0",
30-
"@aws-sdk/lib-dynamodb": "^3.990.0",
31-
"@aws-sdk/s3-request-presigner": "^3.990.0",
32-
"@cedar-policy/cedar-wasm": "^4.9.0",
33-
"@electric-sql/pglite": "^0.3.15",
28+
"@aws-sdk/client-bedrock-runtime": "^3.1011.0",
29+
"@aws-sdk/client-s3": "^3.1011.0",
30+
"@aws-sdk/lib-dynamodb": "^3.1011.0",
31+
"@aws-sdk/s3-request-presigner": "^3.1011.0",
32+
"@cedar-policy/cedar-wasm": "^4.9.1",
33+
"@electric-sql/pglite": "^0.4.0",
3434
"@faker-js/faker": "^10.3.0",
35-
"@langchain/aws": "^1.3.0",
36-
"@langchain/core": "^1.1.29",
37-
"@langchain/openai": "^1.2.11",
38-
"@nestjs/common": "11.1.14",
35+
"@langchain/aws": "^1.3.3",
36+
"@langchain/core": "^1.1.33",
37+
"@langchain/openai": "^1.3.0",
38+
"@nestjs/common": "11.1.17",
3939
"@nestjs/config": "4.0.3",
40-
"@nestjs/core": "11.1.14",
41-
"@nestjs/platform-express": "11.1.14",
40+
"@nestjs/core": "11.1.17",
41+
"@nestjs/platform-express": "11.1.17",
4242
"@nestjs/schedule": "^6.1.1",
4343
"@nestjs/swagger": "^11.2.6",
4444
"@nestjs/throttler": "^6.5.0",
4545
"@nestjs/typeorm": "^11.0.0",
4646
"@nestjsx/crud": "4.6.2",
4747
"@rocketadmin/shared-code": "workspace:*",
4848
"@sentry/minimal": "^6.19.7",
49-
"@sentry/node": "10.40.0",
49+
"@sentry/node": "10.44.0",
5050
"@toon-format/toon": "^2.1.0",
5151
"@types/crypto-js": "^4.2.2",
5252
"@types/jsonwebtoken": "^9.0.10",
53-
"@types/multer": "^2.0.0",
53+
"@types/multer": "^2.1.0",
5454
"@types/nodemailer": "^7.0.11",
5555
"@types/nunjucks": "^3.2.6",
5656
"@types/qrcode": "^1.5.6",
5757
"@zapier/secret-scrubber": "^1.1.6",
5858
"argon2": "0.44.0",
59-
"axios": "^1.13.5",
59+
"axios": "^1.13.6",
6060
"base32-encode": "^2.0.0",
6161
"basic-auth": "2.0.1",
6262
"bcrypt": "6.0.0",
@@ -66,7 +66,7 @@
6666
"cookie-parser": "^1.4.7",
6767
"crc": "^4.3.2",
6868
"crypto-js": "4.2.0",
69-
"csv": "^6.4.1",
69+
"csv": "^6.5.0",
7070
"dotenv": "17.3.1",
7171
"express": "5.2.1",
7272
"fetch-blob": "^4.0.0",
@@ -76,25 +76,25 @@
7676
"json2csv": "^5.0.7",
7777
"jsonwebtoken": "^9.0.3",
7878
"knex": "3.1.0",
79-
"langchain": "^1.2.28",
80-
"lru-cache": "^11.2.6",
81-
"nanoid": "5.1.6",
82-
"nodemailer": "^8.0.1",
79+
"langchain": "^1.2.34",
80+
"lru-cache": "^11.2.7",
81+
"nanoid": "5.1.7",
82+
"nodemailer": "^8.0.2",
8383
"nunjucks": "^3.2.4",
84-
"openai": "^6.25.0",
84+
"openai": "^6.32.0",
8585
"otplib": "^12.0.1",
8686
"p-queue": "9.1.0",
87-
"pg": "^8.19.0",
88-
"pg-connection-string": "^2.11.0",
87+
"pg": "^8.20.0",
88+
"pg-connection-string": "^2.12.0",
8989
"qrcode": "^1.5.4",
9090
"query-string": "^9.3.1",
9191
"reflect-metadata": "0.2.2",
9292
"rimraf": "6.1.3",
9393
"rxjs": "7.8.2",
94-
"safe-regex2": "^5.0.0",
94+
"safe-regex2": "^5.1.0",
9595
"secure-json-parse": "4.1.0",
9696
"typeorm": "0.3.28",
97-
"typeorm-pglite": "^0.3.2",
97+
"typeorm-pglite": "^0.3.4",
9898
"uuid": "^13.0.0",
9999
"validator": "^13.15.26",
100100
"winston": "3.19.0"
@@ -103,7 +103,7 @@
103103
"@ava/typescript": "6.0.0",
104104
"@nestjs/cli": "^11.0.16",
105105
"@nestjs/schematics": "11.0.9",
106-
"@nestjs/testing": "^11.1.14",
106+
"@nestjs/testing": "^11.1.17",
107107
"@types/bcrypt": "^6.0.0",
108108
"@types/body-parser": "^1.19.6",
109109
"@types/cookie-parser": "^1.4.10",
@@ -112,13 +112,13 @@
112112
"@types/ibm_db": "^3.2.0",
113113
"@types/json2csv": "^5.0.7",
114114
"@types/node": "^24.10.1",
115-
"@types/pg": "^8.16.0",
115+
"@types/pg": "^8.18.0",
116116
"@types/safe-regex": "^1.1.6",
117117
"@types/supertest": "^7.2.0",
118118
"@types/uuid": "^11.0.0",
119119
"@types/validator": "^13.15.10",
120120
"ava": "6.4.1",
121-
"knip": "^5.85.0",
121+
"knip": "^5.88.0",
122122
"nock": "^14.0.11",
123123
"supertest": "^7.2.2",
124124
"ts-loader": "^9.5.4",

‎backend/src/common/data-injection.tokens.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ export enum UseCaseType {
114114
FREEZE_CONNECTIONS_IN_COMPANY = 'FREEZE_CONNECTIONS_IN_COMPANY',
115115
UNFREEZE_CONNECTIONS_IN_COMPANY = 'UNFREEZE_CONNECTIONS_IN_COMPANY',
116116
SAAS_REGISTER_USER_WITH_SAML = 'SAAS_REGISTER_USER_WITH_SAML',
117+
SAAS_CREATE_CONNECTION_FOR_HOSTED_DB = 'SAAS_CREATE_CONNECTION_FOR_HOSTED_DB',
118+
SAAS_DELETE_CONNECTION_FOR_HOSTED_DB = 'SAAS_DELETE_CONNECTION_FOR_HOSTED_DB',
117119

118120
INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP = 'INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP',
119121
VERIFY_INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP = 'VERIFY_INVITE_USER_IN_COMPANY_AND_CONNECTION_GROUP',

0 commit comments

Comments
 (0)