Merge pull request #8 from karmaniverous:feature/gh-7-support-local-c…

…onfig-override

[GH-7] added local config override

.metastructure.yml

@@ -1 +1 @@
-configPath: ../metastructure-template/src/metastructure.yml
+config_path: ../metastructure-template/src/metastructure.yml

src/Config.ts

@@ -68,7 +68,8 @@ export const configSchema = z
       .nullable()
       .optional(),
     cli_params: cliParamsSchema.optional(),
-    configPath: z.string().nullable().optional(),
+    config_path: z.string().nullable().optional(),
+    config_override_path: z.string().nullable().optional(),
     organization: z
       .object({
         id: z.string().nullable().optional(),

src/configFile.ts

@@ -19,7 +19,7 @@ const resolveConfigPath = async (path?: string) => {
 
     if (await fs.exists(resolvedPath)) {
       try {
-        const { configPath } = parse(
+        const { config_path: configPath } = parse(
           await fs.readFile(resolvedPath, 'utf8'),
         ) as Partial<Config>;
 
@@ -46,7 +46,21 @@ export const readConfig = async (path?: string) => {
 
   const rawConfig = parse(await fs.readFile(configPath, 'utf8')) as Config;
 
-  return { rawConfig, configPath };
+  const pkgDir = (await packageDirectory({ cwd: configPath })) ?? '.';
+
+  if (rawConfig.config_override_path) {
+    const overridePath = resolve(pkgDir, rawConfig.config_override_path);
+
+    if (await fs.exists(overridePath)) {
+      const overrideConfig = parse(
+        await fs.readFile(overridePath, 'utf8'),
+      ) as Config;
+
+      _.merge(rawConfig, overrideConfig);
+    }
+  }
+
+  return { pkgDir, rawConfig, configPath };
 };
 
 export const writeConfig = async (config: Config, configPath: string) => {

src/parseConfig.ts

@@ -2,8 +2,7 @@ import { Handlebars } from '@karmaniverous/handlebars';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import _ from 'lodash';
-import { dirname, resolve } from 'path';
-import { packageDirectory } from 'pkg-dir';
+import { resolve } from 'path';
 import { inspect } from 'util';
 import { parse } from 'yaml';
 
@@ -37,7 +36,6 @@ export const parseConfig = async ({
   useLocalState,
 }: ParseConfigParams) => {
   let config: Config;
-  let configPath: string;
   let pkgDir: string;
   let rawConfig: Config;
 
@@ -46,17 +44,14 @@ export const parseConfig = async ({
       process.stdout.write(chalk.black.bold('Parsing config file...'));
 
     // Load & parse config file.
-    ({ rawConfig, configPath } = await readConfig(path));
+    ({ pkgDir, rawConfig } = await readConfig(path));
 
     // Validate workspace.
     if (!rawConfig.workspaces?.[workspace]) {
       console.log(chalk.red.bold('Unknown workspace!\n'));
       throw new Error(`Unknown workspace: ${workspace}`);
     }
 
-    // Get CLI default overrides.
-    pkgDir = (await packageDirectory({ cwd: dirname(configPath) })) ?? '.';
-
     let cliDefaultOverrides: CliDefaultOverrides = {};
 
     const rawWorkspace = rawConfig.workspaces[workspace];

src/updateConfig.ts

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import { execa } from 'execa';
 import _ from 'lodash';
 import { resolve } from 'path';
-import { packageDirectory } from 'pkg-dir';
 import { inspect } from 'util';
 
 import { awsCredentials } from './awsCredentials';
@@ -27,7 +26,7 @@ export const updateConfig = async ({
       process.stdout.write(chalk.black.bold(`Updating config file...`));
 
     // Load config file.
-    const { rawConfig: config, configPath } = await readConfig(path);
+    const { pkgDir, rawConfig: config, configPath } = await readConfig(path);
 
     // Validate workspace.
     if (!config.workspaces?.[workspace]) {
@@ -37,7 +36,6 @@ export const updateConfig = async ({
     }
 
     // Configure shell client.
-    const pkgDir = (await packageDirectory({ cwd: configPath })) ?? '.';
     const $ = execa({
       cwd: resolve(pkgDir, config.workspaces[workspace].path),
       env: {