paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

handle stitcher collisions correctly

Browse Source 
Signed-off-by: Fredrik Adelöw <freben@gmail.com>
This commit is contained in:
Fredrik Adelöw
2022-04-13 13:18:44 +02:00
parent d805d7ea54
commit 231d229eab
17 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/blue-chefs-raise.md
+16
View File
@@ -0,0 +1,16 @@
---
'@backstage/backend-common': patch
'@backstage/backend-tasks': patch
'@backstage/backend-test-utils': patch
'@backstage/plugin-app-backend': patch
'@backstage/plugin-auth-backend': patch
'@backstage/plugin-bazaar-backend': patch
'@backstage/plugin-catalog-backend': patch
'@backstage/plugin-code-coverage-backend': patch
'@backstage/plugin-scaffolder-backend': patch
'@backstage/plugin-search-backend-module-pg': patch
'@backstage/plugin-tech-insights-backend': patch
'@backstage/plugin-techdocs-backend': patch
---
Bumped `knex` to version 1.0.6
.changeset/hungry-llamas-rescue.md
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-catalog-backend': patch
---
Handle conflicting stitches correctly
packages/backend-common/api-report.md
+1 -1
View File
@@ -175,7 +175,7 @@ export class Contexts {
export function createDatabaseClient(
dbConfig: Config,
overrides?: Partial<Knex.Config>,
): Knex<any, Record<string, any>[]>;
): Knex<any, any[]>;
// @public
export function createRootLogger(
packages/backend-common/package.json
+1 -1
View File
@@ -64,7 +64,7 @@
"keyv": "^4.0.3",
"keyv-memcache": "^1.2.5",
"@keyv/redis": "^2.2.3",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"logform": "^2.3.2",
"luxon": "^2.0.2",
packages/backend-tasks/package.json
+1 -1
View File
@@ -39,7 +39,7 @@
"@backstage/types": "^1.0.0",
"@types/luxon": "^2.0.4",
"cron": "^1.8.2",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"node-abort-controller": "^3.0.1",
packages/backend-test-utils/package.json
+1 -1
View File
@@ -38,7 +38,7 @@
"@backstage/cli": "^0.17.0-next.1",
"@backstage/config": "^1.0.0",
"better-sqlite3": "^7.5.0",
"knex": "^1.0.2",
"knex": "^1.0.6",
"msw": "^0.35.0",
"mysql2": "^2.2.5",
"pg": "^8.3.0",
plugins/app-backend/package.json
+1 -1
View File
@@ -43,7 +43,7 @@
"express-promise-router": "^4.1.0",
"fs-extra": "10.0.1",
"helmet": "^5.0.2",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"winston": "^3.2.1",
plugins/auth-backend/package.json
+1 -1
View File
@@ -53,7 +53,7 @@
"google-auth-library": "^7.6.1",
"jose": "^1.27.1",
"jwt-decode": "^3.1.0",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"minimatch": "^5.0.0",
plugins/bazaar-backend/package.json
+1 -1
View File
@@ -29,7 +29,7 @@
"@types/express": "^4.17.6",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"knex": "^1.0.2",
"knex": "^1.0.6",
"winston": "^3.2.1",
"yn": "^4.0.0"
},
plugins/catalog-backend/package.json
+1 -1
View File
@@ -55,7 +55,7 @@
"fs-extra": "10.0.1",
"git-url-parse": "^11.6.0",
"glob": "^7.1.6",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"node-fetch": "^2.6.7",
plugins/catalog-backend/src/stitching/Stitcher.ts
+1 -1
View File
@@ -225,7 +225,7 @@ export class Stitcher {
.onConflict('entity_id')
.merge(['final_entity', 'hash']);
if (rowsChanged.length === 0) {
if (rowsChanged === 0) {
this.logger.debug(
`Entity ${entityRef} is already processed, skipping write.`,
);
plugins/code-coverage-backend/package.json
+1 -1
View File
@@ -33,7 +33,7 @@
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"express-xml-bodyparser": "^0.3.0",
"knex": "^1.0.2",
"knex": "^1.0.6",
"uuid": "^8.3.2",
"winston": "^3.2.1",
"yn": "^4.0.0"
plugins/scaffolder-backend/package.json
+1 -1
View File
@@ -59,7 +59,7 @@
"isbinaryfile": "^5.0.0",
"isomorphic-git": "^1.8.0",
"jsonschema": "^1.2.6",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"morgan": "^1.10.0",
plugins/search-backend-module-pg/package.json
+1 -1
View File
@@ -27,7 +27,7 @@
"@backstage/plugin-search-backend-node": "^0.6.0-next.1",
"@backstage/plugin-search-common": "^0.3.3-next.1",
"lodash": "^4.17.21",
"knex": "^1.0.2"
"knex": "^1.0.6"
},
"devDependencies": {
"@backstage/backend-test-utils": "^0.1.23-next.1",
plugins/tech-insights-backend/package.json
+1 -1
View File
@@ -45,7 +45,7 @@
"@types/express": "^4.17.6",
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"luxon": "^2.0.2",
"semver": "^7.3.5",
plugins/techdocs-backend/package.json
+1 -1
View File
@@ -49,7 +49,7 @@
"express": "^4.17.1",
"express-promise-router": "^4.1.0",
"fs-extra": "10.0.1",
"knex": "^1.0.2",
"knex": "^1.0.6",
"lodash": "^4.17.21",
"node-fetch": "^2.6.7",
"p-limit": "^3.1.0",
yarn.lock
+2 -2
View File
@@ -9541,7 +9541,7 @@ command-exists@^1.2.9:
resolved "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69"
integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==
commander@*, commander@^9.1.0:
commander@^9.1.0:
version "9.1.0"
resolved "https://registry.npmjs.org/commander/-/commander-9.1.0.tgz#a6b263b2327f2e188c6402c42623327909f2dbec"
integrity sha512-i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w==
@@ -9576,7 +9576,7 @@ commander@^7.2.0:
resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
commander@^8.3.0:
commander@*, commander@^8.3.0:
version "8.3.0"
resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==