@backstage/plugin-catalog-backend-module-github 0.12.1-next.1 → 0.12.2-next.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @backstage/plugin-catalog-backend-module-github
 
+## 0.12.2-next.0
+
+### Patch Changes
+
+- cfd8103: Updated imports to use stable catalog extension points from `@backstage/plugin-catalog-node` instead of the deprecated alpha exports.
+- 7455dae: Use node prefix on native imports
+- Updated dependencies
+  - @backstage/plugin-catalog-node@1.21.0-next.0
+  - @backstage/backend-plugin-api@1.7.0-next.0
+  - @backstage/integration@1.19.3-next.0
+  - @backstage/plugin-events-node@0.4.19-next.0
+  - @backstage/catalog-model@1.7.6
+  - @backstage/config@1.3.6
+  - @backstage/plugin-catalog-common@1.1.8-next.0
+
+## 0.12.1
+
+### Patch Changes
+
+- cb4b907: Improved efficiency of `GithubOrgEntityProvider` membership event handling and edit team. The provider now fetches only the specific user's teams instead of all organization users when processing membership events, and uses `addEntitiesOperation` instead of `replaceEntitiesOperation` to avoid unnecessary entity deletions.
+- Updated dependencies
+  - @backstage/backend-plugin-api@1.6.1
+  - @backstage/integration@1.19.2
+
 ## 0.12.1-next.1
 
 ### Patch Changes

package/dist/analyzers/GithubLocationAnalyzer.cjs.js

@@ -4,7 +4,7 @@ var integration = require('@backstage/integration');
 var rest = require('@octokit/rest');
 var lodash = require('lodash');
 var parseGitUrl = require('git-url-parse');
