From 20a5161f045922c3f87a8a26453e295a58da74b0 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Tue, 30 Aug 2022 15:11:59 -0700
Subject: [PATCH 01/82] Adding MySQL support to the catalog-backend plugin

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .changeset/nice-pants-boil.md                 |  6 ++
 packages/backend-common/src/database/util.ts  |  4 +-
 .../migrations/20200511113813_init.js         |  2 +-
 .../migrations/20200702153613_entities.js     |  3 +-
 .../20200923104503_case_insensitivity.js      |  4 +-
 .../20201005122705_add_entity_full_name.js    |  7 +-
 .../20201006130744_entity_data_column.js      |  3 +-
 .../20201007201501_index_entity_search.js     | 13 ++-
 .../20201123205611_relations_table_uniq.js    |  4 +-
 .../20210302150147_refresh_state.js           | 93 +++++++------------
 ...210622104022_refresh_state_location_key.js |  4 +-
 ...0925102509_add_refresh_state_input_hash.js |  2 +-
 .../migrations/20220616202842_refresh_keys.js |  4 +-
 .../DefaultProcessingDatabase.test.ts         | 12 ++-
 .../src/database/DefaultProcessingDatabase.ts | 15 ++-
 .../modules/core/DefaultLocationStore.test.ts |  2 +-
 .../service/DefaultEntitiesCatalog.test.ts    |  7 +-
 .../src/service/DefaultEntitiesCatalog.ts     | 61 ++++++++----
 .../src/service/DefaultRefreshService.test.ts |  2 +-
 .../src/stitching/Stitcher.test.ts            |  2 +-
 20 files changed, 135 insertions(+), 115 deletions(-)
 create mode 100644 .changeset/nice-pants-boil.md

diff --git a/.changeset/nice-pants-boil.md b/.changeset/nice-pants-boil.md
new file mode 100644
index 0000000000..e8bdf0a00f
--- /dev/null
+++ b/.changeset/nice-pants-boil.md
@@ -0,0 +1,6 @@
+---
+'@backstage/backend-common': patch
+'@backstage/plugin-catalog-backend': patch
+---
+
+Adds MySQL support for the catalog-backend
diff --git a/packages/backend-common/src/database/util.ts b/packages/backend-common/src/database/util.ts
index 0a7d3cd7f7..a4905d54b0 100644
--- a/packages/backend-common/src/database/util.ts
+++ b/packages/backend-common/src/database/util.ts
@@ -29,6 +29,8 @@ export function isDatabaseConflictError(e: unknown) {
     typeof message === 'string' &&
     (/SQLITE_CONSTRAINT(?:_UNIQUE)?: UNIQUE/.test(message) ||
       /UNIQUE constraint failed:/.test(message) ||
-      /unique constraint/.test(message))
+      /unique constraint/.test(message) ||
+      /Duplicate entry/.test(message) // MySQL uniqueness error msg
+    )
   );
 }
diff --git a/plugins/catalog-backend/migrations/20200511113813_init.js b/plugins/catalog-backend/migrations/20200511113813_init.js
index aa2ff6affa..a34912135e 100644
--- a/plugins/catalog-backend/migrations/20200511113813_init.js
+++ b/plugins/catalog-backend/migrations/20200511113813_init.js
@@ -59,7 +59,7 @@ exports.up = async function up(knex) {
             'An opaque string that changes for each update operation to any part of the entity, including metadata.',
           );
         table
-          .string('generation')
+          .integer('generation')
           .notNullable()
           .unsigned()
           .comment(
diff --git a/plugins/catalog-backend/migrations/20200702153613_entities.js b/plugins/catalog-backend/migrations/20200702153613_entities.js
index 86e0e48e40..37aee4d985 100644
--- a/plugins/catalog-backend/migrations/20200702153613_entities.js
+++ b/plugins/catalog-backend/migrations/20200702153613_entities.js
@@ -31,6 +31,7 @@ exports.up = async function up(knex) {
   }
   await knex.schema.alterTable('entities', table => {
     table.dropUnique([], 'entities_unique_name');
+    table.dropForeign(['location_id']);
   });
   // Setup temporary tables
   await knex.schema.renameTable('entities_search', 'tmp_entities_search');
@@ -56,7 +57,7 @@ exports.up = async function up(knex) {
           'An opaque string that changes for each update operation to any part of the entity, including metadata.',
         );
       table
-        .string('generation')
+        .integer('generation')
         .notNullable()
         .unsigned()
         .comment(
diff --git a/plugins/catalog-backend/migrations/20200923104503_case_insensitivity.js b/plugins/catalog-backend/migrations/20200923104503_case_insensitivity.js
index 01be4789d0..9f0cabac41 100644
--- a/plugins/catalog-backend/migrations/20200923104503_case_insensitivity.js
+++ b/plugins/catalog-backend/migrations/20200923104503_case_insensitivity.js
@@ -24,8 +24,8 @@ exports.up = async function up(knex) {
     .where({ namespace: null })
     .update({ namespace: 'default' });
   await knex('entities_search').update({
-    key: knex.raw('LOWER(key)'),
-    value: knex.raw('LOWER(value)'),
+    key: knex.raw('LOWER(??)', ['key']),
+    value: knex.raw('LOWER(??)', ['value']),
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
index 941b8a0a3f..8705ae26a6 100644
--- a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
+++ b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
@@ -21,19 +21,20 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('entities', table => {
-    table.text('full_name').nullable();
+    table.string('full_name').nullable();
   });
 
   await knex('entities').update({
     full_name: knex.raw(
-      "LOWER(kind) || ':' || LOWER(COALESCE(namespace, 'default')) || '/' || LOWER(name)",
+      "LOWER(??) || ':' || LOWER(COALESCE(??, 'default')) || '/' || LOWER(??)",
+      ['kind', 'namespace', 'name'],
     ),
   });
 
   // SQLite does not support alter column
   if (!knex.client.config.client.includes('sqlite3')) {
     await knex.schema.alterTable('entities', table => {
-      table.text('full_name').notNullable().alter({ alterNullable: true });
+      table.string('full_name').notNullable().alter();
     });
   }
 
diff --git a/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js b/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js
index 47097fc788..6e7ae9b8fe 100644
--- a/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js
+++ b/plugins/catalog-backend/migrations/20201006130744_entity_data_column.js
@@ -31,7 +31,8 @@ exports.up = async function up(knex) {
     // apiVersion and kind should not contain any JSON unsafe chars, and both
     // metadata and spec are already valid serialized JSON
     data: knex.raw(
-      `'{"apiVersion":"' || api_version || '","kind":"' || kind || '","metadata":' || metadata || COALESCE(',"spec":' || spec, '') || '}'`,
+      `'{"apiVersion":"' || ?? || '","kind":"' || ?? || '","metadata":' || ?? || COALESCE(',"spec":' || ??, '') || '}'`,
+      ['api_version', 'kind', 'metadata', 'spec'],
     ),
   });
 
diff --git a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
index 59fd34b700..3611c91b3d 100644
--- a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
+++ b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
@@ -21,8 +21,17 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('entities_search', table => {
-    table.index(['key'], 'entities_search_key');
-    table.index(['value'], 'entities_search_value');
+    if (knex.client.config.client.includes('mysql')) {
+      table.index(['key'], 'entities_search_key', {
+        indexType: 'FULLTEXT',
+      });
+      table.index(['value'], 'entities_search_value', {
+        indexType: 'FULLTEXT',
+      });
+    } else {
+      table.index(['key'], 'entities_search_key');
+      table.index(['value'], 'entities_search_value');
+    }
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20201123205611_relations_table_uniq.js b/plugins/catalog-backend/migrations/20201123205611_relations_table_uniq.js
index 996c69de8c..313eb88600 100644
--- a/plugins/catalog-backend/migrations/20201123205611_relations_table_uniq.js
+++ b/plugins/catalog-backend/migrations/20201123205611_relations_table_uniq.js
@@ -24,7 +24,7 @@ exports.up = async function up(knex) {
     // sqlite doesn't support dropPrimary so we recreate it properly instead
     await knex.schema.dropTable('entities_relations');
     await knex.schema.createTable('entities_relations', table => {
-      table.comment('All relations between entities in the catalog');
+      table.comment('All relations between entities');
       table
         .uuid('originating_entity_id')
         .references('id')
@@ -61,7 +61,7 @@ exports.down = async function down(knex) {
   if (knex.client.config.client.includes('sqlite3')) {
     await knex.schema.dropTable('entities_relations');
     await knex.schema.createTable('entities_relations', table => {
-      table.comment('All relations between entities in the catalog');
+      table.comment('All relations between entities');
       table
         .uuid('originating_entity_id')
         .references('id')
diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index da276940fa..3a58196127 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -21,38 +21,28 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.createTable('refresh_state', table => {
-    table.comment(
-      'Location refresh states. Every individual location (that was ever directly or indirectly discovered) and entity has an entry in this table. It therefore represents the entire live set of things that the refresh loop considers.',
-    );
+    table.comment('Location refresh states');
     table
-      .text('entity_id')
+      .string('entity_id')
       .primary()
       .notNullable()
-      .comment(
-        'Primary ID, which will also be used as the uid of the resulting entity',
-      );
+      .comment('Primary ID, also used as the uid of the entity');
     table
-      .text('entity_ref')
+      .string('entity_ref')
       .notNullable()
-      .comment('A reference to the entity that the refresh state is tied to');
+      .comment('A reference to the entity for this refresh state');
     table
       .text('unprocessed_entity')
       .notNullable()
-      .comment(
-        'The unprocessed entity (in its source form, before being run through all of the processors) as JSON',
-      );
+      .comment('The unprocessed entity (in original form) as JSON');
     table
       .text('processed_entity')
       .nullable()
-      .comment(
-        'The processed entity (after running through all processors, but before being stitched together with state and relations) as JSON',
-      );
+      .comment('The processed entity (not yet stitched) as JSON');
     table
       .text('cache')
       .nullable()
-      .comment(
-        'Cache information tied to the refreshing of this entity, such as etag information or actual response caching',
-      );
+      .comment('Cache information tied to refreshes of this entity');
     table
       .text('errors')
       .notNullable()
@@ -64,41 +54,28 @@ exports.up = async function up(knex) {
     table
       .dateTime('last_discovery_at') // TODO: timezone or change to epoch-millis or similar
       .notNullable()
-      .comment('The last timestamp of which this entity was discovered');
-    table.unique(['entity_ref'], {
-      indexName: 'refresh_state_entity_ref_uniq',
-    });
+      .comment('The last timestamp that this entity was discovered');
+    table.unique(['entity_ref'], 'refresh_state_entity_ref_uniq');
     table.index('entity_id', 'refresh_state_entity_id_idx');
     table.index('entity_ref', 'refresh_state_entity_ref_idx');
     table.index('next_update_at', 'refresh_state_next_update_at_idx');
   });
 
   await knex.schema.createTable('final_entities', table => {
-    table.comment(
-      'This table contains the final entity result after processing and stitching',
-    );
+    table.comment('Final entities after processing and stitching');
     table
-      .text('entity_id')
+      .string('entity_id')
       .primary()
       .notNullable()
       .references('entity_id')
       .inTable('refresh_state')
       .onDelete('CASCADE')
-      .comment(
-        'Entity ID which corresponds to the ID in the refresh_state table',
-      );
+      .comment('Entity ID -> refresh_state table');
+    table.text('hash').notNullable().comment('Stable hash of the entity data');
     table
-      .text('hash')
+      .string('stitch_ticket')
       .notNullable()
-      .comment(
-        'Stable hash of the entity data, to be used for caching and avoiding redundant work',
-      );
-    table
-      .text('stitch_ticket')
-      .notNullable()
-      .comment(
-        'A random value representing a unique stitch attempt ticket, that gets updated each time that a stitching attempt is made on the entity',
-      );
+      .comment('Random value representing a unique stitch attempt ticket');
     table
       .text('final_entity')
       .nullable()
@@ -107,29 +84,23 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.createTable('refresh_state_references', table => {
-    table.comment(
-      'Holds edges between refresh state rows. Every time when an entity is processed and emits another entity, an edge will be stored to represent that fact. This is used to detect orphans and ultimately deletions.',
-    );
+    table.comment('Edges between refresh state rows');
     table
       .increments('id')
       .comment('Primary key to distinguish unique lines from each other');
     table
-      .text('source_key')
+      .string('source_key')
       .nullable()
-      .comment(
-        'When the reference source is not an entity, this is an opaque identifier for that source.',
-      );
+      .comment('Opaque identifier for non-entity sources');
     table
-      .text('source_entity_ref')
+      .string('source_entity_ref')
       .nullable()
       .references('entity_ref')
       .inTable('refresh_state')
       .onDelete('CASCADE')
-      .comment(
-        'When the reference source is an entity, this is the EntityRef of the source entity.',
-      );
+      .comment('EntityRef of entity sources');
     table
-      .text('target_entity_ref')
+      .string('target_entity_ref')
       .notNullable()
       .references('entity_ref')
       .inTable('refresh_state')
@@ -147,36 +118,34 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.createTable('relations', table => {
-    table.comment('All relations between entities in the catalog');
+    table.comment('All relations between entities');
     table
-      .text('originating_entity_id')
+      .string('originating_entity_id')
       .references('entity_id')
       .inTable('refresh_state')
       .onDelete('CASCADE')
       .notNullable()
       .comment('The entity that provided the relation');
     table
-      .text('source_entity_ref')
+      .string('source_entity_ref')
       .notNullable()
-      .comment('The entity reference of the source entity of the relation');
+      .comment('Entity reference of the source entity of the relation');
     table
-      .text('type')
+      .string('type')
       .notNullable()
       .comment('The type of the relation between the entities');
     table
-      .text('target_entity_ref')
+      .string('target_entity_ref')
       .notNullable()
-      .comment('The entity reference of the target entity of the relation');
+      .comment('Entity reference of the target entity of the relation');
     table.index('source_entity_ref', 'relations_source_entity_ref_idx');
     table.index('originating_entity_id', 'relations_source_entity_id_idx');
   });
 
   await knex.schema.createTable('search', table => {
-    table.comment(
-      'Flattened key-values from the entities, used for quick filtering',
-    );
+    table.comment('Flattened key-values from the entities, for filtering');
     table
-      .text('entity_id')
+      .string('entity_id')
       .references('entity_id')
       .inTable('refresh_state')
       .onDelete('CASCADE')
diff --git a/plugins/catalog-backend/migrations/20210622104022_refresh_state_location_key.js b/plugins/catalog-backend/migrations/20210622104022_refresh_state_location_key.js
index 37ab5e12cb..f15e2c208c 100644
--- a/plugins/catalog-backend/migrations/20210622104022_refresh_state_location_key.js
+++ b/plugins/catalog-backend/migrations/20210622104022_refresh_state_location_key.js
@@ -24,9 +24,7 @@ exports.up = async function up(knex) {
     table
       .text('location_key')
       .nullable()
-      .comment(
-        'An opaque key that uniquely identifies the location of an entity in order to support conflict resolution',
-      );
+      .comment('Opaque conflict resolution key');
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20210925102509_add_refresh_state_input_hash.js b/plugins/catalog-backend/migrations/20210925102509_add_refresh_state_input_hash.js
index 7d7a4ac578..136be9899e 100644
--- a/plugins/catalog-backend/migrations/20210925102509_add_refresh_state_input_hash.js
+++ b/plugins/catalog-backend/migrations/20210925102509_add_refresh_state_input_hash.js
@@ -24,7 +24,7 @@ exports.up = async function up(knex) {
     table
       .text('unprocessed_hash')
       .nullable()
-      .comment('A hash of the unprocessed contents, used to detect changes');
+      .comment('A hash of the unprocessed contents');
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js b/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js
index b1b67f68f2..ddc39d4005 100644
--- a/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js
+++ b/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js
@@ -23,14 +23,14 @@ exports.up = async function up(knex) {
       'This table contains relations between entities and keys to trigger refreshes with',
     );
     table
-      .text('entity_id')
+      .string('entity_id')
       .notNullable()
       .references('entity_id')
       .inTable('refresh_state')
       .onDelete('CASCADE')
       .comment('A reference to the entity that the refresh key is tied to');
     table
-      .text('key')
+      .string('key')
       .notNullable()
       .comment(
         'A reference to a key which should be used to trigger a refresh on this entity',
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
index 46b327733d..e8d538fb0b 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
@@ -36,7 +36,7 @@ import { generateStableHash } from './util';
 describe('Default Processing Database', () => {
   const defaultLogger = getVoidLogger();
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['MYSQL_8', 'POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
 
   async function createDatabase(
@@ -1447,10 +1447,12 @@ describe('Default Processing Database', () => {
         const result1 = await db.transaction(async tx =>
           db.listParents(tx, { entityRef: 'component:default/foobar' }),
         );
-        expect(result1.entityRefs).toEqual([
-          'location:default/root-1',
-          'location:default/root-2',
-        ]);
+        expect(result1.entityRefs).toEqual(
+          expect.arrayContaining([
+            'location:default/root-1',
+            'location:default/root-2',
+          ]),
+        );
 
         const result2 = await db.transaction(async tx =>
           db.listParents(tx, { entityRef: 'location:default/root-1' }),
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index 3dc5325178..2ffe69725f 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -82,6 +82,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       refreshKeys,
       locationKey,
     } = options;
+    const configClient = tx.client.config.client;
     const refreshResult = await tx<DbRefreshStateRow>('refresh_state')
       .update({
         processed_entity: JSON.stringify(processedEntity),
@@ -114,10 +115,7 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
     // Delete old relations
     // NOTE(freben): knex implemented support for returning() on update queries for sqlite, but at the current time of writing (Sep 2022) not for delete() queries.
     let previousRelationRows: DbRelationsRow[];
-    if (
-      tx.client.config.client.includes('sqlite3') ||
-      tx.client.config.client.includes('mysql')
-    ) {
+    if (configClient.includes('sqlite3') || configClient.includes('mysql')) {
       previousRelationRows = await tx<DbRelationsRow>('relations')
         .select('*')
         .where({ originating_entity_id: id });
@@ -663,11 +661,11 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
         last_discovery_at: tx.fn.now(),
       });
 
-      // TODO(Rugvip): only tested towards Postgres and SQLite
+      // TODO(Rugvip): only tested towards MySQL, Postgres and SQLite.
       // We have to do this because the only way to detect if there was a conflict with
       // SQLite is to catch the error, while Postgres needs to ignore the conflict to not
       // break the ongoing transaction.
-      if (!tx.client.config.client.includes('sqlite3')) {
+      if (tx.client.config.client.includes('pg')) {
         query = query.onConflict('entity_ref').ignore() as any; // type here does not match runtime
       }
 
@@ -675,10 +673,11 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       const result: { rowCount?: number; length?: number } = await query;
       return result.rowCount === 1 || result.length === 1;
     } catch (error) {
-      // SQLite reached this rather than the rowCount check above
+      // SQLite, or MySQL reached this rather than the rowCount check above
       if (
         isError(error) &&
-        error.message.includes('UNIQUE constraint failed')
+        (error.message.includes('UNIQUE constraint failed') ||
+          error.message.includes('Duplicate entry')) // MySQL failure
       ) {
         return false;
       }
diff --git a/plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts b/plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts
index 2a9b1f8d65..9a957f8838 100644
--- a/plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts
+++ b/plugins/catalog-backend/src/modules/core/DefaultLocationStore.test.ts
@@ -20,7 +20,7 @@ import { DefaultLocationStore } from './DefaultLocationStore';
 
 describe('DefaultLocationStore', () => {
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['MYSQL_8', 'POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
 
   async function createLocationStore(databaseId: TestDatabaseId) {
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 49d4fe9e19..306c141a62 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -30,7 +30,7 @@ import { DefaultEntitiesCatalog } from './DefaultEntitiesCatalog';
 
 describe('DefaultEntitiesCatalog', () => {
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['MYSQL_8', 'POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
   const stitch = jest.fn();
   const stitcher: Stitcher = { stitch } as any;
@@ -239,7 +239,10 @@ describe('DefaultEntitiesCatalog', () => {
           expect.arrayContaining([
             {
               entity: expect.objectContaining({ metadata: { name: 'root' } }),
-              parentEntityRefs: ['k:default/parent1', 'k:default/parent2'],
+              parentEntityRefs: expect.arrayContaining([
+                'k:default/parent1',
+                'k:default/parent2',
+              ]),
             },
             {
               entity: expect.objectContaining({
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index dc84b12484..90e40377f2 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -238,6 +238,8 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
   }
 
   async removeEntityByUid(uid: string): Promise<void> {
+    const dbConfig = this.database.client.config;
+
     // Clear the hashed state of the immediate parents of the deleted entity.
     // This makes sure that when they get reprocessed, their output is written
     // down again. The reason for wanting to do this, is that if the user
@@ -246,21 +248,49 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
     // means it'll never try to write down the children again (it assumes that
     // they already exist). This means that without the code below, the database
     // never "heals" from accidental deletes.
-    await this.database<DbRefreshStateRow>('refresh_state')
-      .update({
-        result_hash: 'child-was-deleted',
-        next_update_at: this.database.fn.now(),
-      })
-      .whereIn('entity_ref', function parents(builder) {
-        return builder
-          .from<DbRefreshStateRow>('refresh_state')
-          .innerJoin<DbRefreshStateReferencesRow>('refresh_state_references', {
-            'refresh_state_references.target_entity_ref':
-              'refresh_state.entity_ref',
-          })
-          .where('refresh_state.entity_id', '=', uid)
-          .select('refresh_state_references.source_entity_ref');
-      });
+    if (dbConfig.client.includes('mysql')) {
+      // MySQL doesn't support the syntax we need to do this in a single query,
+      // http://dev.mysql.com/doc/refman/5.6/en/update.html
+      const results = await this.database<DbRefreshStateRow>('refresh_state')
+        .select('entity_id')
+        .whereIn('entity_ref', function parents(builder) {
+          return builder
+            .from<DbRefreshStateRow>('refresh_state')
+            .innerJoin<DbRefreshStateReferencesRow>(
+              'refresh_state_references',
+              {
+                'refresh_state_references.target_entity_ref':
+                  'refresh_state.entity_ref',
+              },
+            )
+            .where('refresh_state.entity_id', '=', uid)
+            .select('refresh_state_references.source_entity_ref');
+        });
+      await this.database<DbRefreshStateRow>('refresh_state')
+        .update({ result_hash: 'child-was-deleted' })
+        .whereIn(
+          'entity_id',
+          results.map(key => key.entity_id),
+        );
+    } else {
+      await this.database<DbRefreshStateRow>('refresh_state')
+        .update({
+          result_hash: 'child-was-deleted',
+        })
+        .whereIn('entity_ref', function parents(builder) {
+          return builder
+            .from<DbRefreshStateRow>('refresh_state')
+            .innerJoin<DbRefreshStateReferencesRow>(
+              'refresh_state_references',
+              {
+                'refresh_state_references.target_entity_ref':
+                  'refresh_state.entity_ref',
+              },
+            )
+            .where('refresh_state.entity_id', '=', uid)
+            .select('refresh_state_references.source_entity_ref');
+        });
+    }
 
     // Stitch the entities that the deleted one had relations to. If we do not
     // do this, the entities in the other end of the relations will still look
@@ -285,7 +315,6 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
           .select({ ref: 'relations.source_entity_ref' }),
       );
 
-    // Perform the actual deletion
     await this.database<DbRefreshStateRow>('refresh_state')
       .where('entity_id', uid)
       .delete();
diff --git a/plugins/catalog-backend/src/service/DefaultRefreshService.test.ts b/plugins/catalog-backend/src/service/DefaultRefreshService.test.ts
index 419aedc15d..3ed4f3fe36 100644
--- a/plugins/catalog-backend/src/service/DefaultRefreshService.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultRefreshService.test.ts
@@ -36,7 +36,7 @@ import { DefaultRefreshService } from './DefaultRefreshService';
 describe('Refresh integration', () => {
   const defaultLogger = getVoidLogger();
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['MYSQL_8', 'POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
 
   async function createDatabase(
diff --git a/plugins/catalog-backend/src/stitching/Stitcher.test.ts b/plugins/catalog-backend/src/stitching/Stitcher.test.ts
index 9accebf1fc..c6827892ee 100644
--- a/plugins/catalog-backend/src/stitching/Stitcher.test.ts
+++ b/plugins/catalog-backend/src/stitching/Stitcher.test.ts
@@ -29,7 +29,7 @@ import { Stitcher } from './Stitcher';
 
 describe('Stitcher', () => {
   const databases = TestDatabases.create({
-    ids: ['POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
+    ids: ['MYSQL_8', 'POSTGRES_13', 'POSTGRES_9', 'SQLITE_3'],
   });
   const logger = getVoidLogger();
 

From 1e62ef8675904d7148d5e675141880e22b41faff Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Tue, 30 Aug 2022 15:51:52 -0700
Subject: [PATCH 02/82] fix parentheses

Signed-off-by: tonedef <kobylk@gmail.com>
---
 packages/backend-common/src/database/util.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/backend-common/src/database/util.ts b/packages/backend-common/src/database/util.ts
index a4905d54b0..f5abcd7fba 100644
--- a/packages/backend-common/src/database/util.ts
+++ b/packages/backend-common/src/database/util.ts
@@ -30,7 +30,6 @@ export function isDatabaseConflictError(e: unknown) {
     (/SQLITE_CONSTRAINT(?:_UNIQUE)?: UNIQUE/.test(message) ||
       /UNIQUE constraint failed:/.test(message) ||
       /unique constraint/.test(message) ||
-      /Duplicate entry/.test(message) // MySQL uniqueness error msg
-    )
+      /Duplicate entry/.test(message)) // MySQL uniqueness error msg
   );
 }

From 7a854747522c55dcdacc4bc61107e222211c40aa Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Thu, 6 Oct 2022 15:14:57 -0700
Subject: [PATCH 03/82] address feedback

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../20210302150147_refresh_state.js           | 28 +++++++++++++------
 .../DefaultProcessingDatabase.test.ts         | 10 +++----
 .../src/database/DefaultProcessingDatabase.ts | 12 ++++----
 .../service/DefaultEntitiesCatalog.test.ts    |  5 +---
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index 3a58196127..bf1611a099 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -20,6 +20,11 @@
  * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
+  let STRING_TEXT = 'text';
+  if (knex.client.config.client.includes('mysql')) {
+    STRING_TEXT = 'string';
+  }
+
   await knex.schema.createTable('refresh_state', table => {
     table.comment('Location refresh states');
     table
@@ -55,7 +60,9 @@ exports.up = async function up(knex) {
       .dateTime('last_discovery_at') // TODO: timezone or change to epoch-millis or similar
       .notNullable()
       .comment('The last timestamp that this entity was discovered');
-    table.unique(['entity_ref'], 'refresh_state_entity_ref_uniq');
+    table.unique(['entity_ref'], {
+      indexName: 'refresh_state_entity_ref_uniq',
+    });
     table.index('entity_id', 'refresh_state_entity_id_idx');
     table.index('entity_ref', 'refresh_state_entity_ref_idx');
     table.index('next_update_at', 'refresh_state_next_update_at_idx');
@@ -71,9 +78,12 @@ exports.up = async function up(knex) {
       .inTable('refresh_state')
       .onDelete('CASCADE')
       .comment('Entity ID -> refresh_state table');
-    table.text('hash').notNullable().comment('Stable hash of the entity data');
     table
-      .string('stitch_ticket')
+      .string('hash')
+      .notNullable()
+      .comment('Stable hash of the entity data');
+    table
+      .text('stitch_ticket')
       .notNullable()
       .comment('Random value representing a unique stitch attempt ticket');
     table
@@ -88,19 +98,19 @@ exports.up = async function up(knex) {
     table
       .increments('id')
       .comment('Primary key to distinguish unique lines from each other');
-    table
-      .string('source_key')
+    // @ts-ignore
+    table[STRING_TEXT]('source_key')
       .nullable()
       .comment('Opaque identifier for non-entity sources');
-    table
-      .string('source_entity_ref')
+    // @ts-ignore
+    table[STRING_TEXT]('source_entity_ref')
       .nullable()
       .references('entity_ref')
       .inTable('refresh_state')
       .onDelete('CASCADE')
       .comment('EntityRef of entity sources');
-    table
-      .string('target_entity_ref')
+    // @ts-ignore
+    table[STRING_TEXT]('target_entity_ref')
       .notNullable()
       .references('entity_ref')
       .inTable('refresh_state')
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
index e8d538fb0b..3375629d0b 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
@@ -1447,12 +1447,10 @@ describe('Default Processing Database', () => {
         const result1 = await db.transaction(async tx =>
           db.listParents(tx, { entityRef: 'component:default/foobar' }),
         );
-        expect(result1.entityRefs).toEqual(
-          expect.arrayContaining([
-            'location:default/root-1',
-            'location:default/root-2',
-          ]),
-        );
+        expect(result1.entityRefs).toEqual([
+          'location:default/root-1',
+          'location:default/root-2',
+        ]);
 
         const result2 = await db.transaction(async tx =>
           db.listParents(tx, { entityRef: 'location:default/root-1' }),
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index 2ffe69725f..319ccae7f8 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -674,14 +674,14 @@ export class DefaultProcessingDatabase implements ProcessingDatabase {
       return result.rowCount === 1 || result.length === 1;
     } catch (error) {
       // SQLite, or MySQL reached this rather than the rowCount check above
-      if (
-        isError(error) &&
-        (error.message.includes('UNIQUE constraint failed') ||
-          error.message.includes('Duplicate entry')) // MySQL failure
-      ) {
+      if (!isDatabaseConflictError(error)) {
+        throw error;
+      } else {
+        this.options.logger.debug(
+          `Unable to insert a new refresh state row, ${error}`,
+        );
         return false;
       }
-      throw error;
     }
   }
 
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 306c141a62..049619c831 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -239,10 +239,7 @@ describe('DefaultEntitiesCatalog', () => {
           expect.arrayContaining([
             {
               entity: expect.objectContaining({ metadata: { name: 'root' } }),
-              parentEntityRefs: expect.arrayContaining([
-                'k:default/parent1',
-                'k:default/parent2',
-              ]),
+              parentEntityRefs: ['k:default/parent1', 'k:default/parent2'],
             },
             {
               entity: expect.objectContaining({

From 7e87a56a0f3309074ed05a2356af0b7e7b52ff51 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Thu, 6 Oct 2022 15:23:32 -0700
Subject: [PATCH 04/82] fix ts error

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../catalog-backend/src/database/DefaultProcessingDatabase.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index 319ccae7f8..fda65e35a1 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -15,7 +15,7 @@
  */
 
 import { Entity, stringifyEntityRef } from '@backstage/catalog-model';
-import { ConflictError, isError, NotFoundError } from '@backstage/errors';
+import { ConflictError, NotFoundError } from '@backstage/errors';
 import { Knex } from 'knex';
 import lodash from 'lodash';
 import { v4 as uuid } from 'uuid';

From 1fdd91514a45b16d782418c3775cd007771e57fd Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Thu, 6 Oct 2022 16:26:32 -0700
Subject: [PATCH 05/82] repush indexName change

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../migrations/20210302150147_refresh_state.js                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index bf1611a099..1dd82749ed 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -60,9 +60,7 @@ exports.up = async function up(knex) {
       .dateTime('last_discovery_at') // TODO: timezone or change to epoch-millis or similar
       .notNullable()
       .comment('The last timestamp that this entity was discovered');
-    table.unique(['entity_ref'], {
-      indexName: 'refresh_state_entity_ref_uniq',
-    });
+    table.unique(['entity_ref'], { indexName: 'refresh_state_entity_ref_uniq' });
     table.index('entity_id', 'refresh_state_entity_id_idx');
     table.index('entity_ref', 'refresh_state_entity_ref_idx');
     table.index('next_update_at', 'refresh_state_next_update_at_idx');

From 1882a59951bbdf0d4d53ecea1bf359a56f72bf24 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Thu, 6 Oct 2022 16:38:18 -0700
Subject: [PATCH 06/82] repush changes

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../migrations/20210302150147_refresh_state.js              | 6 ++++--
 .../src/database/DefaultProcessingDatabase.test.ts          | 2 +-
 .../src/database/DefaultProcessingDatabase.ts               | 2 +-
 .../src/service/DefaultEntitiesCatalog.test.ts              | 2 +-
 .../catalog-backend/src/service/DefaultEntitiesCatalog.ts   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index 1dd82749ed..dadc656e86 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -60,7 +60,9 @@ exports.up = async function up(knex) {
       .dateTime('last_discovery_at') // TODO: timezone or change to epoch-millis or similar
       .notNullable()
       .comment('The last timestamp that this entity was discovered');
-    table.unique(['entity_ref'], { indexName: 'refresh_state_entity_ref_uniq' });
+    table.unique(['entity_ref'], {
+      indexName: 'refresh_state_entity_ref_uniq',
+    });
     table.index('entity_id', 'refresh_state_entity_id_idx');
     table.index('entity_ref', 'refresh_state_entity_ref_idx');
     table.index('next_update_at', 'refresh_state_next_update_at_idx');
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
index 3375629d0b..f10ac3df6e 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index fda65e35a1..d739c9c8ee 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 049619c831..591c69bcc7 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index 90e40377f2..2b9a3f3310 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

From 50ae38e537fc2075f5dbc06c2eec1bf7d8c311f2 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Fri, 7 Oct 2022 09:24:11 -0700
Subject: [PATCH 07/82] fix notice issue

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../catalog-backend/migrations/20210302150147_refresh_state.js  | 2 +-
 .../src/database/DefaultProcessingDatabase.test.ts              | 2 +-
 .../catalog-backend/src/database/DefaultProcessingDatabase.ts   | 2 +-
 .../catalog-backend/src/service/DefaultEntitiesCatalog.test.ts  | 2 +-
 plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index dadc656e86..bf1611a099 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
index f10ac3df6e..3375629d0b 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.test.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
index d739c9c8ee..fda65e35a1 100644
--- a/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
+++ b/plugins/catalog-backend/src/database/DefaultProcessingDatabase.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
index 591c69bcc7..049619c831 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.test.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index 2b9a3f3310..90e40377f2 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

From 112c6d5605813936f044ef2ffa0995b2e49576f6 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Fri, 28 Oct 2022 13:54:42 -0700
Subject: [PATCH 08/82] address feedback

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../20201005122705_add_entity_full_name.js    |  2 +-
 .../20201007201501_index_entity_search.js     | 22 +++++++++----------
 .../20210302150147_refresh_state.js           | 19 +++++++---------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
index 8705ae26a6..412791d8d7 100644
--- a/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
+++ b/plugins/catalog-backend/migrations/20201005122705_add_entity_full_name.js
@@ -34,7 +34,7 @@ exports.up = async function up(knex) {
   // SQLite does not support alter column
   if (!knex.client.config.client.includes('sqlite3')) {
     await knex.schema.alterTable('entities', table => {
-      table.string('full_name').notNullable().alter();
+      table.string('full_name').notNullable().alter({ alterNullable: true });
     });
   }
 
diff --git a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
index 3611c91b3d..be700a324a 100644
--- a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
+++ b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
@@ -21,17 +21,17 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('entities_search', table => {
-    if (knex.client.config.client.includes('mysql')) {
-      table.index(['key'], 'entities_search_key', {
-        indexType: 'FULLTEXT',
-      });
-      table.index(['value'], 'entities_search_value', {
-        indexType: 'FULLTEXT',
-      });
-    } else {
-      table.index(['key'], 'entities_search_key');
-      table.index(['value'], 'entities_search_value');
-    }
+    const options = knex.client.config.client.includes('mysql') ? { indexType: 'FULLTEXT', } : {}
+      table.index(
+        ['key'],
+        'entities_search_key',
+        options
+      );
+      table.index(
+        ['value'],
+        'entities_search_value',
+        options
+      );
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index bf1611a099..c3c3dc3f12 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -20,11 +20,7 @@
  * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
-  let STRING_TEXT = 'text';
-  if (knex.client.config.client.includes('mysql')) {
-    STRING_TEXT = 'string';
-  }
-
+  const isMySQL = knex.client.config.client.includes('mysql');
   await knex.schema.createTable('refresh_state', table => {
     table.comment('Location refresh states');
     table
@@ -94,23 +90,24 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.createTable('refresh_state_references', table => {
+    const textColumn = isMySQL
+        ? table.string.bind(table)
+        : table.text.bind(table);
+
     table.comment('Edges between refresh state rows');
     table
       .increments('id')
       .comment('Primary key to distinguish unique lines from each other');
-    // @ts-ignore
-    table[STRING_TEXT]('source_key')
+    textColumn('source_key')
       .nullable()
       .comment('Opaque identifier for non-entity sources');
-    // @ts-ignore
-    table[STRING_TEXT]('source_entity_ref')
+    textColumn('source_entity_ref')
       .nullable()
       .references('entity_ref')
       .inTable('refresh_state')
       .onDelete('CASCADE')
       .comment('EntityRef of entity sources');
-    // @ts-ignore
-    table[STRING_TEXT]('target_entity_ref')
+    textColumn('target_entity_ref')
       .notNullable()
       .references('entity_ref')
       .inTable('refresh_state')

From 1f41007d85c02db247178cb9f8dedeccd51047a1 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Sat, 29 Oct 2022 17:07:18 -0700
Subject: [PATCH 09/82] prettier changes

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../20201007201501_index_entity_search.js        | 16 +++++-----------
 .../migrations/20210302150147_refresh_state.js   |  4 ++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
index be700a324a..ea26067a06 100644
--- a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
+++ b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
@@ -21,17 +21,11 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('entities_search', table => {
-    const options = knex.client.config.client.includes('mysql') ? { indexType: 'FULLTEXT', } : {}
-      table.index(
-        ['key'],
-        'entities_search_key',
-        options
-      );
-      table.index(
-        ['value'],
-        'entities_search_value',
-        options
-      );
+    const options = knex.client.config.client.includes('mysql')
+      ? { indexType: 'FULLTEXT' }
+      : {};
+    table.index(['key'], 'entities_search_key', options);
+    table.index(['value'], 'entities_search_value', options);
   });
 };
 
diff --git a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
index c3c3dc3f12..1c8081c0ef 100644
--- a/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
+++ b/plugins/catalog-backend/migrations/20210302150147_refresh_state.js
@@ -91,8 +91,8 @@ exports.up = async function up(knex) {
 
   await knex.schema.createTable('refresh_state_references', table => {
     const textColumn = isMySQL
-        ? table.string.bind(table)
-        : table.text.bind(table);
+      ? table.string.bind(table)
+      : table.text.bind(table);
 
     table.comment('Edges between refresh state rows');
     table

From ed29fad6dae02f914d6793929c8c64a3948b6f0c Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Tue, 1 Nov 2022 10:27:33 -0700
Subject: [PATCH 10/82] Empty commit to trigger GHA

Signed-off-by: tonedef <kobylk@gmail.com>

From 9516b0c355c1bf745a4f62adbbca75a9b07eaf92 Mon Sep 17 00:00:00 2001
From: Nikita Karpukhin <nikita.karpukhin@scout24.com>
Date: Mon, 28 Nov 2022 16:32:51 +0100
Subject: [PATCH 11/82] Add support for sending virtual pageviews on search
 events

Signed-off-by: Nikita Karpukhin <nikita.karpukhin@scout24.com>
---
 .changeset/selfish-lizards-invent.md          |  5 +
 plugins/analytics-module-ga/README.md         | 25 +++++
 plugins/analytics-module-ga/config.d.ts       | 26 ++++++
 .../AnalyticsApi/GoogleAnalytics.test.ts      | 93 +++++++++++++++++++
 .../AnalyticsApi/GoogleAnalytics.ts           | 25 ++++-
 .../src/util/VirtualSearchPageView.ts         | 43 +++++++++
 6 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/selfish-lizards-invent.md
 create mode 100644 plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts

diff --git a/.changeset/selfish-lizards-invent.md b/.changeset/selfish-lizards-invent.md
new file mode 100644
index 0000000000..0eb9e110cf
--- /dev/null
+++ b/.changeset/selfish-lizards-invent.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-analytics-module-ga': minor
+---
+
+Added support for sending virtual pageviews on `search` events
diff --git a/plugins/analytics-module-ga/README.md b/plugins/analytics-module-ga/README.md
index 4b822ea3e3..605044f37c 100644
--- a/plugins/analytics-module-ga/README.md
+++ b/plugins/analytics-module-ga/README.md
@@ -169,6 +169,31 @@ export const apis: AnyApiFactory[] = [
 ];
 ```
 
+### Enabling Site Search
+
+If you wish to see all of the search events in the [Site Search](https://support.google.com/analytics/answer/1012264)
+section of Google Analytics, you can enable sending virtual pageviews on every `search` event like so:
+
+```yaml
+app:
+  analytics:
+    ga:
+      virtualSearchPageView:
+        mode: only # Defaults to 'disabled'
+        mountPath: /virtual-search # Defaults to '/search'
+        queryParam: term # Defaults to 'query'
+```
+
+Available `mode`s are:
+
+- `disabled` - no virtual pageviews are sent, default behavior
+- `only` - sends virtual pageviews _instead_ of `search` events
+- `both` - sends both virtual pageviews _and_ `search` events
+
+Virtual pageviews will be sent to the path specified in the `mountPath`, and the search term will be
+set as the value for query parameter `queryParam`, e.g. the example config above will result in
+virtual pageviews being sent to `/virtual-search?term=SearchTermHere`.
+
 ### Debugging and Testing
 
 In pre-production environments, you may wish to set additional configurations
diff --git a/plugins/analytics-module-ga/config.d.ts b/plugins/analytics-module-ga/config.d.ts
index b91f5812c1..bf9c3b304b 100644
--- a/plugins/analytics-module-ga/config.d.ts
+++ b/plugins/analytics-module-ga/config.d.ts
@@ -53,6 +53,32 @@ export interface Config {
          */
         identity?: 'disabled' | 'optional' | 'required';
 
+        /**
+         * Controls whether to send virtual pageviews on `search` events.
+         * Can be used to enable Site Search in GA.
+         */
+        virtualSearchPageView?: {
+          /**
+           * - `disabled`: (Default) no virtual pageviews are sent
+           * - `only`: Sends virtual pageview _instead_ of the `search` event
+           * - `both`: Sends both the `search` event _and_ the virtual pageview
+           * @visibility frontend
+           */
+          mode?: 'disabled' | 'only' | 'both';
+          /**
+           * Specifies on which path the main Search page is mounted.
+           * Defaults to `/search`.
+           * @visibility frontend
+           */
+          mountPath?: string;
+          /**
+           * Specifies which query param is used in the virtual pageview URL.
+           * Defaults to `query`.
+           * @visibility frontend
+           */
+          queryParam?: string;
+        };
+
         /**
          * Whether or not to log analytics debug statements to the console.
          * Defaults to false.
diff --git a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
index c9c2a02c69..8dbf06ed0f 100644
--- a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
+++ b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
@@ -152,6 +152,99 @@ describe('GoogleAnalytics', () => {
       });
     });
 
+    it('captures virtual pageviews', () => {
+      const config = new ConfigReader({
+        app: {
+          analytics: {
+            ga: {
+              trackingId,
+              testMode: true,
+              virtualSearchPageView: { mode: 'only' },
+            },
+          },
+        },
+      });
+      const api = GoogleAnalytics.fromConfig(config);
+      api.captureEvent({
+        action: 'search',
+        subject: 'test search',
+        context,
+      });
+
+      const [command, data] = ReactGA.testModeAPI.calls[1];
+      expect(command).toBe('send');
+      expect(data).toMatchObject({
+        hitType: 'pageview',
+        page: '/search?query=test search',
+      });
+    });
+
+    it('captures virtual pageviews alongside search events', () => {
+      const config = new ConfigReader({
+        app: {
+          analytics: {
+            ga: {
+              trackingId,
+              testMode: true,
+              virtualSearchPageView: { mode: 'both' },
+            },
+          },
+        },
+      });
+      const api = GoogleAnalytics.fromConfig(config);
+      api.captureEvent({
+        action: 'search',
+        subject: 'test search',
+        context,
+      });
+
+      const [pageviewCommand, pageViewData] = ReactGA.testModeAPI.calls[1];
+      expect(pageviewCommand).toBe('send');
+      expect(pageViewData).toMatchObject({
+        hitType: 'pageview',
+        page: '/search?query=test search',
+      });
+      const [searchCommand, searchData] = ReactGA.testModeAPI.calls[2];
+      expect(searchCommand).toBe('send');
+      expect(searchData).toMatchObject({
+        hitType: 'event',
+        eventCategory: context.extension,
+        eventAction: 'search',
+        eventLabel: 'test search',
+      });
+    });
+
+    it('captures virtual pageviews on custom route with custom query param', () => {
+      const config = new ConfigReader({
+        app: {
+          analytics: {
+            ga: {
+              trackingId,
+              testMode: true,
+              virtualSearchPageView: {
+                mode: 'only',
+                mountPath: '/custom',
+                queryParam: 'term',
+              },
+            },
+          },
+        },
+      });
+      const api = GoogleAnalytics.fromConfig(config);
+      api.captureEvent({
+        action: 'search',
+        subject: 'test search',
+        context,
+      });
+
+      const [command, data] = ReactGA.testModeAPI.calls[1];
+      expect(command).toBe('send');
+      expect(data).toMatchObject({
+        hitType: 'pageview',
+        page: '/custom?term=test search',
+      });
+    });
+
     it('captures configured custom dimensions/metrics on events', () => {
       const api = GoogleAnalytics.fromConfig(advancedConfig);
 
diff --git a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts
index 498b118d0d..16e4807008 100644
--- a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts
+++ b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts
@@ -18,12 +18,16 @@ import ReactGA from 'react-ga';
 import {
   AnalyticsApi,
   AnalyticsContextValue,
-  AnalyticsEventAttributes,
   AnalyticsEvent,
+  AnalyticsEventAttributes,
   IdentityApi,
 } from '@backstage/core-plugin-api';
 import { Config } from '@backstage/config';
 import { DeferredCapture } from '../../../util';
+import {
+  parseVirtualSearchPageViewConfig,
+  VirtualSearchPageViewConfig,
+} from '../../../util/VirtualSearchPageView';
 
 type CustomDimensionOrMetricConfig = {
   type: 'dimension' | 'metric';
@@ -40,6 +44,7 @@ export class GoogleAnalytics implements AnalyticsApi {
   private readonly cdmConfig: CustomDimensionOrMetricConfig[];
   private customUserIdTransform?: (userEntityRef: string) => Promise<string>;
   private readonly capture: DeferredCapture;
+  private readonly virtualSearchPageView: VirtualSearchPageViewConfig;
 
   /**
    * Instantiate the implementation and initialize ReactGA.
@@ -51,6 +56,7 @@ export class GoogleAnalytics implements AnalyticsApi {
     identity: string;
     trackingId: string;
     scriptSrc?: string;
+    virtualSearchPageView: VirtualSearchPageViewConfig;
     testMode: boolean;
     debug: boolean;
   }) {
@@ -61,11 +67,13 @@ export class GoogleAnalytics implements AnalyticsApi {
       identityApi,
       userIdTransform = 'sha-256',
       scriptSrc,
+      virtualSearchPageView,
       testMode,
       debug,
     } = options;
 
     this.cdmConfig = cdmConfig;
+    this.virtualSearchPageView = virtualSearchPageView;
 
     // Initialize Google Analytics.
     ReactGA.initialize(trackingId, {
@@ -105,6 +113,9 @@ export class GoogleAnalytics implements AnalyticsApi {
     const scriptSrc = config.getOptionalString('app.analytics.ga.scriptSrc');
     const identity =
       config.getOptionalString('app.analytics.ga.identity') || 'disabled';
+    const virtualSearchPageView = parseVirtualSearchPageViewConfig(
+      config.getOptionalConfig('app.analytics.ga.virtualSearchPageView'),
+    );
     const debug = config.getOptionalBoolean('app.analytics.ga.debug') ?? false;
     const testMode =
       config.getOptionalBoolean('app.analytics.ga.testMode') ?? false;
@@ -134,6 +145,7 @@ export class GoogleAnalytics implements AnalyticsApi {
       identity,
       trackingId,
       scriptSrc,
+      virtualSearchPageView,
       cdmConfig,
       testMode,
       debug,
@@ -154,6 +166,17 @@ export class GoogleAnalytics implements AnalyticsApi {
       return;
     }
 
+    if (this.virtualSearchPageView.mode !== 'disabled' && action === 'search') {
+      const { mountPath, queryParam } = this.virtualSearchPageView;
+      this.capture.pageview(
+        `${mountPath}?${queryParam}=${subject}`,
+        customMetadata,
+      );
+      if (this.virtualSearchPageView.mode === 'only') {
+        return;
+      }
+    }
+
     this.capture.event({
       category: context.extension || 'App',
       action,
diff --git a/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts b/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts
new file mode 100644
index 0000000000..8da2eebca3
--- /dev/null
+++ b/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Config } from '@backstage/config';
+
+type VirtualSearchPageViewType = 'disabled' | 'only' | 'both';
+
+export type VirtualSearchPageViewConfig = {
+  mode: VirtualSearchPageViewType;
+  mountPath: string;
+  queryParam: string;
+};
+
+function isVirtualSearchPageViewType(
+  value: string | undefined,
+): value is VirtualSearchPageViewType {
+  return value === 'disabled' || value === 'only' || value === 'both';
+}
+
+export function parseVirtualSearchPageViewConfig(
+  config: Config | undefined,
+): VirtualSearchPageViewConfig {
+  const vspvModeString = config?.getOptionalString('mode');
+  return {
+    mode: isVirtualSearchPageViewType(vspvModeString)
+      ? vspvModeString
+      : 'disabled',
+    mountPath: config?.getOptionalString('mountPath') ?? '/search',
+    queryParam: config?.getOptionalString('queryParam') ?? 'query',
+  };
+}

From b7e918f3b8c2c644dbdb8e1133afe5c53ee0f4bc Mon Sep 17 00:00:00 2001
From: Nikita Karpukhin <nikita.karpukhin@scout24.com>
Date: Tue, 29 Nov 2022 11:30:12 +0100
Subject: [PATCH 12/82] Change version bump from minor to patch, link to
 README.md

Signed-off-by: Nikita Karpukhin <nikita.karpukhin@scout24.com>
---
 .changeset/selfish-lizards-invent.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.changeset/selfish-lizards-invent.md b/.changeset/selfish-lizards-invent.md
index 0eb9e110cf..fd486416d8 100644
--- a/.changeset/selfish-lizards-invent.md
+++ b/.changeset/selfish-lizards-invent.md
@@ -1,5 +1,6 @@
 ---
-'@backstage/plugin-analytics-module-ga': minor
+'@backstage/plugin-analytics-module-ga': patch
 ---
 
-Added support for sending virtual pageviews on `search` events
+Added support for sending virtual pageviews on `search` events in order to enable
+Site Search functionality in GA. For more information consult [README](/plugins/analytics-module-ga/README.md#enabling-site-search)

From 73ab069f5e3e1020f658d5a5d0b9f1558f6b0100 Mon Sep 17 00:00:00 2001
From: Connor Younglund <younglund_connor@bah.com>
Date: Tue, 29 Nov 2022 13:47:04 -0500
Subject: [PATCH 13/82] update Stack Overflow plugin to support API Access
 Token

Signed-off-by: Connor Younglund <younglund_connor@bah.com>
---
 plugins/stack-overflow-backend/README.md               |  1 +
 .../search/StackOverflowQuestionsCollatorFactory.ts    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/plugins/stack-overflow-backend/README.md b/plugins/stack-overflow-backend/README.md
index a35a6678cb..65fa50e062 100644
--- a/plugins/stack-overflow-backend/README.md
+++ b/plugins/stack-overflow-backend/README.md
@@ -23,6 +23,7 @@ If you have a private stack overflow instance you will need to supply an API key
 stackoverflow:
   baseUrl: https://api.stackexchange.com/2.2 # alternative: your internal stack overflow instance
   apiKey: $STACK_OVERFLOW_API_KEY
+  apiAccessToken: $STACK_OVERFLOW_API_ACCESS_TOKEN
 ```
 
 ## Areas of Responsibility
diff --git a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
index 1aa0e5d300..68aa83cdeb 100644
--- a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
+++ b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
@@ -52,6 +52,7 @@ export type StackOverflowQuestionsCollatorFactoryOptions = {
   baseUrl?: string;
   maxPage?: number;
   apiKey?: string;
+  apiAccessToken?: string;
   requestParams: StackOverflowQuestionsRequestParams;
   logger: Logger;
 };
@@ -67,6 +68,7 @@ export class StackOverflowQuestionsCollatorFactory
   protected requestParams: StackOverflowQuestionsRequestParams;
   private readonly baseUrl: string | undefined;
   private readonly apiKey: string | undefined;
+  private readonly apiAccessToken: string | undefined;
   private readonly maxPage: number | undefined;
   private readonly logger: Logger;
   public readonly type: string = 'stack-overflow';
@@ -74,6 +76,7 @@ export class StackOverflowQuestionsCollatorFactory
   private constructor(options: StackOverflowQuestionsCollatorFactoryOptions) {
     this.baseUrl = options.baseUrl;
     this.apiKey = options.apiKey;
+    this.apiAccessToken = options.apiAccessToken;
     this.maxPage = options.maxPage;
     this.requestParams = options.requestParams;
     this.logger = options.logger.child({ documentType: this.type });
@@ -84,6 +87,7 @@ export class StackOverflowQuestionsCollatorFactory
     options: StackOverflowQuestionsCollatorFactoryOptions,
   ) {
     const apiKey = config.getOptionalString('stackoverflow.apiKey');
+    const apiAccessToken = config.getOptionalString('stackoverflow.apiAccessToken');
     const baseUrl =
       config.getOptionalString('stackoverflow.baseUrl') ||
       'https://api.stackexchange.com/2.2';
@@ -93,6 +97,7 @@ export class StackOverflowQuestionsCollatorFactory
       baseUrl,
       maxPage,
       apiKey,
+      apiAccessToken,
     });
   }
 
@@ -138,6 +143,11 @@ export class StackOverflowQuestionsCollatorFactory
       }
       const res = await fetch(
         `${this.baseUrl}/questions${params}${apiKeyParam}&page=${page}`,
+        this.apiAccessToken ? {
+          headers: {
+            'X-API-Access-Token': this.apiAccessToken,
+          },
+        } : undefined,
       );
 
       const data = await res.json();

From fd0ca6f447ecfc58855d90c7a90682568662d57f Mon Sep 17 00:00:00 2001
From: Connor Younglund <younglund_connor@bah.com>
Date: Tue, 29 Nov 2022 13:58:51 -0500
Subject: [PATCH 14/82] add changeset

Signed-off-by: Connor Younglund <younglund_connor@bah.com>
---
 .changeset/short-turtles-dream.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/short-turtles-dream.md

diff --git a/.changeset/short-turtles-dream.md b/.changeset/short-turtles-dream.md
new file mode 100644
index 0000000000..9192f9137c
--- /dev/null
+++ b/.changeset/short-turtles-dream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-stack-overflow-backend': minor
+---
+
+Added option to supply API Access Token

From ea857549b53fb065ae5ab772fbde40e5f8b24d4a Mon Sep 17 00:00:00 2001
From: Connor Younglund <younglund_connor@bah.com>
Date: Tue, 29 Nov 2022 14:18:23 -0500
Subject: [PATCH 15/82] format with Prettier

Signed-off-by: Connor Younglund <younglund_connor@bah.com>
---
 .../StackOverflowQuestionsCollatorFactory.ts     | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
index 68aa83cdeb..ebbad99d0a 100644
--- a/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
+++ b/plugins/stack-overflow-backend/src/search/StackOverflowQuestionsCollatorFactory.ts
@@ -87,7 +87,9 @@ export class StackOverflowQuestionsCollatorFactory
     options: StackOverflowQuestionsCollatorFactoryOptions,
   ) {
     const apiKey = config.getOptionalString('stackoverflow.apiKey');
-    const apiAccessToken = config.getOptionalString('stackoverflow.apiAccessToken');
+    const apiAccessToken = config.getOptionalString(
+      'stackoverflow.apiAccessToken',
+    );
     const baseUrl =
       config.getOptionalString('stackoverflow.baseUrl') ||
       'https://api.stackexchange.com/2.2';
@@ -143,11 +145,13 @@ export class StackOverflowQuestionsCollatorFactory
       }
       const res = await fetch(
         `${this.baseUrl}/questions${params}${apiKeyParam}&page=${page}`,
-        this.apiAccessToken ? {
-          headers: {
-            'X-API-Access-Token': this.apiAccessToken,
-          },
-        } : undefined,
+        this.apiAccessToken
+          ? {
+              headers: {
+                'X-API-Access-Token': this.apiAccessToken,
+              },
+            }
+          : undefined,
       );
 
       const data = await res.json();

From 6756292c2499ea6de1f96dffba442c056120bd92 Mon Sep 17 00:00:00 2001
From: Connor Younglund <younglund_connor@bah.com>
Date: Tue, 29 Nov 2022 14:52:42 -0500
Subject: [PATCH 16/82] generate updated api-report.md

Signed-off-by: Connor Younglund <younglund_connor@bah.com>
---
 plugins/stack-overflow-backend/api-report.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/stack-overflow-backend/api-report.md b/plugins/stack-overflow-backend/api-report.md
index 11bfbaadc9..f6c7530de9 100644
--- a/plugins/stack-overflow-backend/api-report.md
+++ b/plugins/stack-overflow-backend/api-report.md
@@ -43,6 +43,7 @@ export type StackOverflowQuestionsCollatorFactoryOptions = {
   baseUrl?: string;
   maxPage?: number;
   apiKey?: string;
+  apiAccessToken?: string;
   requestParams: StackOverflowQuestionsRequestParams;
   logger: Logger;
 };

From da94f4f1a58cf6ab86dbb7d39c41aaa2d36cb9a0 Mon Sep 17 00:00:00 2001
From: tonedef <kobylk@gmail.com>
Date: Tue, 29 Nov 2022 20:28:59 -0800
Subject: [PATCH 17/82] rm FULLTEXT, change value to string, add next_update_at

Signed-off-by: tonedef <kobylk@gmail.com>
---
 .../migrations/20200807120600_entitySearch.js              | 2 +-
 .../migrations/20201007201501_index_entity_search.js       | 7 ++-----
 .../catalog-backend/src/service/DefaultEntitiesCatalog.ts  | 6 +++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/catalog-backend/migrations/20200807120600_entitySearch.js b/plugins/catalog-backend/migrations/20200807120600_entitySearch.js
index 9c7d966087..5acfbeb9ba 100644
--- a/plugins/catalog-backend/migrations/20200807120600_entitySearch.js
+++ b/plugins/catalog-backend/migrations/20200807120600_entitySearch.js
@@ -23,7 +23,7 @@ exports.up = async function up(knex) {
   // Sqlite does not support alter column.
   if (!knex.client.config.client.includes('sqlite3')) {
     await knex.schema.alterTable('entities_search', table => {
-      table.text('value').nullable().alter({ alterType: true });
+      table.string('value').nullable().alter({ alterType: true });
     });
   }
 };
diff --git a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
index ea26067a06..59fd34b700 100644
--- a/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
+++ b/plugins/catalog-backend/migrations/20201007201501_index_entity_search.js
@@ -21,11 +21,8 @@
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('entities_search', table => {
-    const options = knex.client.config.client.includes('mysql')
-      ? { indexType: 'FULLTEXT' }
-      : {};
-    table.index(['key'], 'entities_search_key', options);
-    table.index(['value'], 'entities_search_value', options);
+    table.index(['key'], 'entities_search_key');
+    table.index(['value'], 'entities_search_value');
   });
 };
 
diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index 90e40377f2..4c31f10d1f 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -267,7 +267,10 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
             .select('refresh_state_references.source_entity_ref');
         });
       await this.database<DbRefreshStateRow>('refresh_state')
-        .update({ result_hash: 'child-was-deleted' })
+        .update({
+          result_hash: 'child-was-deleted',
+          next_update_at: this.database.fn.now(),
+        })
         .whereIn(
           'entity_id',
           results.map(key => key.entity_id),
@@ -276,6 +279,7 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
       await this.database<DbRefreshStateRow>('refresh_state')
         .update({
           result_hash: 'child-was-deleted',
+          next_update_at: this.database.fn.now(),
         })
         .whereIn('entity_ref', function parents(builder) {
           return builder

From 623fd9aff9f1713fd5ebf09069cbfd5cfc84b1bf Mon Sep 17 00:00:00 2001
From: Nikita Karpukhin <nikita.karpukhin@scout24.com>
Date: Wed, 30 Nov 2022 09:18:49 +0100
Subject: [PATCH 18/82] add check for calls length

Signed-off-by: Nikita Karpukhin <nikita.karpukhin@scout24.com>
---
 .../apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
index 8dbf06ed0f..072b155adc 100644
--- a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
+++ b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
@@ -152,7 +152,7 @@ describe('GoogleAnalytics', () => {
       });
     });
 
-    it('captures virtual pageviews', () => {
+    it('captures virtual pageviews instead of search events', () => {
       const config = new ConfigReader({
         app: {
           analytics: {
@@ -177,6 +177,7 @@ describe('GoogleAnalytics', () => {
         hitType: 'pageview',
         page: '/search?query=test search',
       });
+      expect(ReactGA.testModeAPI.calls).toHaveLength(2);
     });
 
     it('captures virtual pageviews alongside search events', () => {

From 97070957add59dd9a6552f24b0956801aa599e5d Mon Sep 17 00:00:00 2001
From: Nikita Karpukhin <nikita.karpukhin@scout24.com>
Date: Wed, 30 Nov 2022 11:26:47 +0100
Subject: [PATCH 19/82] add support for search category

Signed-off-by: Nikita Karpukhin <nikita.karpukhin@scout24.com>
---
 plugins/analytics-module-ga/README.md                | 10 ++++++----
 plugins/analytics-module-ga/config.d.ts              | 10 ++++++++--
 .../AnalyticsApi/GoogleAnalytics.test.ts             | 12 +++++++-----
 .../implementations/AnalyticsApi/GoogleAnalytics.ts  | 10 ++++++++--
 .../src/util/VirtualSearchPageView.ts                |  6 ++++--
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/plugins/analytics-module-ga/README.md b/plugins/analytics-module-ga/README.md
index 605044f37c..c2d79aa45d 100644
--- a/plugins/analytics-module-ga/README.md
+++ b/plugins/analytics-module-ga/README.md
@@ -181,7 +181,8 @@ app:
       virtualSearchPageView:
         mode: only # Defaults to 'disabled'
         mountPath: /virtual-search # Defaults to '/search'
-        queryParam: term # Defaults to 'query'
+        searchQuery: term # Defaults to 'query'
+        categoryQuery: sc # Omitted by default
 ```
 
 Available `mode`s are:
@@ -190,9 +191,10 @@ Available `mode`s are:
 - `only` - sends virtual pageviews _instead_ of `search` events
 - `both` - sends both virtual pageviews _and_ `search` events
 
-Virtual pageviews will be sent to the path specified in the `mountPath`, and the search term will be
-set as the value for query parameter `queryParam`, e.g. the example config above will result in
-virtual pageviews being sent to `/virtual-search?term=SearchTermHere`.
+Virtual pageviews will be sent to the path specified in the `mountPath`, the search term will be
+set as the value for query parameter `searchQuery` and category (if provided) will be set as the value for
+query parameter `categoryQuery`, e.g. the example config above will result in
+virtual pageviews being sent to `/virtual-search?term=SearchTermHere&sc=CategoryHere`.
 
 ### Debugging and Testing
 
diff --git a/plugins/analytics-module-ga/config.d.ts b/plugins/analytics-module-ga/config.d.ts
index bf9c3b304b..188727bf93 100644
--- a/plugins/analytics-module-ga/config.d.ts
+++ b/plugins/analytics-module-ga/config.d.ts
@@ -72,11 +72,17 @@ export interface Config {
            */
           mountPath?: string;
           /**
-           * Specifies which query param is used in the virtual pageview URL.
+           * Specifies which query param is used for the term query in the virtual pageview URL.
            * Defaults to `query`.
            * @visibility frontend
            */
-          queryParam?: string;
+          searchQuery?: string;
+          /**
+           * Specifies which query param is used for the category query in the virtual pageview URL.
+           * Skipped by default.
+           * @visibility frontend
+           */
+          categoryQuery?: string;
         };
 
         /**
diff --git a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
index 072b155adc..65e9256aa8 100644
--- a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
+++ b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.test.ts
@@ -25,6 +25,7 @@ describe('GoogleAnalytics', () => {
     pluginId: 'some-plugin',
     routeRef: 'unknown',
     releaseNum: 1337,
+    searchTypes: 'test category',
   };
   const trackingId = 'UA-000000-0';
   const basicValidConfig = new ConfigReader({
@@ -175,7 +176,7 @@ describe('GoogleAnalytics', () => {
       expect(command).toBe('send');
       expect(data).toMatchObject({
         hitType: 'pageview',
-        page: '/search?query=test search',
+        page: '/search?query=test+search',
       });
       expect(ReactGA.testModeAPI.calls).toHaveLength(2);
     });
@@ -203,7 +204,7 @@ describe('GoogleAnalytics', () => {
       expect(pageviewCommand).toBe('send');
       expect(pageViewData).toMatchObject({
         hitType: 'pageview',
-        page: '/search?query=test search',
+        page: '/search?query=test+search',
       });
       const [searchCommand, searchData] = ReactGA.testModeAPI.calls[2];
       expect(searchCommand).toBe('send');
@@ -215,7 +216,7 @@ describe('GoogleAnalytics', () => {
       });
     });
 
-    it('captures virtual pageviews on custom route with custom query param', () => {
+    it('captures virtual pageviews on custom route with custom search query and custom category', () => {
       const config = new ConfigReader({
         app: {
           analytics: {
@@ -225,7 +226,8 @@ describe('GoogleAnalytics', () => {
               virtualSearchPageView: {
                 mode: 'only',
                 mountPath: '/custom',
-                queryParam: 'term',
+                searchQuery: 'term',
+                categoryQuery: 'sc',
               },
             },
           },
@@ -242,7 +244,7 @@ describe('GoogleAnalytics', () => {
       expect(command).toBe('send');
       expect(data).toMatchObject({
         hitType: 'pageview',
-        page: '/custom?term=test search',
+        page: '/custom?term=test+search&sc=test+category',
       });
     });
 
diff --git a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts
index 16e4807008..17c5b26be1 100644
--- a/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts
+++ b/plugins/analytics-module-ga/src/apis/implementations/AnalyticsApi/GoogleAnalytics.ts
@@ -167,9 +167,15 @@ export class GoogleAnalytics implements AnalyticsApi {
     }
 
     if (this.virtualSearchPageView.mode !== 'disabled' && action === 'search') {
-      const { mountPath, queryParam } = this.virtualSearchPageView;
+      const { mountPath, searchQuery, categoryQuery } =
+        this.virtualSearchPageView;
+      const params = new URLSearchParams();
+      params.set(searchQuery, subject);
+      if (categoryQuery) {
+        params.set(categoryQuery, context.searchTypes?.toString() ?? '');
+      }
       this.capture.pageview(
-        `${mountPath}?${queryParam}=${subject}`,
+        `${mountPath}?${params.toString()}`,
         customMetadata,
       );
       if (this.virtualSearchPageView.mode === 'only') {
diff --git a/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts b/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts
index 8da2eebca3..bb3d40afd3 100644
--- a/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts
+++ b/plugins/analytics-module-ga/src/util/VirtualSearchPageView.ts
@@ -20,7 +20,8 @@ type VirtualSearchPageViewType = 'disabled' | 'only' | 'both';
 export type VirtualSearchPageViewConfig = {
   mode: VirtualSearchPageViewType;
   mountPath: string;
-  queryParam: string;
+  searchQuery: string;
+  categoryQuery?: string;
 };
 
 function isVirtualSearchPageViewType(
@@ -38,6 +39,7 @@ export function parseVirtualSearchPageViewConfig(
       ? vspvModeString
       : 'disabled',
     mountPath: config?.getOptionalString('mountPath') ?? '/search',
-    queryParam: config?.getOptionalString('queryParam') ?? 'query',
+    searchQuery: config?.getOptionalString('searchQuery') ?? 'query',
+    categoryQuery: config?.getOptionalString('categoryQuery'),
   };
 }

From 0675bb636d6b1987e0a8495e2b3e2315eb421233 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 12:26:37 +0000
Subject: [PATCH 20/82] Update dependency @swc/core to v1.3.21

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 storybook/yarn.lock | 86 ++++++++++++++++++++++-----------------------
 yarn.lock           | 86 ++++++++++++++++++++++-----------------------
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 29f94941ef..5867c2fb08 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -2966,90 +2966,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-darwin-arm64@npm:1.3.20"
+"@swc/core-darwin-arm64@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-darwin-arm64@npm:1.3.21"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-darwin-x64@npm:1.3.20"
+"@swc/core-darwin-x64@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-darwin-x64@npm:1.3.21"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.20"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.21"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.20"
+"@swc/core-linux-arm64-gnu@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.21"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.20"
+"@swc/core-linux-arm64-musl@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.21"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.20"
+"@swc/core-linux-x64-gnu@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.21"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.20"
+"@swc/core-linux-x64-musl@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.21"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.20"
+"@swc/core-win32-arm64-msvc@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.21"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.20"
+"@swc/core-win32-ia32-msvc@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.21"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.20"
+"@swc/core-win32-x64-msvc@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.21"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.9":
-  version: 1.3.20
-  resolution: "@swc/core@npm:1.3.20"
+  version: 1.3.21
+  resolution: "@swc/core@npm:1.3.21"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.20
-    "@swc/core-darwin-x64": 1.3.20
-    "@swc/core-linux-arm-gnueabihf": 1.3.20
-    "@swc/core-linux-arm64-gnu": 1.3.20
-    "@swc/core-linux-arm64-musl": 1.3.20
-    "@swc/core-linux-x64-gnu": 1.3.20
-    "@swc/core-linux-x64-musl": 1.3.20
-    "@swc/core-win32-arm64-msvc": 1.3.20
-    "@swc/core-win32-ia32-msvc": 1.3.20
-    "@swc/core-win32-x64-msvc": 1.3.20
+    "@swc/core-darwin-arm64": 1.3.21
+    "@swc/core-darwin-x64": 1.3.21
+    "@swc/core-linux-arm-gnueabihf": 1.3.21
+    "@swc/core-linux-arm64-gnu": 1.3.21
+    "@swc/core-linux-arm64-musl": 1.3.21
+    "@swc/core-linux-x64-gnu": 1.3.21
+    "@swc/core-linux-x64-musl": 1.3.21
+    "@swc/core-win32-arm64-msvc": 1.3.21
+    "@swc/core-win32-ia32-msvc": 1.3.21
+    "@swc/core-win32-x64-msvc": 1.3.21
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -3073,7 +3073,7 @@ __metadata:
       optional: true
   bin:
     swcx: run_swcx.js
-  checksum: 646c37e3521f04cd08061ab67a4388959e4b234c38eba2eb9fe0fd615dedb6ff9412264789e58af7c2d24b3e5a7ea456efd060e3760d7a91509234b5b5983ad7
+  checksum: c66cd9320c595c68b87c8d90dc9a978099dd25a84c5e9795a8c7fec95fecdd8481da82076a828880a226ad2c0e57155c0a2b97768e99dee042a74182056bda46
   languageName: node
   linkType: hard
 
diff --git a/yarn.lock b/yarn.lock
index 340f5edf7e..fd63e0dc7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13121,90 +13121,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-darwin-arm64@npm:1.3.20"
+"@swc/core-darwin-arm64@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-darwin-arm64@npm:1.3.21"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-darwin-x64@npm:1.3.20"
+"@swc/core-darwin-x64@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-darwin-x64@npm:1.3.21"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.20"
+"@swc/core-linux-arm-gnueabihf@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.21"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.20"
+"@swc/core-linux-arm64-gnu@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.3.21"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-arm64-musl@npm:1.3.20"
+"@swc/core-linux-arm64-musl@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-arm64-musl@npm:1.3.21"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-x64-gnu@npm:1.3.20"
+"@swc/core-linux-x64-gnu@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-x64-gnu@npm:1.3.21"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-linux-x64-musl@npm:1.3.20"
+"@swc/core-linux-x64-musl@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-linux-x64-musl@npm:1.3.21"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.20"
+"@swc/core-win32-arm64-msvc@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.3.21"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.20"
+"@swc/core-win32-ia32-msvc@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.3.21"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.3.20":
-  version: 1.3.20
-  resolution: "@swc/core-win32-x64-msvc@npm:1.3.20"
+"@swc/core-win32-x64-msvc@npm:1.3.21":
+  version: 1.3.21
+  resolution: "@swc/core-win32-x64-msvc@npm:1.3.21"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
 "@swc/core@npm:^1.3.9":
-  version: 1.3.20
-  resolution: "@swc/core@npm:1.3.20"
+  version: 1.3.21
+  resolution: "@swc/core@npm:1.3.21"
   dependencies:
-    "@swc/core-darwin-arm64": 1.3.20
-    "@swc/core-darwin-x64": 1.3.20
-    "@swc/core-linux-arm-gnueabihf": 1.3.20
-    "@swc/core-linux-arm64-gnu": 1.3.20
-    "@swc/core-linux-arm64-musl": 1.3.20
-    "@swc/core-linux-x64-gnu": 1.3.20
-    "@swc/core-linux-x64-musl": 1.3.20
-    "@swc/core-win32-arm64-msvc": 1.3.20
-    "@swc/core-win32-ia32-msvc": 1.3.20
-    "@swc/core-win32-x64-msvc": 1.3.20
+    "@swc/core-darwin-arm64": 1.3.21
+    "@swc/core-darwin-x64": 1.3.21
+    "@swc/core-linux-arm-gnueabihf": 1.3.21
+    "@swc/core-linux-arm64-gnu": 1.3.21
+    "@swc/core-linux-arm64-musl": 1.3.21
+    "@swc/core-linux-x64-gnu": 1.3.21
+    "@swc/core-linux-x64-musl": 1.3.21
+    "@swc/core-win32-arm64-msvc": 1.3.21
+    "@swc/core-win32-ia32-msvc": 1.3.21
+    "@swc/core-win32-x64-msvc": 1.3.21
   dependenciesMeta:
     "@swc/core-darwin-arm64":
       optional: true
@@ -13228,7 +13228,7 @@ __metadata:
       optional: true
   bin:
     swcx: run_swcx.js
-  checksum: 646c37e3521f04cd08061ab67a4388959e4b234c38eba2eb9fe0fd615dedb6ff9412264789e58af7c2d24b3e5a7ea456efd060e3760d7a91509234b5b5983ad7
+  checksum: c66cd9320c595c68b87c8d90dc9a978099dd25a84c5e9795a8c7fec95fecdd8481da82076a828880a226ad2c0e57155c0a2b97768e99dee042a74182056bda46
   languageName: node
   linkType: hard
 

From 462c1d012e8e35bf86daefbe6f8850b4ea1b974f Mon Sep 17 00:00:00 2001
From: Luca Huettner <luca.huettner@gmail.com>
Date: Wed, 30 Nov 2022 15:11:25 +0100
Subject: [PATCH 21/82] refactor: Remove the header from the default catalog
 page

Signed-off-by: Luca Huettner <luca.huettner@gmail.com>
---
 .changeset/modern-camels-cheat.md             |  5 ++++
 .../CatalogKindHeader/CatalogKindHeader.tsx   |  5 +++-
 .../CatalogPage/DefaultCatalogPage.tsx        | 25 ++++++++-----------
 3 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/modern-camels-cheat.md

diff --git a/.changeset/modern-camels-cheat.md b/.changeset/modern-camels-cheat.md
new file mode 100644
index 0000000000..69c680b989
--- /dev/null
+++ b/.changeset/modern-camels-cheat.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+Remove `CatalogKindHeader` from `DefaultCatalogPage`. Deprecate `CatalogKindHeader`.
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index bb9e98d9c3..2cb8709c34 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -59,7 +59,10 @@ export interface CatalogKindHeaderProps {
   initialFilter?: string;
 }
 
-/** @public */
+/**
+ * @public
+ * @deprecated
+ */
 export function CatalogKindHeader(props: CatalogKindHeaderProps) {
   const { initialFilter = 'component', allowedKinds } = props;
   const classes = useStyles();
diff --git a/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.tsx b/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.tsx
index c5208c94f5..644453f5fb 100644
--- a/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.tsx
+++ b/plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.tsx
@@ -39,7 +39,6 @@ import {
 import React, { ReactNode } from 'react';
 import { createComponentRouteRef } from '../../routes';
 import { CatalogTable, CatalogTableRow } from '../CatalogTable';
-import { CatalogKindHeader } from '../CatalogKindHeader';
 import { useCatalogPluginOptions } from '../../options';
 
 /**
@@ -73,17 +72,15 @@ export function DefaultCatalogPage(props: DefaultCatalogPageProps) {
 
   return (
     <PageWithHeader title={`${orgName} Catalog`} themeId="home">
-      <EntityListProvider>
-        <Content>
-          <ContentHeader
-            titleComponent={<CatalogKindHeader initialFilter={initialKind} />}
-          >
-            <CreateButton
-              title={createButtonTitle}
-              to={createComponentLink && createComponentLink()}
-            />
-            <SupportButton>All your software catalog entities</SupportButton>
-          </ContentHeader>
+      <Content>
+        <ContentHeader title="">
+          <CreateButton
+            title={createButtonTitle}
+            to={createComponentLink && createComponentLink()}
+          />
+          <SupportButton>All your software catalog entities</SupportButton>
+        </ContentHeader>
+        <EntityListProvider>
           <CatalogFilterLayout>
             <CatalogFilterLayout.Filters>
               <EntityKindPicker initialFilter={initialKind} />
@@ -103,8 +100,8 @@ export function DefaultCatalogPage(props: DefaultCatalogPageProps) {
               />
             </CatalogFilterLayout.Content>
           </CatalogFilterLayout>
-        </Content>
-      </EntityListProvider>
+        </EntityListProvider>
+      </Content>
     </PageWithHeader>
   );
 }

From 45eb4d23cf04addaf21364bcb4a4615c27fe9d48 Mon Sep 17 00:00:00 2001
From: Eric Peterson <ericpeterson@spotify.com>
Date: Wed, 30 Nov 2022 15:27:08 +0100
Subject: [PATCH 22/82] Be persistent in attempting to clean up indices on
 error

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>
---
 .changeset/search-lieutenant-dangle.md        |  5 ++
 .../engines/ElasticSearchSearchEngine.test.ts | 30 +++++++-----
 .../src/engines/ElasticSearchSearchEngine.ts  | 46 ++++++++++++++-----
 3 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 .changeset/search-lieutenant-dangle.md

diff --git a/.changeset/search-lieutenant-dangle.md b/.changeset/search-lieutenant-dangle.md
new file mode 100644
index 0000000000..75f1bca915
--- /dev/null
+++ b/.changeset/search-lieutenant-dangle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+---
+
+Fixed a bug that prevented indices from being cleaned up under some circumstances, which could have led to shard exhaustion.
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
index 3a237664a8..602a158b98 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.test.ts
@@ -68,6 +68,14 @@ const customIndexTemplate = {
   },
 };
 
+const advanceTimersByNTimes = async (n = 1, time = 1000) => {
+  for (let i = 0; i < n; i++) {
+    await Promise.resolve();
+    jest.advanceTimersByTime(time);
+    await Promise.resolve();
+  }
+};
+
 describe('ElasticSearchSearchEngine', () => {
   let testSearchEngine: ElasticSearchSearchEngine;
   let inspectableSearchEngine: ElasticSearchSearchEngineForTranslatorTests;
@@ -855,35 +863,33 @@ describe('ElasticSearchSearchEngine', () => {
       });
 
       it('should check for and delete expected index', async () => {
-        const existsSpy = jest.fn().mockReturnValue('truthy value');
         const deleteSpy = jest.fn().mockReturnValue({});
-        mock.add({ method: 'HEAD', path: '/expected-index-name' }, existsSpy);
         mock.add({ method: 'DELETE', path: '/expected-index-name' }, deleteSpy);
 
         await errorHandler(error);
 
         // Check and delete HTTP requests were made.
-        expect(existsSpy).toHaveBeenCalled();
         expect(deleteSpy).toHaveBeenCalled();
       });
 
-      it('should not delete index if none exists', async () => {
-        // Exists call returns 404 on no index.
-        const existsSpy = jest.fn().mockReturnValue(
+      it('should retry delete index up to 5 times', async () => {
+        // Delete call returns 404
+        const deleteSpy = jest.fn().mockReturnValue(
           new errors.ResponseError({
             statusCode: 404,
             body: { status: 404 },
           } as unknown as any),
         );
-        const deleteSpy = jest.fn().mockReturnValue({});
-        mock.add({ method: 'HEAD', path: '/expected-index-name' }, existsSpy);
         mock.add({ method: 'DELETE', path: '/expected-index-name' }, deleteSpy);
 
-        await errorHandler(error);
+        // Call the error handler and advance timers
+        jest.useFakeTimers();
+        errorHandler(error);
+        await advanceTimersByNTimes(10);
+        jest.useRealTimers();
 
-        // Check request was made, but no delete request was made.
-        expect(existsSpy).toHaveBeenCalled();
-        expect(deleteSpy).not.toHaveBeenCalled();
+        // Check request was made 5 times
+        expect(deleteSpy).toHaveBeenCalledTimes(5);
       });
     });
   });
diff --git a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
index 72bab5b3b6..f3db46956d 100644
--- a/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
+++ b/plugins/search-backend-module-elasticsearch/src/engines/ElasticSearchSearchEngine.ts
@@ -266,19 +266,41 @@ export class ElasticSearchSearchEngine implements SearchEngine {
     // Attempt cleanup upon failure.
     indexer.on('error', async e => {
       this.logger.error(`Failed to index documents for type ${type}`, e);
-      try {
-        const response = await this.elasticSearchClientWrapper.indexExists({
-          index: indexer.indexName,
-        });
-        const indexCreated = response.body;
-        if (indexCreated) {
-          this.logger.info(`Removing created index ${indexer.indexName}`);
-          await this.elasticSearchClientWrapper.deleteIndex({
-            index: indexer.indexName,
-          });
+      let cleanupError: Error | undefined;
+
+      // In some cases, a failure may have occurred before the indexer was able
+      // to complete initialization. Try up to 5 times to remove the dangling
+      // index.
+      await new Promise<void>(async done => {
+        const maxAttempts = 5;
+        let attempts = 0;
+
+        while (attempts < maxAttempts) {
+          try {
+            await this.elasticSearchClientWrapper.deleteIndex({
+              index: indexer.indexName,
+            });
+
+            attempts = maxAttempts;
+            cleanupError = undefined;
+            done();
+          } catch (err) {
+            cleanupError = err;
+          }
+
+          // Wait 1 second between retries.
+          await new Promise(okay => setTimeout(okay, 1000));
+
+          attempts++;
         }
-      } catch (error) {
-        this.logger.error(`Unable to clean up elastic index: ${error}`);
+      });
+
+      if (cleanupError) {
+        this.logger.error(
+          `Unable to clean up elastic index ${indexer.indexName}: ${cleanupError}`,
+        );
+      } else {
+        this.logger.info(`Removed partial, failed index ${indexer.indexName}`);
       }
     });
 

From 38f9551faf433fe9e93404eeea32cfac28ea77d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 15:05:25 +0000
Subject: [PATCH 23/82] Update dependency yeoman-environment to v3.13.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fe21e797f9..441430dd19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -38654,8 +38654,8 @@ __metadata:
   linkType: hard
 
 "yeoman-environment@npm:^3.9.1":
-  version: 3.12.1
-  resolution: "yeoman-environment@npm:3.12.1"
+  version: 3.13.0
+  resolution: "yeoman-environment@npm:3.13.0"
   dependencies:
     "@npmcli/arborist": ^4.0.4
     are-we-there-yet: ^2.0.0
@@ -38698,7 +38698,7 @@ __metadata:
     mem-fs-editor: ^8.1.2 || ^9.0.0
   bin:
     yoe: cli/index.js
-  checksum: 71e777fcfa4baf26f9848265292447d7283f4bcb0e6b781018c8f8610c47c430e5a331eb0da03491621a7bcdd6ed40a2854c664a4f9f1ceb9ee111def37f52d1
+  checksum: 2d622d18d2e3fff179477b6dabbdee8b380d58b5d639d300c3ace75e0533223cecb9b325baaf0f46f71879eaa5778d64b11fa660403a26ec3086b2a428484ce6
   languageName: node
   linkType: hard
 

From 2e6d0a9558bb54475468f32912c2d9e46b3d8bb3 Mon Sep 17 00:00:00 2001
From: Luca Huettner <luca.huettner@gmail.com>
Date: Wed, 30 Nov 2022 16:17:38 +0100
Subject: [PATCH 24/82] chore: Update api report

Signed-off-by: Luca Huettner <luca.huettner@gmail.com>
---
 plugins/catalog/api-report.md                                   | 2 +-
 .../src/components/CatalogKindHeader/CatalogKindHeader.tsx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/catalog/api-report.md b/plugins/catalog/api-report.md
index 3f72df00e2..74f64882a8 100644
--- a/plugins/catalog/api-report.md
+++ b/plugins/catalog/api-report.md
@@ -73,7 +73,7 @@ export const CatalogEntityPage: () => JSX.Element;
 // @public (undocumented)
 export const CatalogIndexPage: (props: DefaultCatalogPageProps) => JSX.Element;
 
-// @public (undocumented)
+// @public @deprecated (undocumented)
 export function CatalogKindHeader(props: CatalogKindHeaderProps): JSX.Element;
 
 // @public
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index 2cb8709c34..61a3c6fb4f 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -61,7 +61,7 @@ export interface CatalogKindHeaderProps {
 
 /**
  * @public
- * @deprecated
+ * @deprecated Might be removed in a future release.
  */
 export function CatalogKindHeader(props: CatalogKindHeaderProps) {
   const { initialFilter = 'component', allowedKinds } = props;

From 16b7c2fccda14a1de93d6c94de80be999513d37c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 18:33:59 +0000
Subject: [PATCH 25/82] Update dependency @rollup/plugin-yaml to v4

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 .changeset/renovate-bf8dfb3.md |  5 +++++
 packages/cli/package.json      |  2 +-
 yarn.lock                      | 31 +++++++++++++++++--------------
 3 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/renovate-bf8dfb3.md

diff --git a/.changeset/renovate-bf8dfb3.md b/.changeset/renovate-bf8dfb3.md
new file mode 100644
index 0000000000..57cabf075b
--- /dev/null
+++ b/.changeset/renovate-bf8dfb3.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Updated dependency `@rollup/plugin-yaml` to `^4.0.0`.
diff --git a/packages/cli/package.json b/packages/cli/package.json
index eef838d8ca..ca2bdfb56c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -42,7 +42,7 @@
     "@rollup/plugin-commonjs": "^23.0.0",
     "@rollup/plugin-json": "^5.0.0",
     "@rollup/plugin-node-resolve": "^13.0.6",
-    "@rollup/plugin-yaml": "^3.1.0",
+    "@rollup/plugin-yaml": "^4.0.0",
     "@spotify/eslint-config-base": "^14.0.0",
     "@spotify/eslint-config-react": "^14.0.0",
     "@spotify/eslint-config-typescript": "^14.0.0",
diff --git a/yarn.lock b/yarn.lock
index 441430dd19..b38d765bd7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3613,7 +3613,7 @@ __metadata:
     "@rollup/plugin-commonjs": ^23.0.0
     "@rollup/plugin-json": ^5.0.0
     "@rollup/plugin-node-resolve": ^13.0.6
-    "@rollup/plugin-yaml": ^3.1.0
+    "@rollup/plugin-yaml": ^4.0.0
     "@spotify/eslint-config-base": ^14.0.0
     "@spotify/eslint-config-react": ^14.0.0
     "@spotify/eslint-config-typescript": ^14.0.0
@@ -12683,16 +12683,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/plugin-yaml@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@rollup/plugin-yaml@npm:3.1.0"
+"@rollup/plugin-yaml@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "@rollup/plugin-yaml@npm:4.0.1"
   dependencies:
-    "@rollup/pluginutils": ^3.1.0
-    js-yaml: ^3.14.0
-    tosource: ^1.0.0
+    "@rollup/pluginutils": ^5.0.1
+    js-yaml: ^4.1.0
+    tosource: ^2.0.0-alpha.3
   peerDependencies:
-    rollup: ^1.20.0 || ^2.0.0
-  checksum: be99aa097c480a24e6bedf85de2f8e21e287baf443155e7f2e765c939dda53f63cda674476f170b0397e3c69ce3bc825f0ad4041ac6fe25912480c27423e1b37
+    rollup: ^1.20.0||^2.0.0||^3.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: d48e248a9acd3110c889d745562e03e5a16e5861838c6b6d92701e59c0d4a24af374ee7bd81db0ab8e6d021cdb925c05bd7d30149e4e9a0fce4d899170a78857
   languageName: node
   linkType: hard
 
@@ -26263,7 +26266,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0, js-yaml@npm:^3.14.1, js-yaml@npm:^3.6.1, js-yaml@npm:^3.8.3":
+"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.1, js-yaml@npm:^3.6.1, js-yaml@npm:^3.8.3":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
@@ -36450,10 +36453,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tosource@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "tosource@npm:1.0.0"
-  checksum: 683fc64700484cd749b6eed461c2d105e251df7caf886484ff824bcf1249e365210d65c4f2ca3ced30baa34ea7912c656984e084aaada669920b44e2437c1c05
+"tosource@npm:^2.0.0-alpha.3":
+  version: 2.0.0-alpha.3
+  resolution: "tosource@npm:2.0.0-alpha.3"
+  checksum: bc03a7571de8ed4306e6721283fa891f2adcab9dd80c46f6f177d4259b34bb192fe3a2cb3e1e2ce16f9db0bc7e534acfcb5478ab094b0ba255f98abfce6dab46
   languageName: node
   linkType: hard
 

From 830687539f5f12bb1d7b124ff66c678c7e1e8f85 Mon Sep 17 00:00:00 2001
From: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
Date: Wed, 16 Nov 2022 14:12:38 -0500
Subject: [PATCH 26/82] feat: Apply component guidelines for
 @backstage/core-components for src/components

Signed-off-by: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
---
 .changeset/strong-peaches-melt.md             |  5 +++
 .../components/AlertDisplay/AlertDisplay.tsx  | 33 +++++++-------
 .../src/components/Avatar/Avatar.tsx          | 24 +++++++++--
 .../components/CodeSnippet/CodeSnippet.tsx    | 21 ++++-----
 .../DismissableBanner/DismissableBanner.tsx   |  2 +-
 .../MissingAnnotationEmptyState.tsx           | 17 ++++----
 .../FeatureCalloutCircular.tsx                | 21 ++++-----
 .../HeaderIconLinkRow/IconLinkVertical.tsx    | 17 +++++---
 .../HorizontalScrollGrid.tsx                  | 10 ++---
 .../src/components/Lifecycle/Lifecycle.tsx    | 15 ++++---
 .../src/components/Link/Link.tsx              | 13 +++---
 .../components/LogViewer/RealLogViewer.tsx    | 23 +++++-----
 .../src/components/Progress/Progress.tsx      | 16 ++++---
 .../src/components/ProgressBars/Gauge.tsx     | 15 ++++---
 .../src/components/ProgressBars/GaugeCard.tsx |  7 +--
 .../components/ProgressBars/LinearGauge.tsx   | 13 +++---
 .../src/components/Select/Select.tsx          | 23 +++++-----
 .../Select/static/ClosedDropdown.tsx          |  4 +-
 .../Select/static/OpenedDropdown.tsx          |  4 +-
 .../SimpleStepper/SimpleStepperFooter.tsx     | 12 +++---
 .../SimpleStepper/SimpleStepperStep.tsx       | 10 +++--
 .../src/components/Status/Status.tsx          | 26 ++++++-----
 .../StructuredMetadataTable/MetadataTable.tsx | 20 +++++----
 .../StructuredMetadataTable.tsx               | 11 ++++-
 .../src/components/Table/Filters.tsx          | 23 +++++-----
 .../src/components/Table/SubvalueCell.tsx     | 10 ++---
 .../src/components/Table/Table.tsx            | 43 ++++++++++---------
 .../src/components/Tabs/TabBar.tsx            |  2 +-
 .../src/components/Tabs/TabIcon.tsx           |  6 +--
 .../src/components/Tabs/TabPanel.tsx          |  7 ++-
 .../src/components/Tabs/Tabs.tsx              | 13 +++---
 .../components/WarningPanel/WarningPanel.tsx  |  2 +-
 .../src/layout/ErrorPage/ErrorPage.tsx        |  2 +-
 .../src/layout/Sidebar/SidebarSubmenu.tsx     |  2 +-
 .../src/layout/Sidebar/SidebarSubmenuItem.tsx |  4 +-
 35 files changed, 271 insertions(+), 205 deletions(-)
 create mode 100644 .changeset/strong-peaches-melt.md

diff --git a/.changeset/strong-peaches-melt.md b/.changeset/strong-peaches-melt.md
new file mode 100644
index 0000000000..d866b8ba54
--- /dev/null
+++ b/.changeset/strong-peaches-melt.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Sync components in @backstage/core-components with the Component Design Guidelines
diff --git a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx
index c1f8f51db0..83c11647bb 100644
--- a/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx
+++ b/packages/core-components/src/components/AlertDisplay/AlertDisplay.tsx
@@ -13,14 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React, { useEffect, useState } from 'react';
-import Snackbar from '@material-ui/core/Snackbar';
+import { alertApiRef, AlertMessage, useApi } from '@backstage/core-plugin-api';
 import IconButton from '@material-ui/core/IconButton';
+import Snackbar from '@material-ui/core/Snackbar';
+import Typography from '@material-ui/core/Typography';
 import CloseIcon from '@material-ui/icons/Close';
 import { Alert } from '@material-ui/lab';
-import { AlertMessage, useApi, alertApiRef } from '@backstage/core-plugin-api';
 import pluralize from 'pluralize';
+import React, { useEffect, useState } from 'react';
+
+// TODO: improve on this and promote to a shared component for use by all apps.
+
+/** @public */
+export type AlertDisplayProps = {
+  anchorOrigin?: {
+    vertical: 'top' | 'bottom';
+    horizontal: 'left' | 'center' | 'right';
+  };
+};
 
 /**
  * Displays alerts from {@link @backstage/core-plugin-api#AlertApi}
@@ -30,17 +40,6 @@ import pluralize from 'pluralize';
  *
  * Shown as SnackBar at the center top of the page by default. Configurable with props.
  */
-
-// TODO: improve on this and promote to a shared component for use by all apps.
-
-export type AlertDisplayProps = {
-  anchorOrigin?: {
-    vertical: 'top' | 'bottom';
-    horizontal: 'left' | 'center' | 'right';
-  };
-};
-
-/** @public */
 export function AlertDisplay(props: AlertDisplayProps) {
   const [messages, setMessages] = useState<Array<AlertMessage>>([]);
   const alertApi = useApi(alertApiRef);
@@ -82,7 +81,7 @@ export function AlertDisplay(props: AlertDisplayProps) {
         }
         severity={firstMessage.severity}
       >
-        <span>
+        <Typography component="span">
           {String(firstMessage.message)}
           {messages.length > 1 && (
             <em>{` (${messages.length - 1} older ${pluralize(
@@ -90,7 +89,7 @@ export function AlertDisplay(props: AlertDisplayProps) {
               messages.length - 1,
             )})`}</em>
           )}
-        </span>
+        </Typography>
       </Alert>
     </Snackbar>
   );
diff --git a/packages/core-components/src/components/Avatar/Avatar.tsx b/packages/core-components/src/components/Avatar/Avatar.tsx
index af8dabf554..950f57668e 100644
--- a/packages/core-components/src/components/Avatar/Avatar.tsx
+++ b/packages/core-components/src/components/Avatar/Avatar.tsx
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { CSSProperties } from 'react';
-import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import MaterialAvatar from '@material-ui/core/Avatar';
+import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import React, { CSSProperties } from 'react';
+
 import { extractInitials, stringToColor } from './utils';
 
 /** @public */
@@ -28,6 +30,8 @@ const useStyles = makeStyles(
         width: '4rem',
         height: '4rem',
         color: '#fff',
+      },
+      avatarText: {
         fontWeight: theme.typography.fontWeightBold,
         letterSpacing: '1px',
         textTransform: 'uppercase',
@@ -68,6 +72,11 @@ export function Avatar(props: AvatarProps) {
   const { displayName, picture, customStyles } = props;
   const classes = useStyles();
   let styles = { ...customStyles };
+  const fontStyles = {
+    fontFamily: styles.fontFamily,
+    fontSize: styles.fontSize,
+    fontWeight: styles.fontWeight,
+  };
   // We only calculate the background color if there's not an avatar
   // picture. If there is a picture, it might have a transparent
   // background and we don't know whether the calculated background
@@ -85,7 +94,16 @@ export function Avatar(props: AvatarProps) {
       className={classes.avatar}
       style={styles}
     >
-      {displayName && extractInitials(displayName)}
+      {displayName && (
+        <Typography
+          variant="h6"
+          component="span"
+          className={classes.avatarText}
+          style={fontStyles}
+        >
+          {extractInitials(displayName)}
+        </Typography>
+      )}
     </MaterialAvatar>
   );
 }
diff --git a/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
index fd83797a88..cd6ad07a5c 100644
--- a/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
+++ b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
-import { useTheme } from '@material-ui/core/styles';
 import { BackstageTheme } from '@backstage/theme';
-import { CopyTextButton } from '../CopyTextButton';
-import type {} from 'react-syntax-highlighter';
-import { default as LightAsync } from 'react-syntax-highlighter/dist/esm/light-async';
+import Box from '@material-ui/core/Box';
+import { useTheme } from '@material-ui/core/styles';
+import React from 'react';
+import LightAsync from 'react-syntax-highlighter/dist/esm/light-async';
 import dark from 'react-syntax-highlighter/dist/esm/styles/hljs/dark';
 import docco from 'react-syntax-highlighter/dist/esm/styles/hljs/docco';
 
+import { CopyTextButton } from '../CopyTextButton';
+
+import type {} from 'react-syntax-highlighter';
 /**
  * Properties for {@link CodeSnippet}
  *
@@ -87,7 +88,7 @@ export function CodeSnippet(props: CodeSnippetProps) {
   const highlightColor = theme.palette.type === 'dark' ? '#256bf3' : '#e6ffed';
 
   return (
-    <div style={{ position: 'relative' }}>
+    <Box position="relative">
       <LightAsync
         customStyle={customStyle}
         language={language}
@@ -108,10 +109,10 @@ export function CodeSnippet(props: CodeSnippetProps) {
         {text}
       </LightAsync>
       {showCopyCodeButton && (
-        <div style={{ position: 'absolute', top: 0, right: 0 }}>
+        <Box position="absolute" top={0} right={0}>
           <CopyTextButton text={text} />
-        </div>
+        </Box>
       )}
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx
index 99113fcdb1..c18f9b605f 100644
--- a/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx
+++ b/packages/core-components/src/components/DismissableBanner/DismissableBanner.tsx
@@ -58,7 +58,7 @@ const useStyles = makeStyles(
       zIndex: 'unset',
     },
     icon: {
-      fontSize: 20,
+      fontSize: theme.typography.h6.fontSize,
     },
     content: {
       width: '100%',
diff --git a/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx b/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx
index 59596e6d2b..1910d6e7fd 100644
--- a/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx
+++ b/packages/core-components/src/components/EmptyState/MissingAnnotationEmptyState.tsx
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button';
-import Typography from '@material-ui/core/Typography';
 import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
+import Button from '@material-ui/core/Button';
+import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import React from 'react';
+
+import { CodeSnippet } from '../CodeSnippet';
 import { Link } from '../Link';
 import { EmptyState } from './EmptyState';
-import { CodeSnippet } from '../CodeSnippet';
 
 const COMPONENT_YAML_TEMPLATE = `apiVersion: backstage.io/v1alpha1
 kind: Component
@@ -109,7 +110,7 @@ export function MissingAnnotationEmptyState(props: Props) {
             Add the annotation to your component YAML as shown in the
             highlighted example below:
           </Typography>
-          <div className={classes.code}>
+          <Box className={classes.code}>
             <CodeSnippet
               text={generateComponentYaml(annotations)}
               language="yaml"
@@ -117,7 +118,7 @@ export function MissingAnnotationEmptyState(props: Props) {
               highlightedNumbers={generateLineNumbers(annotations.length)}
               customStyle={{ background: 'inherit', fontSize: '115%' }}
             />
-          </div>
+          </Box>
           <Button color="primary" component={Link} to={url}>
             Read more
           </Button>
diff --git a/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx b/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx
index cac3c8166b..b967ee0a9f 100644
--- a/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx
+++ b/packages/core-components/src/components/FeatureDiscovery/FeatureCalloutCircular.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import Box from '@material-ui/core/Box';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
 import { makeStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
@@ -26,6 +26,7 @@ import React, {
   useState,
 } from 'react';
 import { createPortal } from 'react-dom';
+
 import { usePortal } from './lib/usePortal';
 import { useShowCallout } from './lib/useShowCallout';
 
@@ -168,14 +169,14 @@ export function FeatureCalloutCircular(props: PropsWithChildren<Props>) {
 
   return (
     <>
-      <div className={classes.featureWrapper} ref={wrapperRef}>
+      <Box className={classes.featureWrapper} {...{ ref: wrapperRef }}>
         {children}
-      </div>
+      </Box>
       {createPortal(
-        <div className={classes.backdrop}>
+        <Box className={classes.backdrop}>
           <ClickAwayListener onClickAway={hide}>
             <>
-              <div
+              <Box
                 className={classes.dot}
                 data-testid="dot"
                 style={{
@@ -190,9 +191,9 @@ export function FeatureCalloutCircular(props: PropsWithChildren<Props>) {
                 role="button"
                 tabIndex={0}
               >
-                <div className={classes.pulseCircle} />
-              </div>
-              <div
+                <Box className={classes.pulseCircle} />
+              </Box>
+              <Box
                 className={classes.text}
                 data-testid="text"
                 style={{
@@ -205,10 +206,10 @@ export function FeatureCalloutCircular(props: PropsWithChildren<Props>) {
                   {title}
                 </Typography>
                 <Typography>{description}</Typography>
-              </div>
+              </Box>
             </>
           </ClickAwayListener>
-        </div>,
+        </Box>,
         portalElement,
       )}
     </>
diff --git a/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx b/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx
index f128455549..df03c0f3c6 100644
--- a/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx
+++ b/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx
@@ -18,6 +18,8 @@ import classnames from 'classnames';
 import { makeStyles } from '@material-ui/core/styles';
 import LinkIcon from '@material-ui/icons/Link';
 import { Link } from '../Link';
+import Box from '@material-ui/core/Box';
+import Typography from '@material-ui/core/Typography';
 
 export type IconLinkVerticalProps = {
   color?: 'primary' | 'secondary';
@@ -56,9 +58,8 @@ const useIconStyles = makeStyles(
       color: theme.palette.secondary.main,
     },
     label: {
-      fontSize: '0.7rem',
       textTransform: 'uppercase',
-      fontWeight: 600,
+      fontWeight: theme.typography.fontWeightBold,
       letterSpacing: 1.2,
     },
   }),
@@ -79,10 +80,12 @@ export function IconLinkVertical({
 
   if (disabled) {
     return (
-      <div title={title} className={classnames(classes.link, classes.disabled)}>
+      <Box title={title} className={classnames(classes.link, classes.disabled)}>
         {icon}
-        <span className={classes.label}>{label}</span>
-      </div>
+        <Typography variant="body2" component="span" className={classes.label}>
+          {label}
+        </Typography>
+      </Box>
     );
   }
 
@@ -94,7 +97,9 @@ export function IconLinkVertical({
       onClick={onClick}
     >
       {icon}
-      <span className={classes.label}>{label}</span>
+      <Typography variant="body2" component="span" className={classes.label}>
+        {label}
+      </Typography>
     </Link>
   );
 }
diff --git a/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
index 4ab49596fe..c4c9dadb78 100644
--- a/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
+++ b/packages/core-components/src/components/HorizontalScrollGrid/HorizontalScrollGrid.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import Box from '@material-ui/core/Box';
 import Grid from '@material-ui/core/Grid';
 import IconButton from '@material-ui/core/IconButton';
 import { makeStyles, Theme } from '@material-ui/core/styles';
@@ -227,7 +227,7 @@ export function HorizontalScrollGrid(props: PropsWithChildren<Props>) {
   };
 
   return (
-    <div {...otherProps} className={classes.root}>
+    <Box {...otherProps} className={classes.root}>
       <Grid
         container
         direction="row"
@@ -237,12 +237,12 @@ export function HorizontalScrollGrid(props: PropsWithChildren<Props>) {
       >
         {children}
       </Grid>
-      <div
+      <Box
         className={classNames(classes.fade, classes.fadeLeft, {
           [classes.fadeHidden]: scrollLeft === 0,
         })}
       />
-      <div
+      <Box
         className={classNames(classes.fade, classes.fadeRight, {
           [classes.fadeHidden]: scrollRight === 0,
         })}
@@ -265,6 +265,6 @@ export function HorizontalScrollGrid(props: PropsWithChildren<Props>) {
           <ChevronRightIcon />
         </IconButton>
       )}
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/components/Lifecycle/Lifecycle.tsx b/packages/core-components/src/components/Lifecycle/Lifecycle.tsx
index f553129927..f0bbeaa7bd 100644
--- a/packages/core-components/src/components/Lifecycle/Lifecycle.tsx
+++ b/packages/core-components/src/components/Lifecycle/Lifecycle.tsx
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
-import CSS from 'csstype';
 import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import CSS from 'csstype';
+import React from 'react';
 
 type Props = CSS.Properties & {
   shorthand?: boolean;
@@ -47,15 +47,16 @@ export function Lifecycle(props: Props) {
   const classes = useStyles(props);
   const { shorthand, alpha } = props;
   return shorthand ? (
-    <span
+    <Typography
+      component="span"
       className={classes[alpha ? 'alpha' : 'beta']}
       style={{ fontSize: '120%' }}
     >
       {alpha ? <>&alpha;</> : <>&beta;</>}
-    </span>
+    </Typography>
   ) : (
-    <span className={classes[alpha ? 'alpha' : 'beta']}>
+    <Typography component="span" className={classes[alpha ? 'alpha' : 'beta']}>
       {alpha ? 'Alpha' : 'Beta'}
-    </span>
+    </Typography>
   );
 }
diff --git a/packages/core-components/src/components/Link/Link.tsx b/packages/core-components/src/components/Link/Link.tsx
index dfa38be44e..440fcb811f 100644
--- a/packages/core-components/src/components/Link/Link.tsx
+++ b/packages/core-components/src/components/Link/Link.tsx
@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { configApiRef, useAnalytics, useApi } from '@backstage/core-plugin-api';
-import classnames from 'classnames';
 // eslint-disable-next-line no-restricted-imports
 import MaterialLink, {
   LinkProps as MaterialLinkProps,
 } from '@material-ui/core/Link';
 import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
+import classnames from 'classnames';
+import { trimEnd } from 'lodash';
 import React, { ElementType } from 'react';
 import {
+  createRoutesFromChildren,
   Link as RouterLink,
   LinkProps as RouterLinkProps,
+  Route,
 } from 'react-router-dom';
-import { trimEnd } from 'lodash';
-import { createRoutesFromChildren, Route } from 'react-router-dom';
 
 export function isReactRouterBeta(): boolean {
   const [obj] = createRoutesFromChildren(<Route index element={<div />} />);
@@ -161,7 +162,9 @@ export const Link = React.forwardRef<any, LinkProps>(
         className={classnames(classes.externalLink, props.className)}
       >
         {props.children}
-        <span className={classes.visuallyHidden}>, Opens in a new window</span>
+        <Typography component="span" className={classes.visuallyHidden}>
+          , Opens in a new window
+        </Typography>
       </MaterialLink>
     ) : (
       // Interact with React Router for internal links
diff --git a/packages/core-components/src/components/LogViewer/RealLogViewer.tsx b/packages/core-components/src/components/LogViewer/RealLogViewer.tsx
index ac66d7cdf5..59e0bea44b 100644
--- a/packages/core-components/src/components/LogViewer/RealLogViewer.tsx
+++ b/packages/core-components/src/components/LogViewer/RealLogViewer.tsx
@@ -13,18 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React, { useEffect, useMemo, useRef } from 'react';
-import { useLocation } from 'react-router-dom';
+import Box from '@material-ui/core/Box';
 import IconButton from '@material-ui/core/IconButton';
 import CopyIcon from '@material-ui/icons/FileCopy';
+import classnames from 'classnames';
+import React, { useEffect, useMemo, useRef } from 'react';
+import { useLocation } from 'react-router-dom';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { FixedSizeList } from 'react-window';
+
 import { AnsiProcessor } from './AnsiProcessor';
-import { HEADER_SIZE, useStyles } from './styles';
-import classnames from 'classnames';
 import { LogLine } from './LogLine';
 import { LogViewerControls } from './LogViewerControls';
+import { HEADER_SIZE, useStyles } from './styles';
 import { useLogViewerSearch } from './useLogViewerSearch';
 import { useLogViewerSelection } from './useLogViewerSelection';
 
@@ -69,10 +70,10 @@ export function RealLogViewer(props: RealLogViewerProps) {
   return (
     <AutoSizer>
       {({ height, width }) => (
-        <div style={{ width, height }} className={classes.root}>
-          <div className={classes.header}>
+        <Box style={{ width, height }} className={classes.root}>
+          <Box className={classes.header}>
             <LogViewerControls {...search} />
-          </div>
+          </Box>
           <FixedSizeList
             ref={listRef}
             className={classes.log}
@@ -86,7 +87,7 @@ export function RealLogViewer(props: RealLogViewerProps) {
               const line = data[index];
               const { lineNumber } = line;
               return (
-                <div
+                <Box
                   style={{ ...style }}
                   className={classnames(classes.line, {
                     [classes.lineSelected]: selection.isSelected(lineNumber),
@@ -122,11 +123,11 @@ export function RealLogViewer(props: RealLogViewerProps) {
                         : undefined
                     }
                   />
-                </div>
+                </Box>
               );
             }}
           </FixedSizeList>
-        </div>
+        </Box>
       )}
     </AutoSizer>
   );
diff --git a/packages/core-components/src/components/Progress/Progress.tsx b/packages/core-components/src/components/Progress/Progress.tsx
index f199c5640f..eb17b9eb25 100644
--- a/packages/core-components/src/components/Progress/Progress.tsx
+++ b/packages/core-components/src/components/Progress/Progress.tsx
@@ -13,23 +13,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React, { useState, useEffect, PropsWithChildren } from 'react';
+import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
 import LinearProgress, {
   LinearProgressProps,
 } from '@material-ui/core/LinearProgress';
+import { useTheme } from '@material-ui/core/styles';
+import React, { PropsWithChildren, useEffect, useState } from 'react';
 
 export function Progress(props: PropsWithChildren<LinearProgressProps>) {
+  const theme = useTheme<BackstageTheme>();
   const [isVisible, setIsVisible] = useState(false);
 
   useEffect(() => {
-    const handle = setTimeout(() => setIsVisible(true), 250);
+    const handle = setTimeout(
+      () => setIsVisible(true),
+      theme.transitions.duration.short,
+    );
     return () => clearTimeout(handle);
-  }, []);
+  }, [theme.transitions.duration.short]);
 
   return isVisible ? (
     <LinearProgress {...props} data-testid="progress" />
   ) : (
-    <div style={{ display: 'none' }} />
+    <Box display="none" />
   );
 }
diff --git a/packages/core-components/src/components/ProgressBars/Gauge.tsx b/packages/core-components/src/components/ProgressBars/Gauge.tsx
index 11f977b387..ca84a5f480 100644
--- a/packages/core-components/src/components/ProgressBars/Gauge.tsx
+++ b/packages/core-components/src/components/ProgressBars/Gauge.tsx
@@ -18,6 +18,7 @@ import { BackstagePalette, BackstageTheme } from '@backstage/theme';
 import { makeStyles, useTheme } from '@material-ui/core/styles';
 import { Circle } from 'rc-progress';
 import React, { ReactNode, useEffect, useState } from 'react';
+import Box from '@material-ui/core/Box';
 
 /** @public */
 export type GaugeClassKey =
@@ -38,8 +39,8 @@ const useStyles = makeStyles<BackstageTheme>(
       top: '50%',
       left: '50%',
       transform: 'translate(-50%, -60%)',
-      fontSize: 45,
-      fontWeight: 'bold',
+      fontSize: theme.typography.pxToRem(45),
+      fontWeight: theme.typography.fontWeightBold,
       color: theme.palette.textContrast,
     },
     description: {
@@ -152,7 +153,7 @@ export function Gauge(props: GaugeProps) {
   }, [description, hoverRef]);
 
   return (
-    <div ref={setHoverRef} className={classes.root}>
+    <Box {...{ ref: setHoverRef }} className={classes.root}>
       <Circle
         strokeLinecap="butt"
         percent={asPercentage}
@@ -162,12 +163,12 @@ export function Gauge(props: GaugeProps) {
         className={classes.circle}
       />
       {description && isHovering ? (
-        <div className={classes.description}>{description}</div>
+        <Box className={classes.description}>{description}</Box>
       ) : (
-        <div className={classes.overlay}>
+        <Box className={classes.overlay}>
           {isNaN(value) ? 'N/A' : `${asActual}${unit}`}
-        </div>
+        </Box>
       )}
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/components/ProgressBars/GaugeCard.tsx b/packages/core-components/src/components/ProgressBars/GaugeCard.tsx
index 1114890523..3442395380 100644
--- a/packages/core-components/src/components/ProgressBars/GaugeCard.tsx
+++ b/packages/core-components/src/components/ProgressBars/GaugeCard.tsx
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
 import React, { ReactNode } from 'react';
+
 import { BottomLinkProps } from '../../layout/BottomLink';
 import { InfoCard, InfoCardVariants } from '../../layout/InfoCard';
 import { Gauge, GaugePropsGetColor } from './Gauge';
@@ -74,7 +75,7 @@ export function GaugeCard(props: Props) {
   };
 
   return (
-    <div className={classes.root}>
+    <Box className={classes.root}>
       <InfoCard
         title={title}
         subheader={subheader}
@@ -84,6 +85,6 @@ export function GaugeCard(props: Props) {
       >
         <Gauge {...gaugeProps} />
       </InfoCard>
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/components/ProgressBars/LinearGauge.tsx b/packages/core-components/src/components/ProgressBars/LinearGauge.tsx
index 643c3ec2ac..5bfe1b7a61 100644
--- a/packages/core-components/src/components/ProgressBars/LinearGauge.tsx
+++ b/packages/core-components/src/components/ProgressBars/LinearGauge.tsx
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
+import { BackstageTheme } from '@backstage/theme';
 import { useTheme } from '@material-ui/core/styles';
 import Tooltip from '@material-ui/core/Tooltip';
+import Typography from '@material-ui/core/Typography';
 import { Line } from 'rc-progress';
-import { BackstageTheme } from '@backstage/theme';
-import { getProgressColor, GaugePropsGetColor } from './Gauge';
+import React from 'react';
+
+import { GaugePropsGetColor, getProgressColor } from './Gauge';
 
 type Props = {
   /**
@@ -47,14 +48,14 @@ export function LinearGauge(props: Props) {
   });
   return (
     <Tooltip title={`${percent}%`}>
-      <span>
+      <Typography component="span">
         <Line
           percent={percent}
           strokeWidth={4}
           trailWidth={4}
           strokeColor={strokeColor}
         />
-      </span>
+      </Typography>
     </Tooltip>
   );
 }
diff --git a/packages/core-components/src/components/Select/Select.tsx b/packages/core-components/src/components/Select/Select.tsx
index 7229f89653..9cb8822a05 100644
--- a/packages/core-components/src/components/Select/Select.tsx
+++ b/packages/core-components/src/components/Select/Select.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import Box from '@material-ui/core/Box';
 import Checkbox from '@material-ui/core/Checkbox';
 import Chip from '@material-ui/core/Chip';
 import ClickAwayListener from '@material-ui/core/ClickAwayListener';
@@ -30,6 +30,7 @@ import {
 } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import React, { useEffect, useState } from 'react';
+
 import ClosedDropdown from './static/ClosedDropdown';
 import OpenedDropdown from './static/OpenedDropdown';
 
@@ -45,17 +46,17 @@ const BootstrapInput = withStyles(
         },
       },
       input: {
-        borderRadius: 4,
+        borderRadius: theme.shape.borderRadius,
         position: 'relative',
         backgroundColor: theme.palette.background.paper,
         border: '1px solid #ced4da',
-        fontSize: 16,
-        padding: '10px 26px 10px 12px',
+        fontSize: theme.typography.body1.fontSize,
+        padding: theme.spacing(1.25, 3.25, 1.25, 1.5),
         transition: theme.transitions.create(['border-color', 'box-shadow']),
         fontFamily: 'Helvetica Neue',
         '&:focus': {
           background: theme.palette.background.paper,
-          borderRadius: 4,
+          borderRadius: theme.shape.borderRadius,
         },
       },
     }),
@@ -81,7 +82,7 @@ const useStyles = makeStyles(
       label: {
         transform: 'initial',
         fontWeight: 'bold',
-        fontSize: 14,
+        fontSize: theme.typography.body2.fontSize,
         fontFamily: theme.typography.fontFamily,
         color: theme.palette.text.primary,
         '&.Mui-focused': {
@@ -91,7 +92,7 @@ const useStyles = makeStyles(
       formLabel: {
         transform: 'initial',
         fontWeight: 'bold',
-        fontSize: 14,
+        fontSize: theme.typography.body2.fontSize,
         fontFamily: theme.typography.fontFamily,
         color: theme.palette.text.primary,
         '&.Mui-focused': {
@@ -196,7 +197,7 @@ export function SelectComponent(props: SelectProps) {
   };
 
   return (
-    <div className={classes.root}>
+    <Box className={classes.root}>
       <ClickAwayListener onClickAway={handleClickAway}>
         <FormControl className={classes.formControl}>
           <InputLabel className={classes.formLabel}>{label}</InputLabel>
@@ -217,7 +218,7 @@ export function SelectComponent(props: SelectProps) {
             tabIndex={0}
             renderValue={s =>
               multiple && (value as any[]).length !== 0 ? (
-                <div className={classes.chips}>
+                <Box className={classes.chips}>
                   {(s as string[]).map(selectedValue => (
                     <Chip
                       key={items.find(el => el.value === selectedValue)?.value}
@@ -229,7 +230,7 @@ export function SelectComponent(props: SelectProps) {
                       className={classes.chip}
                     />
                   ))}
-                </div>
+                </Box>
               ) : (
                 <Typography>
                   {(value as any[]).length === 0
@@ -279,6 +280,6 @@ export function SelectComponent(props: SelectProps) {
           </Select>
         </FormControl>
       </ClickAwayListener>
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/components/Select/static/ClosedDropdown.tsx b/packages/core-components/src/components/Select/static/ClosedDropdown.tsx
index 7b0516d017..812afe34eb 100644
--- a/packages/core-components/src/components/Select/static/ClosedDropdown.tsx
+++ b/packages/core-components/src/components/Select/static/ClosedDropdown.tsx
@@ -21,11 +21,11 @@ import SvgIcon from '@material-ui/core/SvgIcon';
 export type ClosedDropdownClassKey = 'icon';
 
 const useStyles = makeStyles(
-  () =>
+  theme =>
     createStyles({
       icon: {
         position: 'absolute',
-        right: '4px',
+        right: theme.spacing(0.5),
         pointerEvents: 'none',
       },
     }),
diff --git a/packages/core-components/src/components/Select/static/OpenedDropdown.tsx b/packages/core-components/src/components/Select/static/OpenedDropdown.tsx
index 617288ded6..b87a00c26a 100644
--- a/packages/core-components/src/components/Select/static/OpenedDropdown.tsx
+++ b/packages/core-components/src/components/Select/static/OpenedDropdown.tsx
@@ -20,11 +20,11 @@ import SvgIcon from '@material-ui/core/SvgIcon';
 export type OpenedDropdownClassKey = 'icon';
 
 const useStyles = makeStyles(
-  () =>
+  theme =>
     createStyles({
       icon: {
         position: 'absolute',
-        right: '4px',
+        right: theme.spacing(0.5),
         pointerEvents: 'none',
       },
     }),
diff --git a/packages/core-components/src/components/SimpleStepper/SimpleStepperFooter.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepperFooter.tsx
index 0f7d604eb0..224b66533a 100644
--- a/packages/core-components/src/components/SimpleStepper/SimpleStepperFooter.tsx
+++ b/packages/core-components/src/components/SimpleStepper/SimpleStepperFooter.tsx
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { useContext, ReactNode, PropsWithChildren } from 'react';
-import { makeStyles } from '@material-ui/core/styles';
+import Box from '@material-ui/core/Box';
 import Button from '@material-ui/core/Button';
-import { StepActions } from './types';
+import { makeStyles } from '@material-ui/core/styles';
+import React, { PropsWithChildren, ReactNode, useContext } from 'react';
+
 import { VerticalStepperContext } from './SimpleStepper';
+import { StepActions } from './types';
 
 export type SimpleStepperFooterClassKey = 'root';
 
@@ -145,7 +147,7 @@ export const SimpleStepperFooter = ({
   };
 
   return (
-    <div className={classes.root}>
+    <Box className={classes.root}>
       {[undefined, true].includes(actions.showBack) && stepIndex !== 0 && (
         <BackBtn
           text={actions.backText}
@@ -184,6 +186,6 @@ export const SimpleStepperFooter = ({
         />
       )}
       {children}
-    </div>
+    </Box>
   );
 };
diff --git a/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx b/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx
index bb46163105..911ad2e73e 100644
--- a/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx
+++ b/packages/core-components/src/components/SimpleStepper/SimpleStepperStep.tsx
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import React, { PropsWithChildren } from 'react';
-import { makeStyles } from '@material-ui/core/styles';
+import Box from '@material-ui/core/Box';
 import MuiStep from '@material-ui/core/Step';
 import StepContent from '@material-ui/core/StepContent';
 import StepLabel from '@material-ui/core/StepLabel';
+import { makeStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
+import React, { PropsWithChildren } from 'react';
+
 import { SimpleStepperFooter } from './SimpleStepperFooter';
 import { StepProps } from './types';
 
@@ -40,11 +42,11 @@ export function SimpleStepperStep(props: PropsWithChildren<StepProps>) {
   // The end step is not a part of the stepper
   // It simply is the final screen with an option to have buttons such as reset or back
   return end ? (
-    <div className={classes.end}>
+    <Box className={classes.end}>
       <Typography variant="h6">{title}</Typography>
       {children}
       <SimpleStepperFooter actions={{ ...(actions || {}), showNext: false }} />
-    </div>
+    </Box>
   ) : (
     <MuiStep {...muiProps}>
       <StepLabel>
diff --git a/packages/core-components/src/components/Status/Status.tsx b/packages/core-components/src/components/Status/Status.tsx
index a855fe3ebe..364193e383 100644
--- a/packages/core-components/src/components/Status/Status.tsx
+++ b/packages/core-components/src/components/Status/Status.tsx
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import { makeStyles } from '@material-ui/core/styles';
 import { BackstageTheme } from '@backstage/theme';
+import { makeStyles } from '@material-ui/core/styles';
+import Typography from '@material-ui/core/Typography';
 import classNames from 'classnames';
 import React, { PropsWithChildren } from 'react';
 
@@ -31,12 +31,12 @@ export type StatusClassKey =
 const useStyles = makeStyles<BackstageTheme>(
   theme => ({
     status: {
-      fontWeight: 500,
+      fontWeight: theme.typography.fontWeightMedium,
       '&::before': {
         width: '0.7em',
         height: '0.7em',
         display: 'inline-block',
-        marginRight: 8,
+        marginRight: theme.spacing(1),
         borderRadius: '50%',
         content: '""',
       },
@@ -78,7 +78,8 @@ const useStyles = makeStyles<BackstageTheme>(
 export function StatusOK(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
-    <span
+    <Typography
+      component="span"
       className={classNames(classes.status, classes.ok)}
       aria-label="Status ok"
       aria-hidden="true"
@@ -90,7 +91,8 @@ export function StatusOK(props: PropsWithChildren<{}>) {
 export function StatusWarning(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
-    <span
+    <Typography
+      component="span"
       className={classNames(classes.status, classes.warning)}
       aria-label="Status warning"
       aria-hidden="true"
@@ -102,7 +104,8 @@ export function StatusWarning(props: PropsWithChildren<{}>) {
 export function StatusError(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
-    <span
+    <Typography
+      component="span"
       className={classNames(classes.status, classes.error)}
       aria-label="Status error"
       aria-hidden="true"
@@ -114,7 +117,8 @@ export function StatusError(props: PropsWithChildren<{}>) {
 export function StatusPending(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
-    <span
+    <Typography
+      component="span"
       className={classNames(classes.status, classes.pending)}
       aria-label="Status pending"
       aria-hidden="true"
@@ -126,7 +130,8 @@ export function StatusPending(props: PropsWithChildren<{}>) {
 export function StatusRunning(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
-    <span
+    <Typography
+      component="span"
       className={classNames(classes.status, classes.running)}
       aria-label="Status running"
       aria-hidden="true"
@@ -138,7 +143,8 @@ export function StatusRunning(props: PropsWithChildren<{}>) {
 export function StatusAborted(props: PropsWithChildren<{}>) {
   const classes = useStyles(props);
   return (
-    <span
+    <Typography
+      component="span"
       className={classNames(classes.status, classes.aborted)}
       aria-label="Status aborted"
       aria-hidden="true"
diff --git a/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
index 2f5dc0b6b5..207354fe4b 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
@@ -13,25 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
+import List from '@material-ui/core/List';
+import ListItem from '@material-ui/core/ListItem';
 import {
-  withStyles,
   createStyles,
-  WithStyles,
   Theme,
+  WithStyles,
+  withStyles,
 } from '@material-ui/core/styles';
 import Table from '@material-ui/core/Table';
 import TableBody from '@material-ui/core/TableBody';
 import TableCell from '@material-ui/core/TableCell';
 import TableRow from '@material-ui/core/TableRow';
+import React from 'react';
 
 export type MetadataTableTitleCellClassKey = 'root';
 
 const tableTitleCellStyles = (theme: Theme) =>
   createStyles({
     root: {
-      fontWeight: 'bolder',
+      fontWeight: theme.typography.fontWeightBold,
       whiteSpace: 'nowrap',
       paddingRight: theme.spacing(4),
       border: '0',
@@ -53,9 +54,7 @@ export type MetadataTableListClassKey = 'root';
 const listStyles = (theme: Theme) =>
   createStyles({
     root: {
-      listStyle: 'none',
       margin: theme.spacing(0, 0, -1, 0),
-      padding: '0',
     },
   });
 
@@ -64,6 +63,7 @@ export type MetadataTableListItemClassKey = 'root' | 'random';
 const listItemStyles = (theme: Theme) =>
   createStyles({
     root: {
+      gutters: 0,
       padding: theme.spacing(0, 0, 1, 0),
     },
     random: {},
@@ -111,11 +111,13 @@ interface StyleProps extends WithStyles {
 export const MetadataList = withStyles(listStyles, {
   name: 'BackstageMetadataTableList',
 })(({ classes, children }: StyleProps) => (
-  <ul className={classes.root}>{children}</ul>
+  <List disablePadding className={classes.root}>
+    {children}
+  </List>
 ));
 
 export const MetadataListItem = withStyles(listItemStyles, {
   name: 'BackstageMetadataTableListItem',
 })(({ classes, children }: StyleProps) => (
-  <li className={classes.root}>{children}</li>
+  <ListItem className={classes.root}>{children}</ListItem>
 ));
diff --git a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
index 9ef7890820..6114054bbe 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
@@ -22,6 +22,7 @@ import {
   Theme,
 } from '@material-ui/core/styles';
 import startCase from 'lodash/startCase';
+import Typography from '@material-ui/core/Typography';
 
 import {
   MetadataTable,
@@ -88,7 +89,9 @@ function renderMap(
         : startCase(key);
     return (
       <MetadataListItem key={key}>
-        {`${fmtKey}: `}
+        <Typography variant="body2" component="span">
+          {`${fmtKey}: `}
+        </Typography>
         {value}
       </MetadataListItem>
     );
@@ -122,7 +125,11 @@ function toValue(
     return <Fragment>{value ? '✅' : '❌'}</Fragment>;
   }
 
-  return <Fragment>{value}</Fragment>;
+  return (
+    <Typography variant="body2" component="span">
+      {value}
+    </Typography>
+  );
 }
 const ItemValue = ({ value, options }: { value: any; options: any }) => (
   <Fragment>{toValue(value, options)}</Fragment>
diff --git a/packages/core-components/src/components/Table/Filters.tsx b/packages/core-components/src/components/Table/Filters.tsx
index 0f4143d442..24eaa98cb5 100644
--- a/packages/core-components/src/components/Table/Filters.tsx
+++ b/packages/core-components/src/components/Table/Filters.tsx
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React, { useEffect, useState } from 'react';
 import { BackstageTheme } from '@backstage/theme';
-import { makeStyles } from '@material-ui/core/styles';
+import Box from '@material-ui/core/Box';
 import Button from '@material-ui/core/Button';
+import { makeStyles } from '@material-ui/core/styles';
+import React, { useEffect, useState } from 'react';
+
 import { Select } from '../Select';
 import { SelectProps } from '../Select/Select';
 
@@ -39,7 +40,7 @@ const useFilterStyles = makeStyles<BackstageTheme>(
     header: {
       display: 'flex',
       alignItems: 'center',
-      height: '60px',
+      height: theme.spacing(7.5),
       justifyContent: 'space-between',
       borderBottom: `1px solid ${theme.palette.grey[500]}`,
     },
@@ -93,14 +94,14 @@ export const Filters = (props: Props) => {
 
   // As material table doesn't provide a way to add a column filter tab we will make our own filter logic
   return (
-    <div className={classes.root}>
-      <div className={classes.header}>
-        <div className={classes.value}>Filters</div>
+    <Box className={classes.root}>
+      <Box className={classes.header}>
+        <Box className={classes.value}>Filters</Box>
         <Button color="primary" onClick={handleClick}>
           Clear all
         </Button>
-      </div>
-      <div className={classes.filters}>
+      </Box>
+      <Box className={classes.filters}>
         {props.filters?.length &&
           props.filters.map(filter => (
             <Select
@@ -116,7 +117,7 @@ export const Filters = (props: Props) => {
               }
             />
           ))}
-      </div>
-    </div>
+      </Box>
+    </Box>
   );
 };
diff --git a/packages/core-components/src/components/Table/SubvalueCell.tsx b/packages/core-components/src/components/Table/SubvalueCell.tsx
index 2564e8e4eb..cc577b7456 100644
--- a/packages/core-components/src/components/Table/SubvalueCell.tsx
+++ b/packages/core-components/src/components/Table/SubvalueCell.tsx
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
 import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
+import React from 'react';
 
 export type SubvalueCellClassKey = 'value' | 'subvalue';
 
 const useSubvalueCellStyles = makeStyles<BackstageTheme>(
   theme => ({
     value: {
-      marginBottom: '6px',
+      marginBottom: theme.spacing(0.75),
     },
     subvalue: {
       color: theme.palette.textSubtle,
@@ -44,8 +44,8 @@ export function SubvalueCell(props: SubvalueCellProps) {
 
   return (
     <>
-      <div className={classes.value}>{value}</div>
-      <div className={classes.subvalue}>{subvalue}</div>
+      <Box className={classes.value}>{value}</Box>
+      <Box className={classes.subvalue}>{subvalue}</Box>
     </>
   );
 }
diff --git a/packages/core-components/src/components/Table/Table.tsx b/packages/core-components/src/components/Table/Table.tsx
index 81471324a0..c799402cbc 100644
--- a/packages/core-components/src/components/Table/Table.tsx
+++ b/packages/core-components/src/components/Table/Table.tsx
@@ -13,12 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { BackstageTheme } from '@backstage/theme';
-import { makeStyles, useTheme, withStyles } from '@material-ui/core/styles';
+import MTable, {
+  Column,
+  Icons,
+  MaterialTableProps,
+  MTableBody,
+  MTableHeader,
+  MTableToolbar,
+  Options,
+} from '@material-table/core';
+import Box from '@material-ui/core/Box';
 import IconButton from '@material-ui/core/IconButton';
+import { makeStyles, useTheme, withStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
-// Material-table is not using the standard icons available in in material-ui. https://github.com/mbrn/material-table/issues/51
 import AddBox from '@material-ui/icons/AddBox';
 import ArrowUpward from '@material-ui/icons/ArrowUpward';
 import Check from '@material-ui/icons/Check';
@@ -34,15 +42,6 @@ import Remove from '@material-ui/icons/Remove';
 import SaveAlt from '@material-ui/icons/SaveAlt';
 import ViewColumn from '@material-ui/icons/ViewColumn';
 import { isEqual, transform } from 'lodash';
-import MTable, {
-  Column,
-  Icons,
-  MaterialTableProps,
-  MTableBody,
-  MTableHeader,
-  MTableToolbar,
-  Options,
-} from '@material-table/core';
 import React, {
   forwardRef,
   MutableRefObject,
@@ -51,9 +50,11 @@ import React, {
   useEffect,
   useState,
 } from 'react';
+
 import { SelectProps } from '../Select/Select';
 import { Filter, Filters, SelectedFilters, Without } from './Filters';
 
+// Material-table is not using the standard icons available in in material-ui. https://github.com/mbrn/material-table/issues/51
 const tableIcons: Icons = {
   Add: forwardRef((props, ref) => <AddBox {...props} ref={ref} />),
   Check: forwardRef((props, ref) => <Check {...props} ref={ref} />),
@@ -122,7 +123,7 @@ const StyledMTableToolbar = withStyles(
     },
     title: {
       '& > h6': {
-        fontWeight: 'bold',
+        fontWeight: theme.typography.fontWeightBold,
       },
     },
     searchField: {
@@ -136,14 +137,14 @@ const StyledMTableToolbar = withStyles(
 export type FiltersContainerClassKey = 'root' | 'title';
 
 const useFilterStyles = makeStyles<BackstageTheme>(
-  () => ({
+  theme => ({
     root: {
       display: 'flex',
       alignItems: 'center',
       justifyContent: 'space-between',
     },
     title: {
-      fontWeight: 'bold',
+      fontWeight: theme.typography.fontWeightBold,
       fontSize: 18,
       whiteSpace: 'nowrap',
     },
@@ -265,21 +266,21 @@ export function TableToolbar(toolbarProps: {
 
   if (hasFilters) {
     return (
-      <div className={filtersClasses.root}>
-        <div className={filtersClasses.root}>
+      <Box className={filtersClasses.root}>
+        <Box className={filtersClasses.root}>
           <IconButton onClick={toggleFilters} aria-label="filter list">
             <FilterList />
           </IconButton>
           <Typography className={filtersClasses.title}>
             Filters ({selectedFiltersLength})
           </Typography>
-        </div>
+        </Box>
         <StyledMTableToolbar
           {...toolbarProps}
           ref={toolbarRef}
           onSearchChanged={onSearchChanged}
         />
-      </div>
+      </Box>
     );
   }
 
@@ -484,7 +485,7 @@ export function Table<T extends object = {}>(props: TableProps<T>) {
   );
 
   return (
-    <div className={tableClasses.root}>
+    <Box className={tableClasses.root}>
       {filtersOpen && data && typeof data !== 'function' && filters?.length && (
         <Filters
           filters={constructFilters(filters, data as any[])}
@@ -521,7 +522,7 @@ export function Table<T extends object = {}>(props: TableProps<T>) {
         }}
         {...restProps}
       />
-    </div>
+    </Box>
   );
 }
 
diff --git a/packages/core-components/src/components/Tabs/TabBar.tsx b/packages/core-components/src/components/Tabs/TabBar.tsx
index d2f0250fd4..acbe88a034 100644
--- a/packages/core-components/src/components/Tabs/TabBar.tsx
+++ b/packages/core-components/src/components/Tabs/TabBar.tsx
@@ -33,7 +33,7 @@ const useStyles = makeStyles<BackstageTheme>(
       display: 'flex',
       justifyContent: 'center',
       backgroundColor: theme.palette.tabbar.indicator,
-      height: '4px',
+      height: theme.spacing(0.5),
     },
     flexContainer: {
       alignItems: 'center',
diff --git a/packages/core-components/src/components/Tabs/TabIcon.tsx b/packages/core-components/src/components/Tabs/TabIcon.tsx
index 9743469aa7..0e93924de9 100644
--- a/packages/core-components/src/components/Tabs/TabIcon.tsx
+++ b/packages/core-components/src/components/Tabs/TabIcon.tsx
@@ -29,16 +29,16 @@ interface StyledIconProps {
 export type TabIconClassKey = 'root';
 
 const useStyles = makeStyles<BackstageTheme, StyledIconProps>(
-  () => ({
+  theme => ({
     root: {
       color: '#6E6E6E',
       overflow: 'visible',
-      fontSize: '1.5rem',
+      fontSize: theme.typography.h5.fontSize,
       textAlign: 'center',
       borderRadius: '50%',
       backgroundColor: '#E6E6E6',
       marginLeft: props => (props.isNext ? 'auto' : '0'),
-      marginRight: props => (props.isNext ? '0' : '10px'),
+      marginRight: props => (props.isNext ? '0' : theme.spacing(1.25)),
       '&:hover': {
         backgroundColor: '#E6E6E6',
         opacity: '1',
diff --git a/packages/core-components/src/components/Tabs/TabPanel.tsx b/packages/core-components/src/components/Tabs/TabPanel.tsx
index b6dd4f9f91..3ecc1ba046 100644
--- a/packages/core-components/src/components/Tabs/TabPanel.tsx
+++ b/packages/core-components/src/components/Tabs/TabPanel.tsx
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React, { PropsWithChildren } from 'react';
 import Box from '@material-ui/core/Box';
+import React, { PropsWithChildren } from 'react';
 
 export interface TabPanelProps {
   value?: any;
@@ -26,13 +25,13 @@ export const TabPanel = (props: PropsWithChildren<TabPanelProps>) => {
   const { children, value, index, ...other } = props;
 
   return (
-    <div
+    <Box
       role="tabpanel"
       hidden={value !== index}
       aria-labelledby={`scrollable-auto-tab-${index}`}
       {...other}
     >
       {value === index && <Box p={3}>{children}</Box>}
-    </div>
+    </Box>
   );
 };
diff --git a/packages/core-components/src/components/Tabs/Tabs.tsx b/packages/core-components/src/components/Tabs/Tabs.tsx
index 1d08f24bb0..420263f576 100644
--- a/packages/core-components/src/components/Tabs/Tabs.tsx
+++ b/packages/core-components/src/components/Tabs/Tabs.tsx
@@ -29,6 +29,7 @@ import { TabPanel } from './TabPanel';
 import { StyledIcon } from './TabIcon';
 import { StyledTab } from './Tab';
 import { StyledTabs } from './TabBar';
+import Box from '@material-ui/core/Box';
 
 /* Props Types */
 
@@ -56,8 +57,8 @@ const useStyles = makeStyles<BackstageTheme>(
     appbar: {
       boxShadow: 'none',
       backgroundColor: theme.palette.background.paper,
-      paddingLeft: '10px',
-      paddingRight: '10px',
+      paddingLeft: theme.spacing(1.25),
+      paddingRight: theme.spacing(1.25),
     },
   }),
   { name: 'BackstageTabs' },
@@ -110,9 +111,9 @@ export function Tabs(props: TabsProps) {
   const currentIndex = navIndex === value[0] ? value[1] : false;
 
   return (
-    <div className={classes.root}>
+    <Box className={classes.root}>
       <AppBar ref={wrapper} className={classes.appbar} position="static">
-        <div>
+        <Box>
           <StyledTabs
             value={currentIndex}
             onChange={handleChange}
@@ -146,7 +147,7 @@ export function Tabs(props: TabsProps) {
               </StyledIcon>
             )}
           </StyledTabs>
-        </div>
+        </Box>
       </AppBar>
       {currentIndex !== false ? (
         chunkedTabs[navIndex].map((tab, index) => (
@@ -164,6 +165,6 @@ export function Tabs(props: TabsProps) {
           {chunkedTabs[value[0]][value[1]].content}
         </TabPanel>
       )}
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/components/WarningPanel/WarningPanel.tsx b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
index 2ddcef52ca..7e8248115f 100644
--- a/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
+++ b/packages/core-components/src/components/WarningPanel/WarningPanel.tsx
@@ -92,7 +92,7 @@ const useStyles = makeStyles<BackstageTheme>(
           severity as NonNullable<WarningProps['severity']>,
           theme,
         ),
-      fontWeight: 'bold',
+      fontWeight: theme.typography.fontWeightBold,
     },
     message: {
       width: '100%',
diff --git a/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
index 658c06de2a..98a65673e3 100644
--- a/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
+++ b/packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
@@ -46,7 +46,7 @@ const useStyles = makeStyles<BackstageTheme>(
       paddingBottom: theme.spacing(5),
       [theme.breakpoints.down('xs')]: {
         paddingBottom: theme.spacing(4),
-        fontSize: 32,
+        fontSize: theme.typography.h3.fontSize,
       },
     },
     subtitle: {
diff --git a/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx b/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
index 438e580ef4..67fd026a91 100644
--- a/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
+++ b/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
@@ -76,7 +76,7 @@ const useStyles = makeStyles<
       },
     }),
     title: {
-      fontSize: 24,
+      fontSize: theme.typography.h5.fontSize,
       fontWeight: 500,
       color: '#FFF',
       padding: 20,
diff --git a/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx b/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
index 51092d7e81..a97abb23bf 100644
--- a/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
+++ b/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
@@ -55,7 +55,7 @@ const useStyles = makeStyles<BackstageTheme>(
     label: {
       margin: 14,
       marginLeft: 7,
-      fontSize: 14,
+      fontSize: theme.typography.body2.fontSize,
       whiteSpace: 'nowrap',
       overflow: 'hidden',
       'text-overflow': 'ellipsis',
@@ -88,7 +88,7 @@ const useStyles = makeStyles<BackstageTheme>(
       color: theme.palette.navigation.color,
       paddingLeft: theme.spacing(4),
       paddingRight: theme.spacing(1),
-      fontSize: '14px',
+      fontSize: theme.typography.body2.fontSize,
       whiteSpace: 'nowrap',
       overflow: 'hidden',
       'text-overflow': 'ellipsis',

From 1326691934ab1fcb723a59b2637332858e9d7f57 Mon Sep 17 00:00:00 2001
From: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
Date: Thu, 17 Nov 2022 18:51:27 -0500
Subject: [PATCH 27/82] fix: Fix tests broken by @backstage/core-components
 update

Signed-off-by: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
---
 packages/core-components/api-report.md        |  4 ++--
 .../src/components/Avatar/Avatar.test.tsx     |  4 +++-
 .../StructuredMetadataTable/MetadataTable.tsx |  1 -
 packages/test-utils/api-report.md             |  4 ++++
 .../test-utils/src/testUtils/appWrappers.tsx  | 23 ++++++++++++++++++-
 packages/test-utils/src/testUtils/index.tsx   |  1 +
 .../src/features/Features.test.tsx            |  6 ++---
 .../DeploymentDrawer.test.tsx                 | 12 ++++++----
 .../IngressDrawer.test.tsx                    | 16 +++++++++----
 .../src/components/Pods/PodDrawer.test.tsx    | 22 ++++++++++++------
 .../ServicesAccordions/ServiceDrawer.test.tsx | 10 +++++---
 .../StatefulSetDrawer.test.tsx                | 18 ++++++++++-----
 12 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index 248b9e227c..9ed964db44 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -52,10 +52,10 @@ import { Theme } from '@material-ui/core/styles';
 import { TooltipProps } from '@material-ui/core/Tooltip';
 import { WithStyles } from '@material-ui/core/styles';
 
-// @public (undocumented)
+// @public
 export function AlertDisplay(props: AlertDisplayProps): JSX.Element | null;
 
-// @public
+// @public (undocumented)
 export type AlertDisplayProps = {
   anchorOrigin?: {
     vertical: 'top' | 'bottom';
diff --git a/packages/core-components/src/components/Avatar/Avatar.test.tsx b/packages/core-components/src/components/Avatar/Avatar.test.tsx
index d7bbf712fe..4c726eb785 100644
--- a/packages/core-components/src/components/Avatar/Avatar.test.tsx
+++ b/packages/core-components/src/components/Avatar/Avatar.test.tsx
@@ -29,7 +29,9 @@ describe('<Avatar />', () => {
   it('generates a background color', async () => {
     const bgcolor = stringToColor('John Doe');
     const { getByText } = render(<Avatar displayName="John Doe" />);
-    expect(getByText('JD')).toHaveStyle(`background-color: ${bgcolor}`);
+    expect(getByText('JD').parentElement).toHaveStyle(
+      `background-color: ${bgcolor}`,
+    );
   });
 
   it('does not generate a background color when a picture is given', async () => {
diff --git a/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
index 207354fe4b..6fb759b340 100644
--- a/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
+++ b/packages/core-components/src/components/StructuredMetadataTable/MetadataTable.tsx
@@ -63,7 +63,6 @@ export type MetadataTableListItemClassKey = 'root' | 'random';
 const listItemStyles = (theme: Theme) =>
   createStyles({
     root: {
-      gutters: 0,
       padding: theme.spacing(0, 0, 1, 0),
     },
     random: {},
diff --git a/packages/test-utils/api-report.md b/packages/test-utils/api-report.md
index 1b0aa44fc6..e11072f5a6 100644
--- a/packages/test-utils/api-report.md
+++ b/packages/test-utils/api-report.md
@@ -23,6 +23,7 @@ import { FetchApi } from '@backstage/core-plugin-api';
 import { IdentityApi } from '@backstage/core-plugin-api';
 import { JsonObject } from '@backstage/types';
 import { JsonValue } from '@backstage/types';
+import { MatcherFunction } from '@testing-library/react';
 import { Observable } from '@backstage/types';
 import { PermissionApi } from '@backstage/plugin-permission-react';
 import { PropsWithChildren } from 'react';
@@ -241,6 +242,9 @@ export type TestAppOptions = {
   };
 };
 
+// @public
+export const textContentMatcher: (text: string) => MatcherFunction;
+
 // @public
 export function withLogCollector(
   callback: AsyncLogCollector,
diff --git a/packages/test-utils/src/testUtils/appWrappers.tsx b/packages/test-utils/src/testUtils/appWrappers.tsx
index 3d2b5a0212..a19fe53301 100644
--- a/packages/test-utils/src/testUtils/appWrappers.tsx
+++ b/packages/test-utils/src/testUtils/appWrappers.tsx
@@ -29,7 +29,7 @@ import {
   attachComponentData,
   createRouteRef,
 } from '@backstage/core-plugin-api';
-import { RenderResult } from '@testing-library/react';
+import { MatcherFunction, RenderResult } from '@testing-library/react';
 import { renderWithEffects } from './testingLibrary';
 import { defaultApis } from './defaultApis';
 import { mockApis } from './mockApis';
@@ -242,3 +242,24 @@ export async function renderInTestApp(
     wrapper: createTestAppWrapper(options),
   });
 }
+
+/**
+ * Returns a `@testing-library/react` valid MatcherFunction for supplied text
+ *
+ * @param string - text Text to match by element's textContent
+ *
+ * @public
+ */
+export const textContentMatcher =
+  (text: string): MatcherFunction =>
+  (_, node) => {
+    if (!node) {
+      return false;
+    }
+
+    const hasText = (textNode: Element) => textNode?.textContent === text;
+    const childrenDontHaveText = (containerNode: Element) =>
+      Array.from(containerNode?.children).every(child => !hasText(child));
+
+    return hasText(node) && childrenDontHaveText(node);
+  };
diff --git a/packages/test-utils/src/testUtils/index.tsx b/packages/test-utils/src/testUtils/index.tsx
index 1df236d92c..8fc1395eb8 100644
--- a/packages/test-utils/src/testUtils/index.tsx
+++ b/packages/test-utils/src/testUtils/index.tsx
@@ -19,6 +19,7 @@ export { default as mockBreakpoint } from './mockBreakpoint';
 export {
   wrapInTestApp,
   renderInTestApp,
+  textContentMatcher,
   createTestAppWrapper,
 } from './appWrappers';
 export type { TestAppOptions } from './appWrappers';
diff --git a/plugins/git-release-manager/src/features/Features.test.tsx b/plugins/git-release-manager/src/features/Features.test.tsx
index a77dcfe9fc..f3a70c2bda 100644
--- a/plugins/git-release-manager/src/features/Features.test.tsx
+++ b/plugins/git-release-manager/src/features/Features.test.tsx
@@ -55,7 +55,7 @@ describe('Features', () => {
 
     expect(getByTestId(TEST_IDS.info.info)).toMatchInlineSnapshot(`
       <div
-        class="MuiBox-root MuiBox-root-10"
+        class="MuiBox-root MuiBox-root-11"
         data-testid="grm--info"
       >
         <h6
@@ -72,7 +72,7 @@ describe('Features', () => {
           : The source control system where releases reside in a practical sense. Read more about
            
           <a
-            class="MuiTypography-root MuiLink-root MuiLink-underlineHover Link-externalLink-12 MuiTypography-colorPrimary"
+            class="MuiTypography-root MuiLink-root MuiLink-underlineHover Link-externalLink-13 MuiTypography-colorPrimary"
             href="https://docs.github.com/en/github/administering-a-repository/managing-releases-in-a-repository"
             rel="noopener"
             target="_blank"
@@ -80,7 +80,7 @@ describe('Features', () => {
           >
             Git releases
             <span
-              class="Link-visuallyHidden-11"
+              class="MuiTypography-root Link-visuallyHidden-12 MuiTypography-body1"
             >
               , Opens in a new window
             </span>
diff --git a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx
index da53db687b..f221a36cee 100644
--- a/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/DeploymentsAccordions/DeploymentDrawer.test.tsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import * as deployments from '../../__fixtures__/2-deployments.json';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, textContentMatcher } from '@backstage/test-utils';
 import { DeploymentDrawer } from './DeploymentDrawer';
 
 describe('DeploymentDrawer', () => {
@@ -33,9 +33,13 @@ describe('DeploymentDrawer', () => {
     expect(getByText('YAML')).toBeInTheDocument();
     expect(getByText('Strategy')).toBeInTheDocument();
     expect(getByText('Rolling Update:')).toBeInTheDocument();
-    expect(getByText('Max Surge: 25%')).toBeInTheDocument();
-    expect(getByText('Max Unavailable: 25%')).toBeInTheDocument();
-    expect(getByText('Type: RollingUpdate')).toBeInTheDocument();
+    expect(getByText(textContentMatcher('Max Surge: 25%'))).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Max Unavailable: 25%')),
+    ).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Type: RollingUpdate')),
+    ).toBeInTheDocument();
     expect(getByText('Min Ready Seconds')).toBeInTheDocument();
     expect(getByText('???')).toBeInTheDocument();
     expect(getByText('Progress Deadline Seconds')).toBeInTheDocument();
diff --git a/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.test.tsx b/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.test.tsx
index f0146cc22e..f478278b02 100644
--- a/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/IngressesAccordions/IngressDrawer.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import * as ingresses from './__fixtures__/2-ingresses.json';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { textContentMatcher, wrapInTestApp } from '@backstage/test-utils';
 import { IngressDrawer } from './IngressDrawer';
 
 describe('IngressDrawer', () => {
@@ -28,11 +28,17 @@ describe('IngressDrawer', () => {
       ),
     );
 
-    expect(getAllByText('awesome-service')).toHaveLength(2);
+    expect(getAllByText('awesome-service')).toHaveLength(4);
     expect(getByText('YAML')).toBeInTheDocument();
     expect(getByText('Rules')).toBeInTheDocument();
-    expect(getByText('Host: api.awesome-host.io')).toBeInTheDocument();
-    expect(getAllByText('Service Port: 80')).toHaveLength(2);
-    expect(getAllByText('Service Name: awesome-service')).toHaveLength(2);
+    expect(
+      getByText(textContentMatcher('Host: api.awesome-host.io')),
+    ).toBeInTheDocument();
+    expect(getAllByText(textContentMatcher('Service Port: 80'))).toHaveLength(
+      2,
+    );
+    expect(
+      getAllByText(textContentMatcher('Service Name: awesome-service')),
+    ).toHaveLength(2);
   });
 });
diff --git a/plugins/kubernetes/src/components/Pods/PodDrawer.test.tsx b/plugins/kubernetes/src/components/Pods/PodDrawer.test.tsx
index c3b39e9f70..b11093250d 100644
--- a/plugins/kubernetes/src/components/Pods/PodDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/Pods/PodDrawer.test.tsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import * as pod from './__fixtures__/pod.json';
 import * as crashingPod from './__fixtures__/crashing-pod.json';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { textContentMatcher, wrapInTestApp } from '@backstage/test-utils';
 import { PodDrawer } from './PodDrawer';
 
 describe('PodDrawer', () => {
@@ -46,8 +46,10 @@ describe('PodDrawer', () => {
     expect(getAllByText('True')).toHaveLength(4);
     expect(getByText('Exposed Ports')).toBeInTheDocument();
     expect(getByText('Nginx:')).toBeInTheDocument();
-    expect(getByText('Container Port: 80')).toBeInTheDocument();
-    expect(getByText('Protocol: TCP')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Container Port: 80')),
+    ).toBeInTheDocument();
+    expect(getByText(textContentMatcher('Protocol: TCP'))).toBeInTheDocument();
   });
   it('should render crashing pod', async () => {
     const { getByText, getAllByText } = render(
@@ -80,12 +82,18 @@ describe('PodDrawer', () => {
       getAllByText('containers with unready status: [side-car other-side-car]'),
     ).toHaveLength(2);
     expect(getByText('Exposed Ports')).toBeInTheDocument();
-    expect(getAllByText('Protocol: TCP')).toHaveLength(3);
+    expect(getAllByText(textContentMatcher('Protocol: TCP'))).toHaveLength(3);
     expect(getByText('Nginx:')).toBeInTheDocument();
-    expect(getByText('Container Port: 80')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Container Port: 80')),
+    ).toBeInTheDocument();
     expect(getByText('Side Car:')).toBeInTheDocument();
-    expect(getByText('Container Port: 81')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Container Port: 81')),
+    ).toBeInTheDocument();
     expect(getByText('Other Side Car:')).toBeInTheDocument();
-    expect(getByText('Container Port: 82')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Container Port: 82')),
+    ).toBeInTheDocument();
   });
 });
diff --git a/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.test.tsx b/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.test.tsx
index 79df15d215..7eb51f073b 100644
--- a/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/ServicesAccordions/ServiceDrawer.test.tsx
@@ -17,7 +17,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import * as services from './__fixtures__/2-services.json';
-import { wrapInTestApp } from '@backstage/test-utils';
+import { textContentMatcher, wrapInTestApp } from '@backstage/test-utils';
 import { ServiceDrawer } from './ServiceDrawer';
 
 describe('ServiceDrawer', () => {
@@ -33,7 +33,11 @@ describe('ServiceDrawer', () => {
     expect(getByText('YAML')).toBeInTheDocument();
     expect(getByText('Cluster IP')).toBeInTheDocument();
     expect(getByText('Ports')).toBeInTheDocument();
-    expect(getByText('Target Port: 1997')).toBeInTheDocument();
-    expect(getByText('App: awesome-service')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Target Port: 1997')),
+    ).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('App: awesome-service')),
+    ).toBeInTheDocument();
   });
 });
diff --git a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.test.tsx b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.test.tsx
index a88c26785d..c187c7d05d 100644
--- a/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.test.tsx
+++ b/plugins/kubernetes/src/components/StatefulSetsAccordions/StatefulSetDrawer.test.tsx
@@ -16,7 +16,7 @@
 
 import React from 'react';
 import * as statefulsets from '../../__fixtures__/2-statefulsets.json';
-import { renderInTestApp } from '@backstage/test-utils';
+import { renderInTestApp, textContentMatcher } from '@backstage/test-utils';
 import { StatefulSetDrawer } from './StatefulSetDrawer';
 
 describe('StatefulSetDrawer', () => {
@@ -28,19 +28,25 @@ describe('StatefulSetDrawer', () => {
       />,
     );
 
-    expect(getAllByText('dice-roller')).toHaveLength(3);
+    expect(getAllByText('dice-roller')).toHaveLength(4);
     expect(getByText('StatefulSet')).toBeInTheDocument();
     expect(getByText('YAML')).toBeInTheDocument();
-    expect(getByText('Type: RollingUpdate')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Type: RollingUpdate')),
+    ).toBeInTheDocument();
     expect(getByText('Rolling Update:')).toBeInTheDocument();
-    expect(getByText('Max Surge: 25%')).toBeInTheDocument();
-    expect(getByText('Max Unavailable: 25%')).toBeInTheDocument();
+    expect(getByText(textContentMatcher('Max Surge: 25%'))).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('Max Unavailable: 25%')),
+    ).toBeInTheDocument();
     expect(getByText('Pod Management Policy')).toBeInTheDocument();
     expect(getByText('Parallel')).toBeInTheDocument();
     expect(getByText('Service Name')).toBeInTheDocument();
     expect(getByText('Selector')).toBeInTheDocument();
     expect(getByText('Match Labels:')).toBeInTheDocument();
-    expect(getByText('App: dice-roller')).toBeInTheDocument();
+    expect(
+      getByText(textContentMatcher('App: dice-roller')),
+    ).toBeInTheDocument();
     expect(getByText('Revision History Limit')).toBeInTheDocument();
     expect(getByText('10')).toBeInTheDocument();
     expect(getByText('namespace: default')).toBeInTheDocument();

From b0efeb8221188f3a8094d3eeb9378c64e9f7ae00 Mon Sep 17 00:00:00 2001
From: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
Date: Tue, 22 Nov 2022 11:38:50 -0500
Subject: [PATCH 28/82] feat: Apply component guidelines for
 @backstage/core-component for Layout folder

Signed-off-by: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
---
 .../src/layout/BottomLink/BottomLink.tsx      |  4 +-
 .../layout/ContentHeader/ContentHeader.tsx    | 20 ++++----
 .../layout/ErrorBoundary/ErrorBoundary.tsx    |  7 ++-
 .../HeaderActionMenu/HeaderActionMenu.tsx     |  4 +-
 .../src/layout/HeaderLabel/HeaderLabel.tsx    |  6 +--
 .../src/layout/HeaderTabs/HeaderTabs.tsx      | 16 +++----
 .../src/layout/InfoCard/InfoCard.tsx          |  2 +-
 .../src/layout/ItemCard/ItemCardGrid.tsx      |  6 +--
 .../src/layout/ItemCard/ItemCardHeader.tsx    |  8 ++--
 .../src/layout/Sidebar/Bar.tsx                | 21 ++++-----
 .../src/layout/Sidebar/Intro.tsx              | 29 ++++++------
 .../src/layout/Sidebar/Items.tsx              | 47 ++++++++++---------
 .../src/layout/Sidebar/Page.tsx               | 12 ++---
 .../src/layout/Sidebar/SidebarSubmenu.tsx     | 14 +++---
 .../src/layout/Sidebar/SidebarSubmenuItem.tsx | 19 ++++----
 .../layout/Sidebar/icons/DoubleArrowLeft.tsx  | 16 +++----
 .../layout/Sidebar/icons/DoubleArrowRight.tsx | 16 +++----
 .../src/layout/TabbedCard/TabbedCard.tsx      |  4 +-
 18 files changed, 129 insertions(+), 122 deletions(-)

diff --git a/packages/core-components/src/layout/BottomLink/BottomLink.tsx b/packages/core-components/src/layout/BottomLink/BottomLink.tsx
index c9c1659284..f385d9ce11 100644
--- a/packages/core-components/src/layout/BottomLink/BottomLink.tsx
+++ b/packages/core-components/src/layout/BottomLink/BottomLink.tsx
@@ -61,7 +61,7 @@ export function BottomLink(props: BottomLinkProps) {
   const classes = useStyles();
 
   return (
-    <div>
+    <Box>
       <Divider />
       <Link to={link} onClick={onClick} underline="none">
         <Box display="flex" alignItems="center" className={classes.root}>
@@ -73,6 +73,6 @@ export function BottomLink(props: BottomLinkProps) {
           <ArrowIcon className={classes.arrow} />
         </Box>
       </Link>
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
index 5a9ed3a77e..381919a170 100644
--- a/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
+++ b/packages/core-components/src/layout/ContentHeader/ContentHeader.tsx
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/**
- * TODO favoriteable capability
- */
-
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import React, { PropsWithChildren, ReactNode } from 'react';
 import { Helmet } from 'react-helmet';
 
+/**
+ * TODO: favoriteable capability
+ */
+
 /** @public */
 export type ContentHeaderClassKey =
   | 'container'
@@ -120,17 +120,17 @@ export function ContentHeader(props: PropsWithChildren<ContentHeaderProps>) {
   return (
     <>
       <Helmet title={title} />
-      <div className={classes.container}>
-        <div className={classes.leftItemsBox}>
+      <Box className={classes.container}>
+        <Box className={classes.leftItemsBox}>
           {renderedTitle}
           {description && (
             <Typography className={classes.description} variant="body2">
               {description}
             </Typography>
           )}
-        </div>
-        <div className={classes.rightItemsBox}>{children}</div>
-      </div>
+        </Box>
+        <Box className={classes.rightItemsBox}>{children}</Box>
+      </Box>
     </>
   );
 }
diff --git a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.tsx b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.tsx
index 39ad82babd..da430d2f88 100644
--- a/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.tsx
+++ b/packages/core-components/src/layout/ErrorBoundary/ErrorBoundary.tsx
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import Typography from '@material-ui/core/Typography';
 import React, { ComponentClass, Component, ErrorInfo } from 'react';
 import { Button } from '../../components/Button';
 import { ErrorPanel } from '../../components/ErrorPanel';
@@ -40,9 +41,11 @@ const SlackLink = (props: { slackChannel?: string | SlackChannel }) => {
   if (!slackChannel) {
     return null;
   } else if (typeof slackChannel === 'string') {
-    return <>Please contact {slackChannel} for help.</>;
+    return <Typography>Please contact {slackChannel} for help.</Typography>;
   } else if (!slackChannel.href) {
-    return <>Please contact {slackChannel.name} for help.</>;
+    return (
+      <Typography>Please contact {slackChannel.name} for help.</Typography>
+    );
   }
 
   return (
diff --git a/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx
index e164244ea7..be6c0c6531 100644
--- a/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx
+++ b/packages/core-components/src/layout/HeaderActionMenu/HeaderActionMenu.tsx
@@ -44,7 +44,7 @@ const ActionItem = ({
   onClick,
 }: HeaderActionMenuItem) => {
   return (
-    <React.Fragment>
+    <Fragment>
       <ListItem
         data-testid="header-action-item"
         disabled={disabled}
@@ -58,7 +58,7 @@ const ActionItem = ({
         {icon && <ListItemIcon>{icon}</ListItemIcon>}
         <ListItemText primary={label} secondary={secondaryLabel} />
       </ListItem>
-    </React.Fragment>
+    </Fragment>
   );
 };
 
diff --git a/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx b/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx
index f523a5319b..e3b6299f85 100644
--- a/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx
+++ b/packages/core-components/src/layout/HeaderLabel/HeaderLabel.tsx
@@ -30,7 +30,7 @@ const useStyles = makeStyles(
     },
     label: {
       color: theme.palette.common.white,
-      fontWeight: 'bold',
+      fontWeight: theme.typography.fontWeightBold,
       letterSpacing: 0,
       fontSize: theme.typography.fontSize,
       marginBottom: theme.spacing(1) / 2,
@@ -77,10 +77,10 @@ export function HeaderLabel(props: HeaderLabelProps) {
   );
   return (
     <Grid item>
-      <span className={classes.root}>
+      <Typography component="span" className={classes.root}>
         <Typography className={classes.label}>{label}</Typography>
         {url ? <Link to={url}>{content}</Link> : content}
-      </span>
+      </Typography>
     </Grid>
   );
 }
diff --git a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
index a97fc70e4b..aac062c01b 100644
--- a/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
+++ b/packages/core-components/src/layout/HeaderTabs/HeaderTabs.tsx
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-// TODO(blam): Remove this implementation when the Tabs are ready
-// This is just a temporary solution to implementing tabs for now
-
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
 import TabUI, { TabProps } from '@material-ui/core/Tab';
 import Tabs from '@material-ui/core/Tabs';
 import React, { useCallback, useEffect, useState } from 'react';
 
+// TODO(blam): Remove this implementation when the Tabs are ready
+// This is just a temporary solution to implementing tabs for now
+
 /** @public */
 export type HeaderTabsClassKey =
   | 'tabsWrapper'
@@ -38,10 +38,10 @@ const useStyles = makeStyles(
       minWidth: 0,
     },
     defaultTab: {
-      padding: theme.spacing(3, 3),
       ...theme.typography.caption,
+      padding: theme.spacing(3, 3),
       textTransform: 'uppercase',
-      fontWeight: 'bold',
+      fontWeight: theme.typography.fontWeightBold,
       color: theme.palette.text.secondary,
     },
     selected: {
@@ -97,7 +97,7 @@ export function HeaderTabs(props: HeaderTabsProps) {
   }, [selectedIndex]);
 
   return (
-    <div className={styles.tabsWrapper}>
+    <Box className={styles.tabsWrapper}>
       <Tabs
         selectionFollowsFocus
         indicatorColor="primary"
@@ -120,6 +120,6 @@ export function HeaderTabs(props: HeaderTabsProps) {
           />
         ))}
       </Tabs>
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/layout/InfoCard/InfoCard.tsx b/packages/core-components/src/layout/InfoCard/InfoCard.tsx
index 831c8f95d9..2026a7eced 100644
--- a/packages/core-components/src/layout/InfoCard/InfoCard.tsx
+++ b/packages/core-components/src/layout/InfoCard/InfoCard.tsx
@@ -47,7 +47,7 @@ const useStyles = makeStyles(
       padding: theme.spacing(2, 2, 2, 2.5),
     },
     headerTitle: {
-      fontWeight: 700,
+      fontWeight: theme.typography.fontWeightBold,
     },
     headerSubheader: {
       paddingTop: theme.spacing(1),
diff --git a/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx b/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx
index 885b43ca34..a1e6d24aeb 100644
--- a/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx
+++ b/packages/core-components/src/layout/ItemCard/ItemCardGrid.tsx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import Box from '@material-ui/core/Box';
 import {
   createStyles,
   makeStyles,
@@ -65,8 +65,8 @@ export function ItemCardGrid(props: ItemCardGridProps) {
   const { children, ...otherProps } = props;
   const classes = useStyles(otherProps);
   return (
-    <div className={classes.root} {...otherProps}>
+    <Box className={classes.root} {...otherProps}>
       {children}
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx b/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx
index 76cf668079..da3d9b7ebe 100644
--- a/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx
+++ b/packages/core-components/src/layout/ItemCard/ItemCardHeader.tsx
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
 import { createStyles, makeStyles, WithStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import React from 'react';
-import { BackstageTheme } from '@backstage/theme';
 
 /** @public */
 export type ItemCardHeaderClassKey = 'root';
@@ -77,7 +77,7 @@ export function ItemCardHeader(props: ItemCardHeaderProps) {
   const { title, subtitle, children } = props;
   const classes = useStyles(props);
   return (
-    <div className={classes.root}>
+    <Box className={classes.root}>
       {subtitle && (
         <Typography variant="subtitle2" component="h3">
           {subtitle}
@@ -89,6 +89,6 @@ export function ItemCardHeader(props: ItemCardHeaderProps) {
         </Typography>
       )}
       {children}
-    </div>
+    </Box>
   );
 }
diff --git a/packages/core-components/src/layout/Sidebar/Bar.tsx b/packages/core-components/src/layout/Sidebar/Bar.tsx
index c86f60a0a2..69b77dd5e1 100644
--- a/packages/core-components/src/layout/Sidebar/Bar.tsx
+++ b/packages/core-components/src/layout/Sidebar/Bar.tsx
@@ -13,28 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
+import Button from '@material-ui/core/Button';
 import { makeStyles } from '@material-ui/core/styles';
 import useMediaQuery from '@material-ui/core/useMediaQuery';
 import classnames from 'classnames';
-
-import React, { useState, useContext, useRef } from 'react';
-import Button from '@material-ui/core/Button';
+import React, { useContext, useRef, useState } from 'react';
 
 import {
   makeSidebarConfig,
   makeSidebarSubmenuConfig,
   SidebarConfig,
   SidebarConfigContext,
-  SubmenuConfig,
   SidebarOptions,
+  SubmenuConfig,
   SubmenuOptions,
 } from './config';
-import { BackstageTheme } from '@backstage/theme';
+import { MobileSidebar } from './MobileSidebar';
 import { useContent } from './Page';
 import { SidebarOpenStateProvider } from './SidebarOpenStateContext';
 import { useSidebarPinState } from './SidebarPinStateContext';
-import { MobileSidebar } from './MobileSidebar';
 
 /** @public */
 export type SidebarClassKey = 'drawer' | 'drawerOpen';
@@ -191,7 +190,7 @@ const DesktopSidebar = (props: DesktopSidebarProps) => {
     <nav style={{}} aria-label="sidebar nav">
       <A11ySkipSidebar />
       <SidebarOpenStateProvider value={{ isOpen, setOpen }}>
-        <div
+        <Box
           className={classes.root}
           data-testid="sidebar-root"
           onMouseEnter={disableExpandOnHover ? () => {} : handleOpen}
@@ -199,14 +198,14 @@ const DesktopSidebar = (props: DesktopSidebarProps) => {
           onMouseLeave={disableExpandOnHover ? () => {} : handleClose}
           onBlur={disableExpandOnHover ? () => {} : handleClose}
         >
-          <div
+          <Box
             className={classnames(classes.drawer, {
               [classes.drawerOpen]: isOpen,
             })}
           >
             {children}
-          </div>
-        </div>
+          </Box>
+        </Box>
       </SidebarOpenStateProvider>
     </nav>
   );
diff --git a/packages/core-components/src/layout/Sidebar/Intro.tsx b/packages/core-components/src/layout/Sidebar/Intro.tsx
index 5cc6bbdcd5..824e9e42fd 100644
--- a/packages/core-components/src/layout/Sidebar/Intro.tsx
+++ b/packages/core-components/src/layout/Sidebar/Intro.tsx
@@ -13,19 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
 import Collapse from '@material-ui/core/Collapse';
-import { makeStyles } from '@material-ui/core/styles';
 import IconButton from '@material-ui/core/IconButton';
+import { makeStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import CloseIcon from '@material-ui/icons/Close';
-import React, { useContext, useState } from 'react';
 import { useLocalStorageValue } from '@react-hookz/web';
+import React, { useContext, useState } from 'react';
+
 import {
-  SidebarConfigContext,
-  SidebarConfig,
   SIDEBAR_INTRO_LOCAL_STORAGE,
+  SidebarConfig,
+  SidebarConfigContext,
 } from './config';
 import { SidebarDivider } from './Items';
 import { useSidebarOpenState } from './SidebarOpenStateContext';
@@ -45,8 +46,8 @@ const useStyles = makeStyles<BackstageTheme, { sidebarConfig: SidebarConfig }>(
       // XXX (@koroeskohr): should I be using a Mui theme variable?
       fontSize: 12,
       width: props.sidebarConfig.drawerWidthOpen,
-      marginTop: 18,
-      marginBottom: 12,
+      marginTop: theme.spacing(2.25),
+      marginBottom: theme.spacing(1.5),
       paddingLeft: props.sidebarConfig.iconPadding,
       paddingRight: props.sidebarConfig.iconPadding,
     }),
@@ -54,13 +55,13 @@ const useStyles = makeStyles<BackstageTheme, { sidebarConfig: SidebarConfig }>(
       display: 'flex',
       justifyContent: 'flex-end',
       alignItems: 'center',
-      marginTop: 12,
+      marginTop: theme.spacing(1.5),
     },
     introDismissLink: {
       color: '#dddddd',
       display: 'flex',
       alignItems: 'center',
-      marginBottom: 4,
+      marginBottom: theme.spacing(0.5),
       '&:hover': {
         color: theme.palette.linkHover,
         transition: theme.transitions.create('color', {
@@ -78,7 +79,7 @@ const useStyles = makeStyles<BackstageTheme, { sidebarConfig: SidebarConfig }>(
     introDismissIcon: {
       width: 18,
       height: 18,
-      marginRight: 12,
+      marginRight: theme.spacing(1.5),
     },
   }),
   { name: 'BackstageSidebarIntro' },
@@ -103,17 +104,17 @@ export function IntroCard(props: IntroCardProps) {
   const handleClose = () => onClose();
 
   return (
-    <div className={classes.introCard}>
+    <Box className={classes.introCard}>
       <Typography variant="subtitle2">{text}</Typography>
-      <div className={classes.introDismiss}>
+      <Box className={classes.introDismiss}>
         <IconButton onClick={handleClose} className={classes.introDismissLink}>
           <CloseIcon className={classes.introDismissIcon} />
           <Typography component="span" className={classes.introDismissText}>
             Dismiss
           </Typography>
         </IconButton>
-      </div>
-    </div>
+      </Box>
+    </Box>
   );
 }
 
diff --git a/packages/core-components/src/layout/Sidebar/Items.tsx b/packages/core-components/src/layout/Sidebar/Items.tsx
index fe8dede499..031b1e5168 100644
--- a/packages/core-components/src/layout/Sidebar/Items.tsx
+++ b/packages/core-components/src/layout/Sidebar/Items.tsx
@@ -13,23 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { IconComponent, useElementFilter } from '@backstage/core-plugin-api';
 import { BackstageTheme } from '@backstage/theme';
-import { makeStyles, styled, Theme } from '@material-ui/core/styles';
-import useMediaQuery from '@material-ui/core/useMediaQuery';
 import Badge from '@material-ui/core/Badge';
-import TextField from '@material-ui/core/TextField';
-import Typography from '@material-ui/core/Typography';
+import Box from '@material-ui/core/Box';
+import { makeStyles, styled, Theme } from '@material-ui/core/styles';
 import {
   CreateCSSProperties,
   StyledComponentProps,
 } from '@material-ui/core/styles/withStyles';
+import TextField from '@material-ui/core/TextField';
+import Typography from '@material-ui/core/Typography';
+import useMediaQuery from '@material-ui/core/useMediaQuery';
+import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
+import ArrowDropUp from '@material-ui/icons/ArrowDropUp';
 import ArrowRightIcon from '@material-ui/icons/ArrowRight';
 import SearchIcon from '@material-ui/icons/Search';
-import ArrowDropUp from '@material-ui/icons/ArrowDropUp';
-import ArrowDropDown from '@material-ui/icons/ArrowDropDown';
 import classnames from 'classnames';
+import { Location } from 'history';
 import React, {
   ComponentProps,
   ComponentType,
@@ -48,18 +49,18 @@ import {
   useLocation,
   useResolvedPath,
 } from 'react-router-dom';
+
 import {
+  SidebarConfig,
   SidebarConfigContext,
   SidebarItemWithSubmenuContext,
-  SidebarConfig,
 } from './config';
-import { SidebarSubmenuProps, SidebarSubmenu } from './SidebarSubmenu';
 import DoubleArrowLeft from './icons/DoubleArrowLeft';
 import DoubleArrowRight from './icons/DoubleArrowRight';
-import { isLocationMatch } from './utils';
-import { Location } from 'history';
 import { useSidebarOpenState } from './SidebarOpenStateContext';
+import { SidebarSubmenu, SidebarSubmenuProps } from './SidebarSubmenu';
 import { SidebarSubmenuItemProps } from './SidebarSubmenuItem';
+import { isLocationMatch } from './utils';
 
 /** @public */
 export type SidebarItemClassKey =
@@ -145,7 +146,7 @@ const makeSidebarStyles = (sidebarConfig: SidebarConfig) =>
       },
       searchField: {
         color: '#b5b5b5',
-        fontWeight: 'bold',
+        fontWeight: theme.typography.fontWeightBold,
         fontSize: theme.typography.fontSize,
       },
       searchFieldHTMLInput: {
@@ -373,10 +374,10 @@ const SidebarItemBase = forwardRef<any, SidebarItemProps>((props, ref) => {
     !isOpen && hasSubmenu ? { display: 'flex', marginLeft: '24px' } : {};
 
   const displayItemIcon = (
-    <div style={divStyle}>
+    <Box style={divStyle}>
       <Icon fontSize="small" />
       {!isOpen && hasSubmenu ? <ArrowRightIcon /> : <></>}
-    </div>
+    </Box>
   );
 
   const itemIcon = (
@@ -393,9 +394,9 @@ const SidebarItemBase = forwardRef<any, SidebarItemProps>((props, ref) => {
 
   const openContent = (
     <>
-      <div data-testid="login-button" className={classes.iconContainer}>
+      <Box data-testid="login-button" className={classes.iconContainer}>
         {itemIcon}
-      </div>
+      </Box>
       {text && (
         <Typography variant="subtitle2" className={classes.label}>
           {text}
@@ -572,7 +573,7 @@ export function SidebarSearchField(props: SidebarSearchFieldProps) {
   };
 
   return (
-    <div className={classes.searchRoot}>
+    <Box className={classes.searchRoot}>
       <SidebarItem
         icon={Icon}
         to={props.to}
@@ -595,7 +596,7 @@ export function SidebarSearchField(props: SidebarSearchFieldProps) {
           }}
         />
       </SidebarItem>
-    </div>
+    </Box>
   );
 }
 
@@ -620,13 +621,13 @@ export const SidebarSpacer = styled('div')(
 export type SidebarDividerClassKey = 'root';
 
 export const SidebarDivider = styled('hr')(
-  {
+  ({ theme }) => ({
     height: 1,
     width: '100%',
     background: '#383838',
     border: 'none',
-    margin: '12px 0px',
-  },
+    margin: theme.spacing(1.2, 0),
+  }),
   { name: 'BackstageSidebarDivider' },
 ) as ComponentType<ComponentProps<'hr'> & StyledComponentProps<'root'>>;
 
@@ -693,9 +694,9 @@ export const SidebarExpandButton = () => {
       aria-label="Expand Sidebar"
       data-testid="sidebar-expand-button"
     >
-      <div className={classes.arrows}>
+      <Box className={classes.arrows}>
         {isOpen ? <DoubleArrowLeft /> : <DoubleArrowRight />}
-      </div>
+      </Box>
     </button>
   );
 };
diff --git a/packages/core-components/src/layout/Sidebar/Page.tsx b/packages/core-components/src/layout/Sidebar/Page.tsx
index bdf41b5dd7..5f660547d1 100644
--- a/packages/core-components/src/layout/Sidebar/Page.tsx
+++ b/packages/core-components/src/layout/Sidebar/Page.tsx
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
-
+import useMediaQuery from '@material-ui/core/useMediaQuery';
 import React, {
   createContext,
   useCallback,
@@ -25,10 +26,9 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import { SidebarConfigContext, SidebarConfig } from './config';
-import { BackstageTheme } from '@backstage/theme';
+
+import { SidebarConfig, SidebarConfigContext } from './config';
 import { LocalStorage } from './localStorage';
-import useMediaQuery from '@material-ui/core/useMediaQuery';
 import { SidebarPinStateProvider } from './SidebarPinStateContext';
 
 export type SidebarPageClassKey = 'root';
@@ -122,7 +122,7 @@ export function SidebarPage(props: SidebarPageProps) {
       }}
     >
       <PageContext.Provider value={pageContext}>
-        <div className={classes.root}>{props.children}</div>
+        <Box className={classes.root}>{props.children}</Box>
       </PageContext.Provider>
     </SidebarPinStateProvider>
   );
diff --git a/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx b/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
index 67fd026a91..cc61a6a063 100644
--- a/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
+++ b/packages/core-components/src/layout/Sidebar/SidebarSubmenu.tsx
@@ -13,17 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { BackstageTheme } from '@backstage/theme';
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
 import Typography from '@material-ui/core/Typography';
 import classnames from 'classnames';
 import React, { ReactNode, useContext, useEffect, useState } from 'react';
+
 import {
-  SidebarItemWithSubmenuContext,
   SidebarConfigContext,
+  SidebarItemWithSubmenuContext,
   SubmenuConfig,
 } from './config';
 import { useSidebarOpenState } from './SidebarOpenStateContext';
-import { BackstageTheme } from '@backstage/theme';
 
 const useStyles = makeStyles<
   BackstageTheme,
@@ -77,9 +79,9 @@ const useStyles = makeStyles<
     }),
     title: {
       fontSize: theme.typography.h5.fontSize,
-      fontWeight: 500,
+      fontWeight: theme.typography.fontWeightMedium,
       color: '#FFF',
-      padding: 20,
+      padding: theme.spacing(2.5),
       [theme.breakpoints.down('xs')]: {
         display: 'none',
       },
@@ -120,7 +122,7 @@ export const SidebarSubmenu = (props: SidebarSubmenuProps) => {
   }, [isHoveredOn]);
 
   return (
-    <div
+    <Box
       className={classnames(classes.drawer, {
         [classes.drawerOpen]: isSubmenuOpen,
       })}
@@ -129,6 +131,6 @@ export const SidebarSubmenu = (props: SidebarSubmenuProps) => {
         {props.title}
       </Typography>
       {props.children}
-    </div>
+    </Box>
   );
 };
diff --git a/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx b/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
index a97abb23bf..fbe4496c72 100644
--- a/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
+++ b/packages/core-components/src/layout/Sidebar/SidebarSubmenuItem.tsx
@@ -26,6 +26,7 @@ import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
 import ArrowDropUpIcon from '@material-ui/icons/ArrowDropUp';
 import { SidebarItemWithSubmenuContext } from './config';
 import { isLocationMatch } from './utils';
+import Box from '@material-ui/core/Box';
 
 const useStyles = makeStyles<BackstageTheme>(
   theme => ({
@@ -39,7 +40,7 @@ const useStyles = makeStyles<BackstageTheme>(
       display: 'flex',
       alignItems: 'center',
       color: theme.palette.navigation.color,
-      padding: 20,
+      padding: theme.spacing(2.5),
       cursor: 'pointer',
       position: 'relative',
       background: 'none',
@@ -53,8 +54,8 @@ const useStyles = makeStyles<BackstageTheme>(
       color: '#FFF',
     },
     label: {
-      margin: 14,
-      marginLeft: 7,
+      margin: theme.spacing(1.75),
+      marginLeft: theme.spacing(1),
       fontSize: theme.typography.body2.fontSize,
       whiteSpace: 'nowrap',
       overflow: 'hidden',
@@ -155,7 +156,7 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
       return isActive;
     });
     return (
-      <div className={classes.itemContainer}>
+      <Box className={classes.itemContainer}>
         <Tooltip title={title} enterDelay={500} enterNextDelay={500}>
           <button
             onClick={handleClickDropdown}
@@ -183,7 +184,7 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
           </button>
         </Tooltip>
         {dropdownItems && showDropDown && (
-          <div className={classes.dropdown}>
+          <Box className={classes.dropdown}>
             {dropdownItems.map((object, key) => (
               <Tooltip
                 key={key}
@@ -204,14 +205,14 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
                 </Link>
               </Tooltip>
             ))}
-          </div>
+          </Box>
         )}
-      </div>
+      </Box>
     );
   }
 
   return (
-    <div className={classes.itemContainer}>
+    <Box className={classes.itemContainer}>
       <Tooltip title={title} enterDelay={500} enterNextDelay={500}>
         <Link
           to={to!}
@@ -235,6 +236,6 @@ export const SidebarSubmenuItem = (props: SidebarSubmenuItemProps) => {
           </Typography>
         </Link>
       </Tooltip>
-    </div>
+    </Box>
   );
 };
diff --git a/packages/core-components/src/layout/Sidebar/icons/DoubleArrowLeft.tsx b/packages/core-components/src/layout/Sidebar/icons/DoubleArrowLeft.tsx
index eb487940a8..ba1640a860 100644
--- a/packages/core-components/src/layout/Sidebar/icons/DoubleArrowLeft.tsx
+++ b/packages/core-components/src/layout/Sidebar/icons/DoubleArrowLeft.tsx
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
 import ArrowBackIosIcon from '@material-ui/icons/ArrowBackIos';
+import React from 'react';
 
 const useStyles = makeStyles({
   iconContainer: {
@@ -34,14 +34,14 @@ const DoubleArrowLeft = () => {
   const classes = useStyles();
 
   return (
-    <div className={classes.iconContainer}>
-      <div className={classes.arrow1}>
+    <Box className={classes.iconContainer}>
+      <Box className={classes.arrow1}>
         <ArrowBackIosIcon style={{ fontSize: '12px' }} />
-      </div>
-      <div>
+      </Box>
+      <Box>
         <ArrowBackIosIcon style={{ fontSize: '12px' }} />
-      </div>
-    </div>
+      </Box>
+    </Box>
   );
 };
 
diff --git a/packages/core-components/src/layout/Sidebar/icons/DoubleArrowRight.tsx b/packages/core-components/src/layout/Sidebar/icons/DoubleArrowRight.tsx
index e1e9b9476d..3824ec263d 100644
--- a/packages/core-components/src/layout/Sidebar/icons/DoubleArrowRight.tsx
+++ b/packages/core-components/src/layout/Sidebar/icons/DoubleArrowRight.tsx
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import React from 'react';
+import Box from '@material-ui/core/Box';
 import { makeStyles } from '@material-ui/core/styles';
 import ArrowForwardIosIcon from '@material-ui/icons/ArrowForwardIos';
+import React from 'react';
 
 const useStyles = makeStyles({
   iconContainer: {
@@ -34,14 +34,14 @@ const DoubleArrowRight = () => {
   const classes = useStyles();
 
   return (
-    <div className={classes.iconContainer}>
-      <div className={classes.arrow1}>
+    <Box className={classes.iconContainer}>
+      <Box className={classes.arrow1}>
         <ArrowForwardIosIcon style={{ fontSize: '12px' }} />
-      </div>
-      <div>
+      </Box>
+      <Box>
         <ArrowForwardIosIcon style={{ fontSize: '12px' }} />
-      </div>
-    </div>
+      </Box>
+    </Box>
   );
 };
 
diff --git a/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx b/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx
index b3b977f04b..90cc928169 100644
--- a/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx
+++ b/packages/core-components/src/layout/TabbedCard/TabbedCard.tsx
@@ -96,7 +96,7 @@ export function TabbedCard(props: PropsWithChildren<Props>) {
   } else {
     React.Children.map(children, child => {
       if (React.isValidElement(child) && child?.props.value === value) {
-        selectedTabContent = child?.props.children;
+        selectedTabContent = child?.props?.children;
       }
     });
   }
@@ -142,7 +142,7 @@ const useCardTabStyles = makeStyles(
       },
     },
     selected: {
-      fontWeight: 'bold',
+      fontWeight: theme.typography.fontWeightBold,
     },
   }),
   { name: 'BackstageCardTab' },

From 247ee2609199142f7c6cd869029202aa18fe2efc Mon Sep 17 00:00:00 2001
From: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
Date: Tue, 22 Nov 2022 12:10:03 -0500
Subject: [PATCH 29/82] fix: Update changeset with changed packages & plugins

Signed-off-by: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
---
 .changeset/strong-peaches-melt.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.changeset/strong-peaches-melt.md b/.changeset/strong-peaches-melt.md
index d866b8ba54..43f819fd4d 100644
--- a/.changeset/strong-peaches-melt.md
+++ b/.changeset/strong-peaches-melt.md
@@ -1,5 +1,6 @@
 ---
 '@backstage/core-components': patch
+'@backstage/test-utils': patch
 ---
 
 Sync components in @backstage/core-components with the Component Design Guidelines

From 4ae7842953f6edfac73d8392f4d6704670537ad3 Mon Sep 17 00:00:00 2001
From: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
Date: Mon, 28 Nov 2022 16:55:22 -0500
Subject: [PATCH 30/82] fix: Revert import sorting for CodeSnippet because of
 #13808

Signed-off-by: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
---
 .../core-components/src/components/CodeSnippet/CodeSnippet.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
index cd6ad07a5c..3270cac176 100644
--- a/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
+++ b/packages/core-components/src/components/CodeSnippet/CodeSnippet.tsx
@@ -17,13 +17,13 @@ import { BackstageTheme } from '@backstage/theme';
 import Box from '@material-ui/core/Box';
 import { useTheme } from '@material-ui/core/styles';
 import React from 'react';
+import type {} from 'react-syntax-highlighter';
 import LightAsync from 'react-syntax-highlighter/dist/esm/light-async';
 import dark from 'react-syntax-highlighter/dist/esm/styles/hljs/dark';
 import docco from 'react-syntax-highlighter/dist/esm/styles/hljs/docco';
 
 import { CopyTextButton } from '../CopyTextButton';
 
-import type {} from 'react-syntax-highlighter';
 /**
  * Properties for {@link CodeSnippet}
  *

From 1a36e2f06d299f60c9ae9f198c35ffeabedf67d4 Mon Sep 17 00:00:00 2001
From: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
Date: Wed, 30 Nov 2022 14:18:52 -0500
Subject: [PATCH 31/82] fix: Use caption variant in IconLinkVertical icon label

Signed-off-by: Carlos Esteban Lopez <lcarlosesteb@vmware.com>
---
 .../src/components/HeaderIconLinkRow/IconLinkVertical.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx b/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx
index df03c0f3c6..c1c0bd4ec8 100644
--- a/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx
+++ b/packages/core-components/src/components/HeaderIconLinkRow/IconLinkVertical.tsx
@@ -82,7 +82,11 @@ export function IconLinkVertical({
     return (
       <Box title={title} className={classnames(classes.link, classes.disabled)}>
         {icon}
-        <Typography variant="body2" component="span" className={classes.label}>
+        <Typography
+          variant="caption"
+          component="span"
+          className={classes.label}
+        >
           {label}
         </Typography>
       </Box>
@@ -97,7 +101,7 @@ export function IconLinkVertical({
       onClick={onClick}
     >
       {icon}
-      <Typography variant="body2" component="span" className={classes.label}>
+      <Typography variant="caption" component="span" className={classes.label}>
         {label}
       </Typography>
     </Link>

From 568ae0246395903aee525628c2f9b05f25ce5e39 Mon Sep 17 00:00:00 2001
From: Casper Thygesen <cth@trifork.com>
Date: Thu, 1 Dec 2022 10:33:59 +0000
Subject: [PATCH 32/82] Added (optional) publicUrl to vault-backend plugin

Signed-off-by: Casper Thygesen <cth@trifork.com>
---
 .changeset/loud-snails-sleep.md               | 5 +++++
 plugins/vault-backend/README.md               | 3 ++-
 plugins/vault-backend/config.d.ts             | 6 ++++++
 plugins/vault-backend/src/config/config.ts    | 5 +++++
 plugins/vault-backend/src/service/vaultApi.ts | 6 ++++--
 5 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/loud-snails-sleep.md

diff --git a/.changeset/loud-snails-sleep.md b/.changeset/loud-snails-sleep.md
new file mode 100644
index 0000000000..a34388e5aa
--- /dev/null
+++ b/.changeset/loud-snails-sleep.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-vault-backend': patch
+---
+
+Added (optional) publicUrl to editUrl and showUrl in case baseUrl is an internal url
diff --git a/plugins/vault-backend/README.md b/plugins/vault-backend/README.md
index d7d227607d..c1b49f623a 100644
--- a/plugins/vault-backend/README.md
+++ b/plugins/vault-backend/README.md
@@ -63,7 +63,8 @@ To get started, first you need a running instance of Vault. You can follow [this
 
    ```yaml
    vault:
-     baseUrl: http://your-vault-url
+     baseUrl: http://your-internal-vault-url.svc
+     publicUrl: https://your-vault-url.example.com
      token: <VAULT_TOKEN>
      secretEngine: 'customSecretEngine' # Optional. By default it uses 'secrets'
      kvVersion: <kv-version> # Optional. The K/V version that your instance is using. The available options are '1' or '2'
diff --git a/plugins/vault-backend/config.d.ts b/plugins/vault-backend/config.d.ts
index c7aac4db9d..a30999b0cb 100644
--- a/plugins/vault-backend/config.d.ts
+++ b/plugins/vault-backend/config.d.ts
@@ -23,6 +23,12 @@ export interface Config {
      */
     baseUrl: string;
 
+    /**
+     * The publicUrl for your Vault instance (Optional).
+     * @visibility frontend
+     */
+    publicUrl?: string;
+
     /**
      * The token used by Backstage to access Vault.
      * @visibility secret
diff --git a/plugins/vault-backend/src/config/config.ts b/plugins/vault-backend/src/config/config.ts
index 4920c73fed..9eed497a48 100644
--- a/plugins/vault-backend/src/config/config.ts
+++ b/plugins/vault-backend/src/config/config.ts
@@ -27,6 +27,11 @@ export interface VaultConfig {
    */
   baseUrl: string;
 
+  /**
+   * The publicUrl for your Vault instance (Optional).
+   */
+  publicUrl?: string;
+
   /**
    * The token used by Backstage to access Vault.
    */
diff --git a/plugins/vault-backend/src/service/vaultApi.ts b/plugins/vault-backend/src/service/vaultApi.ts
index ea588964dc..7510ff218e 100644
--- a/plugins/vault-backend/src/service/vaultApi.ts
+++ b/plugins/vault-backend/src/service/vaultApi.ts
@@ -135,11 +135,13 @@ export class VaultClient implements VaultApi {
             )),
           );
         } else {
+          const vaultUrl =
+            this.vaultConfig.publicUrl || this.vaultConfig.baseUrl;
           secrets.push({
             name: secret,
             path: secretPath,
-            editUrl: `${this.vaultConfig.baseUrl}/ui/vault/secrets/${this.vaultConfig.secretEngine}/edit/${secretPath}/${secret}`,
-            showUrl: `${this.vaultConfig.baseUrl}/ui/vault/secrets/${this.vaultConfig.secretEngine}/show/${secretPath}/${secret}`,
+            editUrl: `${vaultUrl}/ui/vault/secrets/${this.vaultConfig.secretEngine}/edit/${secretPath}/${secret}`,
+            showUrl: `${vaultUrl}/ui/vault/secrets/${this.vaultConfig.secretEngine}/show/${secretPath}/${secret}`,
           });
         }
       }),

From 8b5367dc0f4c8f21fad7fd2f952d24c1856a6bef Mon Sep 17 00:00:00 2001
From: Casper Thygesen <cth@trifork.com>
Date: Thu, 1 Dec 2022 10:50:32 +0000
Subject: [PATCH 33/82] yarn run lint:docs

Signed-off-by: Casper Thygesen <cth@trifork.com>
---
 .changeset/loud-snails-sleep.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/loud-snails-sleep.md b/.changeset/loud-snails-sleep.md
index a34388e5aa..da51a39ce4 100644
--- a/.changeset/loud-snails-sleep.md
+++ b/.changeset/loud-snails-sleep.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-vault-backend': patch
 ---
 
-Added (optional) publicUrl to editUrl and showUrl in case baseUrl is an internal url
+Added (optional) public link option to entity vault card in case base link is internal

From dccc1b99d1082d70c4a42b656081bea93763d5e2 Mon Sep 17 00:00:00 2001
From: Casper Thygesen <cth@trifork.com>
Date: Thu, 1 Dec 2022 11:43:55 +0000
Subject: [PATCH 34/82] improved patch notes

Signed-off-by: Casper Thygesen <cth@trifork.com>
---
 .changeset/loud-snails-sleep.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/loud-snails-sleep.md b/.changeset/loud-snails-sleep.md
index da51a39ce4..d72c1a22b4 100644
--- a/.changeset/loud-snails-sleep.md
+++ b/.changeset/loud-snails-sleep.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-vault-backend': patch
 ---
 
-Added (optional) public link option to entity vault card in case base link is internal
+Added (optional) config `vault.publicUrl` as alternative to `vault.baseUrl` for `editUrl` and `showUrl` in case `vault.baseUrl` is internal

From 442e0d6d1040a49d53aa70c4a15120454a1c4416 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 1 Dec 2022 13:30:54 +0100
Subject: [PATCH 35/82] core-app-api: clean up some duplication in AppManager
 tests

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../core-app-api/src/app/AppManager.test.tsx  | 73 ++++---------------
 1 file changed, 16 insertions(+), 57 deletions(-)

diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index c70b43581a..df3d6f5a27 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -21,7 +21,7 @@ import {
   withLogCollector,
 } from '@backstage/test-utils';
 import { render, screen } from '@testing-library/react';
-import React, { PropsWithChildren } from 'react';
+import React, { PropsWithChildren, ReactNode } from 'react';
 import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
 import {
   configApiRef,
@@ -164,19 +164,20 @@ describe('Integration Test', () => {
   };
 
   const icons = {} as AppIcons;
+  const themes = [
+    {
+      id: 'light',
+      title: 'Light Theme',
+      variant: 'light' as const,
+      Provider: ({ children }: { children: ReactNode }) => <>{children}</>,
+    },
+  ];
 
   it('runs happy paths', async () => {
     const app = new AppManager({
       apis: [noOpAnalyticsApi],
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [],
       components,
@@ -224,14 +225,7 @@ describe('Integration Test', () => {
     const app = new AppManager({
       apis: [noOpAnalyticsApi],
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [],
       components,
@@ -282,14 +276,7 @@ describe('Integration Test', () => {
     const app = new AppManager({
       apis,
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [
         createPlugin({
@@ -345,14 +332,7 @@ describe('Integration Test', () => {
     const app = new AppManager({
       apis,
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [
         createPlugin({
@@ -421,14 +401,7 @@ describe('Integration Test', () => {
     const app = new AppManager({
       apis,
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [],
       components,
@@ -482,14 +455,7 @@ describe('Integration Test', () => {
     const app = new AppManager({
       apis: [],
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [],
       components,
@@ -532,14 +498,7 @@ describe('Integration Test', () => {
     const app = new AppManager({
       apis: [],
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [],
       components,

From ab7561626efc5ae0c6ad673b0c9660a7d26372e1 Mon Sep 17 00:00:00 2001
From: sblausten <sam@roadie.io>
Date: Thu, 1 Dec 2022 14:31:20 +0100
Subject: [PATCH 36/82] Add link to default icons for links

Signed-off-by: sblausten <sam@roadie.io>
---
 docs/features/software-catalog/descriptor-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md
index 81e3604ffe..27b26659cf 100644
--- a/docs/features/software-catalog/descriptor-format.md
+++ b/docs/features/software-catalog/descriptor-format.md
@@ -360,7 +360,7 @@ Fields of a link are:
 _NOTE_: The `icon` field value is meant to be a semantic key that will map to a
 specific icon that may be provided by an icon library (e.g. `material-ui`
 icons). These keys should be a sequence of `[a-z0-9A-Z]`, possibly separated by
-one of `[-_.]`. Backstage may support some basic icons out of the box, but the
+one of `[-_.]`. Backstage may support some basic icons out of the box such as those [defined in app-defaults](https://github.com/backstage/backstage/blob/master/packages/app-defaults/src/defaults/icons.tsx), but the
 Backstage integrator will ultimately be left to provide the appropriate icon
 component mappings. A generic fallback icon would be provided if a mapping
 cannot be resolved.

From 8370157c07dcb1eb6ade96e466bef438f76efb08 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:05:27 +0000
Subject: [PATCH 37/82] Update dependency react-markdown to v8.0.4

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5463fd7c54..0862908100 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32705,8 +32705,8 @@ __metadata:
   linkType: hard
 
 "react-markdown@npm:^8.0.0":
-  version: 8.0.3
-  resolution: "react-markdown@npm:8.0.3"
+  version: 8.0.4
+  resolution: "react-markdown@npm:8.0.4"
   dependencies:
     "@types/hast": ^2.0.0
     "@types/prop-types": ^15.0.0
@@ -32726,7 +32726,7 @@ __metadata:
   peerDependencies:
     "@types/react": ">=16"
     react: ">=16"
-  checksum: 66c0b45889d0262168547d9356145ced276993dac1d441c5c1cf2371fe71f347419696f9040c084c7d77c1caced21d358677c38f66edae736f942ac5964c032f
+  checksum: 9feec3734694ef05f450779a1adac10dbb768b8f3adbf4c81f59ca3cea8fd2f6a578fa4c488183597a7418f972715e5d84705cc76f278b55c86d622e82561bf8
   languageName: node
   linkType: hard
 

From 7d7420924c395f81866a14818e99c2eb91b4c107 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 14:17:57 +0000
Subject: [PATCH 38/82] Update react-router monorepo to v6.4.4

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5463fd7c54..d55b17a41a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12432,10 +12432,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@remix-run/router@npm:1.0.3"
-  checksum: 7e535f3c24bf6b0a48aff3de70ee74e5402fe93105aa9bd01f275d5d8f5a9a8a7cadec08d18cf5544d4f24bc9d7a091abc1c9d4ea8efb2893e9077f104a51459
+"@remix-run/router@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@remix-run/router@npm:1.0.4"
+  checksum: db6b1e111fb6e7e22c3d274bd6cef3054a0a989245894fde5735efd9cb46d18511e528e813ff50bcbdd7eda1c559f4e76e9d0c54396624e33396168d80b09c42
   languageName: node
   linkType: hard
 
@@ -32812,15 +32812,15 @@ __metadata:
   linkType: hard
 
 "react-router-dom@npm:^6.3.0":
-  version: 6.4.3
-  resolution: "react-router-dom@npm:6.4.3"
+  version: 6.4.4
+  resolution: "react-router-dom@npm:6.4.4"
   dependencies:
-    "@remix-run/router": 1.0.3
-    react-router: 6.4.3
+    "@remix-run/router": 1.0.4
+    react-router: 6.4.4
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 67a44d8dc45761a1c88793cac73839bb657168ef61b9473eb39b186b4a3ea1472454fd96f8997dc541cb1e79a723d62f9503cbc9179b63b8f1d634ed6d2b079a
+  checksum: 95f31ae84979b404db7483309e1063fbf724046103dc8b7be7e6df79f7b81e4e63dcdb587f11d8be38e3aaf62b71f9e0d83344ef8d8c5e962de7819c793de781
   languageName: node
   linkType: hard
 
@@ -32835,14 +32835,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router@npm:6.4.3, react-router@npm:^6.3.0":
-  version: 6.4.3
-  resolution: "react-router@npm:6.4.3"
+"react-router@npm:6.4.4, react-router@npm:^6.3.0":
+  version: 6.4.4
+  resolution: "react-router@npm:6.4.4"
   dependencies:
-    "@remix-run/router": 1.0.3
+    "@remix-run/router": 1.0.4
   peerDependencies:
     react: ">=16.8"
-  checksum: b89c0495c6837b1457915c08c5acc4eb7a2e9e3fae0420faf9bfc6311ecdfe78627cc1034c0e975bccd9aeeb70d1dcc5021322779dd3053d94c47e37339d77eb
+  checksum: d82cc8b8bdf10e02e07d089f9d82987fa161c2f07583c973126f5f8a052c02b3d2339891ddbda1738f877755a407e2c35f0dc1ac52aaa1d2c853774d19753ea7
   languageName: node
   linkType: hard
 

From 7bd22049aae0d1ee5a7a16c16359befe6fbf0797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20H=C3=BCttner?= <luca.huettner@gmail.com>
Date: Thu, 1 Dec 2022 15:23:04 +0100
Subject: [PATCH 39/82] Update
 plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Johan Haals <johan@haals.se>
Signed-off-by: Luca Hüttner <luca.huettner@gmail.com>
---
 .../src/components/CatalogKindHeader/CatalogKindHeader.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index 61a3c6fb4f..2f7cb6dfd9 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -61,7 +61,7 @@ export interface CatalogKindHeaderProps {
 
 /**
  * @public
- * @deprecated Might be removed in a future release.
+* @deprecated This component has been deprecated in favour of the EntityKindPicker in the list of filters. If you wish to keep this component long term make sure to raise an issue at github.com/backstage/backstage
  */
 export function CatalogKindHeader(props: CatalogKindHeaderProps) {
   const { initialFilter = 'component', allowedKinds } = props;

From a9a86a897226ee28997abd76de5e98747c246ac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20H=C3=BCttner?= <luca.huettner@gmail.com>
Date: Thu, 1 Dec 2022 15:23:17 +0100
Subject: [PATCH 40/82] Update .changeset/modern-camels-cheat.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Johan Haals <johan@haals.se>
Signed-off-by: Luca Hüttner <luca.huettner@gmail.com>
---
 .changeset/modern-camels-cheat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/modern-camels-cheat.md b/.changeset/modern-camels-cheat.md
index 69c680b989..9575a8f9a8 100644
--- a/.changeset/modern-camels-cheat.md
+++ b/.changeset/modern-camels-cheat.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-catalog': patch
 ---
 
-Remove `CatalogKindHeader` from `DefaultCatalogPage`. Deprecate `CatalogKindHeader`.
+Removed `CatalogKindHeader` from `DefaultCatalogPage`. Deprecated `CatalogKindHeader` in favour of `EntityKindPicker`.

From fabe95dcdf5ccec049d19c06fa3345bc93eb010a Mon Sep 17 00:00:00 2001
From: Luca Huettner <luca.huettner@gmail.com>
Date: Thu, 1 Dec 2022 15:38:19 +0100
Subject: [PATCH 41/82] style: Fix formatting

Signed-off-by: Luca Huettner <luca.huettner@gmail.com>
---
 .../src/components/CatalogKindHeader/CatalogKindHeader.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index 2f7cb6dfd9..67631a3b98 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -61,7 +61,7 @@ export interface CatalogKindHeaderProps {
 
 /**
  * @public
-* @deprecated This component has been deprecated in favour of the EntityKindPicker in the list of filters. If you wish to keep this component long term make sure to raise an issue at github.com/backstage/backstage
+ * @deprecated This component has been deprecated in favour of the EntityKindPicker in the list of filters. If you wish to keep this component long term make sure to raise an issue at github.com/backstage/backstage
  */
 export function CatalogKindHeader(props: CatalogKindHeaderProps) {
   const { initialFilter = 'component', allowedKinds } = props;

From b4b5b023156342c4c45c8b9ca655257e4b649880 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 1 Dec 2022 16:07:02 +0100
Subject: [PATCH 42/82] core-app-api: immediately register discovered feature
 flags

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/gentle-ligers-help.md              |  5 +++
 .../core-app-api/src/app/AppManager.test.tsx  | 39 +++++++++++++++++++
 packages/core-app-api/src/app/AppManager.tsx  | 25 +++++++-----
 3 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/gentle-ligers-help.md

diff --git a/.changeset/gentle-ligers-help.md b/.changeset/gentle-ligers-help.md
new file mode 100644
index 0000000000..f7f9c3b270
--- /dev/null
+++ b/.changeset/gentle-ligers-help.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': patch
+---
+
+Tweak feature flag registration so that it happens immediately before the first rendering of the app, rather than just after.
diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index df3d6f5a27..17d33693e5 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -34,6 +34,7 @@ import {
   createSubRouteRef,
   createRoutableExtension,
   analyticsApiRef,
+  useApi,
 } from '@backstage/core-plugin-api';
 import { AppManager } from './AppManager';
 import { AppComponents, AppIcons } from './types';
@@ -395,6 +396,44 @@ describe('Integration Test', () => {
     });
   });
 
+  it('feature flags should be available immediately', async () => {
+    const app = new AppManager({
+      apis: [
+        createApiFactory({
+          api: featureFlagsApiRef,
+          deps: { configApi: configApiRef },
+          factory() {
+            return new LocalStorageFeatureFlags();
+          },
+        }),
+      ],
+      defaultApis: [],
+      themes,
+      icons,
+      plugins: [createPlugin({ id: 'test', featureFlags: [{ name: 'foo' }] })],
+      components,
+      configLoader: async () => [],
+    });
+
+    const Provider = app.getProvider();
+    const Router = app.getRouter();
+
+    const FeatureFlags = () => {
+      const featureFlags = useApi(featureFlagsApiRef).getRegisteredFlags();
+      return <div>Flags: {featureFlags.map(f => f.name).join(',')}</div>;
+    };
+
+    await renderWithEffects(
+      <Provider>
+        <Router>
+          <FeatureFlags />
+        </Router>
+      </Provider>,
+    );
+
+    expect(screen.getByText('Flags: foo')).toBeInTheDocument();
+  });
+
   it('should track route changes via analytics api', async () => {
     const mockAnalyticsApi = new MockAnalyticsApi();
     const apis = [createApiFactory(analyticsApiRef, mockAnalyticsApi)];
diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index 4582a3c7cd..a6e15fe40c 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -21,8 +21,8 @@ import React, {
   PropsWithChildren,
   ReactElement,
   useContext,
-  useEffect,
   useMemo,
+  useRef,
   useState,
 } from 'react';
 import { Route, Routes } from 'react-router-dom';
@@ -230,6 +230,7 @@ export class AppManager implements BackstageApp {
     let routesHaveBeenValidated = false;
 
     const Provider = ({ children }: PropsWithChildren<{}>) => {
+      const needsFeatureFlagRegistrationRef = useRef(true);
       const appThemeApi = useMemo(
         () => AppThemeSelector.createWithStorage(this.themes),
         [],
@@ -284,10 +285,21 @@ export class AppManager implements BackstageApp {
         this.configApi = api;
       }
 
-      useEffect(() => {
-        if (hasConfigApi) {
-          const featureFlagsApi = this.getApiHolder().get(featureFlagsApiRef)!;
+      if ('node' in loadedConfig) {
+        // Loading or error
+        return loadedConfig.node;
+      }
 
+      // We can't register feature flags just after the element traversal, because the
+      // config API isn't available yet and implementations frequently depend on it.
+      // Instead we make it happen immediately, to make sure all flags are available
+      // for the first render.
+      if (hasConfigApi && needsFeatureFlagRegistrationRef.current) {
+        needsFeatureFlagRegistrationRef.current = false;
+
+        const featureFlagsApi = this.getApiHolder().get(featureFlagsApiRef)!;
+
+        if (featureFlagsApi) {
           for (const plugin of this.plugins.values()) {
             if ('getFeatureFlags' in plugin) {
               for (const flag of plugin.getFeatureFlags()) {
@@ -314,11 +326,6 @@ export class AppManager implements BackstageApp {
             featureFlagsApi.registerFlag({ name, pluginId: '' });
           }
         }
-      }, [hasConfigApi, loadedConfig, featureFlags]);
-
-      if ('node' in loadedConfig) {
-        // Loading or error
-        return loadedConfig.node;
       }
 
       const { ThemeProvider = AppThemeProvider } = this.components;

From 68a2d370d1a0036d213cdc4e8a0084b54546edef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20H=C3=BCttner?= <luca.huettner@gmail.com>
Date: Thu, 1 Dec 2022 16:32:12 +0100
Subject: [PATCH 43/82] Update .changeset/modern-camels-cheat.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Johan Haals <johan@haals.se>
Signed-off-by: Luca Hüttner <luca.huettner@gmail.com>
---
 .changeset/modern-camels-cheat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/modern-camels-cheat.md b/.changeset/modern-camels-cheat.md
index 9575a8f9a8..c0a80934d5 100644
--- a/.changeset/modern-camels-cheat.md
+++ b/.changeset/modern-camels-cheat.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog': minor
 ---
 
 Removed `CatalogKindHeader` from `DefaultCatalogPage`. Deprecated `CatalogKindHeader` in favour of `EntityKindPicker`.

From 8f29738d5c9c3e42a5c532e46e8ed8eff9df2aa1 Mon Sep 17 00:00:00 2001
From: Casper Thygesen <cth@trifork.com>
Date: Thu, 1 Dec 2022 15:41:20 +0000
Subject: [PATCH 44/82] Forgot to update getVaultConfig

Signed-off-by: Casper Thygesen <cth@trifork.com>
---
 plugins/vault-backend/src/config/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/vault-backend/src/config/config.ts b/plugins/vault-backend/src/config/config.ts
index 9eed497a48..159fee0447 100644
--- a/plugins/vault-backend/src/config/config.ts
+++ b/plugins/vault-backend/src/config/config.ts
@@ -58,6 +58,7 @@ export interface VaultConfig {
 export function getVaultConfig(config: Config): VaultConfig {
   return {
     baseUrl: config.getString('vault.baseUrl'),
+    publicUrl: config.getOptionalString('vault.publicUrl'),
     token: config.getString('vault.token'),
     kvVersion: config.getOptionalNumber('vault.kvVersion') ?? 2,
     secretEngine: config.getOptionalString('vault.secretEngine') ?? 'secrets',

From a1cbb8d041598d130d4b66bd4f1a8af0fb021ec3 Mon Sep 17 00:00:00 2001
From: Casper Thygesen <cth@trifork.com>
Date: Thu, 1 Dec 2022 15:50:58 +0000
Subject: [PATCH 45/82] GetVaultConfig tests fixed

Signed-off-by: Casper Thygesen <cth@trifork.com>
---
 plugins/vault-backend/src/config/config.test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/vault-backend/src/config/config.test.ts b/plugins/vault-backend/src/config/config.test.ts
index 7cfdd8f468..a061d0f784 100644
--- a/plugins/vault-backend/src/config/config.test.ts
+++ b/plugins/vault-backend/src/config/config.test.ts
@@ -40,6 +40,7 @@ describe('GetVaultConfig', () => {
     const vaultConfig = getVaultConfig(config);
     expect(vaultConfig).toStrictEqual({
       baseUrl: 'http://www.example.com',
+      publicUrl: undefined,
       token: '123',
       kvVersion: 2,
       secretEngine: 'secrets',
@@ -59,6 +60,7 @@ describe('GetVaultConfig', () => {
     const vaultConfig = getVaultConfig(config);
     expect(vaultConfig).toStrictEqual({
       baseUrl: 'http://www.example.com',
+      publicUrl: undefined,
       token: '123',
       kvVersion: 1,
       secretEngine: 'test',

From 3c1302c07d631f8490ab99201ff9e036effa3f33 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 18:59:03 +0000
Subject: [PATCH 46/82] Update dependency @types/http-errors to v2

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 .changeset/renovate-8c69aed.md       |  5 +++++
 packages/backend-common/package.json |  2 +-
 yarn.lock                            | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/renovate-8c69aed.md

diff --git a/.changeset/renovate-8c69aed.md b/.changeset/renovate-8c69aed.md
new file mode 100644
index 0000000000..63a61d941a
--- /dev/null
+++ b/.changeset/renovate-8c69aed.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-common': patch
+---
+
+Updated dependency `@types/http-errors` to `^2.0.0`.
diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index eb9ab49521..d68d22b9a8 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -101,7 +101,7 @@
     "@types/compression": "^1.7.0",
     "@types/concat-stream": "^2.0.0",
     "@types/fs-extra": "^9.0.3",
-    "@types/http-errors": "^1.6.3",
+    "@types/http-errors": "^2.0.0",
     "@types/minimist": "^1.2.0",
     "@types/mock-fs": "^4.13.0",
     "@types/morgan": "^1.9.0",
diff --git a/yarn.lock b/yarn.lock
index e3d1b5eb88..fa66ab8d2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3396,7 +3396,7 @@ __metadata:
     "@types/dockerode": ^3.3.0
     "@types/express": ^4.17.6
     "@types/fs-extra": ^9.0.3
-    "@types/http-errors": ^1.6.3
+    "@types/http-errors": ^2.0.0
     "@types/luxon": ^3.0.0
     "@types/minimist": ^1.2.0
     "@types/mock-fs": ^4.13.0
@@ -14151,10 +14151,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/http-errors@npm:^1.6.3":
-  version: 1.8.2
-  resolution: "@types/http-errors@npm:1.8.2"
-  checksum: ecc365eea98d7eca650d593e742571acc3003742f0dd0fbbb15b8fce286e0f7421644b4140fb9bf701bbb7f1b744aea3967ebe025f0f0811aa5ab2c3d40fe111
+"@types/http-errors@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@types/http-errors@npm:2.0.1"
+  checksum: 3bb0c50b0a652e679a84c30cd0340d696c32ef6558518268c238840346c077f899315daaf1c26c09c57ddd5dc80510f2a7f46acd52bf949e339e35ed3ee9654f
   languageName: node
   linkType: hard
 

From 5cad431d0c6704d669b11b4807803100f853bd27 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 2 Dec 2022 14:29:50 +0100
Subject: [PATCH 47/82] backend-plugin-api: export service refs via single
 coreServices object

Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 packages/backend-plugin-api/api-report.md     | 45 +++++++++++++------
 .../src/services/definitions/coreServices.ts  | 29 ++++++++++++
 .../src/services/definitions/index.ts         | 16 ++-----
 3 files changed, 64 insertions(+), 26 deletions(-)
 create mode 100644 packages/backend-plugin-api/src/services/definitions/coreServices.ts

diff --git a/packages/backend-plugin-api/api-report.md b/packages/backend-plugin-api/api-report.md
index b73a85c32e..17cae29bff 100644
--- a/packages/backend-plugin-api/api-report.md
+++ b/packages/backend-plugin-api/api-report.md
@@ -76,10 +76,29 @@ export interface BackendRegistrationPoints {
 }
 
 // @public (undocumented)
-export const cacheServiceRef: ServiceRef<PluginCacheManager, 'plugin'>;
+const cacheServiceRef: ServiceRef<PluginCacheManager, 'plugin'>;
 
 // @public (undocumented)
-export const configServiceRef: ServiceRef<Config, 'root'>;
+const configServiceRef: ServiceRef<Config, 'root'>;
+
+declare namespace coreServices {
+  export {
+    configServiceRef as config,
+    httpRouterServiceRef as httpRouter,
+    loggerServiceRef as logger,
+    urlReaderServiceRef as urlReader,
+    cacheServiceRef as cache,
+    databaseServiceRef as database,
+    discoveryServiceRef as discovery,
+    tokenManagerServiceRef as tokenManager,
+    permissionsServiceRef as permissions,
+    schedulerServiceRef as scheduler,
+    rootLoggerServiceRef as rootLogger,
+    pluginMetadataServiceRef as pluginMetadata,
+    lifecycleServiceRef as lifecycle,
+  };
+}
+export { coreServices };
 
 // @public
 export function createBackendModule<
@@ -146,10 +165,10 @@ export function createServiceRef<T>(options: {
 }): ServiceRef<T, 'root'>;
 
 // @public (undocumented)
-export const databaseServiceRef: ServiceRef<PluginDatabaseManager, 'plugin'>;
+const databaseServiceRef: ServiceRef<PluginDatabaseManager, 'plugin'>;
 
 // @public (undocumented)
-export const discoveryServiceRef: ServiceRef<PluginEndpointDiscovery, 'plugin'>;
+const discoveryServiceRef: ServiceRef<PluginEndpointDiscovery, 'plugin'>;
 
 // @public
 export type ExtensionPoint<T> = {
@@ -166,10 +185,10 @@ export interface HttpRouterService {
 }
 
 // @public (undocumented)
-export const httpRouterServiceRef: ServiceRef<HttpRouterService, 'plugin'>;
+const httpRouterServiceRef: ServiceRef<HttpRouterService, 'plugin'>;
 
 // @public (undocumented)
-export const lifecycleServiceRef: ServiceRef<BackendLifecycle, 'plugin'>;
+const lifecycleServiceRef: ServiceRef<BackendLifecycle, 'plugin'>;
 
 // @public (undocumented)
 export interface Logger {
@@ -180,7 +199,7 @@ export interface Logger {
 }
 
 // @public (undocumented)
-export const loggerServiceRef: ServiceRef<Logger, 'plugin'>;
+const loggerServiceRef: ServiceRef<Logger, 'plugin'>;
 
 // @public (undocumented)
 export function loggerToWinstonLogger(
@@ -189,7 +208,7 @@ export function loggerToWinstonLogger(
 ): Logger_2;
 
 // @public (undocumented)
-export const permissionsServiceRef: ServiceRef<
+const permissionsServiceRef: ServiceRef<
   PermissionAuthorizer | PermissionEvaluator,
   'plugin'
 >;
@@ -201,13 +220,13 @@ export interface PluginMetadata {
 }
 
 // @public (undocumented)
-export const pluginMetadataServiceRef: ServiceRef<PluginMetadata, 'plugin'>;
+const pluginMetadataServiceRef: ServiceRef<PluginMetadata, 'plugin'>;
 
 // @public (undocumented)
-export const rootLoggerServiceRef: ServiceRef<Logger, 'root'>;
+const rootLoggerServiceRef: ServiceRef<Logger, 'root'>;
 
 // @public (undocumented)
-export const schedulerServiceRef: ServiceRef<PluginTaskScheduler, 'plugin'>;
+const schedulerServiceRef: ServiceRef<PluginTaskScheduler, 'plugin'>;
 
 // @public (undocumented)
 export type ServiceFactory<TService = unknown> =
@@ -249,7 +268,7 @@ export type ServiceRef<
 };
 
 // @public (undocumented)
-export const tokenManagerServiceRef: ServiceRef<TokenManager, 'plugin'>;
+const tokenManagerServiceRef: ServiceRef<TokenManager, 'plugin'>;
 
 // @public (undocumented)
 export type TypesToServiceRef<T> = {
@@ -257,5 +276,5 @@ export type TypesToServiceRef<T> = {
 };
 
 // @public (undocumented)
-export const urlReaderServiceRef: ServiceRef<UrlReader, 'plugin'>;
+const urlReaderServiceRef: ServiceRef<UrlReader, 'plugin'>;
 ```
diff --git a/packages/backend-plugin-api/src/services/definitions/coreServices.ts b/packages/backend-plugin-api/src/services/definitions/coreServices.ts
new file mode 100644
index 0000000000..d5a5953806
--- /dev/null
+++ b/packages/backend-plugin-api/src/services/definitions/coreServices.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { configServiceRef as config } from './configServiceRef';
+export { httpRouterServiceRef as httpRouter } from './httpRouterServiceRef';
+export { loggerServiceRef as logger } from './loggerServiceRef';
+export { urlReaderServiceRef as urlReader } from './urlReaderServiceRef';
+export { cacheServiceRef as cache } from './cacheServiceRef';
+export { databaseServiceRef as database } from './databaseServiceRef';
+export { discoveryServiceRef as discovery } from './discoveryServiceRef';
+export { tokenManagerServiceRef as tokenManager } from './tokenManagerServiceRef';
+export { permissionsServiceRef as permissions } from './permissionsServiceRef';
+export { schedulerServiceRef as scheduler } from './schedulerServiceRef';
+export { rootLoggerServiceRef as rootLogger } from './rootLoggerServiceRef';
+export { pluginMetadataServiceRef as pluginMetadata } from './pluginMetadataServiceRef';
+export { lifecycleServiceRef as lifecycle } from './lifecycleServiceRef';
diff --git a/packages/backend-plugin-api/src/services/definitions/index.ts b/packages/backend-plugin-api/src/services/definitions/index.ts
index cf997a344d..1ff33362fa 100644
--- a/packages/backend-plugin-api/src/services/definitions/index.ts
+++ b/packages/backend-plugin-api/src/services/definitions/index.ts
@@ -14,21 +14,11 @@
  * limitations under the License.
  */
 
-export { configServiceRef } from './configServiceRef';
-export { httpRouterServiceRef } from './httpRouterServiceRef';
+import * as coreServices from './coreServices';
+
+export { coreServices };
 export type { HttpRouterService } from './httpRouterServiceRef';
-export { loggerServiceRef } from './loggerServiceRef';
 export type { Logger } from './loggerServiceRef';
-export { urlReaderServiceRef } from './urlReaderServiceRef';
-export { cacheServiceRef } from './cacheServiceRef';
-export { databaseServiceRef } from './databaseServiceRef';
-export { discoveryServiceRef } from './discoveryServiceRef';
-export { tokenManagerServiceRef } from './tokenManagerServiceRef';
-export { permissionsServiceRef } from './permissionsServiceRef';
-export { schedulerServiceRef } from './schedulerServiceRef';
-export { rootLoggerServiceRef } from './rootLoggerServiceRef';
-export { pluginMetadataServiceRef } from './pluginMetadataServiceRef';
-export { lifecycleServiceRef } from './lifecycleServiceRef';
 export type {
   BackendLifecycle,
   BackendLifecycleShutdownHook,

From a46a0887a3ebe09cb90709bcb55a6de27adf7d38 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 2 Dec 2022 14:48:15 +0100
Subject: [PATCH 48/82] refactor all the things to use coreServices

Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../services/implementations/cacheService.ts  | 10 ++++-----
 .../services/implementations/configService.ts |  7 +++---
 .../implementations/databaseService.ts        | 10 ++++-----
 .../implementations/discoveryService.ts       |  7 +++---
 .../implementations/httpRouterService.ts      | 10 ++++-----
 .../implementations/lifecycleService.ts       | 10 ++++-----
 .../services/implementations/loggerService.ts | 10 ++++-----
 .../implementations/permissionsService.ts     | 13 +++++------
 .../implementations/rootLoggerService.ts      |  4 ++--
 .../implementations/schedulerService.ts       | 10 ++++-----
 .../implementations/tokenManagerService.ts    | 10 ++++-----
 .../implementations/urlReaderService.ts       | 10 ++++-----
 .../src/wiring/ServiceRegistry.test.ts        |  4 ++--
 .../src/wiring/ServiceRegistry.ts             |  8 +++----
 .../app-backend/src/service/appPlugin.test.ts |  4 ++--
 plugins/app-backend/src/service/appPlugin.ts  | 13 +++++------
 .../AwsS3EntityProviderCatalogModule.test.ts  | 12 ++++------
 .../AwsS3EntityProviderCatalogModule.ts       | 10 ++++-----
 ...eDevOpsEntityProviderCatalogModule.test.ts | 12 ++++------
 .../AzureDevOpsEntityProviderCatalogModule.ts | 10 ++++-----
 ...etCloudEntityProviderCatalogModule.test.ts | 18 +++++----------
 ...tbucketCloudEntityProviderCatalogModule.ts | 13 +++++------
 ...tServerEntityProviderCatalogModule.test.ts | 12 ++++------
 ...bucketServerEntityProviderCatalogModule.ts | 10 ++++-----
 .../GerritEntityProviderCatalogModule.test.ts | 12 ++++------
 .../GerritEntityProviderCatalogModule.ts      | 10 ++++-----
 .../GithubEntityProviderCatalogModule.test.ts | 12 ++++------
 .../GithubEntityProviderCatalogModule.ts      | 10 ++++-----
 ...scoveryEntityProviderCatalogModule.test.ts | 12 ++++------
 ...labDiscoveryEntityProviderCatalogModule.ts | 10 ++++-----
 ...gestionEntityProviderCatalogModule.test.ts | 18 +++++----------
 ...talIngestionEntityProviderCatalogModule.ts | 16 +++++---------
 .../src/run.ts                                |  4 ++--
 ...raphOrgEntityProviderCatalogModule.test.ts | 12 ++++------
 ...softGraphOrgEntityProviderCatalogModule.ts | 10 ++++-----
 .../src/service/CatalogPlugin.ts              | 22 +++++++------------
 .../catalog-node/src/catalogService.test.ts   |  4 ++--
 plugins/catalog-node/src/catalogService.ts    |  4 ++--
 ...onsumingEventPublisherEventsModule.test.ts | 12 ++++------
 ...sSqsConsumingEventPublisherEventsModule.ts | 10 ++++-----
 .../service/GithubWebhookEventsModule.test.ts |  4 ++--
 .../src/service/GithubWebhookEventsModule.ts  |  4 ++--
 .../service/GitlabWebhookEventsModule.test.ts |  4 ++--
 .../src/service/GitlabWebhookEventsModule.ts  |  4 ++--
 .../src/service/EventsPlugin.test.ts          | 10 ++++-----
 .../src/service/EventsPlugin.ts               | 10 ++++-----
 .../src/ScaffolderPlugin.ts                   | 19 ++++++----------
 47 files changed, 182 insertions(+), 288 deletions(-)

diff --git a/packages/backend-app-api/src/services/implementations/cacheService.ts b/packages/backend-app-api/src/services/implementations/cacheService.ts
index 7e15f031c6..df4a782a46 100644
--- a/packages/backend-app-api/src/services/implementations/cacheService.ts
+++ b/packages/backend-app-api/src/services/implementations/cacheService.ts
@@ -16,18 +16,16 @@
 
 import { CacheManager } from '@backstage/backend-common';
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
-  pluginMetadataServiceRef,
-  cacheServiceRef,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
 export const cacheFactory = createServiceFactory({
-  service: cacheServiceRef,
+  service: coreServices.cache,
   deps: {
-    config: configServiceRef,
-    plugin: pluginMetadataServiceRef,
+    config: coreServices.config,
+    plugin: coreServices.pluginMetadata,
   },
   async factory({ config }) {
     const cacheManager = CacheManager.fromConfig(config);
diff --git a/packages/backend-app-api/src/services/implementations/configService.ts b/packages/backend-app-api/src/services/implementations/configService.ts
index 91327289df..f58a756c64 100644
--- a/packages/backend-app-api/src/services/implementations/configService.ts
+++ b/packages/backend-app-api/src/services/implementations/configService.ts
@@ -16,17 +16,16 @@
 
 import { loadBackendConfig } from '@backstage/backend-common';
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
   loggerToWinstonLogger,
-  rootLoggerServiceRef,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
 export const configFactory = createServiceFactory({
-  service: configServiceRef,
+  service: coreServices.config,
   deps: {
-    logger: rootLoggerServiceRef,
+    logger: coreServices.rootLogger,
   },
   async factory({ logger }) {
     const config = await loadBackendConfig({
diff --git a/packages/backend-app-api/src/services/implementations/databaseService.ts b/packages/backend-app-api/src/services/implementations/databaseService.ts
index f6401528e6..f33e825c9b 100644
--- a/packages/backend-app-api/src/services/implementations/databaseService.ts
+++ b/packages/backend-app-api/src/services/implementations/databaseService.ts
@@ -16,18 +16,16 @@
 
 import { DatabaseManager } from '@backstage/backend-common';
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
-  databaseServiceRef,
-  pluginMetadataServiceRef,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
 export const databaseFactory = createServiceFactory({
-  service: databaseServiceRef,
+  service: coreServices.database,
   deps: {
-    config: configServiceRef,
-    plugin: pluginMetadataServiceRef,
+    config: coreServices.config,
+    plugin: coreServices.pluginMetadata,
   },
   async factory({ config }) {
     const databaseManager = DatabaseManager.fromConfig(config);
diff --git a/packages/backend-app-api/src/services/implementations/discoveryService.ts b/packages/backend-app-api/src/services/implementations/discoveryService.ts
index 7f35bf2447..0c04ec6bf0 100644
--- a/packages/backend-app-api/src/services/implementations/discoveryService.ts
+++ b/packages/backend-app-api/src/services/implementations/discoveryService.ts
@@ -16,16 +16,15 @@
 
 import { SingleHostDiscovery } from '@backstage/backend-common';
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
-  discoveryServiceRef,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
 export const discoveryFactory = createServiceFactory({
-  service: discoveryServiceRef,
+  service: coreServices.discovery,
   deps: {
-    config: configServiceRef,
+    config: coreServices.config,
   },
   async factory({ config }) {
     const discovery = SingleHostDiscovery.fromConfig(config);
diff --git a/packages/backend-app-api/src/services/implementations/httpRouterService.ts b/packages/backend-app-api/src/services/implementations/httpRouterService.ts
index d9fc807b1a..2021589a50 100644
--- a/packages/backend-app-api/src/services/implementations/httpRouterService.ts
+++ b/packages/backend-app-api/src/services/implementations/httpRouterService.ts
@@ -16,9 +16,7 @@
 
 import {
   createServiceFactory,
-  httpRouterServiceRef,
-  configServiceRef,
-  pluginMetadataServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import Router from 'express-promise-router';
 import { Handler } from 'express';
@@ -36,10 +34,10 @@ export type HttpRouterFactoryOptions = {
 
 /** @public */
 export const httpRouterFactory = createServiceFactory({
-  service: httpRouterServiceRef,
+  service: coreServices.httpRouter,
   deps: {
-    config: configServiceRef,
-    plugin: pluginMetadataServiceRef,
+    config: coreServices.config,
+    plugin: coreServices.pluginMetadata,
   },
   async factory({ config }, options?: HttpRouterFactoryOptions) {
     const defaultPluginId = options?.indexPlugin ?? 'app';
diff --git a/packages/backend-app-api/src/services/implementations/lifecycleService.ts b/packages/backend-app-api/src/services/implementations/lifecycleService.ts
index 7d41a7a276..5616296e93 100644
--- a/packages/backend-app-api/src/services/implementations/lifecycleService.ts
+++ b/packages/backend-app-api/src/services/implementations/lifecycleService.ts
@@ -16,10 +16,8 @@
 import {
   BackendLifecycle,
   createServiceFactory,
-  lifecycleServiceRef,
+  coreServices,
   loggerToWinstonLogger,
-  pluginMetadataServiceRef,
-  rootLoggerServiceRef,
   BackendLifecycleShutdownHook,
 } from '@backstage/backend-plugin-api';
 import { Logger } from 'winston';
@@ -80,10 +78,10 @@ class PluginScopedLifecycleImpl implements BackendLifecycle {
  * Allows plugins to register shutdown hooks that are run when the process is about to exit.
  * @public */
 export const lifecycleFactory = createServiceFactory({
-  service: lifecycleServiceRef,
+  service: coreServices.lifecycle,
   deps: {
-    logger: rootLoggerServiceRef,
-    plugin: pluginMetadataServiceRef,
+    logger: coreServices.rootLogger,
+    plugin: coreServices.pluginMetadata,
   },
   async factory({ logger }) {
     const rootLifecycle = new BackendLifecycleImpl(
diff --git a/packages/backend-app-api/src/services/implementations/loggerService.ts b/packages/backend-app-api/src/services/implementations/loggerService.ts
index ff72020140..52b391249d 100644
--- a/packages/backend-app-api/src/services/implementations/loggerService.ts
+++ b/packages/backend-app-api/src/services/implementations/loggerService.ts
@@ -16,17 +16,15 @@
 
 import {
   createServiceFactory,
-  loggerServiceRef,
-  pluginMetadataServiceRef,
-  rootLoggerServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
 export const loggerFactory = createServiceFactory({
-  service: loggerServiceRef,
+  service: coreServices.logger,
   deps: {
-    rootLogger: rootLoggerServiceRef,
-    plugin: pluginMetadataServiceRef,
+    rootLogger: coreServices.rootLogger,
+    plugin: coreServices.pluginMetadata,
   },
   async factory({ rootLogger }) {
     return async ({ plugin }) => {
diff --git a/packages/backend-app-api/src/services/implementations/permissionsService.ts b/packages/backend-app-api/src/services/implementations/permissionsService.ts
index 32e8a1a9f9..d3f8d5783c 100644
--- a/packages/backend-app-api/src/services/implementations/permissionsService.ts
+++ b/packages/backend-app-api/src/services/implementations/permissionsService.ts
@@ -15,21 +15,18 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
-  discoveryServiceRef,
-  permissionsServiceRef,
-  tokenManagerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { ServerPermissionClient } from '@backstage/plugin-permission-node';
 
 /** @public */
 export const permissionsFactory = createServiceFactory({
-  service: permissionsServiceRef,
+  service: coreServices.permissions,
   deps: {
-    config: configServiceRef,
-    discovery: discoveryServiceRef,
-    tokenManager: tokenManagerServiceRef,
+    config: coreServices.config,
+    discovery: coreServices.discovery,
+    tokenManager: coreServices.tokenManager,
   },
   async factory({ config }) {
     return async ({ discovery, tokenManager }) => {
diff --git a/packages/backend-app-api/src/services/implementations/rootLoggerService.ts b/packages/backend-app-api/src/services/implementations/rootLoggerService.ts
index a65a8d9126..d2bb406adb 100644
--- a/packages/backend-app-api/src/services/implementations/rootLoggerService.ts
+++ b/packages/backend-app-api/src/services/implementations/rootLoggerService.ts
@@ -18,7 +18,7 @@ import { createRootLogger } from '@backstage/backend-common';
 import {
   createServiceFactory,
   Logger,
-  rootLoggerServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { Logger as WinstonLogger } from 'winston';
 
@@ -40,7 +40,7 @@ class BackstageLogger implements Logger {
 
 /** @public */
 export const rootLoggerFactory = createServiceFactory({
-  service: rootLoggerServiceRef,
+  service: coreServices.rootLogger,
   deps: {},
   async factory() {
     return BackstageLogger.fromWinston(createRootLogger());
diff --git a/packages/backend-app-api/src/services/implementations/schedulerService.ts b/packages/backend-app-api/src/services/implementations/schedulerService.ts
index 40676344ec..a6edec868a 100644
--- a/packages/backend-app-api/src/services/implementations/schedulerService.ts
+++ b/packages/backend-app-api/src/services/implementations/schedulerService.ts
@@ -15,19 +15,17 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
-  pluginMetadataServiceRef,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { TaskScheduler } from '@backstage/backend-tasks';
 
 /** @public */
 export const schedulerFactory = createServiceFactory({
-  service: schedulerServiceRef,
+  service: coreServices.scheduler,
   deps: {
-    config: configServiceRef,
-    plugin: pluginMetadataServiceRef,
+    config: coreServices.config,
+    plugin: coreServices.pluginMetadata,
   },
   async factory({ config }) {
     const taskScheduler = TaskScheduler.fromConfig(config);
diff --git a/packages/backend-app-api/src/services/implementations/tokenManagerService.ts b/packages/backend-app-api/src/services/implementations/tokenManagerService.ts
index 92f42c10db..6a2d47ae14 100644
--- a/packages/backend-app-api/src/services/implementations/tokenManagerService.ts
+++ b/packages/backend-app-api/src/services/implementations/tokenManagerService.ts
@@ -15,20 +15,18 @@
  */
 
 import {
-  configServiceRef,
-  loggerServiceRef,
+  coreServices,
   createServiceFactory,
-  tokenManagerServiceRef,
   loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import { ServerTokenManager } from '@backstage/backend-common';
 
 /** @public */
 export const tokenManagerFactory = createServiceFactory({
-  service: tokenManagerServiceRef,
+  service: coreServices.tokenManager,
   deps: {
-    config: configServiceRef,
-    logger: loggerServiceRef,
+    config: coreServices.config,
+    logger: coreServices.logger,
   },
   async factory() {
     return async ({ config, logger }) => {
diff --git a/packages/backend-app-api/src/services/implementations/urlReaderService.ts b/packages/backend-app-api/src/services/implementations/urlReaderService.ts
index d7d7502a08..b68be74d8c 100644
--- a/packages/backend-app-api/src/services/implementations/urlReaderService.ts
+++ b/packages/backend-app-api/src/services/implementations/urlReaderService.ts
@@ -16,19 +16,17 @@
 
 import { UrlReaders } from '@backstage/backend-common';
 import {
-  configServiceRef,
+  coreServices,
   createServiceFactory,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  urlReaderServiceRef,
 } from '@backstage/backend-plugin-api';
 
 /** @public */
 export const urlReaderFactory = createServiceFactory({
-  service: urlReaderServiceRef,
+  service: coreServices.urlReader,
   deps: {
-    config: configServiceRef,
-    logger: loggerServiceRef,
+    config: coreServices.config,
+    logger: coreServices.logger,
   },
   async factory() {
     return async ({ config, logger }) => {
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
index 897ed4e3cd..b878a6a75d 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.test.ts
@@ -18,7 +18,7 @@ import {
   createServiceRef,
   createServiceFactory,
   ServiceRef,
-  pluginMetadataServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { ServiceRegistry } from './ServiceRegistry';
 
@@ -172,7 +172,7 @@ describe('ServiceRegistry', () => {
     const ref = createServiceRef<{ pluginId: string }>({ id: 'x' });
     const factory = createServiceFactory({
       service: ref,
-      deps: { meta: pluginMetadataServiceRef },
+      deps: { meta: coreServices.pluginMetadata },
       async factory() {
         return async ({ meta }) => ({ pluginId: meta.getId() });
       },
diff --git a/packages/backend-app-api/src/wiring/ServiceRegistry.ts b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
index 007ca00c88..9ff73f4270 100644
--- a/packages/backend-app-api/src/wiring/ServiceRegistry.ts
+++ b/packages/backend-app-api/src/wiring/ServiceRegistry.ts
@@ -17,7 +17,7 @@
 import {
   ServiceFactory,
   ServiceRef,
-  pluginMetadataServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { stringifyError } from '@backstage/errors';
 
@@ -65,10 +65,10 @@ export class ServiceRegistry {
     pluginId: string,
   ): Promise<ServiceFactory> | undefined {
     // Special case handling of the plugin metadata service, generating a custom factory for it each time
-    if (ref.id === pluginMetadataServiceRef.id) {
+    if (ref.id === coreServices.pluginMetadata.id) {
       return Promise.resolve({
         scope: 'plugin',
-        service: pluginMetadataServiceRef,
+        service: coreServices.pluginMetadata,
         deps: {},
         factory: async () => async () => ({
           getId() {
@@ -114,7 +114,7 @@ export class ServiceRegistry {
 
   #checkForMissingDeps(factory: ServiceFactory, pluginId: string) {
     const missingDeps = Object.values(factory.deps).filter(ref => {
-      if (ref.id === pluginMetadataServiceRef.id) {
+      if (ref.id === coreServices.pluginMetadata.id) {
         return false;
       }
       if (this.#providedFactories.get(ref.id)) {
diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts
index f4a2b142e8..8583726287 100644
--- a/plugins/app-backend/src/service/appPlugin.test.ts
+++ b/plugins/app-backend/src/service/appPlugin.test.ts
@@ -17,7 +17,7 @@
 import mockFs from 'mock-fs';
 import { resolve as resolvePath } from 'path';
 import fetch from 'node-fetch';
-import { configServiceRef } from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { appPlugin } from './appPlugin';
 import {
@@ -51,7 +51,7 @@ describe('appPlugin', () => {
     await startTestBackend({
       services: [
         [
-          configServiceRef,
+          coreServices.config,
           new ConfigReader({
             backend: {
               listen: { port },
diff --git a/plugins/app-backend/src/service/appPlugin.ts b/plugins/app-backend/src/service/appPlugin.ts
index f88bcb14f1..bfccf3cc02 100644
--- a/plugins/app-backend/src/service/appPlugin.ts
+++ b/plugins/app-backend/src/service/appPlugin.ts
@@ -16,12 +16,9 @@
 
 import express from 'express';
 import {
-  configServiceRef,
+  coreServices,
   createBackendPlugin,
-  databaseServiceRef,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  httpRouterServiceRef,
 } from '@backstage/backend-plugin-api';
 import { createRouter } from './router';
 
@@ -78,10 +75,10 @@ export const appPlugin = createBackendPlugin({
   register(env, options: AppPluginOptions) {
     env.registerInit({
       deps: {
-        logger: loggerServiceRef,
-        config: configServiceRef,
-        database: databaseServiceRef,
-        httpRouter: httpRouterServiceRef,
+        logger: coreServices.logger,
+        config: coreServices.config,
+        database: coreServices.database,
+        httpRouter: coreServices.httpRouter,
       },
       async init({ logger, config, database, httpRouter }) {
         const {
diff --git a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts
index 3167291bca..c0d36ad3c2 100644
--- a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -66,9 +62,9 @@ describe('awsS3EntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [awsS3EntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts
index 79269ad53a..fa49d1e4c7 100644
--- a/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-aws/src/service/AwsS3EntityProviderCatalogModule.ts
@@ -15,11 +15,9 @@
  */
 
 import {
+  coreServices,
   createBackendModule,
   loggerToWinstonLogger,
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { AwsS3EntityProvider } from '../providers';
@@ -35,10 +33,10 @@ export const awsS3EntityProviderCatalogModule = createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        config: configServiceRef,
+        config: coreServices.config,
         catalog: catalogProcessingExtensionPoint,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ config, catalog, logger, scheduler }) {
         catalog.addEntityProvider(
diff --git a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts
index e3a0449a8e..a11e6b14f2 100644
--- a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -69,9 +65,9 @@ describe('azureDevOpsEntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [azureDevOpsEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts
index f3621bee23..0d0ebdb591 100644
--- a/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-azure/src/service/AzureDevOpsEntityProviderCatalogModule.ts
@@ -17,9 +17,7 @@
 import {
   createBackendModule,
   loggerToWinstonLogger,
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { AzureDevOpsEntityProvider } from '../providers';
@@ -35,10 +33,10 @@ export const azureDevOpsEntityProviderCatalogModule = createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        config: configServiceRef,
+        config: coreServices.config,
         catalog: catalogProcessingExtensionPoint,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ config, catalog, logger, scheduler }) {
         catalog.addEntityProvider(
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts
index 3fcc39fdd0..83e657bcfe 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.test.ts
@@ -20,13 +20,7 @@ import {
   PluginEndpointDiscovery,
   TokenManager,
 } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  discoveryServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-  tokenManagerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -84,11 +78,11 @@ describe('bitbucketCloudEntityProviderCatalogModule', () => {
         [eventsExtensionPoint, eventsExtensionPointImpl],
       ],
       services: [
-        [configServiceRef, config],
-        [discoveryServiceRef, discovery],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
-        [tokenManagerServiceRef, tokenManager],
+        [coreServices.config, config],
+        [coreServices.discovery, discovery],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
+        [coreServices.tokenManager, tokenManager],
       ],
       features: [bitbucketCloudEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts
index 1c005991a6..19b83b92b6 100644
--- a/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-bitbucket-cloud/src/service/BitbucketCloudEntityProviderCatalogModule.ts
@@ -15,12 +15,9 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  schedulerServiceRef,
-  tokenManagerServiceRef,
 } from '@backstage/backend-plugin-api';
 import {
   catalogProcessingExtensionPoint,
@@ -40,13 +37,13 @@ export const bitbucketCloudEntityProviderCatalogModule = createBackendModule({
       deps: {
         catalog: catalogProcessingExtensionPoint,
         catalogApi: catalogServiceRef,
-        config: configServiceRef,
+        config: coreServices.config,
         // TODO(pjungermann): How to make this optional for those which only want the provider without event support?
         //  Do we even want to support this?
         events: eventsExtensionPoint,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
-        tokenManager: tokenManagerServiceRef,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
+        tokenManager: coreServices.tokenManager,
       },
       async init({
         catalog,
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts
index d2ce4dbd3d..474431dc7a 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.test.ts
@@ -16,11 +16,7 @@
 
 import { ConfigReader } from '@backstage/config';
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -73,9 +69,9 @@ describe('bitbucketServerEntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [bitbucketServerEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts
index e89eee7b45..e0f5a21ff9 100644
--- a/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-bitbucket-server/src/service/BitbucketServerEntityProviderCatalogModule.ts
@@ -15,11 +15,9 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { BitbucketServerEntityProvider } from '../providers';
@@ -34,9 +32,9 @@ export const bitbucketServerEntityProviderCatalogModule = createBackendModule({
     env.registerInit({
       deps: {
         catalog: catalogProcessingExtensionPoint,
-        config: configServiceRef,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        config: coreServices.config,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ catalog, config, logger, scheduler }) {
         const winstonLogger = loggerToWinstonLogger(logger);
diff --git a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts
index 53e012209b..9d61cabdb9 100644
--- a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -79,9 +75,9 @@ describe('gerritEntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [gerritEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts
index 32d582e397..674845862f 100644
--- a/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-gerrit/src/service/GerritEntityProviderCatalogModule.ts
@@ -15,11 +15,9 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { GerritEntityProvider } from '../providers/GerritEntityProvider';
@@ -34,9 +32,9 @@ export const gerritEntityProviderCatalogModule = createBackendModule({
     env.registerInit({
       deps: {
         catalog: catalogProcessingExtensionPoint,
-        config: configServiceRef,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        config: coreServices.config,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ catalog, config, logger, scheduler }) {
         const winstonLogger = loggerToWinstonLogger(logger);
diff --git a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts
index b555927d2c..d8ebc8d0ad 100644
--- a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -66,9 +62,9 @@ describe('githubEntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [githubEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts
index 8fdee886a3..e61543ea13 100644
--- a/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-github/src/service/GithubEntityProviderCatalogModule.ts
@@ -17,9 +17,7 @@
 import {
   createBackendModule,
   loggerToWinstonLogger,
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { GithubEntityProvider } from '../providers/GithubEntityProvider';
@@ -36,9 +34,9 @@ export const githubEntityProviderCatalogModule = createBackendModule({
     env.registerInit({
       deps: {
         catalog: catalogProcessingExtensionPoint,
-        config: configServiceRef,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        config: coreServices.config,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ catalog, config, logger, scheduler }) {
         catalog.addEntityProvider(
diff --git a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts
index 0b803734b1..ca8d86f555 100644
--- a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -78,9 +74,9 @@ describe('gitlabDiscoveryEntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [gitlabDiscoveryEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts
index dc11841e20..75a8de263f 100644
--- a/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-gitlab/src/service/GitlabDiscoveryEntityProviderCatalogModule.ts
@@ -17,9 +17,7 @@
 import {
   createBackendModule,
   loggerToWinstonLogger,
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import { GitlabDiscoveryEntityProvider } from '../providers';
@@ -35,10 +33,10 @@ export const gitlabDiscoveryEntityProviderCatalogModule = createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        config: configServiceRef,
+        config: coreServices.config,
         catalog: catalogProcessingExtensionPoint,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ config, catalog, logger, scheduler }) {
         catalog.addEntityProvider(
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts
index 95452c9caf..06cbcb010e 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.test.ts
@@ -15,13 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  databaseServiceRef,
-  httpRouterServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
@@ -56,11 +50,11 @@ describe('bitbucketServerEntityProviderCatalogModule', () => {
         [catalogProcessingExtensionPoint, { addEntityProvider }],
       ],
       services: [
-        [configServiceRef, new ConfigReader({})],
-        [databaseServiceRef, database],
-        [httpRouterServiceRef, httpRouter],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, new ConfigReader({})],
+        [coreServices.database, database],
+        [coreServices.httpRouter, httpRouter],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [
         incrementalIngestionEntityProviderCatalogModule({
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts
index 08e9653688..0ecb45292c 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/incrementalIngestionEntityProviderCatalogModule.ts
@@ -15,12 +15,8 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  databaseServiceRef,
-  httpRouterServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import {
@@ -50,11 +46,11 @@ export const incrementalIngestionEntityProviderCatalogModule =
       env.registerInit({
         deps: {
           catalog: catalogProcessingExtensionPoint,
-          config: configServiceRef,
-          database: databaseServiceRef,
-          httpRouter: httpRouterServiceRef,
-          logger: loggerServiceRef,
-          scheduler: schedulerServiceRef,
+          config: coreServices.config,
+          database: coreServices.database,
+          httpRouter: coreServices.httpRouter,
+          logger: coreServices.logger,
+          scheduler: coreServices.scheduler,
         },
         async init({
           catalog,
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
index 22dc0c97a2..08d95f4417 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/run.ts
@@ -27,7 +27,7 @@ import {
   tokenManagerFactory,
   urlReaderFactory,
 } from '@backstage/backend-app-api';
-import { configServiceRef } from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogPlugin } from '@backstage/plugin-catalog-backend';
@@ -62,7 +62,7 @@ async function main() {
 
   await startTestBackend({
     services: [
-      [configServiceRef, new ConfigReader(config)],
+      [coreServices.config, new ConfigReader(config)],
       databaseFactory(),
       discoveryFactory(),
       httpRouterFactory(),
diff --git a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts
index 764f504898..27ae5b9dd8 100644
--- a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import {
   PluginTaskScheduler,
   TaskScheduleDefinition,
@@ -71,9 +67,9 @@ describe('awsS3EntityProviderCatalogModule', () => {
     await startTestBackend({
       extensionPoints: [[catalogProcessingExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [microsoftGraphOrgEntityProviderCatalogModule()],
     });
diff --git a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts
index 9e817636fa..2643e6e937 100644
--- a/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts
+++ b/plugins/catalog-backend-module-msgraph/src/service/MicrosoftGraphOrgEntityProviderCatalogModule.ts
@@ -15,11 +15,9 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node';
 import {
@@ -72,9 +70,9 @@ export const microsoftGraphOrgEntityProviderCatalogModule = createBackendModule(
       env.registerInit({
         deps: {
           catalog: catalogProcessingExtensionPoint,
-          config: configServiceRef,
-          logger: loggerServiceRef,
-          scheduler: schedulerServiceRef,
+          config: coreServices.config,
+          logger: coreServices.logger,
+          scheduler: coreServices.scheduler,
         },
         async init({ catalog, config, logger, scheduler }) {
           catalog.addEntityProvider(
diff --git a/plugins/catalog-backend/src/service/CatalogPlugin.ts b/plugins/catalog-backend/src/service/CatalogPlugin.ts
index 84cad86d9a..6db54ed4fa 100644
--- a/plugins/catalog-backend/src/service/CatalogPlugin.ts
+++ b/plugins/catalog-backend/src/service/CatalogPlugin.ts
@@ -14,15 +14,9 @@
  * limitations under the License.
  */
 import {
-  configServiceRef,
   createBackendPlugin,
-  databaseServiceRef,
-  loggerServiceRef,
+  coreServices,
   loggerToWinstonLogger,
-  permissionsServiceRef,
-  urlReaderServiceRef,
-  httpRouterServiceRef,
-  lifecycleServiceRef,
 } from '@backstage/backend-plugin-api';
 import { CatalogBuilder } from './CatalogBuilder';
 import {
@@ -73,13 +67,13 @@ export const catalogPlugin = createBackendPlugin({
 
     env.registerInit({
       deps: {
-        logger: loggerServiceRef,
-        config: configServiceRef,
-        reader: urlReaderServiceRef,
-        permissions: permissionsServiceRef,
-        database: databaseServiceRef,
-        httpRouter: httpRouterServiceRef,
-        lifecycle: lifecycleServiceRef,
+        logger: coreServices.logger,
+        config: coreServices.config,
+        reader: coreServices.urlReader,
+        permissions: coreServices.permissions,
+        database: coreServices.database,
+        httpRouter: coreServices.httpRouter,
+        lifecycle: coreServices.lifecycle,
       },
       async init({
         logger,
diff --git a/plugins/catalog-node/src/catalogService.test.ts b/plugins/catalog-node/src/catalogService.test.ts
index 9ecf08b30e..593f5bd59c 100644
--- a/plugins/catalog-node/src/catalogService.test.ts
+++ b/plugins/catalog-node/src/catalogService.test.ts
@@ -18,7 +18,7 @@ import { PluginEndpointDiscovery } from '@backstage/backend-common';
 import {
   createBackendModule,
   createServiceFactory,
-  discoveryServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { CatalogClient } from '@backstage/catalog-client';
@@ -29,7 +29,7 @@ describe('catalogServiceRef', () => {
     expect.assertions(1);
 
     const mockDiscoveryFactory = createServiceFactory({
-      service: discoveryServiceRef,
+      service: coreServices.discovery,
       deps: {},
       factory: async ({}) => {
         return async () => jest.fn() as unknown as PluginEndpointDiscovery;
diff --git a/plugins/catalog-node/src/catalogService.ts b/plugins/catalog-node/src/catalogService.ts
index c6a8fb44f5..0c54bd2d9d 100644
--- a/plugins/catalog-node/src/catalogService.ts
+++ b/plugins/catalog-node/src/catalogService.ts
@@ -17,7 +17,7 @@
 import {
   createServiceFactory,
   createServiceRef,
-  discoveryServiceRef,
+  coreServices,
 } from '@backstage/backend-plugin-api';
 import { CatalogApi, CatalogClient } from '@backstage/catalog-client';
 
@@ -31,7 +31,7 @@ export const catalogServiceRef = createServiceRef<CatalogApi>({
     createServiceFactory({
       service,
       deps: {
-        discoveryApi: discoveryServiceRef,
+        discoveryApi: coreServices.discovery,
       },
       async factory() {
         return async ({ discoveryApi }) => {
diff --git a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts
index 584b62a2c6..589b8c93fa 100644
--- a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts
+++ b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.test.ts
@@ -15,11 +15,7 @@
  */
 
 import { getVoidLogger } from '@backstage/backend-common';
-import {
-  configServiceRef,
-  loggerServiceRef,
-  schedulerServiceRef,
-} from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
@@ -68,9 +64,9 @@ describe('awsSqsEventsModule', () => {
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
       services: [
-        [configServiceRef, config],
-        [loggerServiceRef, getVoidLogger()],
-        [schedulerServiceRef, scheduler],
+        [coreServices.config, config],
+        [coreServices.logger, getVoidLogger()],
+        [coreServices.scheduler, scheduler],
       ],
       features: [awsSqsConsumingEventPublisherEventsModule()],
     });
diff --git a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts
index 7c33d7baae..a6c43d4046 100644
--- a/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts
+++ b/plugins/events-backend-module-aws-sqs/src/service/AwsSqsConsumingEventPublisherEventsModule.ts
@@ -15,11 +15,9 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  loggerServiceRef,
   loggerToWinstonLogger,
-  schedulerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
 import { AwsSqsConsumingEventPublisher } from '../publisher/AwsSqsConsumingEventPublisher';
@@ -35,10 +33,10 @@ export const awsSqsConsumingEventPublisherEventsModule = createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        config: configServiceRef,
+        config: coreServices.config,
         events: eventsExtensionPoint,
-        logger: loggerServiceRef,
-        scheduler: schedulerServiceRef,
+        logger: coreServices.logger,
+        scheduler: coreServices.scheduler,
       },
       async init({ config, events, logger, scheduler }) {
         const winstonLogger = loggerToWinstonLogger(logger);
diff --git a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts
index d02afb125d..84233eedee 100644
--- a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts
+++ b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { configServiceRef } from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import {
@@ -59,7 +59,7 @@ describe('githubWebhookEventsModule', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [[configServiceRef, config]],
+      services: [[coreServices.config, config]],
       features: [githubWebhookEventsModule()],
     });
 
diff --git a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts
index d9f4046a5e..9a3202cb97 100644
--- a/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts
+++ b/plugins/events-backend-module-github/src/service/GithubWebhookEventsModule.ts
@@ -15,7 +15,7 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
 } from '@backstage/backend-plugin-api';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
@@ -34,7 +34,7 @@ export const githubWebhookEventsModule = createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        config: configServiceRef,
+        config: coreServices.config,
         events: eventsExtensionPoint,
       },
       async init({ config, events }) {
diff --git a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts
index 594be74ab8..b139f46f55 100644
--- a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts
+++ b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.test.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { configServiceRef } from '@backstage/backend-plugin-api';
+import { coreServices } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import {
@@ -54,7 +54,7 @@ describe('gitlabWebhookEventsModule', () => {
 
     await startTestBackend({
       extensionPoints: [[eventsExtensionPoint, extensionPoint]],
-      services: [[configServiceRef, config]],
+      services: [[coreServices.config, config]],
       features: [gitlabWebhookEventsModule()],
     });
 
diff --git a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts
index 562fdb9cf5..44f13f31ef 100644
--- a/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts
+++ b/plugins/events-backend-module-gitlab/src/service/GitlabWebhookEventsModule.ts
@@ -15,7 +15,7 @@
  */
 
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
 } from '@backstage/backend-plugin-api';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
@@ -36,7 +36,7 @@ export const gitlabWebhookEventsModule = createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        config: configServiceRef,
+        config: coreServices.config,
         events: eventsExtensionPoint,
       },
       async init({ config, events }) {
diff --git a/plugins/events-backend/src/service/EventsPlugin.test.ts b/plugins/events-backend/src/service/EventsPlugin.test.ts
index f58f081742..b08364600f 100644
--- a/plugins/events-backend/src/service/EventsPlugin.test.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.test.ts
@@ -17,10 +17,8 @@
 import { errorHandler, getVoidLogger } from '@backstage/backend-common';
 import { ConfigReader } from '@backstage/config';
 import {
-  configServiceRef,
+  coreServices,
   createBackendModule,
-  httpRouterServiceRef,
-  loggerServiceRef,
 } from '@backstage/backend-plugin-api';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node';
@@ -73,9 +71,9 @@ describe('eventPlugin', () => {
     await startTestBackend({
       extensionPoints: [],
       services: [
-        [configServiceRef, config],
-        [httpRouterServiceRef, httpRouter],
-        [loggerServiceRef, getVoidLogger()],
+        [coreServices.config, config],
+        [coreServices.httpRouter, httpRouter],
+        [coreServices.logger, getVoidLogger()],
       ],
       features: [eventsPlugin(), testModule()],
     });
diff --git a/plugins/events-backend/src/service/EventsPlugin.ts b/plugins/events-backend/src/service/EventsPlugin.ts
index 65e7770d87..63d0d0b02a 100644
--- a/plugins/events-backend/src/service/EventsPlugin.ts
+++ b/plugins/events-backend/src/service/EventsPlugin.ts
@@ -15,10 +15,8 @@
  */
 
 import {
-  configServiceRef,
   createBackendPlugin,
-  httpRouterServiceRef,
-  loggerServiceRef,
+  coreServices,
   loggerToWinstonLogger,
 } from '@backstage/backend-plugin-api';
 import {
@@ -89,9 +87,9 @@ export const eventsPlugin = createBackendPlugin({
 
     env.registerInit({
       deps: {
-        config: configServiceRef,
-        logger: loggerServiceRef,
-        router: httpRouterServiceRef,
+        config: coreServices.config,
+        logger: coreServices.logger,
+        router: coreServices.httpRouter,
       },
       async init({ config, logger, router }) {
         const winstonLogger = loggerToWinstonLogger(logger);
diff --git a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
index 09d7bdcbb2..8a9da38bf2 100644
--- a/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
+++ b/plugins/scaffolder-backend/src/ScaffolderPlugin.ts
@@ -14,14 +14,9 @@
  * limitations under the License.
  */
 import {
-  configServiceRef,
   createBackendPlugin,
-  databaseServiceRef,
-  loggerServiceRef,
+  coreServices,
   loggerToWinstonLogger,
-  permissionsServiceRef,
-  urlReaderServiceRef,
-  httpRouterServiceRef,
   createExtensionPoint,
 } from '@backstage/backend-plugin-api';
 import { ScmIntegrations } from '@backstage/integration';
@@ -86,12 +81,12 @@ export const scaffolderPlugin = createBackendPlugin({
 
     env.registerInit({
       deps: {
-        logger: loggerServiceRef,
-        config: configServiceRef,
-        reader: urlReaderServiceRef,
-        permissions: permissionsServiceRef,
-        database: databaseServiceRef,
-        httpRouter: httpRouterServiceRef,
+        logger: coreServices.logger,
+        config: coreServices.config,
+        reader: coreServices.urlReader,
+        permissions: coreServices.permissions,
+        database: coreServices.database,
+        httpRouter: coreServices.httpRouter,
         catalogClient: catalogServiceRef,
       },
       async init({

From 884d749b1466881cc248b46c3d390917537172e3 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 2 Dec 2022 14:50:45 +0100
Subject: [PATCH 49/82] changesets: added changesets for coreServices refactor

Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/empty-taxis-run.md  | 22 ++++++++++++++++++++++
 .changeset/many-bikes-press.md |  5 +++++
 2 files changed, 27 insertions(+)
 create mode 100644 .changeset/empty-taxis-run.md
 create mode 100644 .changeset/many-bikes-press.md

diff --git a/.changeset/empty-taxis-run.md b/.changeset/empty-taxis-run.md
new file mode 100644
index 0000000000..d0360b4521
--- /dev/null
+++ b/.changeset/empty-taxis-run.md
@@ -0,0 +1,22 @@
+---
+'@backstage/backend-app-api': patch
+'@backstage/plugin-app-backend': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-backend-module-aws': patch
+'@backstage/plugin-catalog-backend-module-azure': patch
+'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch
+'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
+'@backstage/plugin-catalog-backend-module-gerrit': patch
+'@backstage/plugin-catalog-backend-module-github': patch
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-catalog-node': patch
+'@backstage/plugin-events-backend': patch
+'@backstage/plugin-events-backend-module-aws-sqs': patch
+'@backstage/plugin-events-backend-module-github': patch
+'@backstage/plugin-events-backend-module-gitlab': patch
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Refactored to use `coreServices` from `@backstage/backend-plugin-api`.
diff --git a/.changeset/many-bikes-press.md b/.changeset/many-bikes-press.md
new file mode 100644
index 0000000000..68ddb68c05
--- /dev/null
+++ b/.changeset/many-bikes-press.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-plugin-api': minor
+---
+
+**BREAKING**: All core service references are now exported via a single `coreServices` object. For example, the `loggerServiceRef` is now accessed via `coreServices.logger` instead.

From 3e3244012d96967d154f3d0c887d2b83ff91b057 Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Tue, 22 Nov 2022 19:37:23 -0600
Subject: [PATCH 50/82] add disclaimer to FeatureFlagged section

Signed-off-by: Kurt King <kurtaking@gmail.com>
Signed-off-by: Kurt King <kurt.king@procore.com>
---
 docs/plugins/feature-flags.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/plugins/feature-flags.md b/docs/plugins/feature-flags.md
index a26eb49a9b..c796058ace 100644
--- a/docs/plugins/feature-flags.md
+++ b/docs/plugins/feature-flags.md
@@ -52,6 +52,8 @@ import { FeatureFlagged } from '@backstage/core-app-api'
 </FeatureFlagged>
 ```
 
+If you use a `<FeatureFlagged>` component, you do not need to pass `featureFlags: [{ name: 'show-example-feature' }],` into the `createPlugin()` like done at the top of this page. Doing so will cause duplicate entries to appear under `Settings` > `Feature Flags`.
+
 ## Evaluating Feature Flag State
 
 It is also possible to test the feature flag state using the [FeatureFlags Api](https://backstage.io/docs/reference/core-plugin-api.featureflagsapi).

From 6ebc7c8719d459234983f4a171c25a83c25e1ef8 Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Tue, 29 Nov 2022 07:40:54 -0600
Subject: [PATCH 51/82] check to prevent duplicate feature flag components

Signed-off-by: Kurt King <kurtaking@gmail.com>
Signed-off-by: Kurt King <kurt.king@procore.com>
---
 packages/core-app-api/src/app/AppManager.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index 0ca09c0a0c..70d7bc5434 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -310,8 +310,14 @@ export class AppManager implements BackstageApp {
 
           // Go through the featureFlags returned from the traversal and
           // register those now the configApi has been loaded
+          const registeredFlags = featureFlagsApi.getRegisteredFlags();
           for (const name of featureFlags) {
-            featureFlagsApi.registerFlag({ name, pluginId: '' });
+            // Prevents adding duplicate feature flags
+            if (!registeredFlags.some((featureFlag) => {
+              return featureFlag.name === name
+            })) {
+              featureFlagsApi.registerFlag({ name, pluginId: '' });
+            }
           }
         }
       }, [hasConfigApi, loadedConfig, featureFlags]);

From d1b2ec16f4e7d4ec759d411b6d9af3e3ecf1928a Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Tue, 29 Nov 2022 07:41:59 -0600
Subject: [PATCH 52/82] revert documentation back to original state

Signed-off-by: Kurt King <kurtaking@gmail.com>
Signed-off-by: Kurt King <kurt.king@procore.com>
---
 docs/plugins/feature-flags.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/plugins/feature-flags.md b/docs/plugins/feature-flags.md
index c796058ace..738bc5e6aa 100644
--- a/docs/plugins/feature-flags.md
+++ b/docs/plugins/feature-flags.md
@@ -51,9 +51,6 @@ import { FeatureFlagged } from '@backstage/core-app-api'
   <PreviousFeatureComponent />
 </FeatureFlagged>
 ```
-
-If you use a `<FeatureFlagged>` component, you do not need to pass `featureFlags: [{ name: 'show-example-feature' }],` into the `createPlugin()` like done at the top of this page. Doing so will cause duplicate entries to appear under `Settings` > `Feature Flags`.
-
 ## Evaluating Feature Flag State
 
 It is also possible to test the feature flag state using the [FeatureFlags Api](https://backstage.io/docs/reference/core-plugin-api.featureflagsapi).

From 43244e88895ebae8bfa2d55b87612ed9f9ce0d36 Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Tue, 29 Nov 2022 09:01:46 -0600
Subject: [PATCH 53/82] restore docs to original state

Signed-off-by: Kurt King <kurtaking@gmail.com>
Signed-off-by: Kurt King <kurt.king@procore.com>
---
 docs/plugins/feature-flags.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/plugins/feature-flags.md b/docs/plugins/feature-flags.md
index 738bc5e6aa..a26eb49a9b 100644
--- a/docs/plugins/feature-flags.md
+++ b/docs/plugins/feature-flags.md
@@ -51,6 +51,7 @@ import { FeatureFlagged } from '@backstage/core-app-api'
   <PreviousFeatureComponent />
 </FeatureFlagged>
 ```
+
 ## Evaluating Feature Flag State
 
 It is also possible to test the feature flag state using the [FeatureFlags Api](https://backstage.io/docs/reference/core-plugin-api.featureflagsapi).

From 77b0e42982a59a85f499c200c89833496aa5c4a9 Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Tue, 29 Nov 2022 14:00:54 -0600
Subject: [PATCH 54/82] use set to look for existing feature flags

Signed-off-by: Kurt King <kurtaking@gmail.com>
Signed-off-by: Kurt King <kurt.king@procore.com>
---
 packages/core-app-api/src/app/AppManager.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index 70d7bc5434..8c2e09c903 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -311,11 +311,10 @@ export class AppManager implements BackstageApp {
           // Go through the featureFlags returned from the traversal and
           // register those now the configApi has been loaded
           const registeredFlags = featureFlagsApi.getRegisteredFlags();
+          const flagNames = new Set(registeredFlags.map(f => f.name));
           for (const name of featureFlags) {
             // Prevents adding duplicate feature flags
-            if (!registeredFlags.some((featureFlag) => {
-              return featureFlag.name === name
-            })) {
+            if (!flagNames.has(name)) {
               featureFlagsApi.registerFlag({ name, pluginId: '' });
             }
           }

From 9c0582c7b50ad31868b0671320f7534589b56e3b Mon Sep 17 00:00:00 2001
From: Kurt King <kurtaking@gmail.com>
Date: Thu, 1 Dec 2022 06:16:52 -0600
Subject: [PATCH 55/82] fix m1 issue and add current state of tests

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 packages/core-app-api/package.json            |  1 +
 .../core-app-api/src/app/AppManager.test.tsx  | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 1c15f7d6f5..9a10514ab7 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -37,6 +37,7 @@
     "@backstage/types": "workspace:^",
     "@backstage/version-bridge": "workspace:^",
     "@types/prop-types": "^15.7.3",
+    "canvas": "^2.10.2",
     "prop-types": "^15.7.2",
     "react-use": "^17.2.4",
     "zen-observable": "^0.9.0",
diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index c70b43581a..b03fedd89a 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -34,9 +34,11 @@ import {
   createSubRouteRef,
   createRoutableExtension,
   analyticsApiRef,
+  useApi,
 } from '@backstage/core-plugin-api';
 import { AppManager } from './AppManager';
 import { AppComponents, AppIcons } from './types';
+import { FeatureFlagged } from '../routing/FeatureFlagged';
 
 describe('Integration Test', () => {
   const noOpAnalyticsApi = createApiFactory(
@@ -415,6 +417,82 @@ describe('Integration Test', () => {
     });
   });
 
+  it('should prevent duplicate feature flags from being rendered', async () => {
+    const p1 = createPlugin({
+      id: 'p1',
+      featureFlags: [{ name: 'show-p1-feature' }],
+    });
+    const p2 = createPlugin({
+      id: 'p2',
+      featureFlags: [{ name: 'show-p2-feature' }],
+    });
+
+    const storageFlags = new LocalStorageFeatureFlags();
+    jest.spyOn(storageFlags, 'registerFlag');
+
+    const apis = [
+      noOpAnalyticsApi,
+      createApiFactory({
+        api: featureFlagsApiRef,
+        deps: { configApi: configApiRef },
+        factory() {
+          return storageFlags;
+        },
+      }),
+    ];
+
+    const app = new AppManager({
+      apis,
+      defaultApis: [],
+      themes: [
+        {
+          id: 'light',
+          title: 'Light Theme',
+          variant: 'light',
+          Provider: ({ children }) => <>{children}</>,
+        },
+      ],
+      icons,
+      plugins: [p1, p2],
+      components,
+      configLoader: async () => [],
+      bindRoutes: ({ bind }) => {
+        bind(plugin1.externalRoutes, {
+          extRouteRef1: plugin1RouteRef,
+          extRouteRef2: plugin2RouteRef,
+        });
+      },
+    });
+
+    const Provider = app.getProvider();
+    const Router = app.getRouter();
+
+    function FeatureFlags() {
+      const featureFlags = useApi(featureFlagsApiRef);
+      return (
+        <div>Flags: {featureFlags.getRegisteredFlags().map(f => f.name)}</div>
+      );
+    }
+
+    await renderWithEffects(
+      <Provider>
+        <Router>
+          <FeatureFlagged with="show-p1-feature">
+            <div>My feature behind a flag</div>
+          </FeatureFlagged>
+          <FeatureFlagged with="show-p2-feature">
+            <div>My feature behind a flag</div>
+          </FeatureFlagged>
+          <FeatureFlags />
+        </Router>
+      </Provider>,
+    );
+
+    // we need this test to mimic adding `featureFlags` to a plugin while also passing the value in to a <FeatureFlagged /> component
+
+    // the added code should prevent duplicates from being added.
+  });
+
   it('should track route changes via analytics api', async () => {
     const mockAnalyticsApi = new MockAnalyticsApi();
     const apis = [createApiFactory(analyticsApiRef, mockAnalyticsApi)];

From 770108968b07eb7fa4ed912165b3cf1809dedfdb Mon Sep 17 00:00:00 2001
From: Kurt King <kurt.king@procore.com>
Date: Fri, 2 Dec 2022 09:34:38 -0600
Subject: [PATCH 56/82] add yarn.lock

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 yarn.lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yarn.lock b/yarn.lock
index f3dcb1a699..5c09cef83a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3339,6 +3339,7 @@ __metadata:
     "@types/node": ^16.11.26
     "@types/prop-types": ^15.7.3
     "@types/zen-observable": ^0.8.0
+    canvas: ^2.10.2
     cross-fetch: ^3.1.5
     msw: ^0.49.0
     prop-types: ^15.7.2

From b408e891c9d47ab43ff2b9e0b676945107824b42 Mon Sep 17 00:00:00 2001
From: Kurt King <kurt.king@procore.com>
Date: Fri, 2 Dec 2022 09:51:58 -0600
Subject: [PATCH 57/82] add test for duplicate feature flags

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 packages/core-app-api/src/app/AppManager.test.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index 5a29cc3bfd..e9b18d46e0 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -488,7 +488,10 @@ describe('Integration Test', () => {
     function FeatureFlags() {
       const featureFlags = useApi(featureFlagsApiRef);
       return (
-        <div>Flags: {featureFlags.getRegisteredFlags().map(f => f.name)}</div>
+        <div>{`Flags: ${featureFlags
+          .getRegisteredFlags()
+          .map(f => f.name)
+          .join(',')}`}</div>
       );
     }
 
@@ -506,9 +509,9 @@ describe('Integration Test', () => {
       </Provider>,
     );
 
-    // we need this test to mimic adding `featureFlags` to a plugin while also passing the value in to a <FeatureFlagged /> component
-
-    // the added code should prevent duplicates from being added.
+    expect(
+      screen.getByText('Flags: show-p1-feature,show-p2-feature'),
+    ).toBeInTheDocument();
   });
 
   it('should track route changes via analytics api', async () => {

From d2ee1c8ad791ac929f48312a05dc7c399575ffc4 Mon Sep 17 00:00:00 2001
From: Kurt King <kurt.king@procore.com>
Date: Fri, 2 Dec 2022 10:07:41 -0600
Subject: [PATCH 58/82] remove dependency that was added by accident

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 packages/core-app-api/package.json | 1 -
 yarn.lock                          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json
index 5f548374f4..6f4961403d 100644
--- a/packages/core-app-api/package.json
+++ b/packages/core-app-api/package.json
@@ -37,7 +37,6 @@
     "@backstage/types": "workspace:^",
     "@backstage/version-bridge": "workspace:^",
     "@types/prop-types": "^15.7.3",
-    "canvas": "^2.10.2",
     "prop-types": "^15.7.2",
     "react-use": "^17.2.4",
     "zen-observable": "^0.10.0",
diff --git a/yarn.lock b/yarn.lock
index 6736847714..e3d1b5eb88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3816,7 +3816,6 @@ __metadata:
     "@types/node": ^16.11.26
     "@types/prop-types": ^15.7.3
     "@types/zen-observable": ^0.8.0
-    canvas: ^2.10.2
     cross-fetch: ^3.1.5
     msw: ^0.49.0
     prop-types: ^15.7.2

From 203271b74618eb5b68a4227da8fc98368d10d078 Mon Sep 17 00:00:00 2001
From: Kurt King <kurt.king@procore.com>
Date: Fri, 2 Dec 2022 10:25:49 -0600
Subject: [PATCH 59/82] add changeset

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 .changeset/nice-apricots-love.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/nice-apricots-love.md

diff --git a/.changeset/nice-apricots-love.md b/.changeset/nice-apricots-love.md
new file mode 100644
index 0000000000..c5f308dd8f
--- /dev/null
+++ b/.changeset/nice-apricots-love.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-app-api': minor
+---
+
+Prevent duplicate feature flag components from rendering in the settings when using <FeatureFlagged /> components

From 04880e5b2941d77c29c6ae5d9fff258faedf81f4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 16:27:05 +0000
Subject: [PATCH 60/82] Update graphqlcodegenerator monorepo

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e3d1b5eb88..a7d4141c49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9359,18 +9359,18 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/graphql-modules-preset@npm:^2.3.2":
-  version: 2.5.6
-  resolution: "@graphql-codegen/graphql-modules-preset@npm:2.5.6"
+  version: 2.5.7
+  resolution: "@graphql-codegen/graphql-modules-preset@npm:2.5.7"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^2.7.2
-    "@graphql-codegen/visitor-plugin-common": 2.13.2
+    "@graphql-codegen/visitor-plugin-common": 2.13.3
     "@graphql-tools/utils": ^8.8.0
     change-case-all: 1.0.14
     parse-filepath: ^1.0.2
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: e446c4277f66304d34e9883c37dd241559ba47695716d8ef911514de998c927e2f37770d70b87b56238e3fed1bf43eff9ec7bce679e06fb4eb0b759c98f6cb25
+  checksum: 75fcfa7b8b560ba95d7ee13777f3f15f90df632cd3371ef34bcc782c33f76db2c0e9b1b4d6da15626ccdce58e932283515e1531eca1c7a17a358cd3b5c1db122
   languageName: node
   linkType: hard
 
@@ -9404,39 +9404,39 @@ __metadata:
   linkType: hard
 
 "@graphql-codegen/typescript-resolvers@npm:^2.4.3":
-  version: 2.7.7
-  resolution: "@graphql-codegen/typescript-resolvers@npm:2.7.7"
+  version: 2.7.8
+  resolution: "@graphql-codegen/typescript-resolvers@npm:2.7.8"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^2.7.2
-    "@graphql-codegen/typescript": ^2.8.2
-    "@graphql-codegen/visitor-plugin-common": 2.13.2
+    "@graphql-codegen/typescript": ^2.8.3
+    "@graphql-codegen/visitor-plugin-common": 2.13.3
     "@graphql-tools/utils": ^8.8.0
     auto-bind: ~4.0.0
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: f7b4fcda7fa3d73a48bf93e32ee73fdd8426d1d89951b22555702a98445b110aeb0715a1ed29dc1cdee7cbe0264510d021e98b57798a51bcf07eab34c4445cf5
+  checksum: be6b3f13624912e3e91df7e3e67225edde70e747a7a91a06c4bfd60ce7f8ba4bcaa2ba074c8dfa4f1d984ecb06ec463cb9a811735583826046ee836986fb149e
   languageName: node
   linkType: hard
 
-"@graphql-codegen/typescript@npm:^2.4.2, @graphql-codegen/typescript@npm:^2.8.2":
-  version: 2.8.2
-  resolution: "@graphql-codegen/typescript@npm:2.8.2"
+"@graphql-codegen/typescript@npm:^2.4.2, @graphql-codegen/typescript@npm:^2.8.3":
+  version: 2.8.3
+  resolution: "@graphql-codegen/typescript@npm:2.8.3"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^2.7.2
     "@graphql-codegen/schema-ast": ^2.5.1
-    "@graphql-codegen/visitor-plugin-common": 2.13.2
+    "@graphql-codegen/visitor-plugin-common": 2.13.3
     auto-bind: ~4.0.0
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 7e3beda7a0a8b9b84ee7c40c54913ef496bd8716ddd68028a55b06743657bc1100c4a30cc2932745520f5e008aa3f386731bf09a88e05cc92005e066b57b21c8
+  checksum: 0ba1f651b218303e9e4c369a34eb4327213585b9d1e303226ea91dc460ab106b11d76ea607e3980f8d4e921ace29f05681e45e099de0aab9db67199df33f0ccc
   languageName: node
   linkType: hard
 
-"@graphql-codegen/visitor-plugin-common@npm:2.13.2":
-  version: 2.13.2
-  resolution: "@graphql-codegen/visitor-plugin-common@npm:2.13.2"
+"@graphql-codegen/visitor-plugin-common@npm:2.13.3":
+  version: 2.13.3
+  resolution: "@graphql-codegen/visitor-plugin-common@npm:2.13.3"
   dependencies:
     "@graphql-codegen/plugin-helpers": ^2.7.2
     "@graphql-tools/optimize": ^1.3.0
@@ -9450,7 +9450,7 @@ __metadata:
     tslib: ~2.4.0
   peerDependencies:
     graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: b4b00f9d0cd8be221da69480d0d861f025eb7bec13aa9897acb9a3a485b5e0ca04df17745fa9850efcafefe4de54dab2e4d50dafc534df3fecd9095e6122eaa7
+  checksum: 62259f46a81ce890218adb91c8965e6cc7b7d08cf5d9b40899d9b7e921cacb439e29d6f12bafb282a55d143d031fef691e0c26793503882a73e5042f8d79a760
   languageName: node
   linkType: hard
 

From c25809286d6a72c7f71cc9f6d554b402a3668412 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 16:59:49 +0000
Subject: [PATCH 61/82] build(deps): bump decode-uri-component from 0.2.0 to
 0.2.2 in /microsite

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 microsite/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/microsite/yarn.lock b/microsite/yarn.lock
index f0e6bd698a..0a26cf8ef6 100644
--- a/microsite/yarn.lock
+++ b/microsite/yarn.lock
@@ -2940,9 +2940,9 @@ __metadata:
   linkType: hard
 
 "decode-uri-component@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "decode-uri-component@npm:0.2.0"
-  checksum: f3749344ab9305ffcfe4bfe300e2dbb61fc6359e2b736812100a3b1b6db0a5668cba31a05e4b45d4d63dbf1a18dfa354cd3ca5bb3ededddabb8cd293f4404f94
+  version: 0.2.2
+  resolution: "decode-uri-component@npm:0.2.2"
+  checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139
   languageName: node
   linkType: hard
 

From 3cd5c94408c58fc1c5e9a2b414a3bba939eb29e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 17:00:17 +0000
Subject: [PATCH 62/82] build(deps): bump decode-uri-component from 0.2.0 to
 0.2.2 in /storybook

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 storybook/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 5867c2fb08..57a7c26e5a 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -5092,9 +5092,9 @@ __metadata:
   linkType: hard
 
 "decode-uri-component@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "decode-uri-component@npm:0.2.0"
-  checksum: f3749344ab9305ffcfe4bfe300e2dbb61fc6359e2b736812100a3b1b6db0a5668cba31a05e4b45d4d63dbf1a18dfa354cd3ca5bb3ededddabb8cd293f4404f94
+  version: 0.2.2
+  resolution: "decode-uri-component@npm:0.2.2"
+  checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139
   languageName: node
   linkType: hard
 

From 5a8dd535a5c2c79c2c2ecd6a7f99cde50511c6fc Mon Sep 17 00:00:00 2001
From: Kurt King <kurt.king@procore.com>
Date: Fri, 2 Dec 2022 11:07:32 -0600
Subject: [PATCH 63/82] update changeset to patch

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 .changeset/nice-apricots-love.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/nice-apricots-love.md b/.changeset/nice-apricots-love.md
index c5f308dd8f..527b644d5f 100644
--- a/.changeset/nice-apricots-love.md
+++ b/.changeset/nice-apricots-love.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/core-app-api': minor
+'@backstage/core-app-api': patch
 ---
 
 Prevent duplicate feature flag components from rendering in the settings when using <FeatureFlagged /> components

From 7f477aeb5a340a6bdf0714d76ae71b6f808bc367 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 17:07:40 +0000
Subject: [PATCH 64/82] Update storybook monorepo to v6.5.14

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 storybook/yarn.lock | 550 ++++++++++++++++++++++----------------------
 1 file changed, 275 insertions(+), 275 deletions(-)

diff --git a/storybook/yarn.lock b/storybook/yarn.lock
index 5867c2fb08..5520cedca0 100644
--- a/storybook/yarn.lock
+++ b/storybook/yarn.lock
@@ -1801,17 +1801,17 @@ __metadata:
   linkType: hard
 
 "@storybook/addon-a11y@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/addon-a11y@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/addon-a11y@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/theming": 6.5.13
+    "@storybook/theming": 6.5.14
     axe-core: ^4.2.0
     core-js: ^3.8.2
     global: ^4.4.0
@@ -1828,21 +1828,21 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 6f1ba1f0d97d652a5346a33e051e1ff79aa07786532c6450c5c3dd677c2195e3ee8792cda756d4556e5fbaa2a72a0631843aec2880121b3439bad3e401c25359
+  checksum: 2c35e693641b38e90989a656b8766cd2a86482e24164e62afd2cd1899d454b1a0c0b8f23df328c5350884d22615e9779dd617c71c642f4eada1df6345feba8e3
   languageName: node
   linkType: hard
 
 "@storybook/addon-actions@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/addon-actions@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/addon-actions@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/theming": 6.5.13
+    "@storybook/theming": 6.5.14
     core-js: ^3.8.2
     fast-deep-equal: ^3.1.3
     global: ^4.4.0
@@ -1863,23 +1863,23 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 2679174b1467281860cd6f11fac5ba505e44629eb11ee90713d1c954569cfb54d80aa822a0ed1be2f92f11ca62889fec3dca96f61b89cf238503e0cea4b1db9a
+  checksum: 536a5afb4b9d2fbe6b250657deb36d5ef4eba128101fbe69bf00f9c363859f61e2337a460d0a724607ad48f54713bcc40ed54253df3fee4bdb23baf93a58defd
   languageName: node
   linkType: hard
 
 "@storybook/addon-controls@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/addon-controls@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/addon-controls@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/core-common": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/core-common": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/node-logger": 6.5.13
-    "@storybook/store": 6.5.13
-    "@storybook/theming": 6.5.13
+    "@storybook/node-logger": 6.5.14
+    "@storybook/store": 6.5.14
+    "@storybook/theming": 6.5.14
     core-js: ^3.8.2
     lodash: ^4.17.21
     ts-dedent: ^2.0.0
@@ -1891,19 +1891,19 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: a4f86332686b5681366ad1f1eebb50cb9939ce3424ade64c0043b94827df15a34da0190101c8dc9a2b4b9af67fafd9d3fb50a5b98ff7a24fed6a37a2f8f37f27
+  checksum: cebb9b33f944e9492527f4fd2bdfe73aa0f2737d53a36d7ea086499adc568ba06958e69c75191d5b266063ece513d5f7a484ec1da8f411f326aa4b022cce7ea0
   languageName: node
   linkType: hard
 
 "@storybook/addon-links@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/addon-links@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/addon-links@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.13
+    "@storybook/router": 6.5.14
     "@types/qs": ^6.9.5
     core-js: ^3.8.2
     global: ^4.4.0
@@ -1919,24 +1919,24 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 0bbe14652320c77dbcbcd0a6f45e4776de35475cca43b9825c36424e6ccc250fac4a172cdf01304debdc3c93d74ad2ea3bafb8a752e9a52a5e860f5bb9a397c2
+  checksum: 7dc537aab36fd80ba704b8618c24aa0b9f59d6c28502dd43c01e7dae4194fbce37a95cb7797c4b52547d9662bf9619cd0901f946bddcec7580986df2e38da574
   languageName: node
   linkType: hard
 
 "@storybook/addon-storysource@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/addon-storysource@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/addon-storysource@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/router": 6.5.13
-    "@storybook/source-loader": 6.5.13
-    "@storybook/theming": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/router": 6.5.14
+    "@storybook/source-loader": 6.5.14
+    "@storybook/theming": 6.5.14
     core-js: ^3.8.2
     estraverse: ^5.2.0
-    loader-utils: ^2.0.0
+    loader-utils: ^2.0.4
     prop-types: ^15.7.2
     react-syntax-highlighter: ^15.4.5
     regenerator-runtime: ^0.13.7
@@ -1948,7 +1948,7 @@ __metadata:
       optional: true
     react-dom:
       optional: true
-  checksum: 35ad7b940df64b036c36edc1d203da8016203c2430ae98a380b33fef4ffbfe040651db61f54ef5a9e6edec298e58e660ddd933eb67a1563ce1e39faedbc56cba
+  checksum: d9962b3f03245ab7dce405e7f1a24291d985aa1ecc594836b6322185bcde1c61a84397acfd46e85b2818f00c1de0f564bf7b6e1d84b960418cbe3dc37660d3f9
   languageName: node
   linkType: hard
 
@@ -1974,17 +1974,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addons@npm:6.5.13, @storybook/addons@npm:^6.0.0, @storybook/addons@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/addons@npm:6.5.13"
+"@storybook/addons@npm:6.5.14, @storybook/addons@npm:^6.0.0, @storybook/addons@npm:^6.5.9":
+  version: 6.5.14
+  resolution: "@storybook/addons@npm:6.5.14"
   dependencies:
-    "@storybook/api": 6.5.13
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/api": 6.5.14
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.13
-    "@storybook/theming": 6.5.13
+    "@storybook/router": 6.5.14
+    "@storybook/theming": 6.5.14
     "@types/webpack-env": ^1.16.0
     core-js: ^3.8.2
     global: ^4.4.0
@@ -1992,7 +1992,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 28589da00e8a26b44d4ed8a1938fe934187a85b187e2a0dcd3e6d114460ed5a07fbfe0a89a4d899739767b379015cbabadd47c5c266457922a8c4255e3d769a4
+  checksum: 99d06641bab06a3cc2821f309589d062c0efd8707b451ae24017449034da408bfddce3beda1ccdedadf59669d7d13348bee127f6fd4fc057200c84ff43288312
   languageName: node
   linkType: hard
 
@@ -2024,17 +2024,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/api@npm:6.5.13, @storybook/api@npm:^6.0.0":
-  version: 6.5.13
-  resolution: "@storybook/api@npm:6.5.13"
+"@storybook/api@npm:6.5.14, @storybook/api@npm:^6.0.0":
+  version: 6.5.14
+  resolution: "@storybook/api@npm:6.5.14"
   dependencies:
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/router": 6.5.13
+    "@storybook/router": 6.5.14
     "@storybook/semver": ^7.3.2
-    "@storybook/theming": 6.5.13
+    "@storybook/theming": 6.5.14
     core-js: ^3.8.2
     fast-deep-equal: ^3.1.3
     global: ^4.4.0
@@ -2048,31 +2048,31 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: dd7c8db0cdea2a47ab835c02217f10f99c54bfbf6d826deadf0b160ece4c94b1cb2558cfbaff4e4244c5c776095028a164762bd8de19fcfe10ae318fe0a3fbb4
+  checksum: 0d421c3211a49cb8910dea647b898edd60af79755108ed321626a8fc134713dd1b018c830f15c2fc6c863f0528b571c2e2b34bb79df3c2f43497f5ab36fa9bbf
   languageName: node
   linkType: hard
 
-"@storybook/builder-webpack4@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/builder-webpack4@npm:6.5.13"
+"@storybook/builder-webpack4@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/builder-webpack4@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/channel-postmessage": 6.5.13
-    "@storybook/channels": 6.5.13
-    "@storybook/client-api": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/core-common": 6.5.13
-    "@storybook/core-events": 6.5.13
-    "@storybook/node-logger": 6.5.13
-    "@storybook/preview-web": 6.5.13
-    "@storybook/router": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/channel-postmessage": 6.5.14
+    "@storybook/channels": 6.5.14
+    "@storybook/client-api": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/core-common": 6.5.14
+    "@storybook/core-events": 6.5.14
+    "@storybook/node-logger": 6.5.14
+    "@storybook/preview-web": 6.5.14
+    "@storybook/router": 6.5.14
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.13
-    "@storybook/theming": 6.5.13
-    "@storybook/ui": 6.5.13
+    "@storybook/store": 6.5.14
+    "@storybook/theming": 6.5.14
+    "@storybook/ui": 6.5.14
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/webpack": ^4.41.26
     autoprefixer: ^9.8.6
@@ -2109,30 +2109,30 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: a95fea3951479d7724155a2ddbf2b04a8bfc0e7fddbf8415caed508b94ad71f7dc8d5d25464061ef26f3b4670f49f6ed40198b48b3f646d7af17d8daee5e89cb
+  checksum: 16749d2d03b82e43e6b0fea02ebd4b63ac961229e4203cb371f36f11a9cd0a484d9bef73ee443053e09594ba7a7f2311470ade0e5a246b6d9345d1c7cc7b83b0
   languageName: node
   linkType: hard
 
 "@storybook/builder-webpack5@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/builder-webpack5@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/builder-webpack5@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/channel-postmessage": 6.5.13
-    "@storybook/channels": 6.5.13
-    "@storybook/client-api": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/core-common": 6.5.13
-    "@storybook/core-events": 6.5.13
-    "@storybook/node-logger": 6.5.13
-    "@storybook/preview-web": 6.5.13
-    "@storybook/router": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/channel-postmessage": 6.5.14
+    "@storybook/channels": 6.5.14
+    "@storybook/client-api": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/core-common": 6.5.14
+    "@storybook/core-events": 6.5.14
+    "@storybook/node-logger": 6.5.14
+    "@storybook/preview-web": 6.5.14
+    "@storybook/router": 6.5.14
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.13
-    "@storybook/theming": 6.5.13
+    "@storybook/store": 6.5.14
+    "@storybook/theming": 6.5.14
     "@types/node": ^14.0.10 || ^16.0.0
     babel-loader: ^8.0.0
     babel-plugin-named-exports-order: ^0.0.2
@@ -2161,35 +2161,35 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: f980ab5c832bac9584f80eb0229934bb58ceb4cf24f756043acea4cb397f52f7af49c1fd53ac897aefb5ffc9c808bcb8a0c4867afd2c2a21b7ba2f0a56ae0089
+  checksum: 3aa60285baa51b3249b43b2fde92100ad24a5f383354b0e72a7915125f25386ace3e69a8718fb5baafc7cf8deca9e005c4ce0a9b356a1ca7016abe2254466115
   languageName: node
   linkType: hard
 
-"@storybook/channel-postmessage@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/channel-postmessage@npm:6.5.13"
+"@storybook/channel-postmessage@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/channel-postmessage@npm:6.5.14"
   dependencies:
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     core-js: ^3.8.2
     global: ^4.4.0
     qs: ^6.10.0
     telejson: ^6.0.8
-  checksum: 8d6ccfff2aeafaae30b5fc1af856be8d06b3703b96841ecc0d70959e51542514901763e1a291e1d0278afe31b23cc5c0a5b351994f321e9bd03490be5b51e2d0
+  checksum: 2ea7aed1e49808875788746db75d61d3180a0b883892e978e93326d61617c0e01b7816b9eefcad402579d9f6dd923a13b527bcfcda3f415c0a135987d6c2042d
   languageName: node
   linkType: hard
 
-"@storybook/channel-websocket@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/channel-websocket@npm:6.5.13"
+"@storybook/channel-websocket@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/channel-websocket@npm:6.5.14"
   dependencies:
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
     core-js: ^3.8.2
     global: ^4.4.0
     telejson: ^6.0.8
-  checksum: 16e3b1a51a1af093f6c78ab7ca9c4c69ed05b45fd9bbdefb3050809e92064ccbf7a46f6800d21df2555e5d110d64735dd8d35155e54c3118fa7b4efe6b3b0457
+  checksum: 76bd5734890836d6d7af8fd619015067db4680ae4336fdf86ee1c612e0060412c14cfcba22faee02534a63079af0864323370409730c7f3ee16af8fc3014e758
   languageName: node
   linkType: hard
 
@@ -2204,28 +2204,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/channels@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/channels@npm:6.5.13"
+"@storybook/channels@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/channels@npm:6.5.14"
   dependencies:
     core-js: ^3.8.2
     ts-dedent: ^2.0.0
     util-deprecate: ^1.0.2
-  checksum: 5b8881a2799a4c5ceafea40bc2c8bad1a31649036341eec8da5a77acf79a9d610afeaa5b4ed5d06022ed3c74cb9562dcfc5046d62fd8d27cd65bcba09aa5e903
+  checksum: ff1ee3fea3c7b8591280ba7eabe13c999fc3e12a483ff2c0467cc9cca027662cbbc4676438da567865919157521df8a9a50bd20b35daed6896f39a3a7251a1e5
   languageName: node
   linkType: hard
 
-"@storybook/client-api@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/client-api@npm:6.5.13"
+"@storybook/client-api@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/client-api@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/channel-postmessage": 6.5.13
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/channel-postmessage": 6.5.14
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/store": 6.5.13
+    "@storybook/store": 6.5.14
     "@types/qs": ^6.9.5
     "@types/webpack-env": ^1.16.0
     core-js: ^3.8.2
@@ -2242,7 +2242,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: b0af25786b9144a55ebaa7754dd1b3701f5f8796770eaf59e7bc6d21ada12911fcbe4bf0da037d01bdda2c46138f265a948befe1f3de356fdc0ae3af80973388
+  checksum: 46fe2bec19610a7ab59b41f25653261cb65b485a829a94f99f9aa01f1f5bbc13677979abfe94eb025f0d9c1138b284ddbeb6ce8a0ae392ce4995a813770be83b
   languageName: node
   linkType: hard
 
@@ -2256,23 +2256,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/client-logger@npm:6.5.13, @storybook/client-logger@npm:^6.4.0":
-  version: 6.5.13
-  resolution: "@storybook/client-logger@npm:6.5.13"
+"@storybook/client-logger@npm:6.5.14, @storybook/client-logger@npm:^6.4.0":
+  version: 6.5.14
+  resolution: "@storybook/client-logger@npm:6.5.14"
   dependencies:
     core-js: ^3.8.2
     global: ^4.4.0
-  checksum: 0252d9364a0b2a8faae588fdb29aaf458f660904c330ec7af790f63a668710926ece8f087f58f9b1bebb052e2fe517b8b74867e7500567499cc710ab71ccbbab
+  checksum: 29cc0b58db7a8dc90484320c86b386975580c0e534791b29f6a8c00ce5b156f2bff9513994202f9f9ef99787e8d793988048ae88d2780ba151c6782f3bbf97ff
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:6.5.13, @storybook/components@npm:^6.0.0":
-  version: 6.5.13
-  resolution: "@storybook/components@npm:6.5.13"
+"@storybook/components@npm:6.5.14, @storybook/components@npm:^6.0.0":
+  version: 6.5.14
+  resolution: "@storybook/components@npm:6.5.14"
   dependencies:
-    "@storybook/client-logger": 6.5.13
+    "@storybook/client-logger": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/theming": 6.5.13
+    "@storybook/theming": 6.5.14
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     qs: ^6.10.0
@@ -2281,24 +2281,24 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 5d01c0f445f6574ccadcfa79afd99c078bd1f81d65e59186361100dc57bd73ccbb877e5a8bbc49dd6551bce1b32fbe6f135c2bea15c0126a83faf222cfaed878
+  checksum: 73d0ff418f2c5b1fc9f421f089ebee2342ef0684905e4959397a8bc6f67f32ff97f4ec3587847980cb7e4fc8e40278d8ecea11a8d267fea8d94ad3d8265a0c21
   languageName: node
   linkType: hard
 
-"@storybook/core-client@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/core-client@npm:6.5.13"
+"@storybook/core-client@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/core-client@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/channel-postmessage": 6.5.13
-    "@storybook/channel-websocket": 6.5.13
-    "@storybook/client-api": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/channel-postmessage": 6.5.14
+    "@storybook/channel-websocket": 6.5.14
+    "@storybook/client-api": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/preview-web": 6.5.13
-    "@storybook/store": 6.5.13
-    "@storybook/ui": 6.5.13
+    "@storybook/preview-web": 6.5.14
+    "@storybook/store": 6.5.14
+    "@storybook/ui": 6.5.14
     airbnb-js-shims: ^2.2.1
     ansi-to-html: ^0.6.11
     core-js: ^3.8.2
@@ -2316,13 +2316,13 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c4350b1b579f0781a239fdede79f1d0975e297ecb61ba4096834d62bd553420615231dc9146c446d0178088e83863fd9dc720fbb4485b5779fac7d99ce3eeb9e
+  checksum: ff867021ab6c22408952b809f3c22e58474390062fb5417aecc0ea6dcf2eb0097a616c5b1377e9af6c16045ce0cd5f3a11b32072630085592998dbb6a7ee573d
   languageName: node
   linkType: hard
 
-"@storybook/core-common@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/core-common@npm:6.5.13"
+"@storybook/core-common@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/core-common@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/plugin-proposal-class-properties": ^7.12.1
@@ -2346,7 +2346,7 @@ __metadata:
     "@babel/preset-react": ^7.12.10
     "@babel/preset-typescript": ^7.12.7
     "@babel/register": ^7.12.1
-    "@storybook/node-logger": 6.5.13
+    "@storybook/node-logger": 6.5.14
     "@storybook/semver": ^7.3.2
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/pretty-hrtime": ^1.0.0
@@ -2380,7 +2380,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 369fbe41e9ac657410a8e7fb4668be0e77c50b84c29b352397cc26b72d79397a7e84dcbf7a94f2d02d819d395a66e30a3915de40e85936d7b7dc50bb426aeabb
+  checksum: a1cd6e97524aa8173bc8a0af867cbf407f0542b8577a5be79a82154efb239d9362d05fae3bad0aac41e17d33d950cb69290042be46bbc841a8d12b71f6db1c82
   languageName: node
   linkType: hard
 
@@ -2393,31 +2393,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-events@npm:6.5.13, @storybook/core-events@npm:^6.0.0":
-  version: 6.5.13
-  resolution: "@storybook/core-events@npm:6.5.13"
+"@storybook/core-events@npm:6.5.14, @storybook/core-events@npm:^6.0.0":
+  version: 6.5.14
+  resolution: "@storybook/core-events@npm:6.5.14"
   dependencies:
     core-js: ^3.8.2
-  checksum: 2afeaf5fd658a4e9eedb9ad458ba0bcc73ad4ae5ba0e9971434818258db01d9b48b604d4db396ebfc1e1571dace3f6659e9ed61ac35428a792a4e24bbc08b29c
+  checksum: 6787925c520a6ee5aee748d4b7e2ec599c5ee16a87dbb62a94eeec88003ef42683d8e7ac8b98b49ea2a33205e0648805410c4759d16a997ba2f4215f6c8784ce
   languageName: node
   linkType: hard
 
-"@storybook/core-server@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/core-server@npm:6.5.13"
+"@storybook/core-server@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/core-server@npm:6.5.14"
   dependencies:
     "@discoveryjs/json-ext": ^0.5.3
-    "@storybook/builder-webpack4": 6.5.13
-    "@storybook/core-client": 6.5.13
-    "@storybook/core-common": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/builder-webpack4": 6.5.14
+    "@storybook/core-client": 6.5.14
+    "@storybook/core-common": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/csf-tools": 6.5.13
-    "@storybook/manager-webpack4": 6.5.13
-    "@storybook/node-logger": 6.5.13
+    "@storybook/csf-tools": 6.5.14
+    "@storybook/manager-webpack4": 6.5.14
+    "@storybook/node-logger": 6.5.14
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.13
-    "@storybook/telemetry": 6.5.13
+    "@storybook/store": 6.5.14
+    "@storybook/telemetry": 6.5.14
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/node-fetch": ^2.5.7
     "@types/pretty-hrtime": ^1.0.0
@@ -2461,16 +2461,16 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 142b13ef4fef21a68c8255f35f42ca5c3b9f636b51986f61dc6ae95485788d0f581552604b8a4a796e7cd2ad9548b87317ac9647ea44be58f64b91c440bb71ea
+  checksum: ca61b13ff002f73f76f6d359fc7955f061806d13bb0f158d6ff299696901097329d082b4fdd7fac06dda93fd318bcdbba9f6a08390763d18851c8aa70e581c36
   languageName: node
   linkType: hard
 
-"@storybook/core@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/core@npm:6.5.13"
+"@storybook/core@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/core@npm:6.5.14"
   dependencies:
-    "@storybook/core-client": 6.5.13
-    "@storybook/core-server": 6.5.13
+    "@storybook/core-client": 6.5.14
+    "@storybook/core-server": 6.5.14
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -2482,13 +2482,13 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: e0dbe5d8d52f2a12ab63db965d5d15ee671029a03b7204756954e2bc3253b560c8e430aaab5559ccbddcfd3e97d2bc1c0c58ed370aa593912724402aa86996b8
+  checksum: 16a2b8c589cbb8632ef6f1ba941abd7a422bca6fa54d4ef1dc5a60145bbea8dded10c7fa1fd4b8284e2e86867e779c26d4eebe69e2156123c49cfdf66c14718a
   languageName: node
   linkType: hard
 
-"@storybook/csf-tools@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/csf-tools@npm:6.5.13"
+"@storybook/csf-tools@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/csf-tools@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/generator": ^7.12.11
@@ -2509,7 +2509,7 @@ __metadata:
   peerDependenciesMeta:
     "@storybook/mdx2-csf":
       optional: true
-  checksum: 2b8a5bed04ea89084334742e1095c4565b0b7367b5126e3a9b6648224b59c2136a9d57cbb9067264fc3951e9db58df40b23b975170180d171cce35dfabf2a090
+  checksum: 12e6bb4d9daa1f3ffd6a240edd9680c4088a20f2eba6dd91102fd2900188dcfcec60fc7e7b021aa2ae2232e15e0839aaf490d1c2ab2c9baa74a9dfea74ec713f
   languageName: node
   linkType: hard
 
@@ -2522,18 +2522,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/docs-tools@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/docs-tools@npm:6.5.13"
+"@storybook/docs-tools@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/docs-tools@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/store": 6.5.13
+    "@storybook/store": 6.5.14
     core-js: ^3.8.2
     doctrine: ^3.0.0
     lodash: ^4.17.21
     regenerator-runtime: ^0.13.7
-  checksum: d3ad4674922025aaf6e4e2b7c2ac6f4eaec8f5692dc9a792a15d2d5e38dcd2e1c138daffb31a3da04da1e04c645b3cd8d921890f9ba318bfee7b6a12f263b48a
+  checksum: 1a69dae1f9ae4196a3517571d898097a69431cd6d92f490af3eb3e5504fe0bbde4cbdd82d1ff9648c3a1daa7eab10eaffd5d2ee485e634a6fa5701dec7875196
   languageName: node
   linkType: hard
 
@@ -2550,19 +2550,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/manager-webpack4@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/manager-webpack4@npm:6.5.13"
+"@storybook/manager-webpack4@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/manager-webpack4@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/plugin-transform-template-literals": ^7.12.1
     "@babel/preset-react": ^7.12.10
-    "@storybook/addons": 6.5.13
-    "@storybook/core-client": 6.5.13
-    "@storybook/core-common": 6.5.13
-    "@storybook/node-logger": 6.5.13
-    "@storybook/theming": 6.5.13
-    "@storybook/ui": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/core-client": 6.5.14
+    "@storybook/core-common": 6.5.14
+    "@storybook/node-logger": 6.5.14
+    "@storybook/theming": 6.5.14
+    "@storybook/ui": 6.5.14
     "@types/node": ^14.0.10 || ^16.0.0
     "@types/webpack": ^4.41.26
     babel-loader: ^8.0.0
@@ -2595,23 +2595,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 6645f30b6199d0badb2097aca16478e4d8bc88210b55e60c4da86962e8b0a3441128f1e696cddf8a535591920617a7abf5f1f9771dabc486479e76b8d4b20fbd
+  checksum: c8547b64f80c87dd8590a3e7b784b6f72952607514f9e42858f89efce22ea077404033b25674aecc3874e61264ce74c38220b6130aecbce5361d182b018f7fc7
   languageName: node
   linkType: hard
 
 "@storybook/manager-webpack5@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/manager-webpack5@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/manager-webpack5@npm:6.5.14"
   dependencies:
     "@babel/core": ^7.12.10
     "@babel/plugin-transform-template-literals": ^7.12.1
     "@babel/preset-react": ^7.12.10
-    "@storybook/addons": 6.5.13
-    "@storybook/core-client": 6.5.13
-    "@storybook/core-common": 6.5.13
-    "@storybook/node-logger": 6.5.13
-    "@storybook/theming": 6.5.13
-    "@storybook/ui": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/core-client": 6.5.14
+    "@storybook/core-common": 6.5.14
+    "@storybook/node-logger": 6.5.14
+    "@storybook/theming": 6.5.14
+    "@storybook/ui": 6.5.14
     "@types/node": ^14.0.10 || ^16.0.0
     babel-loader: ^8.0.0
     case-sensitive-paths-webpack-plugin: ^2.3.0
@@ -2641,7 +2641,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 95e720d00e8869f8ec5e8a36f50e5da6aaecdc9a1ea306ae3d7b50f2f07b60a9eb5cb3787e88262c664c958b1f56b7f34e9bf027eb627a96d127b5771ff6a137
+  checksum: 1fe525b777694c90d1837911307fa5ef3ac976387ff9b8c5116e51bfe21437c7d83504d3edb63cc5d3c9d624ba50e467f500a3477b63a879fc5d6e73310894ba
   languageName: node
   linkType: hard
 
@@ -2664,29 +2664,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/node-logger@npm:6.5.13, @storybook/node-logger@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/node-logger@npm:6.5.13"
+"@storybook/node-logger@npm:6.5.14, @storybook/node-logger@npm:^6.5.9":
+  version: 6.5.14
+  resolution: "@storybook/node-logger@npm:6.5.14"
   dependencies:
     "@types/npmlog": ^4.1.2
     chalk: ^4.1.0
     core-js: ^3.8.2
     npmlog: ^5.0.1
     pretty-hrtime: ^1.0.3
-  checksum: bcd1d98822687580e39f27003e16c73e3c775cdfe6e9f8fd8fbe9f4626a82f3f63fe281f9c894f3917faa52202ccb8217916978032d27ba6dbfa9720064e7739
+  checksum: d36d17816b20bf8409504f73b8fe7da2c1aa6b6f37c3cc910f544f4e3d9dfe8cfe5ab66930977413ab12a067f94477d5a1e3da8fa55c07af5dbc88160845ee47
   languageName: node
   linkType: hard
 
-"@storybook/preview-web@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/preview-web@npm:6.5.13"
+"@storybook/preview-web@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/preview-web@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/channel-postmessage": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/channel-postmessage": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/store": 6.5.13
+    "@storybook/store": 6.5.14
     ansi-to-html: ^0.6.11
     core-js: ^3.8.2
     global: ^4.4.0
@@ -2700,7 +2700,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: d66d29667a936ee80d15de07bdeec0c6cb2a476fdaa59f262297f5c7dc774acb57e4779c2dd77e61f5a6d9974ac3359babe587a2cd9baf6aa7673ec949b3234d
+  checksum: ef4d2222feaadd71067339ec93a13279162d0d0c72545ccb52681dd38c95451bb4257f0817dd3689af5d5e5b161602c8a57bc5805cd0d6bc0e066b78a2cfdd23
   languageName: node
   linkType: hard
 
@@ -2723,22 +2723,22 @@ __metadata:
   linkType: hard
 
 "@storybook/react@npm:^6.5.9":
-  version: 6.5.13
-  resolution: "@storybook/react@npm:6.5.13"
+  version: 6.5.14
+  resolution: "@storybook/react@npm:6.5.14"
   dependencies:
     "@babel/preset-flow": ^7.12.1
     "@babel/preset-react": ^7.12.10
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.3
-    "@storybook/addons": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core": 6.5.13
-    "@storybook/core-common": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core": 6.5.14
+    "@storybook/core-common": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
-    "@storybook/docs-tools": 6.5.13
-    "@storybook/node-logger": 6.5.13
+    "@storybook/docs-tools": 6.5.14
+    "@storybook/node-logger": 6.5.14
     "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0
     "@storybook/semver": ^7.3.2
-    "@storybook/store": 6.5.13
+    "@storybook/store": 6.5.14
     "@types/estree": ^0.0.51
     "@types/node": ^14.14.20 || ^16.0.0
     "@types/webpack-env": ^1.16.0
@@ -2783,7 +2783,7 @@ __metadata:
     build-storybook: bin/build.js
     start-storybook: bin/index.js
     storybook-server: bin/index.js
-  checksum: 5a21e4e49a0aba7376dbaef5408e03537cf937d3025e735b45848bce7c9f476a025ca9af4260aa32982a3da668e14a217f66a0ec465ed820369ff2fab49b2ab3
+  checksum: b94b7b3ef19d6b9e9379242fb17afd8892100cdf5dd8beac640e8dcac62618977e8189891e87e0fab40484a3fc84eeb8bc17ebd8dc7cba6b29ee7b65f8f761c8
   languageName: node
   linkType: hard
 
@@ -2803,11 +2803,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/router@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/router@npm:6.5.13"
+"@storybook/router@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/router@npm:6.5.14"
   dependencies:
-    "@storybook/client-logger": 6.5.13
+    "@storybook/client-logger": 6.5.14
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     qs: ^6.10.0
@@ -2815,7 +2815,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: ca144b2f6e3a46d5ac9d449b068d0905e9c72939c8574f095d8d7f7307b172a0c5c13f56ff08d5d5bff540292d9ed13eeecc3a4e600e282ea31e70ed763b735a
+  checksum: ec2550568c02f45de5307e77928eaeb39413049944e994adbc397d9c7e083ac7e110886e40517ddae40e3879c172f458167682f1d73d0bb150bc93ab9dd61514
   languageName: node
   linkType: hard
 
@@ -2831,34 +2831,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/source-loader@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/source-loader@npm:6.5.13"
+"@storybook/source-loader@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/source-loader@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/client-logger": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/client-logger": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
     core-js: ^3.8.2
     estraverse: ^5.2.0
     global: ^4.4.0
-    loader-utils: ^2.0.0
+    loader-utils: ^2.0.4
     lodash: ^4.17.21
     prettier: ">=2.2.1 <=2.3.0"
     regenerator-runtime: ^0.13.7
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 93da14a367a954f664d233f64bd9e7d983475e489b8fbe5c90b723ff793279ab899d86f967eb6882f7997296f4286f6f5c82c17ca83e9294c91f8e4aa0ec0a1d
+  checksum: 81f8908a31eb3428835a201418b89981c7ce7ece669bef2a6487b643025e45238956fe98f8fd70aa61843db0eee2c595a13e84b46835cb28b1eef59defe00740
   languageName: node
   linkType: hard
 
-"@storybook/store@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/store@npm:6.5.13"
+"@storybook/store@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/store@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-events": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-events": 6.5.14
     "@storybook/csf": 0.0.2--canary.4566f4d.1
     core-js: ^3.8.2
     fast-deep-equal: ^3.1.3
@@ -2874,16 +2874,16 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 69f55927bd3569ec9d87f4351879fd07654d51524a0f9da05c64c7f7f3b50e33024f1554fa59668997e47189e9838b85b691de422ab539bd71126b56922d9381
+  checksum: 7330a2492c469bbe989a522873486cbccf660080bf8d03c873029a8fa56f82976d7d71030c69aa9b2df48bf3b6fdc8063f5beecba298908783058ea675f0a159
   languageName: node
   linkType: hard
 
-"@storybook/telemetry@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/telemetry@npm:6.5.13"
+"@storybook/telemetry@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/telemetry@npm:6.5.14"
   dependencies:
-    "@storybook/client-logger": 6.5.13
-    "@storybook/core-common": 6.5.13
+    "@storybook/client-logger": 6.5.14
+    "@storybook/core-common": 6.5.14
     chalk: ^4.1.0
     core-js: ^3.8.2
     detect-package-manager: ^2.0.1
@@ -2894,7 +2894,7 @@ __metadata:
     nanoid: ^3.3.1
     read-pkg-up: ^7.0.1
     regenerator-runtime: ^0.13.7
-  checksum: 94ad6fb58b09c8073600ad95b2a48f476524ea7bc6155aee8e9682966a99ac875a9923ee6512252238e8c56eeef725a712e94ba87e1060d7dca9ab196a9051a6
+  checksum: 6f6323fe0e0fe9301b63a951e4f2959a68847bc20b67e3910587e6979b3e0b058ce5ec1b2bc89e666b77e91211dd0bb2ed8bd23060831f599365b8f41630db53
   languageName: node
   linkType: hard
 
@@ -2926,34 +2926,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:6.5.13, @storybook/theming@npm:^6.0.0":
-  version: 6.5.13
-  resolution: "@storybook/theming@npm:6.5.13"
+"@storybook/theming@npm:6.5.14, @storybook/theming@npm:^6.0.0":
+  version: 6.5.14
+  resolution: "@storybook/theming@npm:6.5.14"
   dependencies:
-    "@storybook/client-logger": 6.5.13
+    "@storybook/client-logger": 6.5.14
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     regenerator-runtime: ^0.13.7
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: f7a59c7d81b87f3fbf65c5eb72f5db5a5c1707236c92350d46bc7e1dcf848d57522ca5dcdd4fe19336d4611bd20727e0d900c4b591d2e8e1dd8a754cb9c56aa3
+  checksum: d139325dd51e8dfa58458a5c033104123b019fc02ddc899898e02de2b5d1358fd318b5def7ef82e6138420f9198e90d50b0fdfbea926987ac6852fc3a2e77c6d
   languageName: node
   linkType: hard
 
-"@storybook/ui@npm:6.5.13":
-  version: 6.5.13
-  resolution: "@storybook/ui@npm:6.5.13"
+"@storybook/ui@npm:6.5.14":
+  version: 6.5.14
+  resolution: "@storybook/ui@npm:6.5.14"
   dependencies:
-    "@storybook/addons": 6.5.13
-    "@storybook/api": 6.5.13
-    "@storybook/channels": 6.5.13
-    "@storybook/client-logger": 6.5.13
-    "@storybook/components": 6.5.13
-    "@storybook/core-events": 6.5.13
-    "@storybook/router": 6.5.13
+    "@storybook/addons": 6.5.14
+    "@storybook/api": 6.5.14
+    "@storybook/channels": 6.5.14
+    "@storybook/client-logger": 6.5.14
+    "@storybook/components": 6.5.14
+    "@storybook/core-events": 6.5.14
+    "@storybook/router": 6.5.14
     "@storybook/semver": ^7.3.2
-    "@storybook/theming": 6.5.13
+    "@storybook/theming": 6.5.14
     core-js: ^3.8.2
     memoizerific: ^1.11.3
     qs: ^6.10.0
@@ -2962,7 +2962,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: d2866987f51d945246776d42628bc2b79e701f1e59fd511bb1e590c83c4b9d9adee5c7e1a11ecb2ef12b9192613e2d576694bbc9aeb1df5545567f2aa44c0145
+  checksum: 898bf81d9ab64d792bdca23b0ec465500af1e42ed5ebace5847416d0ec36d32043fb7c547452a626ce285efd966569e6bfd4f84ddd691367259553ca59538646
   languageName: node
   linkType: hard
 
@@ -7744,7 +7744,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.3":
+"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.3, loader-utils@npm:^2.0.4":
   version: 2.0.4
   resolution: "loader-utils@npm:2.0.4"
   dependencies:

From 565b9eb7dfe58da2f7d4d6096faba72fe543f796 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 17:35:25 +0000
Subject: [PATCH 65/82] Update aws-sdk-js-v3 monorepo to v3.222.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 1226 +++++++++++++++++++++++++++--------------------------
 1 file changed, 621 insertions(+), 605 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a7d4141c49..3cae9d20e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -379,13 +379,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/abort-controller@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/abort-controller@npm:3.215.0"
+"@aws-sdk/abort-controller@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/abort-controller@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: eda64e8f93885a20b889374c6ae068799f9ee5ef91850a9c07e29465734a83c33b4bd37d961a61a2ff0c64ed18651a9878db40b1d7bb39aef4338a9167bfb605
+  checksum: 06528afdab15ed4f088b313e3e42c4ed9b46f4887a2f6f75aabe98830027510e5541965cefa3af1a9f0315ae4b37bdc16b6a9c80b7fca65719b47c8909aad260
   languageName: node
   linkType: hard
 
@@ -408,476 +408,482 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-cognito-identity@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/client-cognito-identity@npm:3.218.0"
+"@aws-sdk/client-cognito-identity@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/client-cognito-identity@npm:3.222.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.218.0
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/credential-provider-node": 3.218.0
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/hash-node": 3.215.0
-    "@aws-sdk/invalid-dependency": 3.215.0
-    "@aws-sdk/middleware-content-length": 3.215.0
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/middleware-host-header": 3.215.0
-    "@aws-sdk/middleware-logger": 3.215.0
-    "@aws-sdk/middleware-recursion-detection": 3.215.0
-    "@aws-sdk/middleware-retry": 3.215.0
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/middleware-signing": 3.215.0
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/middleware-user-agent": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/hash-node": 3.222.0
+    "@aws-sdk/invalid-dependency": 3.222.0
+    "@aws-sdk/middleware-content-length": 3.222.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/middleware-host-header": 3.222.0
+    "@aws-sdk/middleware-logger": 3.222.0
+    "@aws-sdk/middleware-recursion-detection": 3.222.0
+    "@aws-sdk/middleware-retry": 3.222.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/middleware-signing": 3.222.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/middleware-user-agent": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-body-length-browser": 3.188.0
     "@aws-sdk/util-body-length-node": 3.208.0
-    "@aws-sdk/util-defaults-mode-browser": 3.215.0
-    "@aws-sdk/util-defaults-mode-node": 3.215.0
-    "@aws-sdk/util-endpoints": 3.216.0
-    "@aws-sdk/util-user-agent-browser": 3.215.0
-    "@aws-sdk/util-user-agent-node": 3.215.0
+    "@aws-sdk/util-defaults-mode-browser": 3.222.0
+    "@aws-sdk/util-defaults-mode-node": 3.222.0
+    "@aws-sdk/util-endpoints": 3.222.0
+    "@aws-sdk/util-retry": 3.222.0
+    "@aws-sdk/util-user-agent-browser": 3.222.0
+    "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 54c15fa5cf9179eb806ae3bec4b0b936e28a955a2fa750ba99fe687e9580618dd6190726caf770db4fa23aed35dd022406b1d3eb9112c6a04d61edacdda3c501
+  checksum: b733d9bad0232a17967da9b27311cb2adf41acaefc584173e6d74b3b966ed3908b9e9fa65b3a0f3e12709dc305e64b1a5351ea43ac666650a375cb10143368e3
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-s3@npm:^3.208.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/client-s3@npm:3.218.0"
+  version: 3.222.0
+  resolution: "@aws-sdk/client-s3@npm:3.222.0"
   dependencies:
     "@aws-crypto/sha1-browser": 2.0.0
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.218.0
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/credential-provider-node": 3.218.0
-    "@aws-sdk/eventstream-serde-browser": 3.215.0
-    "@aws-sdk/eventstream-serde-config-resolver": 3.215.0
-    "@aws-sdk/eventstream-serde-node": 3.215.0
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/hash-blob-browser": 3.215.0
-    "@aws-sdk/hash-node": 3.215.0
-    "@aws-sdk/hash-stream-node": 3.215.0
-    "@aws-sdk/invalid-dependency": 3.215.0
-    "@aws-sdk/md5-js": 3.215.0
-    "@aws-sdk/middleware-bucket-endpoint": 3.215.0
-    "@aws-sdk/middleware-content-length": 3.215.0
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/middleware-expect-continue": 3.215.0
-    "@aws-sdk/middleware-flexible-checksums": 3.215.0
-    "@aws-sdk/middleware-host-header": 3.215.0
-    "@aws-sdk/middleware-location-constraint": 3.215.0
-    "@aws-sdk/middleware-logger": 3.215.0
-    "@aws-sdk/middleware-recursion-detection": 3.215.0
-    "@aws-sdk/middleware-retry": 3.215.0
-    "@aws-sdk/middleware-sdk-s3": 3.215.0
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/middleware-signing": 3.215.0
-    "@aws-sdk/middleware-ssec": 3.215.0
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/middleware-user-agent": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/signature-v4-multi-region": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/eventstream-serde-browser": 3.222.0
+    "@aws-sdk/eventstream-serde-config-resolver": 3.222.0
+    "@aws-sdk/eventstream-serde-node": 3.222.0
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/hash-blob-browser": 3.222.0
+    "@aws-sdk/hash-node": 3.222.0
+    "@aws-sdk/hash-stream-node": 3.222.0
+    "@aws-sdk/invalid-dependency": 3.222.0
+    "@aws-sdk/md5-js": 3.222.0
+    "@aws-sdk/middleware-bucket-endpoint": 3.222.0
+    "@aws-sdk/middleware-content-length": 3.222.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/middleware-expect-continue": 3.222.0
+    "@aws-sdk/middleware-flexible-checksums": 3.222.0
+    "@aws-sdk/middleware-host-header": 3.222.0
+    "@aws-sdk/middleware-location-constraint": 3.222.0
+    "@aws-sdk/middleware-logger": 3.222.0
+    "@aws-sdk/middleware-recursion-detection": 3.222.0
+    "@aws-sdk/middleware-retry": 3.222.0
+    "@aws-sdk/middleware-sdk-s3": 3.222.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/middleware-signing": 3.222.0
+    "@aws-sdk/middleware-ssec": 3.222.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/middleware-user-agent": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/signature-v4-multi-region": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-body-length-browser": 3.188.0
     "@aws-sdk/util-body-length-node": 3.208.0
-    "@aws-sdk/util-defaults-mode-browser": 3.215.0
-    "@aws-sdk/util-defaults-mode-node": 3.215.0
-    "@aws-sdk/util-endpoints": 3.216.0
-    "@aws-sdk/util-stream-browser": 3.215.0
-    "@aws-sdk/util-stream-node": 3.215.0
-    "@aws-sdk/util-user-agent-browser": 3.215.0
-    "@aws-sdk/util-user-agent-node": 3.215.0
+    "@aws-sdk/util-defaults-mode-browser": 3.222.0
+    "@aws-sdk/util-defaults-mode-node": 3.222.0
+    "@aws-sdk/util-endpoints": 3.222.0
+    "@aws-sdk/util-retry": 3.222.0
+    "@aws-sdk/util-stream-browser": 3.222.0
+    "@aws-sdk/util-stream-node": 3.222.0
+    "@aws-sdk/util-user-agent-browser": 3.222.0
+    "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
-    "@aws-sdk/util-waiter": 3.215.0
+    "@aws-sdk/util-waiter": 3.222.0
     "@aws-sdk/xml-builder": 3.201.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: a747efc45e20a309dc856a01770f95d3503ab3d144d356ef8b37125023b735e98d429e4b7bf3f37fd0686e59132573d9b0703e9dcf0986e08c843eefa10d8aaa
+  checksum: 844b0ac62f37d8db28d462bc1ee4cc9bef97529fd9716db9693dd7c6423ec5d12b81a0a107457aa9feb2e7ca2e26c12aa979fe51ce4b3090229fcfa784778e83
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-sqs@npm:^3.208.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/client-sqs@npm:3.218.0"
+  version: 3.222.0
+  resolution: "@aws-sdk/client-sqs@npm:3.222.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.218.0
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/credential-provider-node": 3.218.0
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/hash-node": 3.215.0
-    "@aws-sdk/invalid-dependency": 3.215.0
-    "@aws-sdk/md5-js": 3.215.0
-    "@aws-sdk/middleware-content-length": 3.215.0
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/middleware-host-header": 3.215.0
-    "@aws-sdk/middleware-logger": 3.215.0
-    "@aws-sdk/middleware-recursion-detection": 3.215.0
-    "@aws-sdk/middleware-retry": 3.215.0
-    "@aws-sdk/middleware-sdk-sqs": 3.215.0
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/middleware-signing": 3.215.0
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/middleware-user-agent": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/hash-node": 3.222.0
+    "@aws-sdk/invalid-dependency": 3.222.0
+    "@aws-sdk/md5-js": 3.222.0
+    "@aws-sdk/middleware-content-length": 3.222.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/middleware-host-header": 3.222.0
+    "@aws-sdk/middleware-logger": 3.222.0
+    "@aws-sdk/middleware-recursion-detection": 3.222.0
+    "@aws-sdk/middleware-retry": 3.222.0
+    "@aws-sdk/middleware-sdk-sqs": 3.222.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/middleware-signing": 3.222.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/middleware-user-agent": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-body-length-browser": 3.188.0
     "@aws-sdk/util-body-length-node": 3.208.0
-    "@aws-sdk/util-defaults-mode-browser": 3.215.0
-    "@aws-sdk/util-defaults-mode-node": 3.215.0
-    "@aws-sdk/util-endpoints": 3.216.0
-    "@aws-sdk/util-user-agent-browser": 3.215.0
-    "@aws-sdk/util-user-agent-node": 3.215.0
+    "@aws-sdk/util-defaults-mode-browser": 3.222.0
+    "@aws-sdk/util-defaults-mode-node": 3.222.0
+    "@aws-sdk/util-endpoints": 3.222.0
+    "@aws-sdk/util-retry": 3.222.0
+    "@aws-sdk/util-user-agent-browser": 3.222.0
+    "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: 6fe2faf96f848fba4f36b736f2979ddf2283708241b56e22cfb27b196c8dcaf87bcbef148eb511e961800257edd6e895ea2cf0fe18bdf9dd9d54140d6dcfeca1
+  checksum: a6ffa1f101ac006e982e072cbdffb2247d125bbca79c710f4780b0af4473fc38cbff1b40281636c675340348a4066231c01aef838cbfe5402b0609875468d720
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso-oidc@npm:3.216.0":
-  version: 3.216.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.216.0"
+"@aws-sdk/client-sso-oidc@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/client-sso-oidc@npm:3.222.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/hash-node": 3.215.0
-    "@aws-sdk/invalid-dependency": 3.215.0
-    "@aws-sdk/middleware-content-length": 3.215.0
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/middleware-host-header": 3.215.0
-    "@aws-sdk/middleware-logger": 3.215.0
-    "@aws-sdk/middleware-recursion-detection": 3.215.0
-    "@aws-sdk/middleware-retry": 3.215.0
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/middleware-user-agent": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/hash-node": 3.222.0
+    "@aws-sdk/invalid-dependency": 3.222.0
+    "@aws-sdk/middleware-content-length": 3.222.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/middleware-host-header": 3.222.0
+    "@aws-sdk/middleware-logger": 3.222.0
+    "@aws-sdk/middleware-recursion-detection": 3.222.0
+    "@aws-sdk/middleware-retry": 3.222.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/middleware-user-agent": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-body-length-browser": 3.188.0
     "@aws-sdk/util-body-length-node": 3.208.0
-    "@aws-sdk/util-defaults-mode-browser": 3.215.0
-    "@aws-sdk/util-defaults-mode-node": 3.215.0
-    "@aws-sdk/util-endpoints": 3.216.0
-    "@aws-sdk/util-user-agent-browser": 3.215.0
-    "@aws-sdk/util-user-agent-node": 3.215.0
+    "@aws-sdk/util-defaults-mode-browser": 3.222.0
+    "@aws-sdk/util-defaults-mode-node": 3.222.0
+    "@aws-sdk/util-endpoints": 3.222.0
+    "@aws-sdk/util-retry": 3.222.0
+    "@aws-sdk/util-user-agent-browser": 3.222.0
+    "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: b1bce1b9594f2a0c19aabe934ee5d53becfff4f4244ce907393621d8e990df0625d0fe3ba3e1c7dba48946f43bd451d2c969b5e9fa9ee1b8504298706677bf30
+  checksum: 40674d89438b689480bdfa10bfb044d90341d87096ae6b0803e6ecc1695d48b1f7a8c513109e92001c380e2b2f5b18aa3e8af1c8ecd3d2f04f63f160cb039611
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/client-sso@npm:3.218.0"
+"@aws-sdk/client-sso@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/client-sso@npm:3.222.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/hash-node": 3.215.0
-    "@aws-sdk/invalid-dependency": 3.215.0
-    "@aws-sdk/middleware-content-length": 3.215.0
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/middleware-host-header": 3.215.0
-    "@aws-sdk/middleware-logger": 3.215.0
-    "@aws-sdk/middleware-recursion-detection": 3.215.0
-    "@aws-sdk/middleware-retry": 3.215.0
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/middleware-user-agent": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/hash-node": 3.222.0
+    "@aws-sdk/invalid-dependency": 3.222.0
+    "@aws-sdk/middleware-content-length": 3.222.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/middleware-host-header": 3.222.0
+    "@aws-sdk/middleware-logger": 3.222.0
+    "@aws-sdk/middleware-recursion-detection": 3.222.0
+    "@aws-sdk/middleware-retry": 3.222.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/middleware-user-agent": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-body-length-browser": 3.188.0
     "@aws-sdk/util-body-length-node": 3.208.0
-    "@aws-sdk/util-defaults-mode-browser": 3.215.0
-    "@aws-sdk/util-defaults-mode-node": 3.215.0
-    "@aws-sdk/util-endpoints": 3.216.0
-    "@aws-sdk/util-user-agent-browser": 3.215.0
-    "@aws-sdk/util-user-agent-node": 3.215.0
+    "@aws-sdk/util-defaults-mode-browser": 3.222.0
+    "@aws-sdk/util-defaults-mode-node": 3.222.0
+    "@aws-sdk/util-endpoints": 3.222.0
+    "@aws-sdk/util-retry": 3.222.0
+    "@aws-sdk/util-user-agent-browser": 3.222.0
+    "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 2ef01b0cf87ca4af9fb728e01674a765b84111a6e4030f8aa4dff3dbacc2a3c55861bdb3d992be84e49b625e50d497aa0f611e7e0c1de844392ee3089b9fe879
+  checksum: bc0cd1125bc5aa94b3fdec15167ce9539acf4a187da060d51fa8ad7c30d0bf6cfee9e3a0175d65e204aba92efee4087c99d1190e1b43927c01cd7a8b1bbbb93e
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sts@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/client-sts@npm:3.218.0"
+"@aws-sdk/client-sts@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/client-sts@npm:3.222.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/credential-provider-node": 3.218.0
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/hash-node": 3.215.0
-    "@aws-sdk/invalid-dependency": 3.215.0
-    "@aws-sdk/middleware-content-length": 3.215.0
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/middleware-host-header": 3.215.0
-    "@aws-sdk/middleware-logger": 3.215.0
-    "@aws-sdk/middleware-recursion-detection": 3.215.0
-    "@aws-sdk/middleware-retry": 3.215.0
-    "@aws-sdk/middleware-sdk-sts": 3.215.0
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/middleware-signing": 3.215.0
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/middleware-user-agent": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/hash-node": 3.222.0
+    "@aws-sdk/invalid-dependency": 3.222.0
+    "@aws-sdk/middleware-content-length": 3.222.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/middleware-host-header": 3.222.0
+    "@aws-sdk/middleware-logger": 3.222.0
+    "@aws-sdk/middleware-recursion-detection": 3.222.0
+    "@aws-sdk/middleware-retry": 3.222.0
+    "@aws-sdk/middleware-sdk-sts": 3.222.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/middleware-signing": 3.222.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/middleware-user-agent": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-body-length-browser": 3.188.0
     "@aws-sdk/util-body-length-node": 3.208.0
-    "@aws-sdk/util-defaults-mode-browser": 3.215.0
-    "@aws-sdk/util-defaults-mode-node": 3.215.0
-    "@aws-sdk/util-endpoints": 3.216.0
-    "@aws-sdk/util-user-agent-browser": 3.215.0
-    "@aws-sdk/util-user-agent-node": 3.215.0
+    "@aws-sdk/util-defaults-mode-browser": 3.222.0
+    "@aws-sdk/util-defaults-mode-node": 3.222.0
+    "@aws-sdk/util-endpoints": 3.222.0
+    "@aws-sdk/util-retry": 3.222.0
+    "@aws-sdk/util-user-agent-browser": 3.222.0
+    "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: 1619e054c23ef3b103fe1427faad454f6dced3e8daf98c91bc2bfd93386864ae25df90b13a3e8cbe4a9d75670e42815ce414401294c99de0b3cd475d3e85167e
+  checksum: 79f18e5b44541673213715e3465a8b000716c03120ea087e6920abba3542683dbd4b881ecb091ef90df34947eec00c82daf70089ea0e5e92cffbb4e57e2d76d7
   languageName: node
   linkType: hard
 
-"@aws-sdk/config-resolver@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/config-resolver@npm:3.215.0"
+"@aws-sdk/config-resolver@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/config-resolver@npm:3.222.0"
   dependencies:
-    "@aws-sdk/signature-v4": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/signature-v4": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-config-provider": 3.208.0
-    "@aws-sdk/util-middleware": 3.215.0
+    "@aws-sdk/util-middleware": 3.222.0
     tslib: ^2.3.1
-  checksum: d2ec1ca0da965a0baa4610a43186654dbacdab697b826ff9ebaff3004e4cd472a17e4757ea3eac463dd88390a8ae8475090b7d88cd2a2a5cdcb99a4dbf3835d4
+  checksum: 8a2524cf1e8bd9d7acf82a039a1da7de9a7f9017d7a0dd913024e74d126509bdaa0e2b2bfc0b9ba5a9aee83af4022e2573f59d675997cc81b726d8300afd22d5
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-cognito-identity@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.218.0"
+"@aws-sdk/credential-provider-cognito-identity@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.222.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.218.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/client-cognito-identity": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: bb7a9e9d4212dd2b393e23ecc6be6691eaea762bf8f882188fea9d426725617ea0d8d66d70e7a7c82c99baff3fab1c0f8819a7829fc329a1923e57c3ee55ac4d
+  checksum: e6a61cf601825907931ed0cc42050b895b150468feb95c1052e053ce00d33e8d225663ca337da1c5825eee7e24438311ba0d28b2a6021868d3e6796aa81fdeeb
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-env@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/credential-provider-env@npm:3.215.0"
+"@aws-sdk/credential-provider-env@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-env@npm:3.222.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: fa878a7dc53e964aa6228b5879c419b6e8aebc74b1e560df8980ec51b40a998d0a43eab8c5ab366c6afae831b43d88310e776cea3f5cfdb4755067cbefde1be4
+  checksum: ae524102f47c8ac471231d990b63d3a3272826f94efd9a37d6a5ccc1c42db1edc86a69c67743eeba16fbead5b6800578de1a43831b99005e6d5b974acdc553d0
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-imds@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/credential-provider-imds@npm:3.215.0"
+"@aws-sdk/credential-provider-imds@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-imds@npm:3.222.0"
   dependencies:
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     tslib: ^2.3.1
-  checksum: 341e1c1af4a3908e635558791b67346bba31ff0d6b6c5a44e1b4af912eda3163ec1edc8933c9f5e123979b0e179a160505a2407efff15c9597e91521783167b7
+  checksum: 41e5ee3819896063fdd3054d9a21d954b6904eaf66b4fc1385407de18dab7417704f2c2ebfad27330692fda629cc8878a0d7291a67f84ab4880a1c1a4a4d3c22
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-ini@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.218.0"
+"@aws-sdk/credential-provider-ini@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.222.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.215.0
-    "@aws-sdk/credential-provider-imds": 3.215.0
-    "@aws-sdk/credential-provider-sso": 3.218.0
-    "@aws-sdk/credential-provider-web-identity": 3.215.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/credential-provider-env": 3.222.0
+    "@aws-sdk/credential-provider-imds": 3.222.0
+    "@aws-sdk/credential-provider-sso": 3.222.0
+    "@aws-sdk/credential-provider-web-identity": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: d48d601c89bb35330ddd3a9c976cad6caaf484468ac5819d21d34550a653b8ff54de616973e4b79b09f3e12d404582d4e4b46977eac465411d1bae79a7db370d
+  checksum: eac19a9b52066f76cf23bee102369df7d50097dfee3be14b12c2e178c16868acd1a79b13c00d3e3ac40d2fbc14b4e2b06119d0c51c5d875c6be3606c33514d62
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.218.0"
+"@aws-sdk/credential-provider-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/credential-provider-env": 3.215.0
-    "@aws-sdk/credential-provider-imds": 3.215.0
-    "@aws-sdk/credential-provider-ini": 3.218.0
-    "@aws-sdk/credential-provider-process": 3.215.0
-    "@aws-sdk/credential-provider-sso": 3.218.0
-    "@aws-sdk/credential-provider-web-identity": 3.215.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/credential-provider-env": 3.222.0
+    "@aws-sdk/credential-provider-imds": 3.222.0
+    "@aws-sdk/credential-provider-ini": 3.222.0
+    "@aws-sdk/credential-provider-process": 3.222.0
+    "@aws-sdk/credential-provider-sso": 3.222.0
+    "@aws-sdk/credential-provider-web-identity": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: da8da825da1fca84fdb8ca3d9958be1059a3b93c868e19b0c4d6a8c628de881cf95701beec3fd107218c37e7726587197ab5a5cdf437d5c628436d17506cb1d1
+  checksum: f17ce6c9b45d48d9bebd63766b5d85e45f6a1d50b02bea4784d0055269a0f5c05e5ba343c6b138cd29086b94c6bb4511568e9fb59f340f3988526b2d7950cb4c
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/credential-provider-process@npm:3.215.0"
+"@aws-sdk/credential-provider-process@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-process@npm:3.222.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 5e8f70e94fc4ec0d347e96b65bd18faba93c9ff7b30f9f24268789bcaa121905295c7fc575ca29842484a6315b3772214dac2621b1b85184c4ded9f924aec5c8
+  checksum: 9f51373b68be65f4ec1a1412796070c4c8570729ad1b2e6882c802b152d6ac54c2877df8049e7e483fe85af94fdd19bda6145ebe9130e7a6502f851ae8db1855
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.218.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.218.0"
+"@aws-sdk/credential-provider-sso@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.222.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.218.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/token-providers": 3.216.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/client-sso": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/token-providers": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 1d6b26776c83d7256336f89b33ae1a5cf7ba252af6ea54b2daaa9c5ce77a1d7b7afb08a49ef10dccbb900f12b40522e87b6561f5128b2869530f8a86ad2c6654
+  checksum: 8e0a39a722fd6548b9758ab4c711eac9128a64bae1fa9bfce5f0b92c2df34883fdcd544c9a48f501d3a7b695e6d0b51a9b5e1be1b7eac626a1818860cfc86072
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.215.0"
+"@aws-sdk/credential-provider-web-identity@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.222.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: f012d3789817c42487a66058c7efadc95aa17afa02a7c652821c79195e18f20884e6b02c9b74e2a2260682f49349f7a8e9b524d3b0e1db4cace8a01a7f7dacf3
+  checksum: 4cae5d24b048decc17e44cef846635d7dfc3e2941b26391b144677a355f2ed4b3b798e87e14cc04959283c4f4914267edaaf8d92e58cd61a4a529551e61459ae
   languageName: node
   linkType: hard
 
 "@aws-sdk/credential-providers@npm:^3.208.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/credential-providers@npm:3.218.0"
+  version: 3.222.0
+  resolution: "@aws-sdk/credential-providers@npm:3.222.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.218.0
-    "@aws-sdk/client-sso": 3.218.0
-    "@aws-sdk/client-sts": 3.218.0
-    "@aws-sdk/credential-provider-cognito-identity": 3.218.0
-    "@aws-sdk/credential-provider-env": 3.215.0
-    "@aws-sdk/credential-provider-imds": 3.215.0
-    "@aws-sdk/credential-provider-ini": 3.218.0
-    "@aws-sdk/credential-provider-node": 3.218.0
-    "@aws-sdk/credential-provider-process": 3.215.0
-    "@aws-sdk/credential-provider-sso": 3.218.0
-    "@aws-sdk/credential-provider-web-identity": 3.215.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/client-cognito-identity": 3.222.0
+    "@aws-sdk/client-sso": 3.222.0
+    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/credential-provider-cognito-identity": 3.222.0
+    "@aws-sdk/credential-provider-env": 3.222.0
+    "@aws-sdk/credential-provider-imds": 3.222.0
+    "@aws-sdk/credential-provider-ini": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/credential-provider-process": 3.222.0
+    "@aws-sdk/credential-provider-sso": 3.222.0
+    "@aws-sdk/credential-provider-web-identity": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 75200e3d75b38435780192232ca7b0daf79b7538e6e8327783e8b4fb9e0f82f783f9cb679cf1642a07feef4bf34a0c8951e27d4d1969afdcf9a59ded50905bba
+  checksum: a6c159abbc210d62ed7d1153278b423595493583f53ec2a9143b402ee149cc1ae39be41615c76c3b658e1e9f70e89019a594c8e7a6a320cf7ea37443714a79ac
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-codec@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/eventstream-codec@npm:3.215.0"
+"@aws-sdk/eventstream-codec@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/eventstream-codec@npm:3.222.0"
   dependencies:
     "@aws-crypto/crc32": 2.0.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-hex-encoding": 3.201.0
     tslib: ^2.3.1
-  checksum: 9fb18b8b9e96c2dea75a70ac37f3d7f3f349167ba234ee8a8aab95dcb433783506a538aa1490da7f0b6824b445cfeacd520664f2f42203c846f41a3ce741e236
+  checksum: e41eebf3117623b26a825de7faebe3ce7e0f8aeaf01044902393581d36887879bdd5e73f20a708ef4031a6cdf0de2b845442cd83ac1b0f02ae9c056778c93113
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-browser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/eventstream-serde-browser@npm:3.215.0"
+"@aws-sdk/eventstream-serde-browser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/eventstream-serde-browser@npm:3.222.0"
   dependencies:
-    "@aws-sdk/eventstream-serde-universal": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/eventstream-serde-universal": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 6c4cd0d0d243b09c01151c7c56926968c38237fdf4cb94afa24cfe21f35cc1cb46c64b7c197c416401d3894b7725c1fecdfc073e072f99869beb3b526109f73e
+  checksum: 7bddf8d48b99615e3e03f051eee4dbb92cd84a23e688c83a7a2d4b8383ece4b59864c2d337d581d3eeaa62f692f912be20091c6b0bb82631d4681fb83d3898b9
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-config-resolver@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/eventstream-serde-config-resolver@npm:3.215.0"
+"@aws-sdk/eventstream-serde-config-resolver@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/eventstream-serde-config-resolver@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 36777edd4b43d43bf007a85399b988d0c71fc67476fd0536e10333b6ae21196c796ea7d30e80554a1fc86b230bda432b449a1b751ae0a26ac24ca9f072744a9c
+  checksum: 77f133dea7ae542cdcd8c2e4533ab862ddf7167a328c19d61ed360733ed3f9f3b4dfd66a52431300dfd87babafc0db8241e27f66178cb90973778b4ac06c2e0a
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-node@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/eventstream-serde-node@npm:3.215.0"
+"@aws-sdk/eventstream-serde-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/eventstream-serde-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/eventstream-serde-universal": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/eventstream-serde-universal": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 15f8c603504f15c5f32430d05c586faa2e3c444fd7ede960e5a9b5b9e13437e54bb2bb424dc6b1fd51183550ad4bc9849d6d2afd43dff7794111014a2c30128a
+  checksum: f18b1254ffffaee8acd7f5f1104969ca29248f797e8a9b018aaf4945e5a6b3bd1d6f46078a878232b1e99133e963e9ad8d840389d3fc9e8b0edc00e767c69d9f
   languageName: node
   linkType: hard
 
-"@aws-sdk/eventstream-serde-universal@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/eventstream-serde-universal@npm:3.215.0"
+"@aws-sdk/eventstream-serde-universal@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/eventstream-serde-universal@npm:3.222.0"
   dependencies:
-    "@aws-sdk/eventstream-codec": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/eventstream-codec": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 4a4e009ec9baf643067453f85df59e29e539eddd7ec1b5b29beab25c4e93e57a9b8c0b2f1788cb5cf17a031444bb6bab751aab8ed530605379a37c9661ff8cea
+  checksum: e3a02b2edc0245fce5137adfaf945c969a2285e5f681752ef257c837f578ece4872af3d7ce3ea2b6776761d70d77151034e843d98f9bbed9523cf3e533f49994
   languageName: node
   linkType: hard
 
@@ -894,59 +900,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/fetch-http-handler@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/fetch-http-handler@npm:3.215.0"
+"@aws-sdk/fetch-http-handler@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/fetch-http-handler@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/querystring-builder": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/querystring-builder": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     tslib: ^2.3.1
-  checksum: 7031944b65100023fdee709d4c38845fc5fe7ab01d3fabdd8fb13c32a326811c1ddcc201f6171fe5847b4bebd171a6a37c77068c5439ee29acf38078e16ef556
+  checksum: b6fa1a03e8e7fa4aea13f9aa154968b93ce1c6eca8f2f3fd58961bad167a720dc999cc62270bdf707d21e2136d22171f1099b4b326ccbcff52bea59a5a278630
   languageName: node
   linkType: hard
 
-"@aws-sdk/hash-blob-browser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/hash-blob-browser@npm:3.215.0"
+"@aws-sdk/hash-blob-browser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/hash-blob-browser@npm:3.222.0"
   dependencies:
     "@aws-sdk/chunked-blob-reader": 3.188.0
     "@aws-sdk/chunked-blob-reader-native": 3.208.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 2d4d8e7ff8e4f44510073a173aa7ecd5dd11f6758e5dc261d2b0576a33271d8728204066089a1805ceb1f5d5b738f44edc3c808fbd7a7121f8eb6bd70de856a7
+  checksum: c70be9c57ebfb3c549be807af61a77242952f39696eca2c38c77b6cde9afe8f83f92c8467cde9224f4da97e97635a3987759cd3996fd07ee23a1cf67dafc0d92
   languageName: node
   linkType: hard
 
-"@aws-sdk/hash-node@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/hash-node@npm:3.215.0"
+"@aws-sdk/hash-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/hash-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-buffer-from": 3.208.0
     tslib: ^2.3.1
-  checksum: 8d50f46c195b48304ba69107adf31e3380a1952920c373031c5ed31f936300c24b492ad477ae3e868a73834cffc78177294bee2a683904133ca516ebb3b64bef
+  checksum: 25ad5a33eb74d7a6a43f1d9d668a268e1ac9d1e5f394395784fc6011d10448630f79ea1f5c5dfbed249556cd4dec2f091d0913eca82700bdea1f64564c6512ae
   languageName: node
   linkType: hard
 
-"@aws-sdk/hash-stream-node@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/hash-stream-node@npm:3.215.0"
+"@aws-sdk/hash-stream-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/hash-stream-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: b86f99e3d5b6da2f48c4a0f1f46544218ce4059758c3bbe2b0ab8bed1aa115d42d9b8ff331f81ee339abfcb029b9aec35c9181137e632f36883f2e1f1e50e981
+  checksum: 6c58512030bb6e10601dda4de1efa0b61b2d6d9828018682c751a5a10a2d52e7931181818b51d8bf9cdf8ec0ef3fc2d93f0ef71ede51e91abc3b4f04a777ac4f
   languageName: node
   linkType: hard
 
-"@aws-sdk/invalid-dependency@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/invalid-dependency@npm:3.215.0"
+"@aws-sdk/invalid-dependency@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/invalid-dependency@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: f3ba901c3884c943909ec344bd5e17cdb13a5246a53d1e8e33fda036f45cb944dcfb52ef948d04d1d27cf514ef711ef65d1f2c3cc5048624b8fc49493d72837f
+  checksum: 1b6f3c2330f57506d8431cd7d295ab483e739a8be21556b5495cf3b0501776e0b286ddb5f049acd8814f46d44380a3c4ec0790c3226cbe8dcea03998c4bc1fd7
   languageName: node
   linkType: hard
 
@@ -960,11 +966,11 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/lib-storage@npm:^3.208.0":
-  version: 3.218.0
-  resolution: "@aws-sdk/lib-storage@npm:3.218.0"
+  version: 3.222.0
+  resolution: "@aws-sdk/lib-storage@npm:3.222.0"
   dependencies:
-    "@aws-sdk/middleware-endpoint": 3.215.0
-    "@aws-sdk/smithy-client": 3.215.0
+    "@aws-sdk/middleware-endpoint": 3.222.0
+    "@aws-sdk/smithy-client": 3.222.0
     buffer: 5.6.0
     events: 3.3.0
     stream-browserify: 3.0.0
@@ -972,267 +978,267 @@ __metadata:
   peerDependencies:
     "@aws-sdk/abort-controller": ^3.0.0
     "@aws-sdk/client-s3": ^3.0.0
-  checksum: 96db639ac862f049431d54e0af0d72245aa7c34f6f95a8ab7fdca280289e9916c86ada4708d6ad12cfb218f16191282b5ecbe2db335a944991228338931f5d2d
+  checksum: c247247e72a2c8a8210054dc84789ec10ce65bc631b253e65a21f407f5c9881c2eaa3fb982ce47f8e8979074b4d96e10ff9dc9f5245e76e40030809fa5ecaf06
   languageName: node
   linkType: hard
 
-"@aws-sdk/md5-js@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/md5-js@npm:3.215.0"
+"@aws-sdk/md5-js@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/md5-js@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 7e51e56cd4c1a91ec00c2d97dfa895497d5755a59feeb0a83eec871c2b6c62b2f0623d7a057b9670c871aea0010abe384236190944d0ecd913e61bf95526d0bc
+  checksum: 1fce491eef05bbf11242472e65a8ac379fd8061c3afc23e1e320fe86ddcb2babaa4696e1ebb452e69fcacf4f812d92490e25b7c928edb44d667db6718e1310cd
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-bucket-endpoint@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.215.0"
+"@aws-sdk/middleware-bucket-endpoint@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-arn-parser": 3.208.0
     "@aws-sdk/util-config-provider": 3.208.0
     tslib: ^2.3.1
-  checksum: 83456d16108aca33078dc55631482c738029bd4c73a23a0ca9bc3573979e43c1de829df46f69e1ee0b58cc2e2f5513d4c3f830fbc9d2fcf605f5ad43d7a709ce
+  checksum: 2f1d0da868788b8716a39e79e885cad3fa481701f6965eade6acd9d60c39fa95a257ca3c3d70b84936cead854232c17ddd6d2d4ce414735959af567e518aeb6e
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-content-length@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-content-length@npm:3.215.0"
+"@aws-sdk/middleware-content-length@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-content-length@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 7f41e88463faa0134be2c57bae62cd3c48fd2e6973d987e10a72f3c5cabc238cf5f59a9a8d6e92f5989e460f668f03c3b034fe54192391314de2431f77681aae
+  checksum: c21d04fa94ad3b20f507ad41f65cd010e84ce6ef9a4b9ae9c8d66ea8ca60b8b4c1436a9a1c19805de79b95b6f885f18dfda50ba19f6546023a71f36577797f66
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-endpoint@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-endpoint@npm:3.215.0"
+"@aws-sdk/middleware-endpoint@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-endpoint@npm:3.222.0"
   dependencies:
-    "@aws-sdk/middleware-serde": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/signature-v4": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/url-parser": 3.215.0
+    "@aws-sdk/middleware-serde": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/signature-v4": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/url-parser": 3.222.0
     "@aws-sdk/util-config-provider": 3.208.0
-    "@aws-sdk/util-middleware": 3.215.0
+    "@aws-sdk/util-middleware": 3.222.0
     tslib: ^2.3.1
-  checksum: cf57854b88ca43874e25dd4d160525a9cf0844319fb20bfdbfe6100570724ecafaf1c0014c803ee477ad85fd2a2b80686ec8e7b2ae69118ac3453b05f4bffc0f
+  checksum: 3a1240f66457d1de73a9c9f5f8baaf628f307d46840ef323492ac68ede5504dee6b1a9299195212e2b12e039ac7d6eafefa72cc1502799bcae6fd77c5d84da93
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-expect-continue@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-expect-continue@npm:3.215.0"
+"@aws-sdk/middleware-expect-continue@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-expect-continue@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: a8d4c7713fbb5f725ffb4d3fc9131a90a196bf4c6035b967b8989f6d0397c8f908723627633232799ca4d8cf5fb416dca56ba4c32f6982341f16b18fb3d1f6b9
+  checksum: 285ed55ab00f9a46af98003a34af9398e2ab044f0892f51b4f498ec1bfc7b83065bf4d6680da9bc2a581fcab438eac76a385b1038e3683aec8c9056285ef9a2f
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.215.0"
+"@aws-sdk/middleware-flexible-checksums@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.222.0"
   dependencies:
     "@aws-crypto/crc32": 2.0.0
     "@aws-crypto/crc32c": 2.0.0
     "@aws-sdk/is-array-buffer": 3.201.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 1bd63010e3cd5f254f4c75122d96915c1db8d9c7388a67391ad05aae7d71e5e8dd37e7243ed4c673a8a652f477b500eaeb9b020c152b4d0e05e8e8f73437559f
+  checksum: b55f9f45b4fd3c9aeed2f80c030b19fb1e2602e1062c692b4f7c5c9d87e7b7c036e7ebdac066dbfe6a3cde275a9091235ff2793a657630a330aaa652c6e53b50
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-host-header@npm:3.215.0"
+"@aws-sdk/middleware-host-header@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-host-header@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 461158ce46c5ca089d12a63b37ed064cc584b48d6b49523c11bcb690fdf811fb3d5603554d5f92c58dcf26d4948308cd7433d7a26c20a934d07e816cbf67a3a3
+  checksum: 0806ce2b235d8ec6328caa1cacdbdbee82196f82b7dc96e1ce6d8413390a35c73475df3a102391a99cd5996ef806054969ea00338064889997bd15428a064c73
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-location-constraint@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-location-constraint@npm:3.215.0"
+"@aws-sdk/middleware-location-constraint@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-location-constraint@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 77efd1a5393357f98a1199d6d5f5690a41935f60924e9a622796d0fcb700c9f27da84b0b282cd0b82b3949778ef94e8bcd225c5d70348107a89aea78333966fc
+  checksum: 54d77c68746e836ec9317f4062152beb09fccee15266f52b7e4ee6a19d5d40b8c4bb720a867170acdf8c77d8ef7b08701cf1a76b202dc3c191488a10507c1bdc
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-logger@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-logger@npm:3.215.0"
+"@aws-sdk/middleware-logger@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-logger@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 7d90e2195e68e1e7c04f52f8b8bdbbcc800f879200082892668477d17ae064beb6e7352540f262758b004d40560039426f6971396569c79eb9b4a51cba701081
+  checksum: c0fef1f56ba710a2e5784515f96d8c8408b3e882288d1bc8e6201bf8128d921de4b2dbaaeca1fee48334539587bf514cb77796cc0fab989173c4d785fc220db5
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.215.0"
+"@aws-sdk/middleware-recursion-detection@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 0bf6eda1208cc39ac92ce25b82c8cddae990c960096d5cffc57646d8fddfa5e3bcfff44cf6a99e1a60b613f48bdc015a6e056c55b790a996db7b3dddf47867eb
+  checksum: 6a3b31de18a32585a86948f312aefd98ec7a9a9ff5b8044f7f11dc8d7737e5fdb5d867f2971ffcf645db118892a28518fdb9689cc8fb64e947717281cca32031
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-retry@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-retry@npm:3.215.0"
+"@aws-sdk/middleware-retry@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-retry@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/service-error-classification": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/util-middleware": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/service-error-classification": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/util-middleware": 3.222.0
     tslib: ^2.3.1
     uuid: ^8.3.2
-  checksum: 6b5d5d9a370e2c46df14654f38ae9aab639dc429f216155556706352dc607c24ad79ff5c03533c8f5e40134e6d5209ce77b3856e0ba49c93ce93255da7b3c6fe
+  checksum: 764a56b92ba0178166cb188db20e521360a625d763a94e9470eeda83ad1d6d240186b5eeec41592896aa09f7c1370e604513419bf30683cbcbd5e5ae625b3a98
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-s3@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.215.0"
+"@aws-sdk/middleware-sdk-s3@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.222.0"
   dependencies:
-    "@aws-sdk/middleware-bucket-endpoint": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/middleware-bucket-endpoint": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-arn-parser": 3.208.0
     tslib: ^2.3.1
-  checksum: de1e1f661d182f385f1658943a3b0a8dce9cc15b8140d29fcc3eea7c8f629c7575613af7ee74499f42b85927682643167170c595cb955d9e7666568818b43b9a
+  checksum: a09aead012e6aae12467ba45b1740255b60da4f5cd816043abc8af0fd4905133063454c755d08ab3dcbf11096d42d0f92ab20b51d08c7d4daaa55f0586e99558
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sqs@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.215.0"
+"@aws-sdk/middleware-sdk-sqs@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-sdk-sqs@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-hex-encoding": 3.201.0
     tslib: ^2.3.1
-  checksum: f09a4ca9701bd4687c1cfa764e98f88c672d36a0c4b39d66e5da3f3c022457764d7c5aee76373b753e5f4cb332be65db21552862354b2f96ce05a30a137927c4
+  checksum: b882f5e83fa65f8e2f1dceaa96a0995d2058fee84dbd16048198b9f45d1f6763215363fbdb99b8f137a580b8cdac820992e776a562378327d7d86b6cca4e8d87
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-sts@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.215.0"
+"@aws-sdk/middleware-sdk-sts@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-sdk-sts@npm:3.222.0"
   dependencies:
-    "@aws-sdk/middleware-signing": 3.215.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/signature-v4": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/middleware-signing": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/signature-v4": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: bace7de141bef58b491d837e00ad4e0acbf6c4f79b8af80e0665dc36aa0cf31a21aa18101a1390096af11a76c5ffacf25995c1cf998874576b35ffd1a5146b3f
+  checksum: 0ad309d6490586686643602199b8a4389818568b6a7f6c41c97ff0b85e91651c9bed05da31c3eddf1ad329af926ac7efa5b8ee353c52a540ef1a529d6346350f
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-serde@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-serde@npm:3.215.0"
+"@aws-sdk/middleware-serde@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-serde@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 45caf42bc4aaa6e1c7fd16fd8f219c0629c939c3adfb8274b6a6fed1e62ff1237ee208e387352655580a9a6c8d7fef704cff1f6f51b5bc237b98fee7b193a959
+  checksum: 28dfe6d9c8d662d449ec4df9c30aa0eb18103f8cff8f3fa5325fc41a4e94b16e054d97d1325fe68b2ef497abfeabfc96b4ad63e485fb71693a488869fe732c33
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-signing@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-signing@npm:3.215.0"
+"@aws-sdk/middleware-signing@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-signing@npm:3.222.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/signature-v4": 3.215.0
-    "@aws-sdk/types": 3.215.0
-    "@aws-sdk/util-middleware": 3.215.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/signature-v4": 3.222.0
+    "@aws-sdk/types": 3.222.0
+    "@aws-sdk/util-middleware": 3.222.0
     tslib: ^2.3.1
-  checksum: a1c8c9b1a0cbde5f64ce5779f8e05494ffeed07bb7e6fe454baf9accf92bd5758dbb09cf0b5ae3f03d081e193af6197ff24659746d390d7e0c2f959f9014c073
+  checksum: 0e43183ba97d40162d2be2d8f0965c532691ebbb9bcb6216cb9b43f6fa2ed81118f3c06f991e5d01b3dc5b8d3cc692344b53996a8e13085fb9c658683da5e791
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-ssec@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-ssec@npm:3.215.0"
+"@aws-sdk/middleware-ssec@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-ssec@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: e362a5b63c327fbf66a959f303ae95f521b2f22e00b74959c24d2a4a6a5df1f8e86db21aef752c80cc8a0be47258dc80c79aa6edaf460c8e8782a750490b126a
+  checksum: fec3cf9a4495c1d2bdcd1ca3d577a077df9427a8fb1afbf53eede63347e1d0181b031e7c4625736079a726bf9c90ae5140aed2655c2282b8dcfc2957ca2641af
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-stack@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-stack@npm:3.215.0"
+"@aws-sdk/middleware-stack@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-stack@npm:3.222.0"
   dependencies:
     tslib: ^2.3.1
-  checksum: dc9c99969d178857ab975387f6326eb3c65fe1679087de719ea3dd25a3973bea310778ae45c61891de9cc41ce640f483dc9ff4f62af6669f3124029277f870aa
+  checksum: 5f143c1a964016a7296798e8ca457b7a364bc8e816eb1829be5c3b5c0f7430dbad2df3725d96bee4f4ad9ac4937083e7b2bf7c72093775c5b9fa85f697304361
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.215.0"
+"@aws-sdk/middleware-user-agent@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/middleware-user-agent@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 054f10a197876acc32d1903575855870edc9f5fe1fd7809dda47210e1b0717c7604e3cd916b34df7aa9f5cbe1ad9fa85934913ec51109a2740e3aed450587633
+  checksum: 3521fc61597faa8e53ee2290a4e1342ad0a22591362757c57985add5e3a85978f9e8fc83e993670740eae532937886c61ca85a8c534327ff4ef1ed721883e7a9
   languageName: node
   linkType: hard
 
-"@aws-sdk/node-config-provider@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/node-config-provider@npm:3.215.0"
+"@aws-sdk/node-config-provider@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/node-config-provider@npm:3.222.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: a23677a836a43bd0d4dd00cab64c42d1c69eafe8ccb833ea08a7b43ab0e891ad67a96757610fdd48a6d1cd749c29aaa1de14d894468c9e79e987e13d979c4382
+  checksum: 53c2e7d7c1ac5c54a0fbf5b5fdf963c89cc659f51189a6086f939d5adc0d9c3500e3205b159285f447df3bbf39ac32e67e1c313bbc368ad1c1ae8d26f771a3f4
   languageName: node
   linkType: hard
 
-"@aws-sdk/node-http-handler@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/node-http-handler@npm:3.215.0"
+"@aws-sdk/node-http-handler@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/node-http-handler@npm:3.222.0"
   dependencies:
-    "@aws-sdk/abort-controller": 3.215.0
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/querystring-builder": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/abort-controller": 3.222.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/querystring-builder": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 7b87cce3393553b9b2cd494aea49075fdafb8c7d9b4d61c44928e7e50f3f2909c6f57547ed504ce7b36b8dc17cc8fc8f0e882a7894898bb3cd5decc9e3de2d65
+  checksum: 06a66d1e54e0fd856c6172f2cfd97daefab8d5b996eecfb83b05cb29f4830ff00af1a5deb2726ec88b306a585be214e3fc7b3ead3ea9b70776a70a768424a70d
   languageName: node
   linkType: hard
 
-"@aws-sdk/property-provider@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/property-provider@npm:3.215.0"
+"@aws-sdk/property-provider@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/property-provider@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 0cb519ff8db962b2e65867b4ae5af12b0b517ace1e6f5d5f0a0f65790d087d734004b91454a2b97d842fc7799b0f0ebe4da7209360f627eac6c07af7e6ddb55b
+  checksum: 924965232eeef1870c7ed108b7ab1b6d23da3032f0741b129a883eab472c17c9811b95f79e3e84299cd0a44512b3aedfafa05ab0b232a0b17782ed327a4a1965
   languageName: node
   linkType: hard
 
@@ -1246,13 +1252,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/protocol-http@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/protocol-http@npm:3.215.0"
+"@aws-sdk/protocol-http@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/protocol-http@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: fd1d6db6168c3129b5311b42937f56731de5b536c11ffed08f8f7e3e1bbda1732e2632f642e601dd4af32722b78d179827772ae4564cea03553395dfa01e02d2
+  checksum: 11650667a4072246e6a12269c95e2c5a746d32032d0a54e3c8d062c711fef07b0c6fc2ad2a23c9ef82a97d305bf9a9222ccbcc3adb2835355b8b0199d3839f75
   languageName: node
   linkType: hard
 
@@ -1267,51 +1273,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/querystring-builder@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/querystring-builder@npm:3.215.0"
+"@aws-sdk/querystring-builder@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/querystring-builder@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-uri-escape": 3.201.0
     tslib: ^2.3.1
-  checksum: 68584d4de16eea7c649bad71b938716917e53aa42aca9a9298a7a21b2dd2195d3e0e5719f0f4a16e448d18f4db6d8ae2ea4229dff4f6a8807712a81097b7aa4c
+  checksum: 418bc648f3597e1b96765784acb6964dc3aaca6853582d7e91aaaaf793d9ee1fe8170da31cddff72b36b95456fc5566589120c94988711726dc80ddf345e9839
   languageName: node
   linkType: hard
 
-"@aws-sdk/querystring-parser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/querystring-parser@npm:3.215.0"
+"@aws-sdk/querystring-parser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/querystring-parser@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: cfccb89aecadea63c3937e3db06690f2927aa32c8d98dd265151d971ee3221b570b715768a419777bf27a18f3c13509adbeccfbffd9e9d00ff90fbe648e36b22
+  checksum: d209807dc727c6eebf885d1e7a440e0fdb9c68e27f7f6e48a326f97eab8da9172dba91a35015656dffd10d7a2b484237e49705d332948cfed747ae04f08de9ab
   languageName: node
   linkType: hard
 
-"@aws-sdk/service-error-classification@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/service-error-classification@npm:3.215.0"
-  checksum: 470cfec61df10efa304f61d44b75a8fc12fc6ded0c42dc36b7c8cbecc6b7290042e6a6b10ef28acf9e15534c234fd31475d1d0ee45522f8e49267f5eb6d8055e
+"@aws-sdk/service-error-classification@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/service-error-classification@npm:3.222.0"
+  checksum: 7277ef3831a91821ce3306eda993d4d646ae15de9c638a4a8804d8db330a267cb6e3a20e3eb886d9cac634a77b0e1f3eb0706ce7c38bc42f4b67a1fac6f6d76a
   languageName: node
   linkType: hard
 
-"@aws-sdk/shared-ini-file-loader@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/shared-ini-file-loader@npm:3.215.0"
+"@aws-sdk/shared-ini-file-loader@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/shared-ini-file-loader@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: b0fcdc3bf81928d3822a5e7e7c088d5ce3c07b6fe4a29692a142226d3829fd1c8ee312cf5b8ee2056893cc6e4686df886641f7cd30e27e4bbd9fcb7ee6b21377
+  checksum: 2efc2618e65058bd549a6acd2cd68c1e8d2a5079a5447328908eb952651714d616fdb1a95622c63b4718f03ac251eb6d5598a666e1c01f1ea223b2071ee74371
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4-multi-region@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.215.0"
+"@aws-sdk/signature-v4-multi-region@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.222.0"
   dependencies:
-    "@aws-sdk/protocol-http": 3.215.0
-    "@aws-sdk/signature-v4": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/protocol-http": 3.222.0
+    "@aws-sdk/signature-v4": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-arn-parser": 3.208.0
     tslib: ^2.3.1
   peerDependencies:
@@ -1319,45 +1325,45 @@ __metadata:
   peerDependenciesMeta:
     "@aws-sdk/signature-v4-crt":
       optional: true
-  checksum: d2b898e505edbb85be410ccd16f22475531f5de22c2e53bbd386ebc93ec5f173b1a68a08d6dd71c9df7518fe2d73594e92bd690b93aa6e0c5dee013d0c6fe09c
+  checksum: 6ab68c8001c85c79974f5bd272e6caeebe486d40665be1658aba4bce11e518873fc3bc72c9731fbfa399fa5d09b980f878aaa1c01330ebc0b026520c8d3f3fed
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/signature-v4@npm:3.215.0"
+"@aws-sdk/signature-v4@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/signature-v4@npm:3.222.0"
   dependencies:
     "@aws-sdk/is-array-buffer": 3.201.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-hex-encoding": 3.201.0
-    "@aws-sdk/util-middleware": 3.215.0
+    "@aws-sdk/util-middleware": 3.222.0
     "@aws-sdk/util-uri-escape": 3.201.0
     tslib: ^2.3.1
-  checksum: 2bf3912bdf51c116abd2c3dcbbfdd669758b264066d4dd18353b984aaea2532ba6caef95043d1a58acf225a9ee59709c8593226f2acd779ad556c77b12fe0e4b
+  checksum: 66f9f0f8170cdede19d4194a5bb56fc914c9013bf9dbc60d84aa4340d15d4f5ed73a477484fac943de08f57d924423eaa01f913bd3055ee0b7b3c5b119f9e348
   languageName: node
   linkType: hard
 
-"@aws-sdk/smithy-client@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/smithy-client@npm:3.215.0"
+"@aws-sdk/smithy-client@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/smithy-client@npm:3.222.0"
   dependencies:
-    "@aws-sdk/middleware-stack": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/middleware-stack": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 4fd6d5631b738d7e7edf957335fb60c743025812183f3def0b4f83469bff95297c3c870fea790152731da9f3bd80aca4634722f6303774ae4b80a95cc17ad568
+  checksum: 0bfbd061a001054a99234a819e9313a2bfd9131e013cdd46674f3dc06faa3e416245d8e3a86e05fad942da5ec6ef34988e686e29d5940ad738452116a4e70173
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.216.0":
-  version: 3.216.0
-  resolution: "@aws-sdk/token-providers@npm:3.216.0"
+"@aws-sdk/token-providers@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/token-providers@npm:3.222.0"
   dependencies:
-    "@aws-sdk/client-sso-oidc": 3.216.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/shared-ini-file-loader": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/client-sso-oidc": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/shared-ini-file-loader": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: a54490666866fa389043e450692b137f1ffab39dbf10927b09ea52c813330dc06dd0e589a6adb653d3e8e974c484656f3234103bb3ca097b634a15d8cbb6f8c9
+  checksum: e0d2d9af50570ca1e9ae4cfe32889a9146a0e49ce3004dfc4d5305ba0f64b7561da95d09ccaf18927638417d3bd1eb9772cb58256aef242beab03a56e4e68883
   languageName: node
   linkType: hard
 
@@ -1368,21 +1374,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.215.0, @aws-sdk/types@npm:^3.1.0, @aws-sdk/types@npm:^3.110.0, @aws-sdk/types@npm:^3.208.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/types@npm:3.215.0"
-  checksum: 7b1301af4444c6d949175337546093946e22c572b40474ada534bd9a4ab37e15f5aabdeca139328b7ea45a6dd1d1a86de89097adbbb07e31365bb3e84254ea38
+"@aws-sdk/types@npm:3.222.0, @aws-sdk/types@npm:^3.1.0, @aws-sdk/types@npm:^3.110.0, @aws-sdk/types@npm:^3.208.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/types@npm:3.222.0"
+  checksum: 41d70038c69b1e9b9dbf0489a8aa416da1c96c4ff84e8d5db01ea4877efceb4c0fdd0ce27bdeea8c67afc4d168151dc63938302a3f945922143f37472c4fd9da
   languageName: node
   linkType: hard
 
-"@aws-sdk/url-parser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/url-parser@npm:3.215.0"
+"@aws-sdk/url-parser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/url-parser@npm:3.222.0"
   dependencies:
-    "@aws-sdk/querystring-parser": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/querystring-parser": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 50221b570ddeb9255be9a7d1afbf9114cdba126dfa48b0c7cf7b0f55e5ca6581e6fa08bc119c7cc3fcceb43d9761bfe9a0e4e7e8a09b3cf010bb1518f0a8cd92
+  checksum: ef878c49c61efc2bd6a94ffebfbacade2bdd19e390785e48a8c5c151db86d099c391c30304ba6ade1cdd94c1c41d87ce160d6570cd4f76058e1cbbe0063829f4
   languageName: node
   linkType: hard
 
@@ -1442,39 +1448,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-defaults-mode-browser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.215.0"
+"@aws-sdk/util-defaults-mode-browser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.222.0"
   dependencies:
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
     bowser: ^2.11.0
     tslib: ^2.3.1
-  checksum: ed8a21c3d614f9b8ac64d2565c7106265d6fed0b8cda0e0b31b44f7be2fc3013aa79a9b5c113e7b016272c88d5547a07907a2f9ba626961f2b2d626866520c7e
+  checksum: 3e936e38976a9edac22ff32990c55ca01a9f3bb058ebf1f933a1f5240bb6c26394224284db521b9011e88bdb6d567b7aa7584e0a594ae962ad9f0e3740801712
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-defaults-mode-node@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-defaults-mode-node@npm:3.215.0"
+"@aws-sdk/util-defaults-mode-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-defaults-mode-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/config-resolver": 3.215.0
-    "@aws-sdk/credential-provider-imds": 3.215.0
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/property-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/config-resolver": 3.222.0
+    "@aws-sdk/credential-provider-imds": 3.222.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/property-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 2dccee67d6fcc10ca5f93090b04851b561b638dacc9de1dedfc127323cdd0bd3f5bc8c5e27a87c90564b20805b8e9ba3992bebc023d76ce3d12e6f70005c7547
+  checksum: 37718633f793e9880f4a93e6d56cb72b1cfc4e45d3177d2065e5179788941cf0f43fb45c740763debbe33fc8a62d1d09c3fe87809c71c039a5dd071cec3a0306
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:3.216.0":
-  version: 3.216.0
-  resolution: "@aws-sdk/util-endpoints@npm:3.216.0"
+"@aws-sdk/util-endpoints@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-endpoints@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: e8e41cd2be036654ba2484647ad08bba770ffac1c264d613e5630fa922a414efee0a4fbafc6313dcd16484bfbddac99bed1413f126ce2f2d03d5a6be99d293a1
+  checksum: 3e71a50994363b978ab35bc1fee7ab21c157731e0c7364f064d40244058c96188c238b27d2f9097becc548b86e0abaca886cea03e89b8b219fb0d0a7fea6a249
   languageName: node
   linkType: hard
 
@@ -1496,38 +1502,48 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-middleware@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-middleware@npm:3.215.0"
+"@aws-sdk/util-middleware@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-middleware@npm:3.222.0"
   dependencies:
     tslib: ^2.3.1
-  checksum: 19400d2560d70dbc0ec2087f4a76cb67ed28921028f851041da47cc55d00cc97520a5f2f0cbc1bd3a982f08d158073a32a4fa5cce5fe5459d0f734f0c20717e8
+  checksum: 807dd36731c7aa59658e4eea5747d6d363b5e5715d0d2c5554c265df6729735f31e790e8e6130d5d56b4923e29080a656e19978631a7ff667f969bfdae8c6320
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-stream-browser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-stream-browser@npm:3.215.0"
+"@aws-sdk/util-retry@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-retry@npm:3.222.0"
   dependencies:
-    "@aws-sdk/fetch-http-handler": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/service-error-classification": 3.222.0
+    tslib: ^2.3.1
+  checksum: d4b38a23a310d44d211db2cfb2ae53ef41cf805308d08e56d9ca786fc69fd6b244f331d40ea35023bbc53625c7b2c1f4fab9fabd32d0a10396d4359ac50eff09
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/util-stream-browser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-stream-browser@npm:3.222.0"
+  dependencies:
+    "@aws-sdk/fetch-http-handler": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-base64": 3.208.0
     "@aws-sdk/util-hex-encoding": 3.201.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     tslib: ^2.3.1
-  checksum: cbc3fb91ad7cd1f7015a5d1e1a939bb6f1d107b2a54b02292277dd255166292207e43d56b7b1618510ba79a7f3b351119e683ddceed9dc7f45e98397343a7d37
+  checksum: 08428921f9a49824ea5b335c4bdacb6216346b8c0fd2e6914a45982c96d440eabc4a05a91e217ff7a5696d802c2fb1ab458546c34ef66edf5e52f41e3ee98dda
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-stream-node@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-stream-node@npm:3.215.0"
+"@aws-sdk/util-stream-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-stream-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/node-http-handler": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/node-http-handler": 3.222.0
+    "@aws-sdk/types": 3.222.0
     "@aws-sdk/util-buffer-from": 3.208.0
     tslib: ^2.3.1
-  checksum: 1f77e7b37ea8e78a74d61d489a6f0be2debc467b92a59ad2d5fe8ad4a51c70db5553b82e8776e3d195662208228b215a3a2ecd41c302495eadf38671377616fa
+  checksum: 04d875a572d45604dc71c1e20b90136f5b8a20820f53ad5ab4e76ee86fa3e043e015c40d041d81822703305c9530baccc595534f6674903b7f830ea9649c050b
   languageName: node
   linkType: hard
 
@@ -1545,30 +1561,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-browser@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-user-agent-browser@npm:3.215.0"
+"@aws-sdk/util-user-agent-browser@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-user-agent-browser@npm:3.222.0"
   dependencies:
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/types": 3.222.0
     bowser: ^2.11.0
     tslib: ^2.3.1
-  checksum: 29a66adec383886ded80abfb41e5c66f4c07d52af5a995aa084a8eae9f4af22caf73cf2e4dbebc86c080da5b8778fed178d941f819b18a9caa082aac62cfb3d6
+  checksum: 14a878c88948fed8c6e19324a6f28088cbb964580e74c97ec319c8afb426f17b35cfbcbc40bb43b977b3a5a9b05aaa254dfc23a028d29802058148f28507f7f1
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.215.0"
+"@aws-sdk/util-user-agent-node@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-user-agent-node@npm:3.222.0"
   dependencies:
-    "@aws-sdk/node-config-provider": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/node-config-provider": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
   peerDependencies:
     aws-crt: ">=1.0.0"
   peerDependenciesMeta:
     aws-crt:
       optional: true
-  checksum: 3f91d4bb57c4725fff15a1ef1b15b16026c38f02975af1b7567bc34fce4ef881968e1a871358f0d42f597a4ddb5c306e5bb9286809d075975715525b21f3213b
+  checksum: 36a9cf397196ef6c188d307f6202b10d98629dfe7583dc903e22870b553cca7624e2732f16e9511e690433665966e5adce7472299081eda1acf8d33b4c977ea4
   languageName: node
   linkType: hard
 
@@ -1591,14 +1607,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-waiter@npm:3.215.0":
-  version: 3.215.0
-  resolution: "@aws-sdk/util-waiter@npm:3.215.0"
+"@aws-sdk/util-waiter@npm:3.222.0":
+  version: 3.222.0
+  resolution: "@aws-sdk/util-waiter@npm:3.222.0"
   dependencies:
-    "@aws-sdk/abort-controller": 3.215.0
-    "@aws-sdk/types": 3.215.0
+    "@aws-sdk/abort-controller": 3.222.0
+    "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: a5caca8c05677ad853822506197dedc8c80fa786fba7fb6d3679120f581ffca92af6cc002dd0a99f9520e4dd98ae046054e9dbde1bd66c638fd1e14d91117afe
+  checksum: 840d57ff2250d6a9fd917ed80db5d8ecea38b056453aaab78c7b19c9858f6e837ffd06f430e5682d0fbd4f3d47ac1a79fcf9f1ed9af7da2e446e3a19239777ec
   languageName: node
   linkType: hard
 

From 09454420c6881f40122e0eb3df0284b1b0a57fbc Mon Sep 17 00:00:00 2001
From: Kurt King <kurt.king@procore.com>
Date: Fri, 2 Dec 2022 11:58:27 -0600
Subject: [PATCH 66/82] cleanup test

Signed-off-by: Kurt King <kurt.king@procore.com>
---
 .../core-app-api/src/app/AppManager.test.tsx  | 31 ++-----------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/packages/core-app-api/src/app/AppManager.test.tsx b/packages/core-app-api/src/app/AppManager.test.tsx
index e9b18d46e0..f81f382650 100644
--- a/packages/core-app-api/src/app/AppManager.test.tsx
+++ b/packages/core-app-api/src/app/AppManager.test.tsx
@@ -445,41 +445,14 @@ describe('Integration Test', () => {
       featureFlags: [{ name: 'show-p2-feature' }],
     });
 
-    const storageFlags = new LocalStorageFeatureFlags();
-    jest.spyOn(storageFlags, 'registerFlag');
-
-    const apis = [
-      noOpAnalyticsApi,
-      createApiFactory({
-        api: featureFlagsApiRef,
-        deps: { configApi: configApiRef },
-        factory() {
-          return storageFlags;
-        },
-      }),
-    ];
-
     const app = new AppManager({
-      apis,
+      apis: [],
       defaultApis: [],
-      themes: [
-        {
-          id: 'light',
-          title: 'Light Theme',
-          variant: 'light',
-          Provider: ({ children }) => <>{children}</>,
-        },
-      ],
+      themes,
       icons,
       plugins: [p1, p2],
       components,
       configLoader: async () => [],
-      bindRoutes: ({ bind }) => {
-        bind(plugin1.externalRoutes, {
-          extRouteRef1: plugin1RouteRef,
-          extRouteRef2: plugin2RouteRef,
-        });
-      },
     });
 
     const Provider = app.getProvider();

From 85546d68b1c982be5757c1741c7f705e7697ea9a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 18:19:35 +0000
Subject: [PATCH 67/82] Update dependency @tanstack/react-query to v4.19.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3cae9d20e5..1a493fa380 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13281,18 +13281,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.18.0":
-  version: 4.18.0
-  resolution: "@tanstack/query-core@npm:4.18.0"
-  checksum: 2d3f253809e2fc0927bbab25e7a61cf1fa957c993006f219a8dcc615acfe68003629e612c7d914198457d0b1bfd2b6d5738093fc45a82369b1d3beee14395a28
+"@tanstack/query-core@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@tanstack/query-core@npm:4.19.0"
+  checksum: ca8bb8cbba8ff7f6f223731a637eadf0c47943d84e964f24b02c8092d6629b84bcfbad897da8193004566e7618cc4746a9d9be67d2d4b441225c6cce5c802a7a
   languageName: node
   linkType: hard
 
 "@tanstack/react-query@npm:^4.1.3":
-  version: 4.18.0
-  resolution: "@tanstack/react-query@npm:4.18.0"
+  version: 4.19.0
+  resolution: "@tanstack/react-query@npm:4.19.0"
   dependencies:
-    "@tanstack/query-core": 4.18.0
+    "@tanstack/query-core": 4.19.0
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -13303,7 +13303,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 2fbb3e664fdc70650dfaaa63e56a1b97dddb50a46f6d3e0a0361c1fe9a0d711c1bb3b0f2e7ba5362269124405eb7a4f232a755b3e901b815d62008ddeedbd889
+  checksum: bce0a8a1b44e6c0a9732615158408e432ee94173e2bddef68d1384bbdd40e59a4dd1b023ac194a757d653b76a451abb8c1493f591e027230bdf13a371179d084
   languageName: node
   linkType: hard
 

From 146378c14607f6f62f335f43e95fa3e6961ca6ac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 19:03:00 +0000
Subject: [PATCH 68/82] Update dependency @react-hookz/web to v20

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 .changeset/renovate-ebb2ea1.md                   |  8 ++++++++
 packages/core-components/package.json            |  2 +-
 plugins/gcp-projects/package.json                |  2 +-
 plugins/scaffolder/package.json                  |  2 +-
 .../techdocs-module-addons-contrib/package.json  |  2 +-
 yarn.lock                                        | 16 ++++++++--------
 6 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 .changeset/renovate-ebb2ea1.md

diff --git a/.changeset/renovate-ebb2ea1.md b/.changeset/renovate-ebb2ea1.md
new file mode 100644
index 0000000000..010236c2f2
--- /dev/null
+++ b/.changeset/renovate-ebb2ea1.md
@@ -0,0 +1,8 @@
+---
+'@backstage/core-components': patch
+'@backstage/plugin-gcp-projects': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-techdocs-module-addons-contrib': patch
+---
+
+Updated dependency `@react-hookz/web` to `^20.0.0`.
diff --git a/packages/core-components/package.json b/packages/core-components/package.json
index 56e124d094..8a6ffdf02d 100644
--- a/packages/core-components/package.json
+++ b/packages/core-components/package.json
@@ -41,7 +41,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "@react-hookz/web": "^19.0.0",
+    "@react-hookz/web": "^20.0.0",
     "@types/react-sparklines": "^1.7.0",
     "@types/react-text-truncate": "^0.14.0",
     "ansi-regex": "^6.0.1",
diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json
index c6509a33a2..e6e60fb9e2 100644
--- a/plugins/gcp-projects/package.json
+++ b/plugins/gcp-projects/package.json
@@ -39,7 +39,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "@react-hookz/web": "^19.0.0"
+    "@react-hookz/web": "^20.0.0"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0",
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index b76ae9d0f6..fbd90a1ab3 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -53,7 +53,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "@react-hookz/web": "^19.0.0",
+    "@react-hookz/web": "^20.0.0",
     "@rjsf/core": "^3.2.1",
     "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.12",
     "@rjsf/material-ui": "^3.2.1",
diff --git a/plugins/techdocs-module-addons-contrib/package.json b/plugins/techdocs-module-addons-contrib/package.json
index 54cebd0ec9..2929f3455f 100644
--- a/plugins/techdocs-module-addons-contrib/package.json
+++ b/plugins/techdocs-module-addons-contrib/package.json
@@ -42,7 +42,7 @@
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "@react-hookz/web": "^19.0.0",
+    "@react-hookz/web": "^20.0.0",
     "git-url-parse": "^13.0.0",
     "react-use": "^17.2.4"
   },
diff --git a/yarn.lock b/yarn.lock
index 1a493fa380..d732a32975 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3967,7 +3967,7 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.57
-    "@react-hookz/web": ^19.0.0
+    "@react-hookz/web": ^20.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/react-hooks": ^8.0.0
@@ -6196,7 +6196,7 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.57
-    "@react-hookz/web": ^19.0.0
+    "@react-hookz/web": ^20.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
@@ -7475,7 +7475,7 @@ __metadata:
     "@material-ui/core": ^4.12.2
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.57
-    "@react-hookz/web": ^19.0.0
+    "@react-hookz/web": ^20.0.0
     "@rjsf/core": ^3.2.1
     "@rjsf/core-v5": "npm:@rjsf/core@^5.0.0-beta.12"
     "@rjsf/material-ui": ^3.2.1
@@ -8139,7 +8139,7 @@ __metadata:
     "@material-ui/core": ^4.9.13
     "@material-ui/icons": ^4.9.1
     "@material-ui/lab": 4.0.0-alpha.57
-    "@react-hookz/web": ^19.0.0
+    "@react-hookz/web": ^20.0.0
     "@testing-library/jest-dom": ^5.10.1
     "@testing-library/react": ^12.1.3
     "@testing-library/user-event": ^14.0.0
@@ -12432,9 +12432,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-hookz/web@npm:^19.0.0":
-  version: 19.2.0
-  resolution: "@react-hookz/web@npm:19.2.0"
+"@react-hookz/web@npm:^20.0.0":
+  version: 20.0.0
+  resolution: "@react-hookz/web@npm:20.0.0"
   dependencies:
     "@react-hookz/deep-equal": ^1.0.3
   peerDependencies:
@@ -12444,7 +12444,7 @@ __metadata:
   peerDependenciesMeta:
     js-cookie:
       optional: true
-  checksum: 0fda3d3a0f967b6b38817f1e72d111711fc01036a8e6d0850bd4e3b3fa41af8635b260babf19e384402ac6d2dfa7db779585c0c8b16700cc0f568df9662ca517
+  checksum: 475d03cdd9a9131b7094549602c8a3ab52ad33e99d7ef408ba2ee7897bfdf332ab5228f46187b9a4c42535b4aaaf808e2c9c882949b2ec32d5ad42d53487a723
   languageName: node
   linkType: hard
 

From 1c5ee676163d3fea923e62cc953a86547431d743 Mon Sep 17 00:00:00 2001
From: Connor Younglund <younglund_connor@bah.com>
Date: Fri, 2 Dec 2022 15:56:15 -0500
Subject: [PATCH 69/82] address PR feedback

Signed-off-by: Connor Younglund <younglund_connor@bah.com>
---
 .changeset/short-turtles-dream.md          | 4 ++--
 plugins/stack-overflow-backend/README.md   | 6 ++++--
 plugins/stack-overflow-backend/config.d.ts | 8 +++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.changeset/short-turtles-dream.md b/.changeset/short-turtles-dream.md
index 9192f9137c..022ef35f58 100644
--- a/.changeset/short-turtles-dream.md
+++ b/.changeset/short-turtles-dream.md
@@ -1,5 +1,5 @@
 ---
-'@backstage/plugin-stack-overflow-backend': minor
+'@backstage/plugin-stack-overflow-backend': patch
 ---
 
-Added option to supply API Access Token
+Added option to supply API Access Token. This is required in addition to an API key when trying to access the data for a private Stack Overflow Team.
diff --git a/plugins/stack-overflow-backend/README.md b/plugins/stack-overflow-backend/README.md
index 65fa50e062..0d88ea98d1 100644
--- a/plugins/stack-overflow-backend/README.md
+++ b/plugins/stack-overflow-backend/README.md
@@ -15,9 +15,11 @@ stackoverflow:
   baseUrl: https://api.stackexchange.com/2.2 # alternative: your internal stack overflow instance
 ```
 
-### Stack Overflow for Teams (private stack overflow instance)
+### Stack Overflow for Teams
 
-If you have a private stack overflow instance you will need to supply an API key as well. You can read more about how to set this up by going to [Stack Overflows Help Page](https://stackoverflow.help/en/articles/4385859-stack-overflow-for-teams-api)
+If you have an private Stack Overflow instance and/or a private Stack Overflow Team you will need to supply an API key. You can read more about how to set this up by going to [Stack Overflow's Help Page](https://stackoverflow.help/en/articles/4385859-stack-overflow-for-teams-api).
+
+A private Stack Overflow Team requires both an API key and an API Access Token. Step 3 ("Generate an Access Token via OAuth") from the previously mentioned Help Page explains the process for generating an API Access Token with no expiration.
 
 ```yaml
 stackoverflow:
diff --git a/plugins/stack-overflow-backend/config.d.ts b/plugins/stack-overflow-backend/config.d.ts
index 617524f0a3..54e517c5d8 100644
--- a/plugins/stack-overflow-backend/config.d.ts
+++ b/plugins/stack-overflow-backend/config.d.ts
@@ -25,9 +25,15 @@ export interface Config {
     baseUrl?: string;
 
     /**
-     * The api key to authenticate to Stack Overflow API
+     * The API key to authenticate to Stack Overflow API
      * @visibility secret
      */
     apiKey?: string;
+
+    /**
+     * The API Access Token to authenticate to Stack Overflow API
+     * @visibility secret
+     */
+    apiAccessToken?: string;
   };
 }

From fa7dacc5c7d8b689b2571e6754126db5424b85a2 Mon Sep 17 00:00:00 2001
From: Connor Younglund <younglund_connor@bah.com>
Date: Fri, 2 Dec 2022 15:58:46 -0500
Subject: [PATCH 70/82] an --> a

Signed-off-by: Connor Younglund <younglund_connor@bah.com>
---
 plugins/stack-overflow-backend/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/stack-overflow-backend/README.md b/plugins/stack-overflow-backend/README.md
index 0d88ea98d1..4bcc755404 100644
--- a/plugins/stack-overflow-backend/README.md
+++ b/plugins/stack-overflow-backend/README.md
@@ -17,7 +17,7 @@ stackoverflow:
 
 ### Stack Overflow for Teams
 
-If you have an private Stack Overflow instance and/or a private Stack Overflow Team you will need to supply an API key. You can read more about how to set this up by going to [Stack Overflow's Help Page](https://stackoverflow.help/en/articles/4385859-stack-overflow-for-teams-api).
+If you have a private Stack Overflow instance and/or a private Stack Overflow Team you will need to supply an API key. You can read more about how to set this up by going to [Stack Overflow's Help Page](https://stackoverflow.help/en/articles/4385859-stack-overflow-for-teams-api).
 
 A private Stack Overflow Team requires both an API key and an API Access Token. Step 3 ("Generate an Access Token via OAuth") from the previously mentioned Help Page explains the process for generating an API Access Token with no expiration.
 

From c507aee8a26429816cf21d0a1920e4b71f1b0005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Sat, 3 Dec 2022 16:21:54 +0100
Subject: [PATCH 71/82] ts-check all migration files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/eight-eels-compete.md                   | 10 ++++++++++
 .../migrations/20211014144054_init.js              |  8 ++++++++
 .../migrations/20211020073922_add_columns.js       |  8 ++++++++
 .../20211117092217_optional_entity_ref.js          |  8 ++++++++
 .../20220817150443_add_member_entity_ref.js        |  8 ++++++++
 .../20221121120212_rename_col_to_title.js          |  8 ++++----
 .../migrations/20221116073152_init.js              | 14 ++++++++------
 .../migrations/20200511113813_init.js              |  2 +-
 .../migrations/20220616202842_refresh_keys.js      |  2 ++
 ...21109192547_search_add_original_value_column.js |  2 ++
 .../migrations/20220701011329_init.js              |  8 ++++++++
 .../migrations/20210311110000_init.js              |  2 ++
 .../migrations/20210727180000_delta_update.js      |  2 ++
 .../migrations/20220824183000_init.js              |  2 ++
 14 files changed, 73 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/eight-eels-compete.md

diff --git a/.changeset/eight-eels-compete.md b/.changeset/eight-eels-compete.md
new file mode 100644
index 0000000000..5cd0cdf041
--- /dev/null
+++ b/.changeset/eight-eels-compete.md
@@ -0,0 +1,10 @@
+---
+'@backstage/plugin-bazaar-backend': patch
+'@backstage/plugin-catalog-backend': patch
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-playlist-backend': patch
+'@backstage/plugin-search-backend-module-pg': patch
+'@backstage/plugin-user-settings-backend': patch
+---
+
+Ensured typescript type checks in migration files.
diff --git a/plugins/bazaar-backend/migrations/20211014144054_init.js b/plugins/bazaar-backend/migrations/20211014144054_init.js
index 5bf66698ac..503812225d 100644
--- a/plugins/bazaar-backend/migrations/20211014144054_init.js
+++ b/plugins/bazaar-backend/migrations/20211014144054_init.js
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+// @ts-check
+
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.up = async function up(knex) {
   await knex.schema.createTable('metadata', table => {
     table.comment('The table of Bazaar metadata');
@@ -59,6 +64,9 @@ exports.up = async function up(knex) {
   });
 };
 
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.down = async function down(knex) {
   await knex.schema.dropTable('metadata');
   await knex.schema.dropTable('members');
diff --git a/plugins/bazaar-backend/migrations/20211020073922_add_columns.js b/plugins/bazaar-backend/migrations/20211020073922_add_columns.js
index ea3a89ea72..740eacb407 100644
--- a/plugins/bazaar-backend/migrations/20211020073922_add_columns.js
+++ b/plugins/bazaar-backend/migrations/20211020073922_add_columns.js
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+// @ts-check
+
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('metadata', table => {
     table
@@ -35,6 +40,9 @@ exports.up = async function up(knex) {
   });
 };
 
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.down = async function down(knex) {
   await knex.schema.alterTable('metadata', table => {
     table
diff --git a/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js b/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js
index 9dd8097ae2..0953d5c2b1 100644
--- a/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js
+++ b/plugins/bazaar-backend/migrations/20211117092217_optional_entity_ref.js
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+// @ts-check
+
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.up = async function up(knex) {
   if (knex.client.config.client.includes('sqlite3')) {
     await knex.schema.dropTable('metadata');
@@ -92,6 +97,9 @@ exports.up = async function up(knex) {
   }
 };
 
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.down = async function down(knex) {
   if (knex.client.config.client.includes('sqlite3')) {
     await knex.schema.dropTable('metadata');
diff --git a/plugins/bazaar-backend/migrations/20220817150443_add_member_entity_ref.js b/plugins/bazaar-backend/migrations/20220817150443_add_member_entity_ref.js
index 79b80ef20c..c7ac0ccf2c 100644
--- a/plugins/bazaar-backend/migrations/20220817150443_add_member_entity_ref.js
+++ b/plugins/bazaar-backend/migrations/20220817150443_add_member_entity_ref.js
@@ -14,12 +14,20 @@
  * limitations under the License.
  */
 
+// @ts-check
+
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('members', table => {
     table.string('user_ref').nullable();
   });
 };
 
+/**
+ * @param {import('knex').Knex} knex
+ */
 exports.down = async function down(knex) {
   return knex.schema.table('members', table => {
     table.dropColumn('user_ref');
diff --git a/plugins/bazaar-backend/migrations/20221121120212_rename_col_to_title.js b/plugins/bazaar-backend/migrations/20221121120212_rename_col_to_title.js
index 9974c9eb20..93de567f93 100644
--- a/plugins/bazaar-backend/migrations/20221121120212_rename_col_to_title.js
+++ b/plugins/bazaar-backend/migrations/20221121120212_rename_col_to_title.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
+ * @param {import('knex').Knex} knex
  */
 exports.up = async function up(knex) {
   await knex.schema.alterTable('metadata', table => {
@@ -25,8 +26,7 @@ exports.up = async function up(knex) {
 };
 
 /**
- * @param { import("knex").Knex } knex
- * @returns { Promise<void> }
+ * @param {import('knex').Knex} knex
  */
 exports.down = async function down(knex) {
   await knex.schema.alterTable('metadata', table => {
diff --git a/plugins/catalog-backend-module-incremental-ingestion/migrations/20221116073152_init.js b/plugins/catalog-backend-module-incremental-ingestion/migrations/20221116073152_init.js
index dc77e0bc31..09b6af9004 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/migrations/20221116073152_init.js
+++ b/plugins/catalog-backend-module-incremental-ingestion/migrations/20221116073152_init.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
  * @param { import("knex").Knex } knex
  */
@@ -25,7 +27,7 @@ exports.up = async function up(knex) {
     table.comment('Tracks ingestion streams for very large data sets');
 
     table
-      .uuid('id', { primary: true })
+      .uuid('id')
       .notNullable()
       .comment('Auto-generated ID of the ingestion');
 
@@ -85,7 +87,7 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.alterTable('ingestions', t => {
-    t.primary('id');
+    t.primary(['id']);
     t.index('provider_name', 'ingestion_provider_name_idx');
     t.unique(['provider_name', 'completion_ticket'], {
       indexName: 'ingestion_composite_index',
@@ -100,7 +102,7 @@ exports.up = async function up(knex) {
     table.comment('tracks each step of an iterative ingestion');
 
     table
-      .uuid('id', { primary: true })
+      .uuid('id')
       .notNullable()
       .comment('Auto-generated ID of the ingestion mark');
 
@@ -128,7 +130,7 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.alterTable('ingestion_marks', t => {
-    t.primary('id');
+    t.primary(['id']);
     t.index('ingestion_id', 'ingestion_mark_ingestion_id_idx');
   });
 
@@ -141,7 +143,7 @@ exports.up = async function up(knex) {
     );
 
     table
-      .uuid('id', { primary: true })
+      .uuid('id')
       .notNullable()
       .comment('Auto-generated ID of the marked entity');
 
@@ -162,7 +164,7 @@ exports.up = async function up(knex) {
   });
 
   await knex.schema.alterTable('ingestion_mark_entities', t => {
-    t.primary('id');
+    t.primary(['id']);
     t.index('ingestion_mark_id', 'ingestion_mark_entity_ingestion_mark_id_idx');
   });
 };
diff --git a/plugins/catalog-backend/migrations/20200511113813_init.js b/plugins/catalog-backend/migrations/20200511113813_init.js
index a34912135e..710ff537e0 100644
--- a/plugins/catalog-backend/migrations/20200511113813_init.js
+++ b/plugins/catalog-backend/migrations/20200511113813_init.js
@@ -27,7 +27,7 @@ exports.up = async function up(knex) {
       //
       .createTable('locations', table => {
         table.comment(
-          'Registered locations that shall be contiuously scanned for catalog item updates',
+          'Registered locations that shall be continuously scanned for catalog item updates',
         );
         table
           .uuid('id')
diff --git a/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js b/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js
index ddc39d4005..a7ec819489 100644
--- a/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js
+++ b/plugins/catalog-backend/migrations/20220616202842_refresh_keys.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
  * @param { import("knex").Knex } knex
  */
diff --git a/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js b/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js
index 258af5ef06..fff7955530 100644
--- a/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js
+++ b/plugins/catalog-backend/migrations/20221109192547_search_add_original_value_column.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
  * @param { import("knex").Knex } knex
  */
diff --git a/plugins/playlist-backend/migrations/20220701011329_init.js b/plugins/playlist-backend/migrations/20220701011329_init.js
index be08363dec..fea6b52700 100644
--- a/plugins/playlist-backend/migrations/20220701011329_init.js
+++ b/plugins/playlist-backend/migrations/20220701011329_init.js
@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+// @ts-check
+
+/**
+ * @param { import("knex").Knex } knex
+ */
 exports.up = async function up(knex) {
   await knex.schema.createTable('playlists', table => {
     table.comment('Playlists table');
@@ -57,6 +62,9 @@ exports.up = async function up(knex) {
   });
 };
 
+/**
+ * @param { import("knex").Knex } knex
+ */
 exports.down = async function down(knex) {
   await knex.schema.dropTable('playlists');
   await knex.schema.dropTable('entities');
diff --git a/plugins/search-backend-module-pg/migrations/20210311110000_init.js b/plugins/search-backend-module-pg/migrations/20210311110000_init.js
index 70ccf9406b..e3bbca41e3 100644
--- a/plugins/search-backend-module-pg/migrations/20210311110000_init.js
+++ b/plugins/search-backend-module-pg/migrations/20210311110000_init.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
  * @param {import('knex').Knex} knex
  */
diff --git a/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js b/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js
index 429c8aa805..2a449b5fa4 100644
--- a/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js
+++ b/plugins/search-backend-module-pg/migrations/20210727180000_delta_update.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
  * @param {import('knex').Knex} knex
  */
diff --git a/plugins/user-settings-backend/migrations/20220824183000_init.js b/plugins/user-settings-backend/migrations/20220824183000_init.js
index a519969a98..0e99a76f93 100644
--- a/plugins/user-settings-backend/migrations/20220824183000_init.js
+++ b/plugins/user-settings-backend/migrations/20220824183000_init.js
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// @ts-check
+
 /**
  * @param {import('knex').Knex} knex
  */

From 00a9e570b608450d67bf1561bcf893a6e59f7b3f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 18:19:01 +0000
Subject: [PATCH 72/82] Update dependency @tanstack/react-query to v4.19.1

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1a493fa380..4af9e1862a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13281,18 +13281,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tanstack/query-core@npm:4.19.0":
-  version: 4.19.0
-  resolution: "@tanstack/query-core@npm:4.19.0"
-  checksum: ca8bb8cbba8ff7f6f223731a637eadf0c47943d84e964f24b02c8092d6629b84bcfbad897da8193004566e7618cc4746a9d9be67d2d4b441225c6cce5c802a7a
+"@tanstack/query-core@npm:4.19.1":
+  version: 4.19.1
+  resolution: "@tanstack/query-core@npm:4.19.1"
+  checksum: a54a613d5b7abe2bba352fa26228bee0589eb8116bf482760dbe39474202b08cfc3899100e478f0bd1ae1a7bd60dcda0634c04bec56a98346763d32bc7720b54
   languageName: node
   linkType: hard
 
 "@tanstack/react-query@npm:^4.1.3":
-  version: 4.19.0
-  resolution: "@tanstack/react-query@npm:4.19.0"
+  version: 4.19.1
+  resolution: "@tanstack/react-query@npm:4.19.1"
   dependencies:
-    "@tanstack/query-core": 4.19.0
+    "@tanstack/query-core": 4.19.1
     use-sync-external-store: ^1.2.0
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -13303,7 +13303,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: bce0a8a1b44e6c0a9732615158408e432ee94173e2bddef68d1384bbdd40e59a4dd1b023ac194a757d653b76a451abb8c1493f591e027230bdf13a371179d084
+  checksum: cce8b51c5cbaff007efb2fc54c5e03a2191e363626226903c345ae9baf0d48a36fc322383e24aff4f12250e672da67d3ceaa9819bbb16ace98a5c7bdff098a61
   languageName: node
   linkType: hard
 

From 4ed4acd7a58e12532697a95e0de15168c30541c1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 18:54:32 +0000
Subject: [PATCH 73/82] Update aws-sdk-js-v3 monorepo to v3.223.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 154 ++++++++++++++++++++++++------------------------------
 1 file changed, 69 insertions(+), 85 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4af9e1862a..fb74b2ad4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -408,15 +408,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-cognito-identity@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/client-cognito-identity@npm:3.222.0"
+"@aws-sdk/client-cognito-identity@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/client-cognito-identity@npm:3.223.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/client-sts": 3.223.0
     "@aws-sdk/config-resolver": 3.222.0
-    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.223.0
     "@aws-sdk/fetch-http-handler": 3.222.0
     "@aws-sdk/hash-node": 3.222.0
     "@aws-sdk/invalid-dependency": 3.222.0
@@ -442,26 +442,25 @@ __metadata:
     "@aws-sdk/util-defaults-mode-browser": 3.222.0
     "@aws-sdk/util-defaults-mode-node": 3.222.0
     "@aws-sdk/util-endpoints": 3.222.0
-    "@aws-sdk/util-retry": 3.222.0
     "@aws-sdk/util-user-agent-browser": 3.222.0
     "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: b733d9bad0232a17967da9b27311cb2adf41acaefc584173e6d74b3b966ed3908b9e9fa65b3a0f3e12709dc305e64b1a5351ea43ac666650a375cb10143368e3
+  checksum: ada894c3fbe943044617d719dc947af51546dbfea72e5b63f23c6230677c39dc0355248ed1ba119a29f2d4b7bc64e28400880b580a263bcd45d05fdf45007ad7
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-s3@npm:^3.208.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/client-s3@npm:3.222.0"
+  version: 3.223.0
+  resolution: "@aws-sdk/client-s3@npm:3.223.0"
   dependencies:
     "@aws-crypto/sha1-browser": 2.0.0
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/client-sts": 3.223.0
     "@aws-sdk/config-resolver": 3.222.0
-    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.223.0
     "@aws-sdk/eventstream-serde-browser": 3.222.0
     "@aws-sdk/eventstream-serde-config-resolver": 3.222.0
     "@aws-sdk/eventstream-serde-node": 3.222.0
@@ -500,7 +499,6 @@ __metadata:
     "@aws-sdk/util-defaults-mode-browser": 3.222.0
     "@aws-sdk/util-defaults-mode-node": 3.222.0
     "@aws-sdk/util-endpoints": 3.222.0
-    "@aws-sdk/util-retry": 3.222.0
     "@aws-sdk/util-stream-browser": 3.222.0
     "@aws-sdk/util-stream-node": 3.222.0
     "@aws-sdk/util-user-agent-browser": 3.222.0
@@ -511,19 +509,19 @@ __metadata:
     "@aws-sdk/xml-builder": 3.201.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: 844b0ac62f37d8db28d462bc1ee4cc9bef97529fd9716db9693dd7c6423ec5d12b81a0a107457aa9feb2e7ca2e26c12aa979fe51ce4b3090229fcfa784778e83
+  checksum: 52f5fe06c0740db4ccfbe61010654e02ecc0e994cdd6feb8b95a49e507a2813fe2889bb7cf12977febfe3d96333a962c16e8d26a77df80a9bd23a635dcc0f505
   languageName: node
   linkType: hard
 
 "@aws-sdk/client-sqs@npm:^3.208.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/client-sqs@npm:3.222.0"
+  version: 3.223.0
+  resolution: "@aws-sdk/client-sqs@npm:3.223.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
-    "@aws-sdk/client-sts": 3.222.0
+    "@aws-sdk/client-sts": 3.223.0
     "@aws-sdk/config-resolver": 3.222.0
-    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.223.0
     "@aws-sdk/fetch-http-handler": 3.222.0
     "@aws-sdk/hash-node": 3.222.0
     "@aws-sdk/invalid-dependency": 3.222.0
@@ -551,20 +549,19 @@ __metadata:
     "@aws-sdk/util-defaults-mode-browser": 3.222.0
     "@aws-sdk/util-defaults-mode-node": 3.222.0
     "@aws-sdk/util-endpoints": 3.222.0
-    "@aws-sdk/util-retry": 3.222.0
     "@aws-sdk/util-user-agent-browser": 3.222.0
     "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: a6ffa1f101ac006e982e072cbdffb2247d125bbca79c710f4780b0af4473fc38cbff1b40281636c675340348a4066231c01aef838cbfe5402b0609875468d720
+  checksum: 3f5e5052e02c33590199dcdc37df66692b5330e15afaaa5868b55ccb8a085f2a839dce5bda54270e75fe660b0be6fac3071722922ddb12922dd1f162912fe77e
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso-oidc@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/client-sso-oidc@npm:3.222.0"
+"@aws-sdk/client-sso-oidc@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/client-sso-oidc@npm:3.223.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
@@ -593,19 +590,18 @@ __metadata:
     "@aws-sdk/util-defaults-mode-browser": 3.222.0
     "@aws-sdk/util-defaults-mode-node": 3.222.0
     "@aws-sdk/util-endpoints": 3.222.0
-    "@aws-sdk/util-retry": 3.222.0
     "@aws-sdk/util-user-agent-browser": 3.222.0
     "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: 40674d89438b689480bdfa10bfb044d90341d87096ae6b0803e6ecc1695d48b1f7a8c513109e92001c380e2b2f5b18aa3e8af1c8ecd3d2f04f63f160cb039611
+  checksum: ab5b6142d897ec48a3bb246577c23d1b6e26ee228c7ce264f826d10f88caa83e03f0dac9d88e361c70b778ceef45f0ebd9712cd03ca5b60ab240a3d4382ecb7c
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sso@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/client-sso@npm:3.222.0"
+"@aws-sdk/client-sso@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/client-sso@npm:3.223.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
@@ -634,24 +630,23 @@ __metadata:
     "@aws-sdk/util-defaults-mode-browser": 3.222.0
     "@aws-sdk/util-defaults-mode-node": 3.222.0
     "@aws-sdk/util-endpoints": 3.222.0
-    "@aws-sdk/util-retry": 3.222.0
     "@aws-sdk/util-user-agent-browser": 3.222.0
     "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     tslib: ^2.3.1
-  checksum: bc0cd1125bc5aa94b3fdec15167ce9539acf4a187da060d51fa8ad7c30d0bf6cfee9e3a0175d65e204aba92efee4087c99d1190e1b43927c01cd7a8b1bbbb93e
+  checksum: 856e3745182906d274dc894baa7d853966b0074f89ea892f29132e1cefdf49f267f1d0fffaa2de3de352d19ff3963d59290602057bd4510731e0156199bed664
   languageName: node
   linkType: hard
 
-"@aws-sdk/client-sts@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/client-sts@npm:3.222.0"
+"@aws-sdk/client-sts@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/client-sts@npm:3.223.0"
   dependencies:
     "@aws-crypto/sha256-browser": 2.0.0
     "@aws-crypto/sha256-js": 2.0.0
     "@aws-sdk/config-resolver": 3.222.0
-    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/credential-provider-node": 3.223.0
     "@aws-sdk/fetch-http-handler": 3.222.0
     "@aws-sdk/hash-node": 3.222.0
     "@aws-sdk/invalid-dependency": 3.222.0
@@ -678,14 +673,13 @@ __metadata:
     "@aws-sdk/util-defaults-mode-browser": 3.222.0
     "@aws-sdk/util-defaults-mode-node": 3.222.0
     "@aws-sdk/util-endpoints": 3.222.0
-    "@aws-sdk/util-retry": 3.222.0
     "@aws-sdk/util-user-agent-browser": 3.222.0
     "@aws-sdk/util-user-agent-node": 3.222.0
     "@aws-sdk/util-utf8-browser": 3.188.0
     "@aws-sdk/util-utf8-node": 3.208.0
     fast-xml-parser: 4.0.11
     tslib: ^2.3.1
-  checksum: 79f18e5b44541673213715e3465a8b000716c03120ea087e6920abba3542683dbd4b881ecb091ef90df34947eec00c82daf70089ea0e5e92cffbb4e57e2d76d7
+  checksum: 6976345f839b0028a0e83f6d11e3323da68cef103ae5381299c6d75df25a1ef336b83023c79896242fbc4b7d2a27f3deebb1b1922e815e6cc7780f3eee302210
   languageName: node
   linkType: hard
 
@@ -702,15 +696,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-cognito-identity@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.222.0"
+"@aws-sdk/credential-provider-cognito-identity@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/credential-provider-cognito-identity@npm:3.223.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.222.0
+    "@aws-sdk/client-cognito-identity": 3.223.0
     "@aws-sdk/property-provider": 3.222.0
     "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: e6a61cf601825907931ed0cc42050b895b150468feb95c1052e053ce00d33e8d225663ca337da1c5825eee7e24438311ba0d28b2a6021868d3e6796aa81fdeeb
+  checksum: e0f03110b120699ef9c458edd5b1a248f5e3f360931b2e8be7ebb7fc33da51ac1c3fdf96bb05a755a2d303c00c7effee7a582706da2333b4ee43c0040ff551a5
   languageName: node
   linkType: hard
 
@@ -738,37 +732,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-ini@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.222.0"
+"@aws-sdk/credential-provider-ini@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.223.0"
   dependencies:
     "@aws-sdk/credential-provider-env": 3.222.0
     "@aws-sdk/credential-provider-imds": 3.222.0
-    "@aws-sdk/credential-provider-sso": 3.222.0
+    "@aws-sdk/credential-provider-sso": 3.223.0
     "@aws-sdk/credential-provider-web-identity": 3.222.0
     "@aws-sdk/property-provider": 3.222.0
     "@aws-sdk/shared-ini-file-loader": 3.222.0
     "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: eac19a9b52066f76cf23bee102369df7d50097dfee3be14b12c2e178c16868acd1a79b13c00d3e3ac40d2fbc14b4e2b06119d0c51c5d875c6be3606c33514d62
+  checksum: f407fe591999f1da1d5580b182af261ceeb4455da9a53d18ae871c9cf244e6e72fa10ef28036419790e2b5787d64c5de5b4daf4c7f69acb866894410baa880d0
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/credential-provider-node@npm:3.222.0"
+"@aws-sdk/credential-provider-node@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/credential-provider-node@npm:3.223.0"
   dependencies:
     "@aws-sdk/credential-provider-env": 3.222.0
     "@aws-sdk/credential-provider-imds": 3.222.0
-    "@aws-sdk/credential-provider-ini": 3.222.0
+    "@aws-sdk/credential-provider-ini": 3.223.0
     "@aws-sdk/credential-provider-process": 3.222.0
-    "@aws-sdk/credential-provider-sso": 3.222.0
+    "@aws-sdk/credential-provider-sso": 3.223.0
     "@aws-sdk/credential-provider-web-identity": 3.222.0
     "@aws-sdk/property-provider": 3.222.0
     "@aws-sdk/shared-ini-file-loader": 3.222.0
     "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: f17ce6c9b45d48d9bebd63766b5d85e45f6a1d50b02bea4784d0055269a0f5c05e5ba343c6b138cd29086b94c6bb4511568e9fb59f340f3988526b2d7950cb4c
+  checksum: 6ce5f88f75a6e879344ea76fa2b390c779d74f1b3657fa15367b15797b09d9713ef0d2f14c95421254a6bc0b8bde1acd2634978a6549e02a74c33160ae6130fd
   languageName: node
   linkType: hard
 
@@ -784,17 +778,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.222.0"
+"@aws-sdk/credential-provider-sso@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.223.0"
   dependencies:
-    "@aws-sdk/client-sso": 3.222.0
+    "@aws-sdk/client-sso": 3.223.0
     "@aws-sdk/property-provider": 3.222.0
     "@aws-sdk/shared-ini-file-loader": 3.222.0
-    "@aws-sdk/token-providers": 3.222.0
+    "@aws-sdk/token-providers": 3.223.0
     "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: 8e0a39a722fd6548b9758ab4c711eac9128a64bae1fa9bfce5f0b92c2df34883fdcd544c9a48f501d3a7b695e6d0b51a9b5e1be1b7eac626a1818860cfc86072
+  checksum: 4593a94dc86ef7218517061cf875285c2c6087f1d4a1199442055e6165701f11f9921612a04ab3c1b3f29b3132d46a8ce8cd26070fad132509e20eca1b89f217
   languageName: node
   linkType: hard
 
@@ -810,25 +804,25 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/credential-providers@npm:^3.208.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/credential-providers@npm:3.222.0"
+  version: 3.223.0
+  resolution: "@aws-sdk/credential-providers@npm:3.223.0"
   dependencies:
-    "@aws-sdk/client-cognito-identity": 3.222.0
-    "@aws-sdk/client-sso": 3.222.0
-    "@aws-sdk/client-sts": 3.222.0
-    "@aws-sdk/credential-provider-cognito-identity": 3.222.0
+    "@aws-sdk/client-cognito-identity": 3.223.0
+    "@aws-sdk/client-sso": 3.223.0
+    "@aws-sdk/client-sts": 3.223.0
+    "@aws-sdk/credential-provider-cognito-identity": 3.223.0
     "@aws-sdk/credential-provider-env": 3.222.0
     "@aws-sdk/credential-provider-imds": 3.222.0
-    "@aws-sdk/credential-provider-ini": 3.222.0
-    "@aws-sdk/credential-provider-node": 3.222.0
+    "@aws-sdk/credential-provider-ini": 3.223.0
+    "@aws-sdk/credential-provider-node": 3.223.0
     "@aws-sdk/credential-provider-process": 3.222.0
-    "@aws-sdk/credential-provider-sso": 3.222.0
+    "@aws-sdk/credential-provider-sso": 3.223.0
     "@aws-sdk/credential-provider-web-identity": 3.222.0
     "@aws-sdk/property-provider": 3.222.0
     "@aws-sdk/shared-ini-file-loader": 3.222.0
     "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: a6c159abbc210d62ed7d1153278b423595493583f53ec2a9143b402ee149cc1ae39be41615c76c3b658e1e9f70e89019a594c8e7a6a320cf7ea37443714a79ac
+  checksum: 289d043f41460751e90c3adc323f3a56e517f67c0a7f8889249e0969b3302f19d093eef4a10d3528bdf34f1043f95fa41555ed5c91af4d2ca636cded1775c81c
   languageName: node
   linkType: hard
 
@@ -966,8 +960,8 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/lib-storage@npm:^3.208.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/lib-storage@npm:3.222.0"
+  version: 3.223.0
+  resolution: "@aws-sdk/lib-storage@npm:3.223.0"
   dependencies:
     "@aws-sdk/middleware-endpoint": 3.222.0
     "@aws-sdk/smithy-client": 3.222.0
@@ -978,7 +972,7 @@ __metadata:
   peerDependencies:
     "@aws-sdk/abort-controller": ^3.0.0
     "@aws-sdk/client-s3": ^3.0.0
-  checksum: c247247e72a2c8a8210054dc84789ec10ce65bc631b253e65a21f407f5c9881c2eaa3fb982ce47f8e8979074b4d96e10ff9dc9f5245e76e40030809fa5ecaf06
+  checksum: 85dccc0148b404cb822156eafca32e918835f2beb6f218fd6062cce3ea93f80cf7229dd58f2a1c06959880958cb893a2b3e6e05526e080cd76c9b3971689602f
   languageName: node
   linkType: hard
 
@@ -1354,16 +1348,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/token-providers@npm:3.222.0"
+"@aws-sdk/token-providers@npm:3.223.0":
+  version: 3.223.0
+  resolution: "@aws-sdk/token-providers@npm:3.223.0"
   dependencies:
-    "@aws-sdk/client-sso-oidc": 3.222.0
+    "@aws-sdk/client-sso-oidc": 3.223.0
     "@aws-sdk/property-provider": 3.222.0
     "@aws-sdk/shared-ini-file-loader": 3.222.0
     "@aws-sdk/types": 3.222.0
     tslib: ^2.3.1
-  checksum: e0d2d9af50570ca1e9ae4cfe32889a9146a0e49ce3004dfc4d5305ba0f64b7561da95d09ccaf18927638417d3bd1eb9772cb58256aef242beab03a56e4e68883
+  checksum: 08d724bc685b90761159b449413c9dddb581cc61cd982ee9a189e8682d1a703acc70663beec2ae31d1ebf6fe9a86480b63fb65da531e35b2e8772a2c3906969f
   languageName: node
   linkType: hard
 
@@ -1511,16 +1505,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-retry@npm:3.222.0":
-  version: 3.222.0
-  resolution: "@aws-sdk/util-retry@npm:3.222.0"
-  dependencies:
-    "@aws-sdk/service-error-classification": 3.222.0
-    tslib: ^2.3.1
-  checksum: d4b38a23a310d44d211db2cfb2ae53ef41cf805308d08e56d9ca786fc69fd6b244f331d40ea35023bbc53625c7b2c1f4fab9fabd32d0a10396d4359ac50eff09
-  languageName: node
-  linkType: hard
-
 "@aws-sdk/util-stream-browser@npm:3.222.0":
   version: 3.222.0
   resolution: "@aws-sdk/util-stream-browser@npm:3.222.0"

From 9b606366bf2da9b6fd56807ac3fe3b47518a9b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 5 Dec 2022 11:17:38 +0100
Subject: [PATCH 74/82] Bump json-schema-library
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/thin-flies-wink.md   |  5 +++
 plugins/scaffolder/package.json |  2 +-
 yarn.lock                       | 56 ++++++++++++++-------------------
 3 files changed, 30 insertions(+), 33 deletions(-)
 create mode 100644 .changeset/thin-flies-wink.md

diff --git a/.changeset/thin-flies-wink.md b/.changeset/thin-flies-wink.md
new file mode 100644
index 0000000000..a31db67a1c
--- /dev/null
+++ b/.changeset/thin-flies-wink.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder': patch
+---
+
+Bump `json-schema-library` to version `^7.3.9` which does not pull in the `gson-pointer` library
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
index b76ae9d0f6..018e60f074 100644
--- a/plugins/scaffolder/package.json
+++ b/plugins/scaffolder/package.json
@@ -67,7 +67,7 @@
     "humanize-duration": "^3.25.1",
     "immer": "^9.0.1",
     "json-schema": "^0.4.0",
-    "json-schema-library": "^7.0.0",
+    "json-schema-library": "^7.3.9",
     "lodash": "^4.17.21",
     "luxon": "^3.0.0",
     "qs": "^6.9.4",
diff --git a/yarn.lock b/yarn.lock
index 4af9e1862a..849b8648f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7497,7 +7497,7 @@ __metadata:
     humanize-duration: ^3.25.1
     immer: ^9.0.1
     json-schema: ^0.4.0
-    json-schema-library: ^7.0.0
+    json-schema-library: ^7.3.9
     lodash: ^4.17.21
     luxon: ^3.0.0
     msw: ^0.49.0
@@ -12793,6 +12793,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sagold/json-pointer@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "@sagold/json-pointer@npm:5.0.0"
+  checksum: 0a087ff25e28d0c49b56566a14d6186ae0ce9fe538569eb7756c1a70989f2794dbc6f0834b5d2f2a0a79b6f0e3096eb05558664d5ff038daba5a46cb5e752e1a
+  languageName: node
+  linkType: hard
+
+"@sagold/json-query@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@sagold/json-query@npm:6.0.0"
+  dependencies:
+    "@sagold/json-pointer": ^5.0.0
+    ebnf: ^1.9.0
+  checksum: 56bb6151e6e6b1ef26bb03133b440e90d47c013529899e26cedb4c96f8a51f0115717ebab1355a8c3e6ea0c70e5ddaefc54c44330686ae3b2f8cb7d162011d73
+  languageName: node
+  linkType: hard
+
 "@short.io/opensearch-mock@npm:^0.3.1":
   version: 0.3.1
   resolution: "@short.io/opensearch-mock@npm:0.3.1"
@@ -23741,31 +23758,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gson-conform@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "gson-conform@npm:1.0.3"
-  checksum: 63867de06365e82394492fb83dd225e2f8af71f1ff0eb72bd860a86d4b4830e3cc3cdd561374625cc6ef99415a3f757c932ef08cf9fc3c097f0903d0c47bca8b
-  languageName: node
-  linkType: hard
-
-"gson-pointer@npm:4.1.1, gson-pointer@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "gson-pointer@npm:4.1.1"
-  checksum: e6ad0232467ae1ab8902cf801f74436ab28d251fa5f7db7dba78e26d871b7cd8edcef60170bd4ba1aa9b16639f2662a47bbb7214750c4a14594dba4990b0db47
-  languageName: node
-  linkType: hard
-
-"gson-query@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "gson-query@npm:5.1.0"
-  dependencies:
-    ebnf: ^1.9.0
-    gson-conform: ^1.0.3
-    gson-pointer: 4.1.1
-  checksum: 8af3d5ba52d0a684e71af1b00b2180b2d80bb8eea5252034c5a9f5213e06ee105ef77c17002cf10f1c8ecaaa0e2fbbd43978f579528c66a8b975a0dc4839e9d5
-  languageName: node
-  linkType: hard
-
 "gtoken@npm:^6.1.0":
   version: 6.1.1
   resolution: "gtoken@npm:6.1.1"
@@ -26558,16 +26550,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-schema-library@npm:^7.0.0":
-  version: 7.3.0
-  resolution: "json-schema-library@npm:7.3.0"
+"json-schema-library@npm:^7.3.9":
+  version: 7.3.9
+  resolution: "json-schema-library@npm:7.3.9"
   dependencies:
+    "@sagold/json-pointer": ^5.0.0
+    "@sagold/json-query": ^6.0.0
     deepmerge: ^4.2.2
     fast-deep-equal: ^3.1.3
-    gson-pointer: ^4.1.1
-    gson-query: ^5.1.0
     valid-url: ^1.0.9
-  checksum: 3d148d4be1e59e058bd777d247c181e2cb4820f9f5b9c97f7258f88fa73e1c0ed5c8e07c3fef4e1e8e892666def02b2b5fe5366d3d8d2bed09be3752e5593319
+  checksum: de40dd4d5f1ce438fa45703402716f2cf543b8e89d4ffc3618045f771f6f749928984905db761e9cf7e8602d213f4578c3e983a40e0d49013c0fea1488d397a8
   languageName: node
   linkType: hard
 

From 5960d0902eb61227fed2a334c611322d7cf4120d Mon Sep 17 00:00:00 2001
From: Simon <simme.jakobsson@gmail.com>
Date: Mon, 5 Dec 2022 12:03:57 +0100
Subject: [PATCH 75/82] ran prettier, added changeset

Signed-off-by: Simon <simme.jakobsson@gmail.com>
---
 .changeset/old-sloths-warn.md                          |  5 +++++
 .../src/example/alerts/KubernetesMigrationAlert.tsx    |  4 +++-
 plugins/cost-insights/src/example/client.ts            | 10 ++++++----
 .../KubernetesMigrationBarChart.tsx                    |  2 +-
 .../KubernetesMigrationBarChartLegend.tsx              |  3 ++-
 .../example/forms/KubernetesMigrationDismissForm.tsx   |  3 ++-
 plugins/cost-insights/src/forms/AlertDismissForm.tsx   |  2 +-
 plugins/cost-insights/src/forms/AlertSnoozeForm.tsx    |  2 +-
 plugins/cost-insights/src/hooks/useConfig.tsx          |  3 ++-
 plugins/cost-insights/src/hooks/useFilters.tsx         |  3 ++-
 plugins/cost-insights/src/hooks/useGroups.tsx          |  2 +-
 .../src/hooks/useLastCompleteBillingDate.tsx           |  2 +-
 plugins/cost-insights/src/hooks/useScroll.tsx          |  2 +-
 plugins/cost-insights/src/testUtils/mockData.ts        |  5 ++++-
 plugins/cost-insights/src/testUtils/products.ts        |  2 +-
 plugins/cost-insights/src/testUtils/testUtils.ts       |  5 ++---
 plugins/cost-insights/src/utils/alerts.tsx             |  3 ++-
 plugins/cost-insights/src/utils/change.test.ts         |  2 +-
 plugins/cost-insights/src/utils/change.ts              |  6 ++----
 plugins/cost-insights/src/utils/charts.ts              |  6 +++++-
 plugins/cost-insights/src/utils/config.ts              |  3 ++-
 plugins/cost-insights/src/utils/filters.ts             |  3 ++-
 plugins/cost-insights/src/utils/formatters.ts          |  3 ++-
 plugins/cost-insights/src/utils/graphs.ts              |  3 ++-
 plugins/cost-insights/src/utils/history.ts             |  3 ++-
 plugins/cost-insights/src/utils/loading.ts             |  3 ++-
 plugins/cost-insights/src/utils/sort.ts                |  3 ++-
 plugins/cost-insights/src/utils/sum.ts                 |  2 +-
 28 files changed, 60 insertions(+), 35 deletions(-)
 create mode 100644 .changeset/old-sloths-warn.md

diff --git a/.changeset/old-sloths-warn.md b/.changeset/old-sloths-warn.md
new file mode 100644
index 0000000000..8eca0a9292
--- /dev/null
+++ b/.changeset/old-sloths-warn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-cost-insights': patch
+---
+
+Internal refactor to avoid usage of deprecated symbols
diff --git a/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx b/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx
index e9d5877bf0..eb5423148d 100644
--- a/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx
+++ b/plugins/cost-insights/src/example/alerts/KubernetesMigrationAlert.tsx
@@ -24,9 +24,11 @@ import {
   AlertOptions,
   AlertStatus,
   AlertSnoozeFormData,
+} from '../../types';
+import {
   ChangeStatistic,
   Entity,
-} from '../../types';
+} from '@backstage/plugin-cost-insights-common';
 import {
   KubernetesMigrationDismissForm,
   KubernetesMigrationDismissFormData,
diff --git a/plugins/cost-insights/src/example/client.ts b/plugins/cost-insights/src/example/client.ts
index e2a183b682..160c0a691b 100644
--- a/plugins/cost-insights/src/example/client.ts
+++ b/plugins/cost-insights/src/example/client.ts
@@ -19,15 +19,17 @@ import { DateTime } from 'luxon';
 import { CostInsightsApi, ProductInsightsOptions } from '../api';
 import {
   Alert,
-  Cost,
   DEFAULT_DATE_FORMAT,
+  ProjectGrowthData,
+  UnlabeledDataflowData,
+} from '../types';
+import {
   Entity,
   Group,
   MetricData,
   Project,
-  ProjectGrowthData,
-  UnlabeledDataflowData,
-} from '../types';
+  Cost,
+} from '@backstage/plugin-cost-insights-common';
 import { KubernetesMigrationAlert } from './alerts';
 import { ProjectGrowthAlert, UnlabeledDataflowAlert } from '../alerts';
 import {
diff --git a/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChart.tsx b/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChart.tsx
index 68a92aa877..bdc7af551a 100644
--- a/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChart.tsx
+++ b/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChart.tsx
@@ -19,9 +19,9 @@ import { BarChart } from '../../../components';
 import {
   BarChartOptions,
   CostInsightsTheme,
-  Entity,
   ResourceData,
 } from '../../../types';
+import { Entity } from '@backstage/plugin-cost-insights-common';
 import { useTheme } from '@material-ui/core';
 
 type MigrationBarChartProps = {
diff --git a/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChartLegend.tsx b/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChartLegend.tsx
index 5b62b4b7bc..1b46b15a10 100644
--- a/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChartLegend.tsx
+++ b/plugins/cost-insights/src/example/components/KubernetesMigrationAlertCard/KubernetesMigrationBarChartLegend.tsx
@@ -17,7 +17,8 @@
 import React from 'react';
 import { Box, useTheme } from '@material-ui/core';
 import { CostGrowth, LegendItem } from '../../../components';
-import { ChangeStatistic, CostInsightsTheme, Duration } from '../../../types';
+import { CostInsightsTheme, Duration } from '../../../types';
+import { ChangeStatistic } from '@backstage/plugin-cost-insights-common';
 import { monthOf } from '../../../utils/formatters';
 
 export type MigrationBarChartLegendProps = {
diff --git a/plugins/cost-insights/src/example/forms/KubernetesMigrationDismissForm.tsx b/plugins/cost-insights/src/example/forms/KubernetesMigrationDismissForm.tsx
index 285cc15f94..7efd32616c 100644
--- a/plugins/cost-insights/src/example/forms/KubernetesMigrationDismissForm.tsx
+++ b/plugins/cost-insights/src/example/forms/KubernetesMigrationDismissForm.tsx
@@ -28,7 +28,8 @@ import {
   FormGroup,
   Typography,
 } from '@material-ui/core';
-import { AlertFormProps, Entity } from '../../types';
+import { AlertFormProps } from '../../types';
+import { Entity } from '@backstage/plugin-cost-insights-common';
 import { KubernetesMigrationAlert } from '../alerts';
 import { findAlways } from '../../utils/assert';
 
diff --git a/plugins/cost-insights/src/forms/AlertDismissForm.tsx b/plugins/cost-insights/src/forms/AlertDismissForm.tsx
index 9697672789..7506fe8ee1 100644
--- a/plugins/cost-insights/src/forms/AlertDismissForm.tsx
+++ b/plugins/cost-insights/src/forms/AlertDismissForm.tsx
@@ -37,8 +37,8 @@ import {
   AlertDismissReason,
   AlertDismissOptions,
   AlertDismissFormData,
-  Maybe,
 } from '../types';
+import { Maybe } from '@backstage/plugin-cost-insights-common';
 import { useAlertDialogStyles as useStyles } from '../utils/styles';
 
 export type AlertDismissFormProps = AlertFormProps<Alert, AlertDismissFormData>;
diff --git a/plugins/cost-insights/src/forms/AlertSnoozeForm.tsx b/plugins/cost-insights/src/forms/AlertSnoozeForm.tsx
index 0dcc0a949e..3f87c87771 100644
--- a/plugins/cost-insights/src/forms/AlertSnoozeForm.tsx
+++ b/plugins/cost-insights/src/forms/AlertSnoozeForm.tsx
@@ -35,10 +35,10 @@ import {
   AlertFormProps,
   Duration,
   DEFAULT_DATE_FORMAT,
-  Maybe,
   AlertSnoozeFormData,
   AlertSnoozeOptions,
 } from '../types';
+import { Maybe } from '@backstage/plugin-cost-insights-common';
 import { useAlertDialogStyles as useStyles } from '../utils/styles';
 import { intervalsOf } from '../utils/duration';
 
diff --git a/plugins/cost-insights/src/hooks/useConfig.tsx b/plugins/cost-insights/src/hooks/useConfig.tsx
index d1b3a4788e..f42cea38c3 100644
--- a/plugins/cost-insights/src/hooks/useConfig.tsx
+++ b/plugins/cost-insights/src/hooks/useConfig.tsx
@@ -22,7 +22,8 @@ import React, {
   useState,
 } from 'react';
 import { Config as BackstageConfig } from '@backstage/config';
-import { Currency, EngineerThreshold, Icon, Metric, Product } from '../types';
+import { Currency, EngineerThreshold, Icon } from '../types';
+import { Metric, Product } from '@backstage/plugin-cost-insights-common';
 import { getIcon } from '../utils/navigation';
 import { validateCurrencies, validateMetrics } from '../utils/config';
 import { createCurrencyFormat, defaultCurrencies } from '../utils/currency';
diff --git a/plugins/cost-insights/src/hooks/useFilters.tsx b/plugins/cost-insights/src/hooks/useFilters.tsx
index abe7a132cc..e888da369e 100644
--- a/plugins/cost-insights/src/hooks/useFilters.tsx
+++ b/plugins/cost-insights/src/hooks/useFilters.tsx
@@ -23,7 +23,8 @@ import React, {
   useState,
 } from 'react';
 import { Alert } from '@material-ui/lab';
-import { Maybe, PageFilters, ProductFilters } from '../types';
+import { PageFilters, ProductFilters } from '../types';
+import { Maybe } from '@backstage/plugin-cost-insights-common';
 import { useLocation, useNavigate } from 'react-router-dom';
 import {
   stringify,
diff --git a/plugins/cost-insights/src/hooks/useGroups.tsx b/plugins/cost-insights/src/hooks/useGroups.tsx
index de0e253763..ec10faa7de 100644
--- a/plugins/cost-insights/src/hooks/useGroups.tsx
+++ b/plugins/cost-insights/src/hooks/useGroups.tsx
@@ -23,7 +23,7 @@ import React, {
 import { Alert } from '@material-ui/lab';
 import { costInsightsApiRef } from '../api';
 import { MapLoadingToProps, useLoading } from './useLoading';
-import { Group, Maybe } from '../types';
+import { Group, Maybe } from '@backstage/plugin-cost-insights-common';
 import { DefaultLoadingAction } from '../utils/loading';
 import { useApi, identityApiRef } from '@backstage/core-plugin-api';
 import { DEFAULT_NAMESPACE, parseEntityRef } from '@backstage/catalog-model';
diff --git a/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx b/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx
index d8236ed61a..24c5716442 100644
--- a/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx
+++ b/plugins/cost-insights/src/hooks/useLastCompleteBillingDate.tsx
@@ -25,7 +25,7 @@ import { Alert } from '@material-ui/lab';
 import { costInsightsApiRef } from '../api';
 import { MapLoadingToProps, useLoading } from './useLoading';
 import { DefaultLoadingAction } from '../utils/loading';
-import { Maybe } from '../types';
+import { Maybe } from '@backstage/plugin-cost-insights-common';
 import { useApi } from '@backstage/core-plugin-api';
 
 type BillingDateProviderLoadingProps = {
diff --git a/plugins/cost-insights/src/hooks/useScroll.tsx b/plugins/cost-insights/src/hooks/useScroll.tsx
index 5ddc60b8ff..3e2bbc6c24 100644
--- a/plugins/cost-insights/src/hooks/useScroll.tsx
+++ b/plugins/cost-insights/src/hooks/useScroll.tsx
@@ -20,7 +20,7 @@ import React, {
   useContext,
   PropsWithChildren,
 } from 'react';
-import { Maybe } from '../types';
+import { Maybe } from '@backstage/plugin-cost-insights-common';
 
 export type ScrollTo = Maybe<string>;
 
diff --git a/plugins/cost-insights/src/testUtils/mockData.ts b/plugins/cost-insights/src/testUtils/mockData.ts
index 45a514ff8f..67cb4d9035 100644
--- a/plugins/cost-insights/src/testUtils/mockData.ts
+++ b/plugins/cost-insights/src/testUtils/mockData.ts
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { DateAggregation, Entity } from '../types';
+import {
+  DateAggregation,
+  Entity,
+} from '@backstage/plugin-cost-insights-common';
 
 export const MockAggregatedDailyCosts: DateAggregation[] = [
   {
diff --git a/plugins/cost-insights/src/testUtils/products.ts b/plugins/cost-insights/src/testUtils/products.ts
index 1daab969de..200c1014b0 100644
--- a/plugins/cost-insights/src/testUtils/products.ts
+++ b/plugins/cost-insights/src/testUtils/products.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Entity, Product } from '../types';
+import { Entity, Product } from '@backstage/plugin-cost-insights-common';
 import { findAlways } from '../utils/assert';
 
 type mockEntityRenderer<T> = (entity: T) => T;
diff --git a/plugins/cost-insights/src/testUtils/testUtils.ts b/plugins/cost-insights/src/testUtils/testUtils.ts
index e0ed1aa933..4e1bea347d 100644
--- a/plugins/cost-insights/src/testUtils/testUtils.ts
+++ b/plugins/cost-insights/src/testUtils/testUtils.ts
@@ -16,14 +16,13 @@
 
 import { DateTime } from 'luxon';
 import regression, { DataPoint } from 'regression';
+import { Duration, DEFAULT_DATE_FORMAT } from '../types';
 import {
   ChangeStatistic,
-  Duration,
   Entity,
   Trendline,
   DateAggregation,
-  DEFAULT_DATE_FORMAT,
-} from '../types';
+} from '@backstage/plugin-cost-insights-common';
 import { inclusiveEndDateOf, inclusiveStartDateOf } from '../utils/duration';
 import {
   MockComputeEngineInsights,
diff --git a/plugins/cost-insights/src/utils/alerts.tsx b/plugins/cost-insights/src/utils/alerts.tsx
index 2039a5b617..9efc8a4f3b 100644
--- a/plugins/cost-insights/src/utils/alerts.tsx
+++ b/plugins/cost-insights/src/utils/alerts.tsx
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Alert, AlertForm, AlertStatus, Maybe } from '../types';
+import { Alert, AlertForm, AlertStatus } from '../types';
+import { Maybe } from '@backstage/plugin-cost-insights-common';
 import { AlertAcceptForm, AlertDismissForm, AlertSnoozeForm } from '../forms';
 
 const createAlertHandler = (status?: AlertStatus) => (alert: Alert) =>
diff --git a/plugins/cost-insights/src/utils/change.test.ts b/plugins/cost-insights/src/utils/change.test.ts
index 1a0b9947f5..79f68db716 100644
--- a/plugins/cost-insights/src/utils/change.test.ts
+++ b/plugins/cost-insights/src/utils/change.test.ts
@@ -20,8 +20,8 @@ import {
   ChangeThreshold,
   EngineerThreshold,
   Duration,
-  Cost,
 } from '../types';
+import { Cost } from '@backstage/plugin-cost-insights-common';
 import { MockAggregatedDailyCosts, trendlineOf, changeOf } from '../testUtils';
 
 const GrowthMap = {
diff --git a/plugins/cost-insights/src/utils/change.ts b/plugins/cost-insights/src/utils/change.ts
index 43d58a021b..33a5eb4a9b 100644
--- a/plugins/cost-insights/src/utils/change.ts
+++ b/plugins/cost-insights/src/utils/change.ts
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
+import { ChangeThreshold, GrowthType, Duration } from '../types';
 import {
   Cost,
   ChangeStatistic,
-  ChangeThreshold,
-  GrowthType,
   MetricData,
-  Duration,
   DateAggregation,
-} from '../types';
+} from '@backstage/plugin-cost-insights-common';
 import { DateTime, Duration as LuxonDuration } from 'luxon';
 import { inclusiveStartDateOf } from './duration';
 import { notEmpty } from './assert';
diff --git a/plugins/cost-insights/src/utils/charts.ts b/plugins/cost-insights/src/utils/charts.ts
index 2a6d0b2ad6..e7bcd7bd33 100644
--- a/plugins/cost-insights/src/utils/charts.ts
+++ b/plugins/cost-insights/src/utils/charts.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { DateAggregation, Trendline, ChartData } from '../types';
+import {
+  DateAggregation,
+  Trendline,
+} from '@backstage/plugin-cost-insights-common';
+import { ChartData } from '../types';
 
 export function trendFrom(trendline: Trendline, date: number): number {
   return trendline.slope * (date / 1000) + trendline.intercept;
diff --git a/plugins/cost-insights/src/utils/config.ts b/plugins/cost-insights/src/utils/config.ts
index 496021d70e..3a2e858de3 100644
--- a/plugins/cost-insights/src/utils/config.ts
+++ b/plugins/cost-insights/src/utils/config.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Metric, Currency } from '../types';
+import { Currency } from '../types';
+import { Metric } from '@backstage/plugin-cost-insights-common';
 
 export function validateMetrics(metrics: Metric[]) {
   const defaults = metrics.filter(metric => metric.default);
diff --git a/plugins/cost-insights/src/utils/filters.ts b/plugins/cost-insights/src/utils/filters.ts
index f0252edd45..d44042d358 100644
--- a/plugins/cost-insights/src/utils/filters.ts
+++ b/plugins/cost-insights/src/utils/filters.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Duration, Group, PageFilters } from '../types';
+import { Duration, PageFilters } from '../types';
+import { Group } from '@backstage/plugin-cost-insights-common';
 
 export function getDefaultPageFilters(groups: Group[]): PageFilters {
   return {
diff --git a/plugins/cost-insights/src/utils/formatters.ts b/plugins/cost-insights/src/utils/formatters.ts
index fd3fb4c0ef..e715aebbd7 100644
--- a/plugins/cost-insights/src/utils/formatters.ts
+++ b/plugins/cost-insights/src/utils/formatters.ts
@@ -16,7 +16,8 @@
 
 import { DateTime, Duration as LuxonDuration } from 'luxon';
 import pluralize from 'pluralize';
-import { ChangeStatistic, Duration } from '../types';
+import { Duration } from '../types';
+import { ChangeStatistic } from '@backstage/plugin-cost-insights-common';
 import { inclusiveEndDateOf, inclusiveStartDateOf } from './duration';
 import { notEmpty } from './assert';
 
diff --git a/plugins/cost-insights/src/utils/graphs.ts b/plugins/cost-insights/src/utils/graphs.ts
index 896d09f865..7512ec0c51 100644
--- a/plugins/cost-insights/src/utils/graphs.ts
+++ b/plugins/cost-insights/src/utils/graphs.ts
@@ -16,7 +16,8 @@
 
 import { TooltipProps } from 'recharts';
 import { Payload } from 'recharts/types/component/DefaultTooltipContent';
-import { AlertCost, DataKey, Entity, ResourceData } from '../types';
+import { AlertCost, DataKey, ResourceData } from '../types';
+import { Entity } from '@backstage/plugin-cost-insights-common';
 import {
   currencyFormatter,
   dateFormatter,
diff --git a/plugins/cost-insights/src/utils/history.ts b/plugins/cost-insights/src/utils/history.ts
index 466f506479..ccdce9c3e4 100644
--- a/plugins/cost-insights/src/utils/history.ts
+++ b/plugins/cost-insights/src/utils/history.ts
@@ -16,7 +16,8 @@
 
 import qs from 'qs';
 import * as yup from 'yup';
-import { Duration, Group, PageFilters } from '../types';
+import { Duration, PageFilters } from '../types';
+import { Group } from '@backstage/plugin-cost-insights-common';
 import { getDefaultPageFilters } from '../utils/filters';
 import { ConfigContextProps } from '../hooks/useConfig';
 
diff --git a/plugins/cost-insights/src/utils/loading.ts b/plugins/cost-insights/src/utils/loading.ts
index 2a453a58f1..7fe95a39db 100644
--- a/plugins/cost-insights/src/utils/loading.ts
+++ b/plugins/cost-insights/src/utils/loading.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Duration, Entity, Loading, Maybe, Product } from '../types';
+import { Duration, Loading } from '../types';
+import { Entity, Maybe, Product } from '@backstage/plugin-cost-insights-common';
 import { DEFAULT_DURATION } from './duration';
 
 export type ProductState = {
diff --git a/plugins/cost-insights/src/utils/sort.ts b/plugins/cost-insights/src/utils/sort.ts
index 817e4b9012..0bdcc388b5 100644
--- a/plugins/cost-insights/src/utils/sort.ts
+++ b/plugins/cost-insights/src/utils/sort.ts
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DateAggregation, ResourceData } from '../types';
+import { ResourceData } from '../types';
+import { DateAggregation } from '@backstage/plugin-cost-insights-common';
 import { ProductState } from './loading';
 
 export const aggregationSort = (
diff --git a/plugins/cost-insights/src/utils/sum.ts b/plugins/cost-insights/src/utils/sum.ts
index 1ab6bdef71..2aba59891a 100644
--- a/plugins/cost-insights/src/utils/sum.ts
+++ b/plugins/cost-insights/src/utils/sum.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { DateAggregation } from '../types';
+import { DateAggregation } from '@backstage/plugin-cost-insights-common';
 
 export const aggregationSum = (aggregation: DateAggregation[]) =>
   aggregation.reduce((total, curAgg) => total + curAgg.amount, 0);

From b3fabe41d57af469ac06d8c255af58b4c16822c5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 11:11:58 +0000
Subject: [PATCH 76/82] Update dependency @types/jest to v29.2.4

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 029368be00..fd6e81eaab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14280,12 +14280,12 @@ __metadata:
   linkType: hard
 
 "@types/jest@npm:*, @types/jest@npm:^29.0.0":
-  version: 29.2.3
-  resolution: "@types/jest@npm:29.2.3"
+  version: 29.2.4
+  resolution: "@types/jest@npm:29.2.4"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: 55370906711b600a05b9e497c22aa74d80d8adcdbe4ac2f1bc9311f6f6ca0dd192862b6f38df6ac0d45e92396bcd796e377b1d8058c10bdfd584aeee580c3ce1
+  checksum: 9deb4756fe1b438d41ff1aae7d6c216c9e49e5fe60f539f8edb6698ffeb530ff7b25d37e223439b03602ca3a7397c9c2e53e1a39c7bd616353472fce0cc04107
   languageName: node
   linkType: hard
 

From 978ed3b8c851c06034bafd72ac51c0da026e0514 Mon Sep 17 00:00:00 2001
From: Simon <simme.jakobsson@gmail.com>
Date: Mon, 5 Dec 2022 12:26:33 +0100
Subject: [PATCH 77/82] added api report

Signed-off-by: Simon <simme.jakobsson@gmail.com>
---
 plugins/cost-insights/api-report.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/plugins/cost-insights/api-report.md b/plugins/cost-insights/api-report.md
index 9bc662dae1..00cbc4c3af 100644
--- a/plugins/cost-insights/api-report.md
+++ b/plugins/cost-insights/api-report.md
@@ -17,8 +17,10 @@ import { Entity as Entity_2 } from '@backstage/plugin-cost-insights-common';
 import { ForwardRefExoticComponent } from 'react';
 import { Group as Group_2 } from '@backstage/plugin-cost-insights-common';
 import { Maybe as Maybe_2 } from '@backstage/plugin-cost-insights-common';
+import { Metric as Metric_2 } from '@backstage/plugin-cost-insights-common';
 import { MetricData as MetricData_2 } from '@backstage/plugin-cost-insights-common';
 import { PaletteOptions } from '@material-ui/core/styles/createPalette';
+import { Product as Product_2 } from '@backstage/plugin-cost-insights-common';
 import { Project as Project_2 } from '@backstage/plugin-cost-insights-common';
 import { PropsWithChildren } from 'react';
 import { ReactNode } from 'react';
@@ -233,8 +235,8 @@ export type ChartData = {
 // @public (undocumented)
 export type ConfigContextProps = {
   baseCurrency: Intl.NumberFormat;
-  metrics: Metric[];
-  products: Product[];
+  metrics: Metric_2[];
+  products: Product_2[];
   icons: Icon[];
   engineerCost: number;
   engineerThreshold: number;
@@ -426,21 +428,21 @@ export class ExampleCostInsightsClient implements CostInsightsApi {
   getCatalogEntityDailyCost(
     entityRef: string,
     intervals: string,
-  ): Promise<Cost>;
+  ): Promise<Cost_2>;
   // (undocumented)
-  getDailyMetricData(metric: string, intervals: string): Promise<MetricData>;
+  getDailyMetricData(metric: string, intervals: string): Promise<MetricData_2>;
   // (undocumented)
-  getGroupDailyCost(group: string, intervals: string): Promise<Cost>;
+  getGroupDailyCost(group: string, intervals: string): Promise<Cost_2>;
   // (undocumented)
-  getGroupProjects(group: string): Promise<Project[]>;
+  getGroupProjects(group: string): Promise<Project_2[]>;
   // (undocumented)
   getLastCompleteBillingDate(): Promise<string>;
   // (undocumented)
-  getProductInsights(options: ProductInsightsOptions): Promise<Entity>;
+  getProductInsights(options: ProductInsightsOptions): Promise<Entity_2>;
   // (undocumented)
-  getProjectDailyCost(project: string, intervals: string): Promise<Cost>;
+  getProjectDailyCost(project: string, intervals: string): Promise<Cost_2>;
   // (undocumented)
-  getUserGroups(userId: string): Promise<Group[]>;
+  getUserGroups(userId: string): Promise<Group_2[]>;
 }
 
 // @public @deprecated (undocumented)

From bb7660377d7cf3be4d9808003d7030a7199ad8aa Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 12:43:02 +0000
Subject: [PATCH 78/82] Update dependency esbuild to v0.15.18

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 182 +++++++++++++++++++++++++++---------------------------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 11c63fe94a..be3e591ce7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9110,16 +9110,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.15.16":
-  version: 0.15.16
-  resolution: "@esbuild/android-arm@npm:0.15.16"
+"@esbuild/android-arm@npm:0.15.18":
+  version: 0.15.18
+  resolution: "@esbuild/android-arm@npm:0.15.18"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "@esbuild/linux-loong64@npm:0.15.16"
+"@esbuild/linux-loong64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "@esbuild/linux-loong64@npm:0.15.18"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
@@ -21048,100 +21048,100 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-android-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-android-64@npm:0.15.16"
+"esbuild-android-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-android-64@npm:0.15.18"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-android-arm64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-android-arm64@npm:0.15.16"
+"esbuild-android-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-android-arm64@npm:0.15.18"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"esbuild-darwin-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-darwin-64@npm:0.15.16"
+"esbuild-darwin-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-darwin-64@npm:0.15.18"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-darwin-arm64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-darwin-arm64@npm:0.15.16"
+"esbuild-darwin-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-darwin-arm64@npm:0.15.18"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"esbuild-freebsd-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-freebsd-64@npm:0.15.16"
+"esbuild-freebsd-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-freebsd-64@npm:0.15.18"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-freebsd-arm64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-freebsd-arm64@npm:0.15.16"
+"esbuild-freebsd-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-freebsd-arm64@npm:0.15.18"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"esbuild-linux-32@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-32@npm:0.15.16"
+"esbuild-linux-32@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-32@npm:0.15.18"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
-"esbuild-linux-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-64@npm:0.15.16"
+"esbuild-linux-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-64@npm:0.15.18"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-linux-arm64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-arm64@npm:0.15.16"
+"esbuild-linux-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-arm64@npm:0.15.18"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"esbuild-linux-arm@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-arm@npm:0.15.16"
+"esbuild-linux-arm@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-arm@npm:0.15.18"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"esbuild-linux-mips64le@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-mips64le@npm:0.15.16"
+"esbuild-linux-mips64le@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-mips64le@npm:0.15.18"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"esbuild-linux-ppc64le@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-ppc64le@npm:0.15.16"
+"esbuild-linux-ppc64le@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-ppc64le@npm:0.15.18"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"esbuild-linux-riscv64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-riscv64@npm:0.15.16"
+"esbuild-linux-riscv64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-riscv64@npm:0.15.18"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
-"esbuild-linux-s390x@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-linux-s390x@npm:0.15.16"
+"esbuild-linux-s390x@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-linux-s390x@npm:0.15.18"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
@@ -21162,74 +21162,74 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-netbsd-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-netbsd-64@npm:0.15.16"
+"esbuild-netbsd-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-netbsd-64@npm:0.15.18"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-openbsd-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-openbsd-64@npm:0.15.16"
+"esbuild-openbsd-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-openbsd-64@npm:0.15.18"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-sunos-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-sunos-64@npm:0.15.16"
+"esbuild-sunos-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-sunos-64@npm:0.15.18"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-windows-32@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-windows-32@npm:0.15.16"
+"esbuild-windows-32@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-windows-32@npm:0.15.18"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"esbuild-windows-64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-windows-64@npm:0.15.16"
+"esbuild-windows-64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-windows-64@npm:0.15.18"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"esbuild-windows-arm64@npm:0.15.16":
-  version: 0.15.16
-  resolution: "esbuild-windows-arm64@npm:0.15.16"
+"esbuild-windows-arm64@npm:0.15.18":
+  version: 0.15.18
+  resolution: "esbuild-windows-arm64@npm:0.15.18"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
 "esbuild@npm:^0.15.0, esbuild@npm:^0.15.6":
-  version: 0.15.16
-  resolution: "esbuild@npm:0.15.16"
+  version: 0.15.18
+  resolution: "esbuild@npm:0.15.18"
   dependencies:
-    "@esbuild/android-arm": 0.15.16
-    "@esbuild/linux-loong64": 0.15.16
-    esbuild-android-64: 0.15.16
-    esbuild-android-arm64: 0.15.16
-    esbuild-darwin-64: 0.15.16
-    esbuild-darwin-arm64: 0.15.16
-    esbuild-freebsd-64: 0.15.16
-    esbuild-freebsd-arm64: 0.15.16
-    esbuild-linux-32: 0.15.16
-    esbuild-linux-64: 0.15.16
-    esbuild-linux-arm: 0.15.16
-    esbuild-linux-arm64: 0.15.16
-    esbuild-linux-mips64le: 0.15.16
-    esbuild-linux-ppc64le: 0.15.16
-    esbuild-linux-riscv64: 0.15.16
-    esbuild-linux-s390x: 0.15.16
-    esbuild-netbsd-64: 0.15.16
-    esbuild-openbsd-64: 0.15.16
-    esbuild-sunos-64: 0.15.16
-    esbuild-windows-32: 0.15.16
-    esbuild-windows-64: 0.15.16
-    esbuild-windows-arm64: 0.15.16
+    "@esbuild/android-arm": 0.15.18
+    "@esbuild/linux-loong64": 0.15.18
+    esbuild-android-64: 0.15.18
+    esbuild-android-arm64: 0.15.18
+    esbuild-darwin-64: 0.15.18
+    esbuild-darwin-arm64: 0.15.18
+    esbuild-freebsd-64: 0.15.18
+    esbuild-freebsd-arm64: 0.15.18
+    esbuild-linux-32: 0.15.18
+    esbuild-linux-64: 0.15.18
+    esbuild-linux-arm: 0.15.18
+    esbuild-linux-arm64: 0.15.18
+    esbuild-linux-mips64le: 0.15.18
+    esbuild-linux-ppc64le: 0.15.18
+    esbuild-linux-riscv64: 0.15.18
+    esbuild-linux-s390x: 0.15.18
+    esbuild-netbsd-64: 0.15.18
+    esbuild-openbsd-64: 0.15.18
+    esbuild-sunos-64: 0.15.18
+    esbuild-windows-32: 0.15.18
+    esbuild-windows-64: 0.15.18
+    esbuild-windows-arm64: 0.15.18
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -21277,7 +21277,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 6f9262784b115363290cc9aa54692b3b646cd0508364333a609cc7be5ede4d93f91561ae8da48125e077da2e7add5368105486233ac2258f7169b171e8d78564
+  checksum: ec12682b2cb2d4f0669d0e555028b87a9284ca7f6a1b26e35e69a8697165b35cc682ad598abc70f0bbcfdc12ca84ef888caf5ceee389237862e8f8c17da85f89
   languageName: node
   linkType: hard
 

From 08c8b844444d379db1518d4038b78b97caccbe9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustaf=20R=C3=A4ntil=C3=A4?= <g.rantila@gmail.com>
Date: Mon, 5 Dec 2022 14:23:40 +0100
Subject: [PATCH 79/82] Add 'CI/CD Statistics' plugin to the microsite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gustaf Räntilä <g.rantila@gmail.com>
---
 microsite/data/plugins/cicd-statistics.yaml | 13 +++++++++++++
 microsite/static/img/cicd-statistics.svg    |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 microsite/data/plugins/cicd-statistics.yaml
 create mode 100644 microsite/static/img/cicd-statistics.svg

diff --git a/microsite/data/plugins/cicd-statistics.yaml b/microsite/data/plugins/cicd-statistics.yaml
new file mode 100644
index 0000000000..a43b56b0d9
--- /dev/null
+++ b/microsite/data/plugins/cicd-statistics.yaml
@@ -0,0 +1,13 @@
+---
+title: CI/CD Statistics
+author: Spotify
+authorUrl: https://github.com/spotify
+category: CI/CD
+description: Visualize CI/CD pipeline statistics such as build time or success and error rates.
+documentation: https://github.com/backstage/backstage/tree/master/plugins/cicd-statistics
+iconUrl: img/cicd-statistics.svg
+npmPackageName: '@backstage/plugin-cicd-statistics'
+tags:
+  - ci
+  - cd
+addedDate: '2022-01-13'
diff --git a/microsite/static/img/cicd-statistics.svg b/microsite/static/img/cicd-statistics.svg
new file mode 100644
index 0000000000..302f5e8f98
--- /dev/null
+++ b/microsite/static/img/cicd-statistics.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><g><rect fill="none" height="24" width="24"/></g><g><g><path d="M21,8c-1.45,0-2.26,1.44-1.93,2.51l-3.55,3.56c-0.3-0.09-0.74-0.09-1.04,0l-2.55-2.55C12.27,10.45,11.46,9,10,9 c-1.45,0-2.27,1.44-1.93,2.52l-4.56,4.55C2.44,15.74,1,16.55,1,18c0,1.1,0.9,2,2,2c1.45,0,2.26-1.44,1.93-2.51l4.55-4.56 c0.3,0.09,0.74,0.09,1.04,0l2.55,2.55C12.73,16.55,13.54,18,15,18c1.45,0,2.27-1.44,1.93-2.52l3.56-3.55 C21.56,12.26,23,11.45,23,10C23,8.9,22.1,8,21,8z"/><polygon points="15,9 15.94,6.93 18,6 15.94,5.07 15,3 14.08,5.07 12,6 14.08,6.93"/><polygon points="3.5,11 4,9 6,8.5 4,8 3.5,6 3,8 1,8.5 3,9"/></g></g></svg>
\ No newline at end of file

From 25b00c01b8cf40736383dad79f729927bedf8099 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 13:55:53 +0000
Subject: [PATCH 80/82] Update dependency @uiw/react-codemirror to v4.17.1

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index be3e591ce7..c49541d435 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15575,9 +15575,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.15.1":
-  version: 4.15.1
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.15.1"
+"@uiw/codemirror-extensions-basic-setup@npm:4.17.1":
+  version: 4.17.1
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.17.1"
   dependencies:
     "@codemirror/autocomplete": ^6.0.0
     "@codemirror/commands": ^6.0.0
@@ -15594,19 +15594,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: 1805caa6432a2ed0c616efee4977d3e90faae85be4a75b6e5f654c8bc9dced640ad75dbe7a57d50bc84c117139b486ef0a116a8127c6f8efb44068631a48bc09
+  checksum: 7cddc8721ad2ea487760a1c53a0a45b11356ea0ceb4277f70f38085268d96e35cfcbf5bc01f56437781e4cf1a4c5d84b2ba48fb9b8fcdb1d111c23f38ef43c3d
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.9.3":
-  version: 4.15.1
-  resolution: "@uiw/react-codemirror@npm:4.15.1"
+  version: 4.17.1
+  resolution: "@uiw/react-codemirror@npm:4.17.1"
   dependencies:
     "@babel/runtime": ^7.18.6
     "@codemirror/commands": ^6.1.0
     "@codemirror/state": ^6.1.1
     "@codemirror/theme-one-dark": ^6.0.0
-    "@uiw/codemirror-extensions-basic-setup": 4.15.1
+    "@uiw/codemirror-extensions-basic-setup": 4.17.1
     codemirror: ^6.0.0
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -15616,7 +15616,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 49e3011e6d5455f26266b5d39d11d6e2c6505b48063882d1d4593f8c333c159fefcf0df4f743bea36d95ade1e88e19fad13571d0e3fa3b3d6cd5a43bb59f5eb7
+  checksum: 071db12e091fdd5ecb62efc6f56586c37d6491c7e3e36982421bd24f61caa7d5d85d01aacb94908c637f1cbb4d218a68267acc741f0219e1a199ef8c1bac856c
   languageName: node
   linkType: hard
 

From 16e150a587b967d798f4fdff3257823dda28eedd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 14:56:15 +0000
Subject: [PATCH 81/82] Update dependency eslint to v8.29.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b703207887..f0e4eb3712 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21612,8 +21612,8 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^8.6.0":
-  version: 8.28.0
-  resolution: "eslint@npm:8.28.0"
+  version: 8.29.0
+  resolution: "eslint@npm:8.29.0"
   dependencies:
     "@eslint/eslintrc": ^1.3.3
     "@humanwhocodes/config-array": ^0.11.6
@@ -21656,7 +21656,7 @@ __metadata:
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 1b793486b2ec80f0602d75fff7116f7c39a3286f523608a999eead9bec4154a06841785d2b4fb87f8292a94cf85778c1dbfaec727772a09c4d604fdb9ff0809a
+  checksum: e05204b05907b82d910983995cb946e0ba62ca514eb2b6791c43f623333b143564a2eee0139909d31c10935c21877d815b1f76dd674a59cb91c471064325c4ab
   languageName: node
   linkType: hard
 

From f439d72139b132026e91dff2b581bdf40dc7a0c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 14:57:22 +0000
Subject: [PATCH 82/82] Update dependency lint-staged to v13.1.0

Signed-off-by: Renovate Bot <bot@renovateapp.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b703207887..1b2e472a2e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27223,8 +27223,8 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^13.0.0":
-  version: 13.0.4
-  resolution: "lint-staged@npm:13.0.4"
+  version: 13.1.0
+  resolution: "lint-staged@npm:13.1.0"
   dependencies:
     cli-truncate: ^3.1.0
     colorette: ^2.0.19
@@ -27241,7 +27241,7 @@ __metadata:
     yaml: ^2.1.3
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 4676172df5dc734a7f409ad786a72d39bd2239de8b2e5eb1d99eaa751479f60f7b4ef85c8508698855b51b125a512f395ac6a3c7d2d57de8e8221e0aaaab6f4f
+  checksum: adf20c4ca9285c4a93b06598b970d71b04cfe58a1a4c9006f753b83e02c1c622d1866c32a4f1e7e29a98091c501eac3345f7678af247b4f97d5be88b3d8727c1
   languageName: node
   linkType: hard