create script: repo has default, don't overwrite dev password

Author: andrewplummer

commands.js

@@ -46,13 +46,15 @@ export default {
         {
           flags: '-d, --domain <domain>',
           description: 'Domain',
+          type: 'domain',
           required: true,
           downcase: true,
           prompt: true,
         },
         {
           flags: '-r, --repository [repository]',
           description: 'Git repository',
+          type: 'repository',
           prompt: true,
         },
         {
@@ -342,7 +344,6 @@ export default {
                   flags: '-u, --user-id [string...]',
                   description: 'Limit to users by ID (can be multiple).',
                 },
-
                 {
                   flags: '-m, --email [string...]',
                   description: 'Limit to users by email (can be multiple).',

src/create/index.js

@@ -8,25 +8,32 @@ import { queueTask, runTasks } from '../utils/tasks.js';
 import { removeFiles } from '../utils/file.js';
 import { replaceAll } from '../utils/replace.js';
 import { exec, withDir } from '../utils/shell.js';
+import { exit } from '../utils/flow.js';
 import { getEnvironments, updateServiceYamlEnv } from '../cloud/utils.js';
 
 const BEDROCK_REPO = 'bedrockio/bedrock-core';
 
 export default async function create(options) {
-  const { project } = options;
+  let {
+    project,
+    domain,
+    repository,
+    address,
+    staging: stagingId,
+    production: productionId,
+    password: adminPassword,
+  } = options;
 
+  if (!domain) {
+    exit('Domain required.');
+  }
   // "project" will accept any casing
   const kebab = kebabCase(project);
   const under = snakeCase(project);
 
-  const {
-    domain = '',
-    repository = '',
-    address = '',
-    stagingProjectId = `${kebab}-staging`,
-    productionProjectId = `${kebab}-production`,
-    'admin-password': adminPassword = '',
-  } = options;
+  repository ||= kebab;
+  stagingId ||= `${kebab}-staging`;
+  productionId ||= `${kebab}-production`;
 
   queueTask('Clone Repository', async () => {
     await cloneRepository(kebab, BEDROCK_REPO);
@@ -35,15 +42,19 @@ export default async function create(options) {
 
   queueTask('Configure', async () => {
     const appName = startCase(project);
+
     const JWT_SECRET = await exec('openssl rand -base64 30');
     const ADMIN_PASSWORD = adminPassword || randomBytes(8).toString('hex');
 
-    await replaceAll('*.{js,md,yml,tf,conf,json,env}', (str) => {
+    await replaceAll('**/*.{js,md,yml,tf,conf,json,env}', (str, basename) => {
+      if (basename !== '.env') {
+        str = str.replace(/ADMIN_PASSWORD=(.+)/g, `ADMIN_PASSWORD=${ADMIN_PASSWORD}`);
+      }
+
       str = str.replace(/APP_COMPANY_ADDRESS=(.+)/g, `APP_COMPANY_ADDRESS=${address}`);
       str = str.replace(/JWT_SECRET=(.+)/g, `JWT_SECRET=${JWT_SECRET}`);
-      str = str.replace(/ADMIN_PASSWORD=(.+)/g, `ADMIN_PASSWORD=${ADMIN_PASSWORD}`);
-      str = str.replace(/bedrock-foundation-production/g, productionProjectId);
-      str = str.replace(/bedrock-foundation-staging/g, stagingProjectId);
+      str = str.replace(/bedrock-foundation-production/g, productionId);
+      str = str.replace(/bedrock-foundation-staging/g, stagingId);
       str = str.replace(/bedrockio\/bedrock-core/g, repository);
       str = str.replace(/bedrock-foundation/g, kebab);
       str = str.replace(/bedrock\.foundation/g, domain);

src/utils/file.js

@@ -60,8 +60,8 @@ function getRelativePath(dir) {
   return path.relative(process.cwd(), dir);
 }
 
-export async function readFile(file) {
-  if (file.match(/\.json$/)) {
+export async function readFile(file, coerce = true) {
+  if (coerce && file.match(/\.json$/)) {
     return await loadJson(file);
   } else {
     return await fs.readFile(file, 'utf8');

src/utils/git.js

@@ -19,10 +19,11 @@ export async function cloneRepository(dir, repo) {
 
 export async function initializeRepository(dir, repo) {
   const commands = ['git tag bedrock-cut', 'git add .', 'git commit -m "Bedrock Create"'];
-  if (repo) {
-    commands.push(`git remote remove origin`);
-    commands.push(`git remote add origin git@github.com:${repo}.git`);
+  if (!repo) {
+    throw new Error('Repository required.');
   }
+  commands.push(`git remote remove origin`);
+  commands.push(`git remote add origin git@github.com:${repo}.git`);
   await exec(commands);
 }
 

src/utils/replace.js

@@ -1,3 +1,5 @@
+import { basename } from 'path';
+
 import { glob } from 'glob';
 
 import { readFile, writeFile } from './file.js';
@@ -10,8 +12,9 @@ export async function replaceAll(pattern, fn) {
   });
   return Promise.all(
     files.map(async (filename) => {
-      const pre = await readFile(filename);
-      const post = fn(pre);
+      const pre = await readFile(filename, false);
+      const base = basename(filename);
+      const post = fn(pre, base);
       if (pre !== post) {
         await writeFile(filename, post);
       }