Merge pull request #70 from bradmccoydev/add-gh-org-data

feat: add backstage config for gh
ortelius · Nov 29, 2022 · bfbfc15 · bfbfc15
2 parents 5bf376e + 401dc82
commit bfbfc15
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/app-config.production.yaml b/app-config.production.yaml
@@ -6,7 +6,7 @@ auth:
   environment: production
   providers:
     github:
-      development:
+      production:
         clientId: ${GITHUB_CLIENT_ID}
         clientSecret: ${GITHUB_CLIENT_SECRET}
 

diff --git a/app-config.yaml b/app-config.yaml
@@ -1,5 +1,5 @@
 app:
-  title: Scaffolded Backstage App
+  title: Ortelius Catalog
   baseUrl: https://backstage.ortelius.io
 
 organization:

diff --git a/chart/backstage/Chart.yaml b/chart/backstage/Chart.yaml
@@ -4,8 +4,8 @@ description: A Helm chart for the Ortelius Backstage Instance
 
 type: application
 
-version: 0.0.16
-appVersion: "0.0.16"
+version: 0.0.17
+appVersion: "0.0.17"
 
 home: "https://ortelius.io"
 icon: https://backstage.io/img/twitter-summary.png

diff --git a/chart/backstage/templates/backend/deployment.yaml b/chart/backstage/templates/backend/deployment.yaml
@@ -88,7 +88,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: backstage-secrets
-                  key: ARGOCD_URL
+                  key: ARGOCD_BASE_URL
             - name: ARGOCD_USERNAME
               valueFrom:
                 secretKeyRef:

diff --git a/packages/backend/src/plugins/catalog.ts b/packages/backend/src/plugins/catalog.ts
@@ -2,13 +2,28 @@ import { CatalogBuilder } from '@backstage/plugin-catalog-backend';
 import { ScaffolderEntitiesProcessor } from '@backstage/plugin-scaffolder-backend';
 import { Router } from 'express';
 import { PluginEnvironment } from '../types';
+import { GithubOrgEntityProvider } from '@backstage/plugin-catalog-backend-module-github';
 
 export default async function createPlugin(
   env: PluginEnvironment,
 ): Promise<Router> {
   const builder = await CatalogBuilder.create(env);
   builder.addProcessor(new ScaffolderEntitiesProcessor());
+  builder.addEntityProvider(
+    GithubOrgEntityProvider.fromConfig(env.config, {
+      id: 'production',
+      orgUrl: 'https://github.com/ortelius',
+      logger: env.logger,
+      schedule: env.scheduler.createScheduledTaskRunner({
+        frequency: { minutes: 60 },
+        timeout: { minutes: 15 },
+      }),
+    }),
+  );
   const { processingEngine, router } = await builder.build();
   await processingEngine.start();
   return router;
 }
+
+// The org URL below needs to match a configured integrations.github entry
+// specified in your app-config.
diff --git a/yarn.lock b/yarn.lock
@@ -5633,7 +5633,7 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
-"@types/react-dom@*", "@types/react-dom@<18.0.0":
+"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^17":
   version "17.0.18"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.18.tgz#8f7af38f5d9b42f79162eea7492e5a1caff70dc2"
   integrity sha512-rLVtIfbwyur2iFKykP2w0pl/1unw26b5td16d5xMgp7/yjTHomkyxPYChFoCr/FtEX1lN9wY6lFj1qvKdS5kDw==