-var path = require('path');
+var node_path = require('node:path');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -29,7 +29,7 @@ class GithubLocationAnalyzer {
     const { url, catalogFilename } = options;
     const { owner, name: repo } = parseGitUrl__default.default(url);
     const catalogFile = catalogFilename || "catalog-info.yaml";
-    const extension = path.extname(catalogFile);
+    const extension = node_path.extname(catalogFile);
     const extensionQuery = !lodash.isEmpty(extension) ? `extension:${extension.replace(".", "")}` : "";
     const query = `filename:${catalogFile} ${extensionQuery} repo:${owner}/${repo}`;
     const integration = this.integrations.github.byUrl(url);

package/dist/analyzers/GithubLocationAnalyzer.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"GithubLocationAnalyzer.cjs.js","sources":["../../src/analyzers/GithubLocationAnalyzer.ts"],"sourcesContent":["/*\n * Copyright 2022 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  DefaultGithubCredentialsProvider,\n  GithubCredentialsProvider,\n  ScmIntegrationRegistry,\n  ScmIntegrations,\n} from '@backstage/integration';\nimport { Octokit } from '@octokit/rest';\nimport { isEmpty, trimEnd } from 'lodash';\nimport parseGitUrl from 'git-url-parse';\nimport {\n  AnalyzeOptions,\n  CatalogService,\n  ScmLocationAnalyzer,\n} from '@backstage/plugin-catalog-node';\nimport { Config } from '@backstage/config';\nimport { AuthService } from '@backstage/backend-plugin-api';\nimport { extname } from 'path';\n\n/** @public */\nexport type GithubLocationAnalyzerOptions = {\n  config: Config;\n  auth: AuthService;\n  githubCredentialsProvider?: GithubCredentialsProvider;\n  catalog: CatalogService;\n};\n\n/** @public */\nexport class GithubLocationAnalyzer implements ScmLocationAnalyzer {\n  private readonly catalogClient: CatalogService;\n  private readonly githubCredentialsProvider: GithubCredentialsProvider;\n  private readonly integrations: ScmIntegrationRegistry;\n  private readonly auth: AuthService;\n\n  constructor(options: GithubLocationAnalyzerOptions) {\n    this.catalogClient = options.catalog;\n    this.integrations = ScmIntegrations.fromConfig(options.config);\n    this.githubCredentialsProvider =\n      options.githubCredentialsProvider ||\n      DefaultGithubCredentialsProvider.fromIntegrations(this.integrations);\n\n    this.auth = options.auth;\n  }\n\n  supports(url: string) {\n    const integration = this.integrations.byUrl(url);\n    return integration?.type === 'github';\n  }\n\n  async analyze(options: AnalyzeOptions) {\n    const { url, catalogFilename } = options;\n    const { owner, name: repo } = parseGitUrl(url);\n\n    const catalogFile = catalogFilename || 'catalog-info.yaml';\n    const extension = extname(catalogFile);\n    const extensionQuery = !isEmpty(extension)\n      ? `extension:${extension.replace('.', '')}`\n      : '';\n\n    const query = `filename:${catalogFile} ${extensionQuery} repo:${owner}/${repo}`;\n\n    const integration = this.integrations.github.byUrl(url);\n    if (!integration) {\n      throw new Error('Make sure you have a GitHub integration configured');\n    }\n\n    const { token: githubToken } =\n      await this.githubCredentialsProvider.getCredentials({\n        url,\n      });\n\n    const octokitClient = new Octokit({\n      auth: githubToken,\n      baseUrl: integration.config.apiBaseUrl,\n    });\n\n    const searchResult = await octokitClient.search\n      .code({ q: query })\n      .catch(e => {\n        throw new Error(`Couldn't search repository for metadata file, ${e}`);\n      });\n\n    const exists = searchResult.data.total_count > 0;\n    if (exists) {\n      const repoInformation = await octokitClient.repos\n        .get({ owner, repo })\n        .catch(e => {\n          throw new Error(`Couldn't fetch repo data, ${e}`);\n        });\n      const defaultBranch = repoInformation.data.default_branch;\n\n      const result = await Promise.all(\n        searchResult.data.items\n          .map(i => `${trimEnd(url, '/')}/blob/${defaultBranch}/${i.path}`)\n          .map(async target => {\n            const addLocationResult = await this.catalogClient.addLocation(\n              {\n                type: 'url',\n                target,\n                dryRun: true,\n              },\n              { credentials: await this.auth.getOwnServiceCredentials() },\n            );\n            return addLocationResult.entities.map(e => ({\n              location: { type: 'url', target },\n              isRegistered: !!addLocationResult.exists,\n              entity: e,\n            }));\n          }),\n      );\n\n      return { existing: result.flat() };\n    }\n    return { existing: [] };\n  }\n}\n"],"names":["ScmIntegrations","DefaultGithubCredentialsProvider","parseGitUrl","extname","isEmpty","Octokit","trimEnd"],"mappings":";;;;;;;;;;;;AA2CO,MAAM,sBAAA,CAAsD;AAAA,EAChD,aAAA;AAAA,EACA,yBAAA;AAAA,EACA,YAAA;AAAA,EACA,IAAA;AAAA,EAEjB,YAAY,OAAA,EAAwC;AAClD,IAAA,IAAA,CAAK,gBAAgB,OAAA,CAAQ,OAAA;AAC7B,IAAA,IAAA,CAAK,YAAA,GAAeA,2BAAA,CAAgB,UAAA,CAAW,OAAA,CAAQ,MAAM,CAAA;AAC7D,IAAA,IAAA,CAAK,4BACH,OAAA,CAAQ,yBAAA,IACRC,4CAAA,CAAiC,gBAAA,CAAiB,KAAK,YAAY,CAAA;AAErE,IAAA,IAAA,CAAK,OAAO,OAAA,CAAQ,IAAA;AAAA,EACtB;AAAA,EAEA,SAAS,GAAA,EAAa;AACpB,IAAA,MAAM,WAAA,GAAc,IAAA,CAAK,YAAA,CAAa,KAAA,CAAM,GAAG,CAAA;AAC/C,IAAA,OAAO,aAAa,IAAA,KAAS,QAAA;AAAA,EAC/B;AAAA,EAEA,MAAM,QAAQ,OAAA,EAAyB;AACrC,IAAA,MAAM,EAAE,GAAA,EAAK,eAAA,EAAgB,GAAI,OAAA;AACjC,IAAA,MAAM,EAAE,KAAA,EAAO,IAAA,EAAM,IAAA,EAAK,GAAIC,6BAAY,GAAG,CAAA;AAE7C,IAAA,MAAM,cAAc,eAAA,IAAmB,mBAAA;AACvC,IAAA,MAAM,SAAA,GAAYC,aAAQ,WAAW,CAAA;AACrC,IAAA,MAAM,cAAA,GAAiB,CAACC,cAAA,CAAQ,SAAS,CAAA,GACrC,CAAA,UAAA,EAAa,SAAA,CAAU,OAAA,CAAQ,GAAA,EAAK,EAAE,CAAC,CAAA,CAAA,GACvC,EAAA;AAEJ,IAAA,MAAM,KAAA,GAAQ,YAAY,WAAW,CAAA,CAAA,EAAI,cAAc,CAAA,MAAA,EAAS,KAAK,IAAI,IAAI,CAAA,CAAA;AAE7E,IAAA,MAAM,WAAA,GAAc,IAAA,CAAK,YAAA,CAAa,MAAA,CAAO,MAAM,GAAG,CAAA;AACtD,IAAA,IAAI,CAAC,WAAA,EAAa;AAChB,MAAA,MAAM,IAAI,MAAM,oDAAoD,CAAA;AAAA,IACtE;AAEA,IAAA,MAAM,EAAE,KAAA,EAAO,WAAA,KACb,MAAM,IAAA,CAAK,0BAA0B,cAAA,CAAe;AAAA,MAClD;AAAA,KACD,CAAA;AAEH,IAAA,MAAM,aAAA,GAAgB,IAAIC,YAAA,CAAQ;AAAA,MAChC,IAAA,EAAM,WAAA;AAAA,MACN,OAAA,EAAS,YAAY,MAAA,CAAO;AAAA,KAC7B,CAAA;AAED,IAAA,MAAM,YAAA,GAAe,MAAM,aAAA,CAAc,MAAA,CACtC,IAAA,CAAK,EAAE,CAAA,EAAG,KAAA,EAAO,CAAA,CACjB,KAAA,CAAM,CAAA,CAAA,KAAK;AACV,MAAA,MAAM,IAAI,KAAA,CAAM,CAAA,8CAAA,EAAiD,CAAC,CAAA,CAAE,CAAA;AAAA,IACtE,CAAC,CAAA;AAEH,IAAA,MAAM,MAAA,GAAS,YAAA,CAAa,IAAA,CAAK,WAAA,GAAc,CAAA;AAC/C,IAAA,IAAI,MAAA,EAAQ;AACV,MAAA,MAAM,eAAA,GAAkB,MAAM,aAAA,CAAc,KAAA,CACzC,GAAA,CAAI,EAAE,KAAA,EAAO,IAAA,EAAM,CAAA,CACnB,KAAA,CAAM,CAAA,CAAA,KAAK;AACV,QAAA,MAAM,IAAI,KAAA,CAAM,CAAA,0BAAA,EAA6B,CAAC,CAAA,CAAE,CAAA;AAAA,MAClD,CAAC,CAAA;AACH,MAAA,MAAM,aAAA,GAAgB,gBAAgB,IAAA,CAAK,cAAA;AAE3C,MAAA,MAAM,MAAA,GAAS,MAAM,OAAA,CAAQ,GAAA;AAAA,QAC3B,aAAa,IAAA,CAAK,KAAA,CACf,IAAI,CAAA,CAAA,KAAK,CAAA,EAAGC,eAAQ,GAAA,EAAK,GAAG,CAAC,CAAA,MAAA,EAAS,aAAa,IAAI,CAAA,CAAE,IAAI,EAAE,CAAA,CAC/D,GAAA,CAAI,OAAM,MAAA,KAAU;AACnB,UAAA,MAAM,iBAAA,GAAoB,MAAM,IAAA,CAAK,aAAA,CAAc,WAAA;AAAA,YACjD;AAAA,cACE,IAAA,EAAM,KAAA;AAAA,cACN,MAAA;AAAA,cACA,MAAA,EAAQ;AAAA,aACV;AAAA,YACA,EAAE,WAAA,EAAa,MAAM,IAAA,CAAK,IAAA,CAAK,0BAAyB;AAAE,WAC5D;AACA,UAAA,OAAO,iBAAA,CAAkB,QAAA,CAAS,GAAA,CAAI,CAAA,CAAA,MAAM;AAAA,YAC1C,QAAA,EAAU,EAAE,IAAA,EAAM,KAAA,EAAO,MAAA,EAAO;AAAA,YAChC,YAAA,EAAc,CAAC,CAAC,iBAAA,CAAkB,MAAA;AAAA,YAClC,MAAA,EAAQ;AAAA,WACV,CAAE,CAAA;AAAA,QACJ,CAAC;AAAA,OACL;AAEA,MAAA,OAAO,EAAE,QAAA,EAAU,MAAA,CAAO,IAAA,EAAK,EAAE;AAAA,IACnC;AACA,IAAA,OAAO,EAAE,QAAA,EAAU,EAAC,EAAE;AAAA,EACxB;AACF;;;;"}
+{"version":3,"file":"GithubLocationAnalyzer.cjs.js","sources":["../../src/analyzers/GithubLocationAnalyzer.ts"],"sourcesContent":["/*\n * Copyright 2022 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  DefaultGithubCredentialsProvider,\n  GithubCredentialsProvider,\n  ScmIntegrationRegistry,\n  ScmIntegrations,\n} from '@backstage/integration';\nimport { Octokit } from '@octokit/rest';\nimport { isEmpty, trimEnd } from 'lodash';\nimport parseGitUrl from 'git-url-parse';\nimport {\n  AnalyzeOptions,\n  CatalogService,\n  ScmLocationAnalyzer,\n} from '@backstage/plugin-catalog-node';\nimport { Config } from '@backstage/config';\nimport { AuthService } from '@backstage/backend-plugin-api';\nimport { extname } from 'node:path';\n\n/** @public */\nexport type GithubLocationAnalyzerOptions = {\n  config: Config;\n  auth: AuthService;\n  githubCredentialsProvider?: GithubCredentialsProvider;\n  catalog: CatalogService;\n};\n\n/** @public */\nexport class GithubLocationAnalyzer implements ScmLocationAnalyzer {\n  private readonly catalogClient: CatalogService;\n  private readonly githubCredentialsProvider: GithubCredentialsProvider;\n  private readonly integrations: ScmIntegrationRegistry;\n  private readonly auth: AuthService;\n\n  constructor(options: GithubLocationAnalyzerOptions) {\n    this.catalogClient = options.catalog;\n    this.integrations = ScmIntegrations.fromConfig(options.config);\n    this.githubCredentialsProvider =\n      options.githubCredentialsProvider ||\n      DefaultGithubCredentialsProvider.fromIntegrations(this.integrations);\n\n    this.auth = options.auth;\n  }\n\n  supports(url: string) {\n    const integration = this.integrations.byUrl(url);\n    return integration?.type === 'github';\n  }\n\n  async analyze(options: AnalyzeOptions) {\n    const { url, catalogFilename } = options;\n    const { owner, name: repo } = parseGitUrl(url);\n\n    const catalogFile = catalogFilename || 'catalog-info.yaml';\n    const extension = extname(catalogFile);\n    const extensionQuery = !isEmpty(extension)\n      ? `extension:${extension.replace('.', '')}`\n      : '';\n\n    const query = `filename:${catalogFile} ${extensionQuery} repo:${owner}/${repo}`;\n\n    const integration = this.integrations.github.byUrl(url);\n    if (!integration) {\n      throw new Error('Make sure you have a GitHub integration configured');\n    }\n\n    const { token: githubToken } =\n      await this.githubCredentialsProvider.getCredentials({\n        url,\n      });\n\n    const octokitClient = new Octokit({\n      auth: githubToken,\n      baseUrl: integration.config.apiBaseUrl,\n    });\n\n    const searchResult = await octokitClient.search\n      .code({ q: query })\n      .catch(e => {\n        throw new Error(`Couldn't search repository for metadata file, ${e}`);\n      });\n\n    const exists = searchResult.data.total_count > 0;\n    if (exists) {\n      const repoInformation = await octokitClient.repos\n        .get({ owner, repo })\n        .catch(e => {\n          throw new Error(`Couldn't fetch repo data, ${e}`);\n        });\n      const defaultBranch = repoInformation.data.default_branch;\n\n      const result = await Promise.all(\n        searchResult.data.items\n          .map(i => `${trimEnd(url, '/')}/blob/${defaultBranch}/${i.path}`)\n          .map(async target => {\n            const addLocationResult = await this.catalogClient.addLocation(\n              {\n                type: 'url',\n                target,\n                dryRun: true,\n              },\n              { credentials: await this.auth.getOwnServiceCredentials() },\n            );\n            return addLocationResult.entities.map(e => ({\n              location: { type: 'url', target },\n              isRegistered: !!addLocationResult.exists,\n              entity: e,\n            }));\n          }),\n      );\n\n      return { existing: result.flat() };\n    }\n    return { existing: [] };\n  }\n}\n"],"names":["ScmIntegrations","DefaultGithubCredentialsProvider","parseGitUrl","extname","isEmpty","Octokit","trimEnd"],"mappings":"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"}

