Merge branch 'master' of github.com:spotify/backstage into mob/union-types

* 'master' of github.com:spotify/backstage: (22 commits)
  [microsite] Add CNCF logo (#2511)
  feat: use title for API type in table
  new tutorials (#2435)
  e2e-test: ignore unhandled errors from jsdom
  Techdocs without docker-in-docker (#2438)
  Test for docker before attempting to run a container (#2497)
  scaffolder: Fix backend fails to start
  feat: add api-docs config ref for widgets
  Mark docs template description as required
  Send component description to GitHub
  Pass props to lists and control rendering from outside wrapper
  Remove commented out code
  Remove unnecessary boolean conversion
  docs: improve navigation around ADRs
  Update default-app template
  Handle empty sections
  Change logic of FeatureFlags.toggle()
  Update sidepar
  Add featureflags components and toggle method on api
  Cleanup and breaking out into more components
  ...

packages/backend/src/plugins/scaffolder.ts

@@ -55,31 +55,60 @@ export default async function createPlugin({
 
   const publishers = new Publishers();
 
-  const githubToken = config.getString('scaffolder.github.token');
-  const repoVisibility = config.getString(
-    'scaffolder.github.visibility',
-  ) as RepoVisilityOptions;
+  const githubConfig = config.getOptionalConfig('scaffolder.github');
 
-  const githubClient = new Octokit({ auth: githubToken });
-  const githubPublisher = new GithubPublisher({
-    client: githubClient,
-    token: githubToken,
-    repoVisibility,
-  });
-  publishers.register('file', githubPublisher);
-  publishers.register('github', githubPublisher);
+  if (githubConfig) {
+    try {
+      const repoVisibility = githubConfig.getString(
+        'visibility',
+      ) as RepoVisilityOptions;
+
+      const githubToken = githubConfig.getString('token');
+      const githubClient = new Octokit({ auth: githubToken });
+      const githubPublisher = new GithubPublisher({
+        client: githubClient,
+        token: githubToken,
+        repoVisibility,
+      });
+      publishers.register('file', githubPublisher);
+      publishers.register('github', githubPublisher);
+    } catch (e) {
+      const providerName = 'github';
+      if (process.env.NODE_ENV !== 'development') {
+        throw new Error(
+          `Failed to initialize ${providerName} scaffolding provider, ${e.message}`,
+        );
+      }
+
+      logger.warn(
+        `Skipping ${providerName} scaffolding provider, ${e.message}`,
+      );
+    }
+  }
 
   const gitLabConfig = config.getOptionalConfig('scaffolder.gitlab.api');
-
   if (gitLabConfig) {
-    const gitLabToken = gitLabConfig.getString('token');
-    const gitLabClient = new Gitlab({
-      host: gitLabConfig.getOptionalString('baseUrl'),
-      token: gitLabToken,
-    });
-    const gitLabPublisher = new GitlabPublisher(gitLabClient, gitLabToken);
-    publishers.register('gitlab', gitLabPublisher);
-    publishers.register('gitlab/api', gitLabPublisher);
+    try {
+      const gitLabToken = gitLabConfig.getString('token');
+      const gitLabClient = new Gitlab({
+        host: gitLabConfig.getOptionalString('baseUrl'),
+        token: gitLabToken,
+      });
+      const gitLabPublisher = new GitlabPublisher(gitLabClient, gitLabToken);
+      publishers.register('gitlab', gitLabPublisher);
+      publishers.register('gitlab/api', gitLabPublisher);
+    } catch (e) {
+      const providerName = 'gitlab';
+      if (process.env.NODE_ENV !== 'development') {
+        throw new Error(
+          `Failed to initialize ${providerName} scaffolding provider, ${e.message}`,
+        );
+      }
+
+      logger.warn(
+        `Skipping ${providerName} scaffolding provider, ${e.message}`,
+      );
+    }
   }
 
   const dockerClient = new Docker();