From 57bc317b331c6a119dc9b685eb1d45fbe5d790c3 Mon Sep 17 00:00:00 2001 From: slorber Date: Fri, 4 Dec 2020 14:26:34 +0100 Subject: [PATCH] improve deploy logs --- packages/docusaurus/src/commands/deploy.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus/src/commands/deploy.ts b/packages/docusaurus/src/commands/deploy.ts index baa71707b066..cd2451a195b3 100644 --- a/packages/docusaurus/src/commands/deploy.ts +++ b/packages/docusaurus/src/commands/deploy.ts @@ -15,17 +15,25 @@ import loadConfig from '../server/config'; import build from './build'; import {BuildCLIOptions} from '@docusaurus/types'; +// GIT_PASS env variable should not appear in logs +function obfuscateGitPass(str) { + const gitPass = process.env.GIT_PASS; + return gitPass ? str.replace(gitPass, 'GIT_PASS') : str; +} + // Log executed commands so that user can figure out mistakes on his own // for example: https://github.com/facebook/docusaurus/issues/3875 function shellExecLog(cmd) { try { const result = shell.exec(cmd); console.log( - `${chalk.cyan('CMD:')} ${cmd} ${chalk.cyan(`(code=${result.code})`)}`, + `${chalk.cyan('CMD:')} ${obfuscateGitPass(cmd)} ${chalk.cyan( + `(code=${result.code})`, + )}`, ); return result; } catch (e) { - console.log(`${chalk.red('CMD:')} ${cmd}`); + console.log(`${chalk.red('CMD:')} ${obfuscateGitPass(cmd)}`); throw e; } } @@ -64,6 +72,8 @@ export default async function deploy( `Missing project organization name. Did you forget to define 'organizationName' in ${CONFIG_FILE_NAME}? You may also export it via the ORGANIZATION_NAME environment variable.`, ); } + console.log(`${chalk.cyan('organizationName:')} ${organizationName}`); + const projectName = process.env.PROJECT_NAME || process.env.CIRCLE_PROJECT_REPONAME || @@ -73,6 +83,7 @@ export default async function deploy( `Missing project name. Did you forget to define 'projectName' in ${CONFIG_FILE_NAME}? You may also export it via the PROJECT_NAME environment variable.`, ); } + console.log(`${chalk.cyan('projectName:')} ${projectName}`); // We never deploy on pull request. const isPullRequest = @@ -86,6 +97,8 @@ export default async function deploy( const deploymentBranch = process.env.DEPLOYMENT_BRANCH || (projectName.indexOf('.github.io') !== -1 ? 'master' : 'gh-pages'); + console.log(`${chalk.cyan('deploymentBranch:')} ${deploymentBranch}`); + const githubHost = process.env.GITHUB_HOST || siteConfig.githubHost || 'github.com'; @@ -104,6 +117,10 @@ export default async function deploy( ? sshRemoteBranch : nonSshRemoteBranch; + console.log( + `${chalk.cyan('Remote branch:')} ${obfuscateGitPass(remoteBranch)}`, + ); + // Check if this is a cross-repo publish. const currentRepoUrl = shell .exec('git config --get remote.origin.url')