Merge pull request #1649 from forcedotcom/d/W-16891765-b

NEW @W-16891765@ Config action mentions outfile

Author: jfeingold35

messages/action-summary-viewer.md

@@ -0,0 +1,15 @@
+# common.summary-header
+
+Summary
+
+# common.logfile-location
+
+Additional log information written to:
+
+# config-action.no-outfiles
+
+No output file was specified.
+
+# config-action.outfile-location
+
+Configuration written to:

messages/config-model.md

@@ -12,3 +12,6 @@ Empty object used because rule selection returned no rules
 
 # template.yaml.no-rules-selected
 Remove this empty object {} when you are ready to specify your first rule override
+
+# template.common.end-of-config
+END OF CODE ANALYZER CONFIGURATION

src/commands/code-analyzer/config.ts

@@ -2,6 +2,7 @@ import {Flags, SfCommand} from '@salesforce/sf-plugins-core';
 import {ConfigAction, ConfigDependencies} from '../../lib/actions/ConfigAction';
 import {ConfigFileWriter} from '../../lib/writers/ConfigWriter';
 import {ConfigStyledYamlViewer} from '../../lib/viewers/ConfigViewer';
+import {ConfigActionSummaryViewer} from '../../lib/viewers/ActionSummaryViewer';
 import {CodeAnalyzerConfigFactoryImpl} from '../../lib/factories/CodeAnalyzerConfigFactory';
 import {EnginePluginsFactoryImpl} from '../../lib/factories/EnginePluginsFactory';
 import {BundleName, getMessage, getMessages} from '../../lib/messages';
@@ -70,6 +71,7 @@ export default class ConfigCommand extends SfCommand<void> implements Displayabl
 			logEventListeners: [new LogEventDisplayer(uxDisplay)],
 			progressEventListeners: [new RuleSelectionProgressSpinner(uxDisplay)],
 			modelGenerator: modelGeneratorFunction,
