FAI-14379 | Override mode for GitHub / Jira (#1852)

* Override mode for GitHub * Override mode for Jira * use regex for jira
faros-ai · Dec 10, 2024 · 9aef880 · 9aef880
1 parent 13818da
commit 9aef880
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/sources/github-source/src/index.ts b/sources/github-source/src/index.ts
@@ -66,6 +66,10 @@ export class GitHubSource extends AirbyteSourceBase<GitHubConfig> {
     return 'github';
   }
 
+  mode(config: GitHubConfig): string | undefined {
+    return !config.url ? 'cloud' : 'server';
+  }
+
   async spec(): Promise<AirbyteSpec> {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     return new AirbyteSpec(require('../resources/spec.json'));

diff --git a/sources/jira-source/src/index.ts b/sources/jira-source/src/index.ts
@@ -15,7 +15,13 @@ import {
 import {FarosClient} from 'faros-js-client';
 import VError from 'verror';
 
-import {DEFAULT_API_URL, DEFAULT_CUTOFF_DAYS, Jira, JiraConfig} from './jira';
+import {
+  DEFAULT_API_URL,
+  DEFAULT_CUTOFF_DAYS,
+  Jira,
+  JIRA_CLOUD_REGEX,
+  JiraConfig,
+} from './jira';
 import {RunMode, RunModeStreams, TeamStreamNames} from './streams/common';
 import {FarosBoardIssues} from './streams/faros_board_issues';
 import {FarosBoards} from './streams/faros_boards';
@@ -44,6 +50,13 @@ export class JiraSource extends AirbyteSourceBase<JiraConfig> {
     return 'jira';
   }
 
+  mode(config: JiraConfig): string | undefined {
+    if (!config.url) {
+      return undefined;
+    }
+    return config.url.match(JIRA_CLOUD_REGEX) != null ? 'cloud' : 'server';
+  }
+
   async spec(): Promise<AirbyteSpec> {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     return new AirbyteSpec(require('../resources/spec.json'));

diff --git a/sources/jira-source/src/jira.ts b/sources/jira-source/src/jira.ts
@@ -115,7 +115,7 @@ const prRegex = new RegExp(
     'stateCount=(?<count>[0-9]+)})'
 );
 
-const jiraCloudRegex = /^https:\/\/(.*)\.atlassian\.net/g;
+export const JIRA_CLOUD_REGEX = /^https:\/\/(.*)\.atlassian\.net/g;
 const PREFIX_CHARS = [...'abcdefghijklmnopqrstuvwxyz', ...'0123456789'];
 
 const MAX_SPRINT_HISTORY_FETCH_FAILURES = 5;
@@ -208,7 +208,7 @@ export class Jira {
       throw new VError('Please provide a Jira URL');
     }
 
-    const isCloud = cfg.url.match(jiraCloudRegex) != null;
+    const isCloud = cfg.url.match(JIRA_CLOUD_REGEX) != null;
     const jiraType = isCloud ? 'Cloud' : 'Server/DC';
     logger?.debug(`Assuming ${cfg.url} to be a Jira ${jiraType} instance`);