Merge pull request #3661 from backstage/freben/github-rename-move

catalog-backend: move github util to own folder

plugins/catalog-backend/src/ingestion/processors/GithubOrgReaderProcessor.ts

@@ -18,9 +18,9 @@ import { LocationSpec } from '@backstage/catalog-model';
 import { Config } from '@backstage/config';
 import { graphql } from '@octokit/graphql';
 import { Logger } from 'winston';
+import { getOrganizationTeams, getOrganizationUsers } from './github';
 import * as results from './results';
 import { CatalogProcessor, CatalogProcessorEmit } from './types';
-import { getOrganizationTeams, getOrganizationUsers } from './util/github';
 import { buildOrgHierarchy } from './util/org';
 
 /**

plugins/catalog-backend/src/ingestion/processors/github/github.test.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+import { msw } from '@backstage/test-utils';
 import { graphql } from '@octokit/graphql';
 import { graphql as graphqlMsw } from 'msw';
 import { setupServer } from 'msw/node';
-import { msw } from '@backstage/test-utils';
 import {
   getOrganizationTeams,
   getOrganizationUsers,

plugins/catalog-backend/src/ingestion/processors/github/index.ts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * 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 { getOrganizationTeams, getOrganizationUsers } from './github';

plugins/catalog-backend/src/ingestion/processors/index.ts

@@ -16,11 +16,6 @@
 
 import * as results from './results';
 
-export { results };
-export * from './types';
-
-export { parseEntityYaml } from './util/parse';
-
 export { AnnotateLocationEntityProcessor } from './AnnotateLocationEntityProcessor';
 export { BuiltinKindsEntityProcessor } from './BuiltinKindsEntityProcessor';
 export { CodeOwnersProcessor } from './CodeOwnersProcessor';
@@ -32,4 +27,7 @@ export { MicrosoftGraphOrgReaderProcessor } from './MicrosoftGraphOrgReaderProce
 export { PlaceholderProcessor } from './PlaceholderProcessor';
 export type { PlaceholderResolver } from './PlaceholderProcessor';
 export { StaticLocationProcessor } from './StaticLocationProcessor';
+export * from './types';
 export { UrlReaderProcessor } from './UrlReaderProcessor';
+export { parseEntityYaml } from './util/parse';
+export { results };