feat(utils): read config by branches

Airkro · Dec 22, 2023 · 602aeeb · 602aeeb
1 parent b5e4d66
commit 602aeeb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 31 deletions.
diff --git a/packages/sample/lib/cmd.mjs b/packages/sample/lib/cmd.mjs
@@ -2,18 +2,11 @@ export const command = 'sample';
 
 export const describe = 'Generate code sample files';
 
-export function builder(cli) {
-  cli.option('config', {
-    alias: 'c',
-    describe: 'Config file path',
-    default: '.bring-it/sample.config.json',
-    type: 'string',
-  });
-}
+export function builder() {}
 
-export function handler(io) {
+export function handler() {
   import('./lib/sample.mjs')
-    .then(({ action }) => action(io))
+    .then(({ action }) => action())
     .catch((error) => {
       process.exitCode = 1;
       console.error(error);

diff --git a/packages/sample/lib/lib/config.mjs b/packages/sample/lib/lib/config.mjs
@@ -1,9 +1,5 @@
 import { resolve } from 'node:path';
 
-import { readJSON } from '@bring-it/utils';
-
-import { logger } from './utils.mjs';
-
 function checkString(input, name) {
   if (typeof input !== 'string') {
     throw new TypeError(`${name} must be a string`);
@@ -22,7 +18,7 @@ function checkArray(input, name, string = true) {
   }
 }
 
-export function mergeConfig(group) {
+export function mergeConfig(group = [{}]) {
   checkArray(group, 'group', false);
 
   return group.map(
@@ -62,9 +58,3 @@ export function mergeConfig(group) {
     },
   );
 }
-
-export function readConfig(configName) {
-  return readJSON(configName, logger).then(({ group = [{}] }) =>
-    mergeConfig(group),
-  );
-}
diff --git a/packages/sample/lib/lib/sample.mjs b/packages/sample/lib/lib/sample.mjs
@@ -1,10 +1,14 @@
-import { readConfig } from './config.mjs';
+import { readConfig } from '@bring-it/utils';
+
+import { mergeConfig } from './config.mjs';
 import { pdf } from './pdf.mjs';
 import { picker, scan } from './picker.mjs';
 import { logger } from './utils.mjs';
 
-export async function action({ config: configName }) {
-  const configs = await readConfig(configName);
+export async function action() {
+  const configs = await readConfig('sample', logger).then(({ group }) =>
+    mergeConfig(group),
+  );
 
   for (const config of configs) {
     const files = await scan(config);

diff --git a/packages/sentry/lib/utils.mjs b/packages/sentry/lib/utils.mjs
@@ -4,7 +4,7 @@ import { rm } from 'node:fs/promises';
 import spawn from '@npmcli/promise-spawn';
 import { globby } from 'globby';
 
-import { ignore, Logger, readJSON } from '@bring-it/utils/index.mjs';
+import { ignore, Logger, readConfig } from '@bring-it/utils';
 
 const logger = new Logger('sentry');
 
@@ -14,10 +14,6 @@ function commitHash() {
   }).trim();
 }
 
-function readConfig(configName) {
-  return readJSON(configName, logger);
-}
-
 function scan({ include }) {
   return globby(include, {
     ignore,
@@ -51,7 +47,8 @@ function createCli({ url, org, project, token }) {
 export async function action({ mode, name }) {
   try {
     const { [name || mode]: current, ...all } = await readConfig(
-      '.bring-it/sentry.config.json',
+      'sentry',
+      logger,
     );
 
     const {

diff --git a/packages/utils/index.mjs b/packages/utils/index.mjs
@@ -59,9 +59,20 @@ export const ignore = [
   '**/sshd*config',
 ];
 
-export function readJSON(configName, logger) {
+function readJSON(configName, logger) {
   return readFile(configName, 'utf8')
     .then((text) => JSON.parse(text))
+    .then((json) => {
+      const { BRANCH_NAME } = process.env;
+
+      if (BRANCH_NAME) {
+        const { branches, ...rest } = json;
+
+        return { ...rest, ...branches[BRANCH_NAME] };
+      }
+
+      return json;
+    })
     .catch((error) => {
       logger.warn(error.message);
       logger.info('Fallback to default configuration');