package/dist/module/githubCatalogModule.cjs.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var backendPluginApi = require('@backstage/backend-plugin-api');
-var alpha = require('@backstage/plugin-catalog-node/alpha');
 var pluginCatalogNode = require('@backstage/plugin-catalog-node');
 var pluginEventsNode = require('@backstage/plugin-events-node');
 var GithubEntityProvider = require('../providers/GithubEntityProvider.cjs.js');
@@ -13,9 +12,9 @@ const githubCatalogModule = backendPluginApi.createBackendModule({
   register(env) {
     env.registerInit({
       deps: {
-        catalogAnalyzers: alpha.catalogAnalysisExtensionPoint,
+        catalogAnalyzers: pluginCatalogNode.catalogAnalysisExtensionPoint,
         auth: backendPluginApi.coreServices.auth,
-        catalogProcessing: alpha.catalogProcessingExtensionPoint,
+        catalogProcessing: pluginCatalogNode.catalogProcessingExtensionPoint,
         config: backendPluginApi.coreServices.rootConfig,
         events: pluginEventsNode.eventsServiceRef,
         logger: backendPluginApi.coreServices.logger,

package/dist/module/githubCatalogModule.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"githubCatalogModule.cjs.js","sources":["../../src/module/githubCatalogModule.ts"],"sourcesContent":["/*\n * Copyright 2022 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  coreServices,\n  createBackendModule,\n} from '@backstage/backend-plugin-api';\nimport {\n  catalogAnalysisExtensionPoint,\n  catalogProcessingExtensionPoint,\n} from '@backstage/plugin-catalog-node/alpha';\nimport { catalogServiceRef } from '@backstage/plugin-catalog-node';\nimport { eventsServiceRef } from '@backstage/plugin-events-node';\nimport { GithubEntityProvider } from '../providers/GithubEntityProvider';\nimport { GithubLocationAnalyzer } from '../analyzers/GithubLocationAnalyzer';\n\n/**\n * Registers the `GithubEntityProvider` with the catalog processing extension point.\n *\n * @public\n */\nexport const githubCatalogModule = createBackendModule({\n  pluginId: 'catalog',\n  moduleId: 'github',\n  register(env) {\n    env.registerInit({\n      deps: {\n        catalogAnalyzers: catalogAnalysisExtensionPoint,\n        auth: coreServices.auth,\n        catalogProcessing: catalogProcessingExtensionPoint,\n        config: coreServices.rootConfig,\n        events: eventsServiceRef,\n        logger: coreServices.logger,\n        scheduler: coreServices.scheduler,\n        catalog: catalogServiceRef,\n      },\n      async init({\n        catalogProcessing,\n        config,\n        events,\n        logger,\n        scheduler,\n        catalogAnalyzers,\n        auth,\n        catalog,\n      }) {\n        catalogAnalyzers.addScmLocationAnalyzer(\n          new GithubLocationAnalyzer({\n            config,\n            auth,\n            catalog,\n          }),\n        );\n\n        catalogProcessing.addEntityProvider(\n          GithubEntityProvider.fromConfig(config, {\n            events,\n            logger,\n            scheduler,\n          }),\n        );\n      },\n    });\n  },\n});\n"],"names":["createBackendModule","catalogAnalysisExtensionPoint","coreServices","catalogProcessingExtensionPoint","eventsServiceRef","catalogServiceRef","GithubLocationAnalyzer","GithubEntityProvider"],"mappings":";;;;;;;;;AAkCO,MAAM,sBAAsBA,oCAAA,CAAoB;AAAA,EACrD,QAAA,EAAU,SAAA;AAAA,EACV,QAAA,EAAU,QAAA;AAAA,EACV,SAAS,GAAA,EAAK;AACZ,IAAA,GAAA,CAAI,YAAA,CAAa;AAAA,MACf,IAAA,EAAM;AAAA,QACJ,gBAAA,EAAkBC,mCAAA;AAAA,QAClB,MAAMC,6BAAA,CAAa,IAAA;AAAA,QACnB,iBAAA,EAAmBC,qCAAA;AAAA,QACnB,QAAQD,6BAAA,CAAa,UAAA;AAAA,QACrB,MAAA,EAAQE,iCAAA;AAAA,QACR,QAAQF,6BAAA,CAAa,MAAA;AAAA,QACrB,WAAWA,6BAAA,CAAa,SAAA;AAAA,QACxB,OAAA,EAASG;AAAA,OACX;AAAA,MACA,MAAM,IAAA,CAAK;AAAA,QACT,iBAAA;AAAA,QACA,MAAA;AAAA,QACA,MAAA;AAAA,QACA,MAAA;AAAA,QACA,SAAA;AAAA,QACA,gBAAA;AAAA,QACA,IAAA;AAAA,QACA;AAAA,OACF,EAAG;AACD,QAAA,gBAAA,CAAiB,sBAAA;AAAA,UACf,IAAIC,6CAAA,CAAuB;AAAA,YACzB,MAAA;AAAA,YACA,IAAA;AAAA,YACA;AAAA,WACD;AAAA,SACH;AAEA,QAAA,iBAAA,CAAkB,iBAAA;AAAA,UAChBC,yCAAA,CAAqB,WAAW,MAAA,EAAQ;AAAA,YACtC,MAAA;AAAA,YACA,MAAA;AAAA,YACA;AAAA,WACD;AAAA,SACH;AAAA,MACF;AAAA,KACD,CAAA;AAAA,EACH;AACF,CAAC;;;;"}
+{"version":3,"file":"githubCatalogModule.cjs.js","sources":["../../src/module/githubCatalogModule.ts"],"sourcesContent":["/*\n * Copyright 2022 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  coreServices,\n  createBackendModule,\n} from '@backstage/backend-plugin-api';\nimport {\n  catalogAnalysisExtensionPoint,\n  catalogProcessingExtensionPoint,\n} from '@backstage/plugin-catalog-node';\nimport { catalogServiceRef } from '@backstage/plugin-catalog-node';\nimport { eventsServiceRef } from '@backstage/plugin-events-node';\nimport { GithubEntityProvider } from '../providers/GithubEntityProvider';\nimport { GithubLocationAnalyzer } from '../analyzers/GithubLocationAnalyzer';\n\n/**\n * Registers the `GithubEntityProvider` with the catalog processing extension point.\n *\n * @public\n */\nexport const githubCatalogModule = createBackendModule({\n  pluginId: 'catalog',\n  moduleId: 'github',\n  register(env) {\n    env.registerInit({\n      deps: {\n        catalogAnalyzers: catalogAnalysisExtensionPoint,\n        auth: coreServices.auth,\n        catalogProcessing: catalogProcessingExtensionPoint,\n        config: coreServices.rootConfig,\n        events: eventsServiceRef,\n        logger: coreServices.logger,\n        scheduler: coreServices.scheduler,\n        catalog: catalogServiceRef,\n      },\n      async init({\n        catalogProcessing,\n        config,\n        events,\n        logger,\n        scheduler,\n        catalogAnalyzers,\n        auth,\n        catalog,\n      }) {\n        catalogAnalyzers.addScmLocationAnalyzer(\n          new GithubLocationAnalyzer({\n            config,\n            auth,\n            catalog,\n          }),\n        );\n\n        catalogProcessing.addEntityProvider(\n          GithubEntityProvider.fromConfig(config, {\n            events,\n            logger,\n            scheduler,\n          }),\n        );\n      },\n    });\n  },\n});\n"],"names":["createBackendModule","catalogAnalysisExtensionPoint","coreServices","catalogProcessingExtensionPoint","eventsServiceRef","catalogServiceRef","GithubLocationAnalyzer","GithubEntityProvider"],"mappings":";;;;;;;;AAkCO,MAAM,sBAAsBA,oCAAA,CAAoB;AAAA,EACrD,QAAA,EAAU,SAAA;AAAA,EACV,QAAA,EAAU,QAAA;AAAA,EACV,SAAS,GAAA,EAAK;AACZ,IAAA,GAAA,CAAI,YAAA,CAAa;AAAA,MACf,IAAA,EAAM;AAAA,QACJ,gBAAA,EAAkBC,+CAAA;AAAA,QAClB,MAAMC,6BAAA,CAAa,IAAA;AAAA,QACnB,iBAAA,EAAmBC,iDAAA;AAAA,QACnB,QAAQD,6BAAA,CAAa,UAAA;AAAA,QACrB,MAAA,EAAQE,iCAAA;AAAA,QACR,QAAQF,6BAAA,CAAa,MAAA;AAAA,QACrB,WAAWA,6BAAA,CAAa,SAAA;AAAA,QACxB,OAAA,EAASG;AAAA,OACX;AAAA,MACA,MAAM,IAAA,CAAK;AAAA,QACT,iBAAA;AAAA,QACA,MAAA;AAAA,QACA,MAAA;AAAA,QACA,MAAA;AAAA,QACA,SAAA;AAAA,QACA,gBAAA;AAAA,QACA,IAAA;AAAA,QACA;AAAA,OACF,EAAG;AACD,QAAA,gBAAA,CAAiB,sBAAA;AAAA,UACf,IAAIC,6CAAA,CAAuB;AAAA,YACzB,MAAA;AAAA,YACA,IAAA;AAAA,YACA;AAAA,WACD;AAAA,SACH;AAEA,QAAA,iBAAA,CAAkB,iBAAA;AAAA,UAChBC,yCAAA,CAAqB,WAAW,MAAA,EAAQ;AAAA,YACtC,MAAA;AAAA,YACA,MAAA;AAAA,YACA;AAAA,WACD;AAAA,SACH;AAAA,MACF;AAAA,KACD,CAAA;AAAA,EACH;AACF,CAAC;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend-module-github",
-  "version": "0.12.1-next.1",
+  "version": "0.12.2-next.0",
   "description": "A Backstage catalog backend module that helps integrate towards GitHub",
   "backstage": {
     "role": "backend-plugin-module",
@@ -65,13 +65,13 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "1.6.0",
+    "@backstage/backend-plugin-api": "1.7.0-next.0",
     "@backstage/catalog-model": "1.7.6",
     "@backstage/config": "1.3.6",
-    "@backstage/integration": "1.19.2-next.0",
-    "@backstage/plugin-catalog-common": "1.1.7",
-    "@backstage/plugin-catalog-node": "1.20.1",
-    "@backstage/plugin-events-node": "0.4.18",
+    "@backstage/integration": "1.19.3-next.0",
+    "@backstage/plugin-catalog-common": "1.1.8-next.0",
+    "@backstage/plugin-catalog-node": "1.21.0-next.0",
+    "@backstage/plugin-events-node": "0.4.19-next.0",
     "@octokit/core": "^5.2.0",
     "@octokit/graphql": "^7.0.2",
     "@octokit/plugin-throttling": "^8.1.3",
@@ -82,8 +82,8 @@
     "uuid": "^11.0.0"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "1.10.3-next.1",
-    "@backstage/cli": "0.35.2-next.1",
+    "@backstage/backend-test-utils": "1.10.4-next.0",
+    "@backstage/cli": "0.35.3-next.0",
     "@types/lodash": "^4.14.151",
     "msw": "^2.0.0",
     "type-fest": "^4.41.0"