From 8a63e6a523e4f4f2bb436d3aefbdce2d22908a5c Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Thu, 10 Jun 2021 12:48:41 +0200 Subject: [PATCH] Rename from `plugin-catalog-backend-extension-msgraph` to `plugin-catalog-backend-module-msgraph` Signed-off-by: Oliver Sand --- .changeset/metal-badgers-carry.md | 4 ++-- .changeset/silent-ways-laugh.md | 2 +- packages/backend/package.json | 2 +- packages/backend/src/plugins/catalog.ts | 2 +- .../.eslintrc.js | 0 .../README.md | 4 ++-- .../config.d.ts | 0 .../package.json | 4 ++-- .../src/index.ts | 0 .../src/microsoftGraph/client.test.ts | 0 .../src/microsoftGraph/client.ts | 0 .../src/microsoftGraph/config.test.ts | 0 .../src/microsoftGraph/config.ts | 0 .../src/microsoftGraph/constants.ts | 0 .../src/microsoftGraph/helper.test.ts | 0 .../src/microsoftGraph/helper.ts | 0 .../src/microsoftGraph/index.ts | 0 .../src/microsoftGraph/org.test.ts | 0 .../src/microsoftGraph/org.ts | 0 .../src/microsoftGraph/read.test.ts | 0 .../src/microsoftGraph/read.ts | 0 .../src/microsoftGraph/types.ts | 0 .../src/processors/MicrosoftGraphOrgReaderProcessor.ts | 0 .../src/processors/index.ts | 0 .../src/setupTests.ts | 0 .../ingestion/processors/MicrosoftGraphOrgReaderProcessor.ts | 4 ++-- 26 files changed, 11 insertions(+), 11 deletions(-) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/.eslintrc.js (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/README.md (94%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/config.d.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/package.json (90%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/index.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/client.test.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/client.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/config.test.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/config.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/constants.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/helper.test.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/helper.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/index.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/org.test.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/org.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/read.test.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/read.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/microsoftGraph/types.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/processors/MicrosoftGraphOrgReaderProcessor.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/processors/index.ts (100%) rename plugins/{catalog-backend-extension-msgraph => catalog-backend-module-msgraph}/src/setupTests.ts (100%) diff --git a/.changeset/metal-badgers-carry.md b/.changeset/metal-badgers-carry.md index 17592e062f..8d0cc3715d 100644 --- a/.changeset/metal-badgers-carry.md +++ b/.changeset/metal-badgers-carry.md @@ -1,10 +1,10 @@ --- '@backstage/plugin-catalog-backend': patch -'@backstage/plugin-catalog-backend-extension-msgraph': patch +'@backstage/plugin-catalog-backend-module-msgraph': patch --- Move `MicrosoftGraphOrgReaderProcessor` from `@backstage/plugin-catalog-backend` -to `@backstage/plugin-catalog-backend-extension-msgraph`. +to `@backstage/plugin-catalog-backend-module-msgraph`. For now `MicrosoftGraphOrgReaderProcessor` is only deprecated in `@backstage/plugin-catalog-backend`, but will be removed in the future. While it diff --git a/.changeset/silent-ways-laugh.md b/.changeset/silent-ways-laugh.md index cdb28a520c..ea152c68ef 100644 --- a/.changeset/silent-ways-laugh.md +++ b/.changeset/silent-ways-laugh.md @@ -1,5 +1,5 @@ --- -'@backstage/plugin-catalog-backend-extension-msgraph': patch +'@backstage/plugin-catalog-backend-module-msgraph': patch --- Allow customizations of `MicrosoftGraphOrgReaderProcessor` by passing an diff --git a/packages/backend/package.json b/packages/backend/package.json index b0fb1ec9d4..aceace8764 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -36,7 +36,7 @@ "@backstage/plugin-auth-backend": "^0.3.12", "@backstage/plugin-badges-backend": "^0.1.6", "@backstage/plugin-catalog-backend": "^0.10.2", - "@backstage/plugin-catalog-backend-extension-msgraph": "^0.1.0", + "@backstage/plugin-catalog-backend-module-msgraph": "^0.1.0", "@backstage/plugin-code-coverage-backend": "^0.1.6", "@backstage/plugin-graphql-backend": "^0.1.8", "@backstage/plugin-kubernetes-backend": "^0.3.8", diff --git a/packages/backend/src/plugins/catalog.ts b/packages/backend/src/plugins/catalog.ts index 57afe4fefd..e64fd1f2da 100644 --- a/packages/backend/src/plugins/catalog.ts +++ b/packages/backend/src/plugins/catalog.ts @@ -16,7 +16,7 @@ import { CatalogBuilder, - createRouter, + createRouter } from '@backstage/plugin-catalog-backend'; import { Router } from 'express'; import { PluginEnvironment } from '../types'; diff --git a/plugins/catalog-backend-extension-msgraph/.eslintrc.js b/plugins/catalog-backend-module-msgraph/.eslintrc.js similarity index 100% rename from plugins/catalog-backend-extension-msgraph/.eslintrc.js rename to plugins/catalog-backend-module-msgraph/.eslintrc.js diff --git a/plugins/catalog-backend-extension-msgraph/README.md b/plugins/catalog-backend-module-msgraph/README.md similarity index 94% rename from plugins/catalog-backend-extension-msgraph/README.md rename to plugins/catalog-backend-module-msgraph/README.md index 8296d277df..e2f13ebac3 100644 --- a/plugins/catalog-backend-extension-msgraph/README.md +++ b/plugins/catalog-backend-module-msgraph/README.md @@ -8,13 +8,13 @@ users and groups from Office 365. ## Getting Started 1. The processor is not installed by default, therefore you have to add a - dependency to `@backstage/plugin-catalog-backend-extension-msgraph` to your + dependency to `@backstage/plugin-catalog-backend-module-msgraph` to your backend package. ```bash # From your Backstage root directory cd packages/backend -yarn add @backstage/plugin-catalog-backend-extension-msgraph +yarn add @backstage/plugin-catalog-backend-module-msgraph ``` 2. The `MicrosoftGraphOrgReaderProcessor` is not registered by default, so you have to register it in the catalog plugin: diff --git a/plugins/catalog-backend-extension-msgraph/config.d.ts b/plugins/catalog-backend-module-msgraph/config.d.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/config.d.ts rename to plugins/catalog-backend-module-msgraph/config.d.ts diff --git a/plugins/catalog-backend-extension-msgraph/package.json b/plugins/catalog-backend-module-msgraph/package.json similarity index 90% rename from plugins/catalog-backend-extension-msgraph/package.json rename to plugins/catalog-backend-module-msgraph/package.json index 9feb8e973f..65794cbd91 100644 --- a/plugins/catalog-backend-extension-msgraph/package.json +++ b/plugins/catalog-backend-module-msgraph/package.json @@ -1,5 +1,5 @@ { - "name": "@backstage/plugin-catalog-backend-extension-msgraph", + "name": "@backstage/plugin-catalog-backend-module-msgraph", "version": "0.1.0", "main": "src/index.ts", "types": "src/index.ts", @@ -14,7 +14,7 @@ "repository": { "type": "git", "url": "https://github.com/backstage/backstage", - "directory": "plugins/catalog-backend-extension-msgraph" + "directory": "plugins/catalog-backend-module-msgraph" }, "keywords": [ "backstage" diff --git a/plugins/catalog-backend-extension-msgraph/src/index.ts b/plugins/catalog-backend-module-msgraph/src/index.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/index.ts rename to plugins/catalog-backend-module-msgraph/src/index.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/client.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/client.test.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.test.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/client.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/client.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/client.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/config.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/config.test.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.test.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/config.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/config.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/config.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/constants.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/constants.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/constants.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/constants.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/helper.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.test.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/helper.test.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.test.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/helper.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/helper.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/index.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/index.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/index.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/index.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/org.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/org.test.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/org.test.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/org.test.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/org.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/org.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/org.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/org.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/read.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/read.test.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.test.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/read.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/read.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/read.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/microsoftGraph/types.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/types.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/microsoftGraph/types.ts rename to plugins/catalog-backend-module-msgraph/src/microsoftGraph/types.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts b/plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts rename to plugins/catalog-backend-module-msgraph/src/processors/MicrosoftGraphOrgReaderProcessor.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/processors/index.ts b/plugins/catalog-backend-module-msgraph/src/processors/index.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/processors/index.ts rename to plugins/catalog-backend-module-msgraph/src/processors/index.ts diff --git a/plugins/catalog-backend-extension-msgraph/src/setupTests.ts b/plugins/catalog-backend-module-msgraph/src/setupTests.ts similarity index 100% rename from plugins/catalog-backend-extension-msgraph/src/setupTests.ts rename to plugins/catalog-backend-module-msgraph/src/setupTests.ts diff --git a/plugins/catalog-backend/src/ingestion/processors/MicrosoftGraphOrgReaderProcessor.ts b/plugins/catalog-backend/src/ingestion/processors/MicrosoftGraphOrgReaderProcessor.ts index a25b3bc506..40a7251fcf 100644 --- a/plugins/catalog-backend/src/ingestion/processors/MicrosoftGraphOrgReaderProcessor.ts +++ b/plugins/catalog-backend/src/ingestion/processors/MicrosoftGraphOrgReaderProcessor.ts @@ -33,7 +33,7 @@ import { CatalogProcessor, CatalogProcessorEmit } from './types'; * Extracts teams and users out of a the Microsoft Graph API. * * @deprecated Use the MicrosoftGraphOrgReaderProcessor from package - * @backstage/plugin-catalog-backend-extension-msgraph instead. + * @backstage/plugin-catalog-backend-module-msgraph instead. */ export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor { private readonly providers: MicrosoftGraphProviderConfig[]; @@ -65,7 +65,7 @@ export class MicrosoftGraphOrgReaderProcessor implements CatalogProcessor { } this.logger.warn( - 'MicrosoftGraphOrgReaderProcessor from @backstage/plugin-catalog is deprecated and will be removed in the future. Please migrate to the new one from @backstage/plugin-catalog-backend-extension-msgraph instead.', + 'MicrosoftGraphOrgReaderProcessor from @backstage/plugin-catalog is deprecated and will be removed in the future. Please migrate to the new one from @backstage/plugin-catalog-backend-module-msgraph instead.', ); const provider = this.providers.find(p =>