Merge pull request #16764 from backstage/freben/rename-catalog-modules

🧹 rename catalog modules to fit naming pattern

.changeset/healthy-buses-live-1.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+---
+
+Renamed `incrementalIngestionEntityProviderCatalogModule` to `catalogModuleIncrementalIngestionEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-2.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-bitbucket-server': patch
+---
+
+Renamed `bitbucketServerEntityProviderCatalogModule` to `catalogModuleBitbucketServerEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-3.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-bitbucket-cloud': patch
+---
+
+Renamed `bitbucketCloudEntityProviderCatalogModule` to `catalogModuleBitbucketCloudEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-4.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+---
+
+Renamed `microsoftGraphOrgEntityProviderCatalogModule` to `catalogModuleMicrosoftGraphOrgEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-5.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-gerrit': patch
+---
+
+Renamed `gerritEntityProviderCatalogModule` to `catalogModuleGerritEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-6.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-github': patch
+---
+
+Renamed `githubEntityProviderCatalogModule` to `catalogModuleGithubEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-7.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-gitlab': patch
+---
+
+Renamed `gitlabDiscoveryEntityProviderCatalogModule` to `catalogModuleGitlabDiscoveryEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-8.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-azure': patch
+---
+
+Renamed `azureDevOpsEntityProviderCatalogModule` to `catalogModuleAzureDevOpsEntityProvider` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

.changeset/healthy-buses-live-9.md

@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend-module-aws': patch
+---
+
+Renamed `awsS3EntityProviderCatalogModule` to `catalogModuleAwsS3EntityProviders` to match the [recommended naming patterns](https://backstage.io/docs/backend-system/architecture/naming-patterns).

plugins/catalog-backend-module-aws/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const awsS3EntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleAwsS3EntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-aws/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { awsS3EntityProviderCatalogModule } from './service/AwsS3EntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.test.ts

@@ -24,10 +24,10 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
-import { awsS3EntityProviderCatalogModule } from './AwsS3EntityProviderCatalogModule';
+import { catalogModuleAwsS3EntityProvider } from './catalogModuleAwsS3EntityProvider';
 import { AwsS3EntityProvider } from '../providers';
 
-describe('awsS3EntityProviderCatalogModule', () => {
+describe('catalogModuleAwsS3EntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<AwsS3EntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -66,7 +66,7 @@ describe('awsS3EntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [awsS3EntityProviderCatalogModule()],
+      features: [catalogModuleAwsS3EntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-aws/src/module/catalogModuleAwsS3EntityProvider.ts

@@ -27,7 +27,7 @@ import { AwsS3EntityProvider } from '../providers';
  *
  * @alpha
  */
-export const awsS3EntityProviderCatalogModule = createBackendModule({
+export const catalogModuleAwsS3EntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'awsS3EntityProvider',
   register(env) {

plugins/catalog-backend-module-aws/src/module/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 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 { catalogModuleAwsS3EntityProvider } from './catalogModuleAwsS3EntityProvider';

plugins/catalog-backend-module-azure/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const azureDevOpsEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleAzureDevOpsEntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-azure/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { azureDevOpsEntityProviderCatalogModule } from './service/AzureDevOpsEntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.test.ts

@@ -24,10 +24,10 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
-import { azureDevOpsEntityProviderCatalogModule } from './AzureDevOpsEntityProviderCatalogModule';
+import { catalogModuleAzureDevOpsEntityProvider } from './catalogModuleAzureDevOpsEntityProvider';
 import { AzureDevOpsEntityProvider } from '../providers';
 
-describe('azureDevOpsEntityProviderCatalogModule', () => {
+describe('catalogModuleAzureDevOpsEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<AzureDevOpsEntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -69,7 +69,7 @@ describe('azureDevOpsEntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [azureDevOpsEntityProviderCatalogModule()],
+      features: [catalogModuleAzureDevOpsEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-azure/src/module/catalogModuleAzureDevOpsEntityProvider.ts

@@ -27,7 +27,7 @@ import { AzureDevOpsEntityProvider } from '../providers';
  *
  * @alpha
  */
-export const azureDevOpsEntityProviderCatalogModule = createBackendModule({
+export const catalogModuleAzureDevOpsEntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'azureDevOpsEntityProvider',
   register(env) {

plugins/catalog-backend-module-azure/src/module/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 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 { catalogModuleAzureDevOpsEntityProvider } from './catalogModuleAzureDevOpsEntityProvider';

plugins/catalog-backend-module-bitbucket-cloud/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-export const bitbucketCloudEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleBitbucketCloudEntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-bitbucket-cloud/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { bitbucketCloudEntityProviderCatalogModule } from './service/BitbucketCloudEntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-bitbucket-cloud/src/index.ts

@@ -20,4 +20,4 @@
  * @packageDocumentation
  */
 
-export { BitbucketCloudEntityProvider } from './BitbucketCloudEntityProvider';
+export { BitbucketCloudEntityProvider } from './providers/BitbucketCloudEntityProvider';

plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.test.ts

@@ -23,10 +23,10 @@ import { startTestBackend, mockServices } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
 import { Duration } from 'luxon';
-import { bitbucketCloudEntityProviderCatalogModule } from './BitbucketCloudEntityProviderCatalogModule';
-import { BitbucketCloudEntityProvider } from '../BitbucketCloudEntityProvider';
+import { catalogModuleBitbucketCloudEntityProvider } from './catalogModuleBitbucketCloudEntityProvider';
+import { BitbucketCloudEntityProvider } from '../providers/BitbucketCloudEntityProvider';
 
-describe('bitbucketCloudEntityProviderCatalogModule', () => {
+describe('catalogModuleBitbucketCloudEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<BitbucketCloudEntityProvider> | undefined;
     let addedSubscribers: Array<BitbucketCloudEntityProvider> | undefined;
@@ -73,7 +73,7 @@ describe('bitbucketCloudEntityProviderCatalogModule', () => {
         }),
         [coreServices.scheduler, scheduler],
       ],
-      features: [bitbucketCloudEntityProviderCatalogModule()],
+      features: [catalogModuleBitbucketCloudEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-bitbucket-cloud/src/module/catalogModuleBitbucketCloudEntityProvider.ts

@@ -24,12 +24,12 @@ import {
   catalogServiceRef,
 } from '@backstage/plugin-catalog-node/alpha';
 import { eventsExtensionPoint } from '@backstage/plugin-events-node/alpha';
-import { BitbucketCloudEntityProvider } from '../BitbucketCloudEntityProvider';
+import { BitbucketCloudEntityProvider } from '../providers/BitbucketCloudEntityProvider';
 
 /**
  * @alpha
  */
-export const bitbucketCloudEntityProviderCatalogModule = createBackendModule({
+export const catalogModuleBitbucketCloudEntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'bitbucketCloudEntityProvider',
   register(env) {

plugins/catalog-backend-module-bitbucket-cloud/src/module/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 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 { catalogModuleBitbucketCloudEntityProvider } from './catalogModuleBitbucketCloudEntityProvider';

plugins/catalog-backend-module-bitbucket-server/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-export const bitbucketServerEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleBitbucketServerEntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-bitbucket-server/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { bitbucketServerEntityProviderCatalogModule } from './service/BitbucketServerEntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.test.ts

@@ -23,11 +23,11 @@ import {
 } from '@backstage/backend-tasks';
 import { startTestBackend } from '@backstage/backend-test-utils';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
-import { bitbucketServerEntityProviderCatalogModule } from './BitbucketServerEntityProviderCatalogModule';
+import { catalogModuleBitbucketServerEntityProvider } from './catalogModuleBitbucketServerEntityProvider';
 import { Duration } from 'luxon';
 import { BitbucketServerEntityProvider } from '../providers';
 
-describe('bitbucketServerEntityProviderCatalogModule', () => {
+describe('catalogModuleBitbucketServerEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<BitbucketServerEntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -73,7 +73,7 @@ describe('bitbucketServerEntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [bitbucketServerEntityProviderCatalogModule()],
+      features: [catalogModuleBitbucketServerEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-bitbucket-server/src/module/catalogModuleBitbucketServerEntityProvider.ts

@@ -25,7 +25,7 @@ import { BitbucketServerEntityProvider } from '../providers';
 /**
  * @alpha
  */
-export const bitbucketServerEntityProviderCatalogModule = createBackendModule({
+export const catalogModuleBitbucketServerEntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'bitbucketServerEntityProvider',
   register(env) {

plugins/catalog-backend-module-bitbucket-server/src/module/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 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 { catalogModuleBitbucketServerEntityProvider } from './catalogModuleBitbucketServerEntityProvider';

plugins/catalog-backend-module-gerrit/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha (undocumented)
-export const gerritEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleGerritEntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-gerrit/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { gerritEntityProviderCatalogModule } from './service/GerritEntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.test.ts

@@ -24,10 +24,10 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
-import { gerritEntityProviderCatalogModule } from './GerritEntityProviderCatalogModule';
+import { catalogModuleGerritEntityProvider } from './catalogModuleGerritEntityProvider';
 import { GerritEntityProvider } from '../providers/GerritEntityProvider';
 
-describe('gerritEntityProviderCatalogModule', () => {
+describe('catalogModuleGerritEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<GerritEntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -79,7 +79,7 @@ describe('gerritEntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [gerritEntityProviderCatalogModule()],
+      features: [catalogModuleGerritEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-gerrit/src/module/catalogModuleGerritEntityProvider.ts

@@ -25,7 +25,7 @@ import { GerritEntityProvider } from '../providers/GerritEntityProvider';
 /**
  * @alpha
  */
-export const gerritEntityProviderCatalogModule = createBackendModule({
+export const catalogModuleGerritEntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'gerritEntityProvider',
   register(env) {

plugins/catalog-backend-module-gerrit/src/module/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 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 { catalogModuleGerritEntityProvider } from './catalogModuleGerritEntityProvider';

plugins/catalog-backend-module-github/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const githubEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleGithubEntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-github/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { githubEntityProviderCatalogModule } from './service/GithubEntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-github/src/module/catalogModuleGithubEntityProvider.test.ts

@@ -24,10 +24,10 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
-import { githubEntityProviderCatalogModule } from './GithubEntityProviderCatalogModule';
+import { catalogModuleGithubEntityProvider } from './catalogModuleGithubEntityProvider';
 import { GithubEntityProvider } from '../providers/GithubEntityProvider';
 
-describe('githubEntityProviderCatalogModule', () => {
+describe('catalogModuleGithubEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<GithubEntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -66,7 +66,7 @@ describe('githubEntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [githubEntityProviderCatalogModule()],
+      features: [catalogModuleGithubEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-github/src/module/catalogModuleGithubEntityProvider.ts

@@ -27,7 +27,7 @@ import { GithubEntityProvider } from '../providers/GithubEntityProvider';
  *
  * @alpha
  */
-export const githubEntityProviderCatalogModule = createBackendModule({
+export const catalogModuleGithubEntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'githubEntityProvider',
   register(env) {

plugins/catalog-backend-module-github/src/module/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2023 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 { catalogModuleGithubEntityProvider } from './catalogModuleGithubEntityProvider';

plugins/catalog-backend-module-gitlab/alpha-api-report.md

@@ -6,7 +6,7 @@
 import { BackendFeature } from '@backstage/backend-plugin-api';
 
 // @alpha
-export const gitlabDiscoveryEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleGitlabDiscoveryEntityProvider: () => BackendFeature;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/catalog-backend-module-gitlab/src/alpha.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { gitlabDiscoveryEntityProviderCatalogModule } from './service/GitlabDiscoveryEntityProviderCatalogModule';
+export { catalogModuleGitlabDiscoveryEntityProvider } from './module/catalogModuleGitlabDiscoveryEntityProvider';

plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.test.ts

@@ -24,10 +24,10 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
-import { gitlabDiscoveryEntityProviderCatalogModule } from './GitlabDiscoveryEntityProviderCatalogModule';
+import { catalogModuleGitlabDiscoveryEntityProvider } from './catalogModuleGitlabDiscoveryEntityProvider';
 import { GitlabDiscoveryEntityProvider } from '../providers';
 
-describe('gitlabDiscoveryEntityProviderCatalogModule', () => {
+describe('catalogModuleGitlabDiscoveryEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<GitlabDiscoveryEntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -78,7 +78,7 @@ describe('gitlabDiscoveryEntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [gitlabDiscoveryEntityProviderCatalogModule()],
+      features: [catalogModuleGitlabDiscoveryEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('P1M'));

plugins/catalog-backend-module-gitlab/src/module/catalogModuleGitlabDiscoveryEntityProvider.ts

@@ -27,7 +27,7 @@ import { GitlabDiscoveryEntityProvider } from '../providers';
  *
  * @alpha
  */
-export const gitlabDiscoveryEntityProviderCatalogModule = createBackendModule({
+export const catalogModuleGitlabDiscoveryEntityProvider = createBackendModule({
   pluginId: 'catalog',
   moduleId: 'gitlabDiscoveryEntityProvider',
   register(env) {

plugins/catalog-backend-module-incremental-ingestion/alpha-api-report.md

@@ -8,7 +8,7 @@ import { IncrementalEntityProvider } from '@backstage/plugin-catalog-backend-mod
 import { IncrementalEntityProviderOptions } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 
 // @alpha
-export const incrementalIngestionEntityProviderCatalogModule: (options: {
+export const catalogModuleIncrementalIngestionEntityProvider: (options: {
   providers: {
     provider: IncrementalEntityProvider<unknown, unknown>;
     options: IncrementalEntityProviderOptions;

plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.test.ts

@@ -20,9 +20,9 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { IncrementalEntityProvider } from '../types';
-import { incrementalIngestionEntityProviderCatalogModule } from './incrementalIngestionEntityProviderCatalogModule';
+import { catalogModuleIncrementalIngestionEntityProvider } from './catalogModuleIncrementalIngestionEntityProvider';
 
-describe('bitbucketServerEntityProviderCatalogModule', () => {
+describe('catalogModuleIncrementalIngestionEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     const provider1: IncrementalEntityProvider<number, {}> = {
       getProviderName: () => 'provider1',
@@ -57,7 +57,7 @@ describe('bitbucketServerEntityProviderCatalogModule', () => {
         [coreServices.scheduler, scheduler],
       ],
       features: [
-        incrementalIngestionEntityProviderCatalogModule({
+        catalogModuleIncrementalIngestionEntityProvider({
           providers: [
             {
               provider: provider1,

plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts

@@ -30,7 +30,7 @@ import { WrapperProviders } from './WrapperProviders';
  *
  * @alpha
  */
-export const incrementalIngestionEntityProviderCatalogModule =
+export const catalogModuleIncrementalIngestionEntityProvider =
   createBackendModule(
     (options: {
       providers: Array<{

plugins/catalog-backend-module-incremental-ingestion/src/module/index.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { incrementalIngestionEntityProviderCatalogModule } from './incrementalIngestionEntityProviderCatalogModule';
+export { catalogModuleIncrementalIngestionEntityProvider } from './catalogModuleIncrementalIngestionEntityProvider';

plugins/catalog-backend-module-incremental-ingestion/src/run.ts

@@ -25,7 +25,7 @@ import {
 import { ConfigReader } from '@backstage/config';
 import { catalogPlugin } from '@backstage/plugin-catalog-backend/alpha';
 import { IncrementalEntityProvider } from '.';
-import { incrementalIngestionEntityProviderCatalogModule } from './alpha';
+import { catalogModuleIncrementalIngestionEntityProvider } from './alpha';
 
 const provider: IncrementalEntityProvider<number, {}> = {
   getProviderName: () => 'test-provider',
@@ -63,7 +63,7 @@ async function main() {
 
   backend.add(catalogPlugin());
   backend.add(
-    incrementalIngestionEntityProviderCatalogModule({
+    catalogModuleIncrementalIngestionEntityProvider({
       providers: [
         {
           provider: provider,

plugins/catalog-backend-module-msgraph/alpha-api-report.md

@@ -9,10 +9,10 @@ import { OrganizationTransformer } from '@backstage/plugin-catalog-backend-modul
 import { UserTransformer } from '@backstage/plugin-catalog-backend-module-msgraph';
 
 // @alpha
-export const microsoftGraphOrgEntityProviderCatalogModule: () => BackendFeature;
+export const catalogModuleMicrosoftGraphOrgEntityProvider: () => BackendFeature;
 
 // @alpha
-export interface MicrosoftGraphOrgEntityProviderCatalogModuleOptions {
+export interface CatalogModuleMicrosoftGraphOrgEntityProviderOptions {
   groupTransformer?: GroupTransformer | Record<string, GroupTransformer>;
   organizationTransformer?:
     | OrganizationTransformer

plugins/catalog-backend-module-msgraph/src/alpha.ts

@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-export { microsoftGraphOrgEntityProviderCatalogModule } from './service/MicrosoftGraphOrgEntityProviderCatalogModule';
-export type { MicrosoftGraphOrgEntityProviderCatalogModuleOptions } from './service/MicrosoftGraphOrgEntityProviderCatalogModule';
+export * from './module';

plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.test.ts

@@ -24,10 +24,10 @@ import { startTestBackend } from '@backstage/backend-test-utils';
 import { ConfigReader } from '@backstage/config';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
 import { Duration } from 'luxon';
-import { microsoftGraphOrgEntityProviderCatalogModule } from './MicrosoftGraphOrgEntityProviderCatalogModule';
+import { catalogModuleMicrosoftGraphOrgEntityProvider } from './catalogModuleMicrosoftGraphOrgEntityProvider';
 import { MicrosoftGraphOrgEntityProvider } from '../processors';
 
-describe('awsS3EntityProviderCatalogModule', () => {
+describe('catalogModuleMicrosoftGraphOrgEntityProvider', () => {
   it('should register provider at the catalog extension point', async () => {
     let addedProviders: Array<MicrosoftGraphOrgEntityProvider> | undefined;
     let usedSchedule: TaskScheduleDefinition | undefined;
@@ -71,7 +71,7 @@ describe('awsS3EntityProviderCatalogModule', () => {
         [coreServices.logger, getVoidLogger()],
         [coreServices.scheduler, scheduler],
       ],
-      features: [microsoftGraphOrgEntityProviderCatalogModule()],
+      features: [catalogModuleMicrosoftGraphOrgEntityProvider()],
     });
 
     expect(usedSchedule?.frequency).toEqual(Duration.fromISO('PT30M'));

plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts

@@ -28,11 +28,11 @@ import {
 import { MicrosoftGraphOrgEntityProvider } from '../processors';
 
 /**
- * Options for {@link microsoftGraphOrgEntityProviderCatalogModule}.
+ * Options for {@link catalogModuleMicrosoftGraphOrgEntityProvider}.
  *
  * @alpha
  */
-export interface MicrosoftGraphOrgEntityProviderCatalogModuleOptions {
+export interface CatalogModuleMicrosoftGraphOrgEntityProviderOptions {
   /**
    * The function that transforms a user entry in msgraph to an entity.
    * Optionally, you can pass separate transformers per provider ID.
@@ -59,13 +59,13 @@ export interface MicrosoftGraphOrgEntityProviderCatalogModuleOptions {
  *
  * @alpha
  */
-export const microsoftGraphOrgEntityProviderCatalogModule = createBackendModule(
+export const catalogModuleMicrosoftGraphOrgEntityProvider = createBackendModule(
   {
     pluginId: 'catalog',
     moduleId: 'microsoftGraphOrgEntityProvider',
     register(
       env,
-      options?: MicrosoftGraphOrgEntityProviderCatalogModuleOptions,
+      options?: CatalogModuleMicrosoftGraphOrgEntityProviderOptions,
     ) {
       env.registerInit({
         deps: {

plugins/catalog-backend-module-msgraph/src/module/index.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2023 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 { catalogModuleMicrosoftGraphOrgEntityProvider } from './catalogModuleMicrosoftGraphOrgEntityProvider';
+export type { CatalogModuleMicrosoftGraphOrgEntityProviderOptions } from './catalogModuleMicrosoftGraphOrgEntityProvider';