Merge pull request #126 from vbihun/handle-error-in-data-provider-and…

…-config-validator

Handle errors in dataProvider and configValidator

src/entry/config-validator/index.ts

@@ -3,9 +3,16 @@ import { ConfigValidatorResult, ConfigValidatorResponse } from '@atlassian/forge
 import { getConnectedGroups } from '../../services/group';
 
 export const configValidator = async (): Promise<ConfigValidatorResult> => {
-  const connectedGroups = await getConnectedGroups();
-  const appConfigured = connectedGroups && connectedGroups.length > 0;
+  try {
+    const connectedGroups = await getConnectedGroups();
+    const appConfigured = connectedGroups && connectedGroups.length > 0;
 
-  const response = new ConfigValidatorResponse(appConfigured);
-  return response.build();
+    const response = new ConfigValidatorResponse(appConfigured);
+    return response.build();
+  } catch (e) {
+    console.error('Could not determine installation state when invoking config validator');
+    const response = new ConfigValidatorResponse(false);
+    response.error = 'Could not determine installation state';
+    return response.build();
+  }
 };

src/entry/data-provider/index.ts

@@ -17,17 +17,34 @@ import { GitlabHttpMethodError } from '../../models/errors';
 export const dataProvider = async (
   request: DataProviderPayload,
 ): Promise<DataProviderResult | ForgeInvocationError> => {
-  const {
-    project: { id: projectId, default_branch: defaultBranch, name: projectName },
-    groupToken,
-  } = await getProjectDataFromUrl(request.url);
+  let projectId: number;
+  let defaultBranch: string;
+  let projectName: string;
+  let groupToken: string;
+  let trackingBranch: string;
+
+  try {
+    ({
+      project: { id: projectId, default_branch: defaultBranch, name: projectName },
+      groupToken,
+    } = await getProjectDataFromUrl(request.url));
+  } catch (e) {
+    console.error(`Error while getting project data from URL in dataProvider ${e}`);
+    return null;
+  }
 
   if (!projectId) {
     console.warn('Cannot get GitLab project data by provided link.');
     return null;
   }
 
-  const trackingBranch = await getTrackingBranchName(groupToken, projectId, defaultBranch);
+  try {
+    trackingBranch = await getTrackingBranchName(groupToken, projectId, defaultBranch);
+  } catch (e) {
+    console.error(`Error while getting tracking branch name in dataProvider ${e}`);
+
+    return null;
+  }
 
   const backfillData: BackfillData = {
     builds: [],