From c37efd3f8783195fcb899aad43a26d50d64d261a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 20 Apr 2022 11:26:51 +0000 Subject: [PATCH 1/4] fix(deps): update dependency knex to v1.0.7 Signed-off-by: Renovate Bot --- yarn.lock | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 685afd01b4..1140542dea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10575,13 +10575,6 @@ debug@4.3.2: dependencies: ms "2.1.2" -debug@4.3.3: - version "4.3.3" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== - dependencies: - ms "2.1.2" - debug@^3.1.0, debug@^3.1.1, debug@^3.2.7: version "3.2.7" resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -12996,6 +12989,11 @@ get-monorepo-packages@^1.1.0: globby "^7.1.1" load-json-file "^4.0.0" +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + get-pkg-repo@^4.0.0: version "4.2.1" resolved "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385" @@ -16163,15 +16161,16 @@ kleur@^4.0.3: integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA== knex@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/knex/-/knex-1.0.2.tgz#1b79273f39f587a631c1a5515482c203d5971781" - integrity sha512-RuDKTylj6X/3nYomnsFV8sOdxTcehLHczOd3yrUdULE4pQR8jVlZxYt3vvIU04otJF0Cw9DCtRt05S4PN4kDpw== + version "1.0.7" + resolved "https://registry.npmjs.org/knex/-/knex-1.0.7.tgz#965f4490efc451b140aac4c5c6efa39fd877597b" + integrity sha512-89jxuRATt4qJMb9ZyyaKBy0pQ4d5h7eOFRqiNFnUvsgU+9WZ2eIaZKrAPG1+F3mgu5UloPUnkVE5Yo2sKZUs6Q== dependencies: colorette "2.0.16" - commander "^8.3.0" - debug "4.3.3" + commander "^9.1.0" + debug "4.3.4" escalade "^3.1.1" esm "^3.2.25" + get-package-type "^0.1.0" getopts "2.3.0" interpret "^2.2.0" lodash "^4.17.21" From a3a49fb088dde02f11f024d7bd355a046c558e42 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 20 Apr 2022 14:29:27 +0200 Subject: [PATCH 2/4] chore: fixing types for search stitching Signed-off-by: blam --- plugins/catalog-backend/src/stitching/Stitcher.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/catalog-backend/src/stitching/Stitcher.ts b/plugins/catalog-backend/src/stitching/Stitcher.ts index c31052c01e..cf65a14fee 100644 --- a/plugins/catalog-backend/src/stitching/Stitcher.ts +++ b/plugins/catalog-backend/src/stitching/Stitcher.ts @@ -213,7 +213,7 @@ export class Stitcher { // to write the search index. const searchEntries = buildEntitySearch(entityId, entity); - const rowsChanged = await this.database( + const amountOfRowsChanged = await this.database( 'final_entities', ) .update({ @@ -225,7 +225,7 @@ export class Stitcher { .onConflict('entity_id') .merge(['final_entity', 'hash']); - if (rowsChanged.length === 0) { + if (amountOfRowsChanged === 0) { this.logger.debug( `Entity ${entityRef} is already processed, skipping write.`, ); From 55e09b29dd1dcf52d6102c1eb6f8499a17337800 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 20 Apr 2022 14:33:37 +0200 Subject: [PATCH 3/4] chore: added changeset Signed-off-by: blam --- .changeset/hip-adults-collect.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/hip-adults-collect.md diff --git a/.changeset/hip-adults-collect.md b/.changeset/hip-adults-collect.md new file mode 100644 index 0000000000..97afdf3da2 --- /dev/null +++ b/.changeset/hip-adults-collect.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Fixing broken types for `knex` when checking returned rows From 4b698b4ec11eb9fd112452442a0a98f50ec88fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 21 Apr 2022 10:22:27 +0200 Subject: [PATCH 4/4] update api report MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- packages/backend-common/api-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md index cd4d08df87..55c684b003 100644 --- a/packages/backend-common/api-report.md +++ b/packages/backend-common/api-report.md @@ -175,7 +175,7 @@ export class Contexts { export function createDatabaseClient( dbConfig: Config, overrides?: Partial, -): Knex[]>; +): Knex; // @public export function createRootLogger(