+			actionSummaryViewer: new ConfigActionSummaryViewer(uxDisplay),
 			viewer: new ConfigStyledYamlViewer(uxDisplay)
 		};
 		if (outputFile) {

src/lib/actions/ConfigAction.ts

@@ -7,6 +7,7 @@ import {ConfigViewer} from '../viewers/ConfigViewer';
 import {createWorkspace} from '../utils/WorkspaceUtil';
 import {LogEventListener, LogEventLogger} from '../listeners/LogEventListener';
 import {ProgressEventListener} from '../listeners/ProgressEventListener';
+import {ConfigActionSummaryViewer} from '../viewers/ActionSummaryViewer';
 import {ConfigModel, ConfigModelGeneratorFunction, ConfigContext} from '../models/ConfigModel';
 
 export type ConfigDependencies = {
@@ -16,11 +17,13 @@ export type ConfigDependencies = {
 	logEventListeners: LogEventListener[];
 	progressEventListeners: ProgressEventListener[];
 	writer?: ConfigWriter;
+	actionSummaryViewer: ConfigActionSummaryViewer;
 	viewer: ConfigViewer;
 };
 
 export type ConfigInput = {
 	'config-file'?: string;
+	'output-file'?: string;
 	'rule-selector': string[];
 	workspace?: string[];
 };
@@ -38,7 +41,8 @@ export class ConfigAction {
 		const defaultConfig: CodeAnalyzerConfig = CodeAnalyzerConfig.withDefaults();
 
 		// We always add a Logger Listener to the appropriate listeners list, because we should always be logging.
-		const logEventLogger: LogEventLogger = new LogEventLogger(await LogFileWriter.fromConfig(userConfig));
+		const logFileWriter: LogFileWriter = await LogFileWriter.fromConfig(userConfig);
+		const logEventLogger: LogEventLogger = new LogEventLogger(logFileWriter);
 		this.dependencies.logEventListeners.push(logEventLogger);
 
 		// The User's config produces one Core.
@@ -118,7 +122,10 @@ export class ConfigAction {
 		const configModel: ConfigModel = this.dependencies.modelGenerator(relevantEngines, userConfigContext, defaultConfigContext);
 
 		this.dependencies.viewer.view(configModel);
-		await this.dependencies.writer?.write(configModel);
+		const fileWritten: boolean = this.dependencies.writer
+			? await this.dependencies.writer.write(configModel)
+			: false;
+		this.dependencies.actionSummaryViewer.view(logFileWriter.getLogDestination(), fileWritten ? input['output-file'] : undefined);
 		return Promise.resolve();
 	}
 

src/lib/messages.ts

@@ -5,6 +5,7 @@ import {Tokens} from '@salesforce/core/lib/messages';
 Messages.importMessagesDirectory(__dirname);
 
 export enum BundleName {
+	ActionSummaryViewer = 'action-summary-viewer',
 	ConfigCommand = 'config-command',
 	ConfigModel = 'config-model',
 	ConfigWriter = 'config-writer',

src/lib/models/ConfigModel.ts

@@ -114,7 +114,9 @@ abstract class YamlFormatter {
 			this.toYamlRuleOverrides() + '\n' +
 			'\n' +
 			this.toYamlComment(topLevelDescription.fieldDescriptions!.engines) + '\n' +
-			this.toYamlEngineOverrides() + '\n';
+			this.toYamlEngineOverrides() + '\n' +
+			'\n' +
+			this.toYamlSectionHeadingComment(getMessage(BundleName.ConfigModel, 'template.common.end-of-config')) + '\n';
 	}
 
 	private toYamlRuleOverrides(): string {

src/lib/viewers/ActionSummaryViewer.ts

@@ -0,0 +1,49 @@
+import {Display} from '../Display';
+import {toStyledHeader, indent} from '../utils/StylingUtil';
+import {BundleName, getMessage} from '../messages';
+
+abstract class AbstractActionSummaryViewer {
+	protected readonly display: Display;
+
+	protected constructor(display: Display) {
+		this.display = display;
+	}
+
+	protected displaySummaryHeader(): void {
+		this.display.displayLog(toStyledHeader(getMessage(BundleName.ActionSummaryViewer, 'common.summary-header')));
+	}
+
+	protected displayLineSeparator(): void {
+		this.display.displayLog("");
+	}
+
+	protected displayLogFileInfo(logFile: string): void {
+		this.display.displayLog(getMessage(BundleName.ActionSummaryViewer, 'common.logfile-location'));
+		this.display.displayLog(indent(logFile));
+	}
+}
+
+export class ConfigActionSummaryViewer extends AbstractActionSummaryViewer {
+	public constructor(display: Display) {
+		super(display);
+	}
+
+	public view(logFile: string, outfile?: string): void {
+		this.displaySummaryHeader();
+		this.displayLineSeparator();
+
+		if (outfile) {
+			this.displayOutfile(outfile);
+		} else {
+			this.display.displayLog(getMessage(BundleName.ActionSummaryViewer, 'config-action.no-outfiles'));
+		}
+		this.displayLineSeparator();
+
+		this.displayLogFileInfo(logFile);
+	}
+
+	private displayOutfile(outfile: string): void {
+		this.display.displayLog(getMessage(BundleName.ActionSummaryViewer, 'config-action.outfile-location'));
+		this.display.displayLog(indent(outfile));
+	}
+}

src/lib/writers/ConfigWriter.ts

@@ -6,7 +6,7 @@ import {Display} from '../Display';
 import {exists} from '../utils/FileUtil';
 
 export interface ConfigWriter {
-	write(model: ConfigModel): Promise<void>;
+	write(model: ConfigModel): Promise<boolean>;
 }
 
 export class ConfigFileWriter implements ConfigWriter {
@@ -20,10 +20,13 @@ export class ConfigFileWriter implements ConfigWriter {
 		this.display = display;
 	}
 
-	public async write(model: ConfigModel): Promise<void> {
+	public async write(model: ConfigModel): Promise<boolean> {
 		// Only write to the file if it doesn't already exist, or if the user confirms that they want to overwrite it.
 		if (!(await exists(this.file)) || await this.display.confirm(getMessage(BundleName.ConfigWriter, 'prompt.overwrite-existing-file', [this.file]))) {
 			fs.writeFileSync(this.file, model.toFormattedOutput(this.format));
+			return true;
+		} else {
+			return false;
 		}
 	}
 

test/commands/code-analyzer/config.test.ts

@@ -177,6 +177,7 @@ describe('`code-analyzer config` tests', () => {
 				expect(createActionSpy).toHaveBeenCalled();
 				expect(fromFileSpy).toHaveBeenCalled();
 				expect(receivedFile).toEqual(inputValue);
+				expect(receivedActionInput).toHaveProperty('output-file', inputValue);
 			});
 
 			it('Can be referenced by its shortname, -f', async () => {
@@ -186,6 +187,7 @@ describe('`code-analyzer config` tests', () => {
 				expect(createActionSpy).toHaveBeenCalled();
 				expect(fromFileSpy).toHaveBeenCalled();
 				expect(receivedFile).toEqual(inputValue);
+				expect(receivedActionInput).toHaveProperty('output-file', inputValue);
 			});
 
 			it('Cannot be supplied multiple times', async () => {
@@ -201,6 +203,7 @@ describe('`code-analyzer config` tests', () => {
 				expect(executeSpy).toHaveBeenCalled();
 				expect(createActionSpy).toHaveBeenCalled();
 				expect(fromFileSpy).not.toHaveBeenCalled();
+				expect(receivedActionInput['output-file']).toBeUndefined();
 			});
 
 		});

test/fixtures/comparison-files/lib/actions/ConfigAction.test.ts/action-summaries/no-outfile-created.txt.goldfile

@@ -0,0 +1,5 @@
+=== Summary
+
+No output file was specified.
+
+Additional log information written to: