Add new command to collect data on mainline

package.json

@@ -45,6 +45,7 @@
     "typescript": "^4.1.2"
   },
   "dependencies": {
+    "@codecoach/api-client": "^1.0.45",
     "@octokit/core": "^3.2.4",
     "@octokit/rest": "^18.12.0",
     "js-yaml": "^4.1.0",

sample/config/data-config.yaml

@@ -0,0 +1,11 @@
+repo:
+  url: https://github.com/codeleague/codecoach
+  runId: 40
+  headCommit: 123qwe123qwe123qwe123qwe123qwe123qwe123q
+  branch: main
+buildLogFiles:
+  - type: tslint
+    path: /path/to/log.json
+    cwd: /repo/src
+output: ./output.json
+apiServer: https://localhost:3000

src/Api.ts

@@ -0,0 +1,16 @@
+import axios from 'axios';
+
+import { RunApi } from '@codecoach/api-client';
+
+export class Api {
+  private readonly axiosInstance;
+  constructor(private readonly apiServer: string) {
+    this.axiosInstance = axios.create({
+      baseURL: this.apiServer,
+    });
+  }
+
+  get runClient(): RunApi {
+    return new RunApi(undefined, '', this.axiosInstance);
+  }
+}

src/Config/@enums/command.ts

@@ -0,0 +1,4 @@
+export enum COMMAND {
+  DEFAULT = 'default',
+  COLLECT = 'collect',
+}

src/Config/@enums/index.ts

@@ -1 +1,2 @@
 export { ProjectType } from './projectType';
+export { COMMAND } from './command';

src/Config/@types/appConfig.ts

@@ -1,6 +1,9 @@
+import { COMMAND } from '../@enums';
 import { BuildLogFile } from './buildLogFile';
 
 export type AppConfig = {
+  command: COMMAND;
   logFilePath: string;
   buildLogFiles: BuildLogFile[];
+  apiServer: string;
 };

src/Config/@types/configArgument.ts

@@ -1,11 +1,24 @@
 import { BuildLogFile } from './buildLogFile';
 
-export type ConfigArgument = {
+type BaseConfigArgument = {
   url: string;
-  pr: number;
   buildLogFile: BuildLogFile[];
   output: string;
-  token: string;
-  removeOldComment: boolean;
   config: string;
 };
+
+export type PrConfigArgument = {
+  pr: number;
+  removeOldComment: boolean;
+  token: string;
+  apiServer: never;
+} & BaseConfigArgument;
+
+export type DataConfigArgument = {
+  headCommit: string;
+  runId: number;
+  branch: string;
+  apiServer: string;
+} & BaseConfigArgument;
+
+export type ConfigArgument = PrConfigArgument | DataConfigArgument;

src/Config/@types/configYAML.ts

@@ -1,14 +1,31 @@
 import { BuildLogFile } from './buildLogFile';
 
-export type ConfigYAML = {
+type BaseConfigYAML = {
   repo: {
     url: string;
-    pr: number;
-    token: string;
     userAgent: string;
     timeZone: string;
-    removeOldComment: boolean;
   };
   buildLogFiles: BuildLogFile[];
   output: string;
 };
+
+export type PrConfigYAML = {
+  repo: {
+    token: string;
+    pr: number;
+    removeOldComment: boolean;
+  };
+  apiServer: never;
+} & BaseConfigYAML;
+
+export type DataConfigYAML = {
+  repo: {
+    headCommit: string;
+    runId: number;
+    branch: string;
+  };
+  apiServer: string;
+} & BaseConfigYAML;
+
+export type ConfigYAML = PrConfigYAML | DataConfigYAML;

src/Config/@types/index.ts

@@ -1,5 +1,6 @@
 export { AppConfig } from './appConfig';
 export { ConfigObject } from './configObject';
-export { ProviderConfig } from './providerConfig';
-export { ConfigArgument } from './configArgument';
+export * from './providerConfig';
+export * from './configArgument';
+export * from './configYAML';
 export { BuildLogFile } from './buildLogFile';

src/Config/@types/providerConfig.ts

@@ -1,6 +1,17 @@
-export type ProviderConfig = {
-  token: string;
+type BaseProviderConfig = {
   repoUrl: string;
+};
+
+export type PrProviderConfig = {
+  token: string;
   prId: number;
   removeOldComment: boolean;
-};
+} & BaseProviderConfig;
+
+export type DataProviderConfig = {
+  runId: number;
+  headCommit: string;
+  branch: string;
+} & BaseProviderConfig;
+
+export type ProviderConfig = PrProviderConfig | DataProviderConfig;

src/Config/Config.spec.ts

@@ -1,6 +1,7 @@
+import { DataProviderConfig, PrProviderConfig } from '.';
 import { Config } from './Config';
 
-const MOCK_ARGS = [
+const PR_MOCK_ARGS = [
   '/usr/local/Cellar/node/15.13.0/bin/node',
   '/Users/codecoach/src/app.ts',
   '--url=https://github.com/codeleague/codecoach.git',
@@ -11,13 +12,25 @@ const MOCK_ARGS = [
   '-o=./tmp/out.json',
 ];
 
-const MOCK_ARGS_W_CONFIG_YAML = [
+const PR_MOCK_ARGS_W_COMMAND = [
+  '/usr/local/Cellar/node/15.13.0/bin/node',
+  '/Users/codecoach/src/app.ts',
+  'comment',
+  '--url=https://github.com/codeleague/codecoach.git',
+  '--removeOldComment',
+  '--token=placeyourtokenhere',
+  '--pr=15',
+  '-f=dotnetbuild;./sample/dotnetbuild/build.content;/repo/src',
+  '-o=./tmp/out.json',
+];
+
+const PR_MOCK_ARGS_W_CONFIG_YAML = [
   '/usr/local/Cellar/node/15.13.0/bin/node',
   '/Users/codecoach/src/app.ts',
   '--config=sample/config/config.yaml',
 ];
 
-export const EXPECTED_MOCK_ARGS = [
+export const PR_EXPECTED_MOCK_ARGS = [
   '/usr/local/Cellar/node/15.13.0/bin/node',
   '/Users/codecoach/src/app.ts',
   'https://github.com/codeleague/codecoach.git',
@@ -28,23 +41,87 @@ export const EXPECTED_MOCK_ARGS = [
   './tmp/out.json',
 ];
 
-describe('Config Test', () => {
+const DATA_MOCK_ARGS = [
+  '/usr/local/Cellar/node/15.13.0/bin/node',
+  '/Users/codecoach/src/app.ts',
+  'collect',
+  '--url=https://github.com/codeleague/codecoach.git',
+  '-r=3',
+  '-b=main',
+  '-c=headCommitsha',
+  '-f=dotnetbuild;./sample/dotnetbuild/build.content;/repo/src',
+  '-o=./tmp/out.json',
+  '--api=https://localhost:3000',
+];
+
+const DATA_MOCK_ARGS_W_CONFIG_YAML = [
+  '/usr/local/Cellar/node/15.13.0/bin/node',
+  '/Users/codecoach/src/app.ts',
+  'collect',
+  '--config=sample/config/data-config.yaml',
+];
+
+export const DATA_EXPECTED_MOCK_ARGS = [
+  '/usr/local/Cellar/node/15.13.0/bin/node',
+  '/Users/codecoach/src/app.ts',
+  'https://github.com/codeleague/codecoach.git',
+  3,
+  'main',
+  'headCommitsha',
+  'dotnetbuild;./sample/dotnetbuild/build.content;/repo/src',
+  './tmp/out.json',
+  'https://localhost:3000',
+];
+
+describe('PR config Test', () => {
   let config: typeof Config;
 
   beforeEach(() => {
     jest.resetModules();
   });
 
   it('Should able to parse this args and run without throwing error', async () => {
-    process.argv = MOCK_ARGS;
+    process.argv = PR_MOCK_ARGS;
+    config = (await import('./Config')).Config;
+    let fullfillConfig = (await config).provider as PrProviderConfig;
+    expect(fullfillConfig.repoUrl).toBe(PR_EXPECTED_MOCK_ARGS[2]);
+    expect(fullfillConfig.removeOldComment).toBe(PR_EXPECTED_MOCK_ARGS[3]);
+
+    process.argv = PR_MOCK_ARGS_W_COMMAND;
+    config = (await import('./Config')).Config;
+    fullfillConfig = (await config).provider as PrProviderConfig;
+    expect(fullfillConfig.repoUrl).toBe(PR_EXPECTED_MOCK_ARGS[2]);
+    expect(fullfillConfig.removeOldComment).toBe(PR_EXPECTED_MOCK_ARGS[3]);
+  });
+
+  it('Should able to use a config file without passing other args', async () => {
+    process.argv = PR_MOCK_ARGS_W_CONFIG_YAML;
     config = (await import('./Config')).Config;
     const fullfillConfig = await config;
-    expect(fullfillConfig.provider.repoUrl).toBe(EXPECTED_MOCK_ARGS[2]);
-    expect(fullfillConfig.provider.removeOldComment).toBe(EXPECTED_MOCK_ARGS[3]);
+    expect(fullfillConfig.app.buildLogFiles[0].type).toBe('tslint');
+  });
+});
+
+describe('Data config Test', () => {
+  let config: typeof Config;
+
+  beforeEach(() => {
+    jest.resetModules();
+  });
+
+  it('Should able to parse this args and run without throwing error', async () => {
+    process.argv = DATA_MOCK_ARGS;
+    config = (await import('./Config')).Config;
+    const providerConfig = (await config).provider as DataProviderConfig;
+    expect(providerConfig.repoUrl).toBe(DATA_EXPECTED_MOCK_ARGS[2]);
+    expect(providerConfig.runId).toBe(DATA_EXPECTED_MOCK_ARGS[3]);
+    expect(providerConfig.branch).toBe(DATA_EXPECTED_MOCK_ARGS[4]);
+    expect(providerConfig.headCommit).toBe(DATA_EXPECTED_MOCK_ARGS[5]);
+    expect((await config).app.apiServer).toBe(DATA_EXPECTED_MOCK_ARGS[8]);
   });
 
   it('Should able to use a config file without passing other args', async () => {
-    process.argv = MOCK_ARGS_W_CONFIG_YAML;
+    process.argv = DATA_MOCK_ARGS_W_CONFIG_YAML;
     config = (await import('./Config')).Config;
     const fullfillConfig = await config;
     expect(fullfillConfig.app.buildLogFiles[0].type).toBe('tslint');