Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/commands/print-tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { BuildRunner } from '~build-tasks/build-runner';
import { Validator } from '~parser/validator';
import { AwsUtil } from '~util/aws-util';
import { ConsoleUtil } from '~util/console-util';
import { GlobalState } from '~util/global-state';

const commandName = 'print-tasks <tasksFile>';
const commandDescription = 'Will print out all cloudformation templates that will be deployed by tasksFile';
Expand Down Expand Up @@ -60,7 +61,10 @@ export class PrintTasksCommand extends BaseCliCommand<IPrintTasksCommandArgs> {

command.parsedParameters = this.parseCfnParameters(command.parameters);
const config = new BuildConfiguration(tasksFile, command.parsedParameters, command.TemplatingContext);
await config.fixateOrganizationFile(command);
const template = await config.fixateOrganizationFile(command);
const state = await this.getState(command);

GlobalState.Init(state, template);

const printTasks = config.enumPrintTasks(command);

Expand Down
5 changes: 4 additions & 1 deletion src/commands/validate-tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { BuildRunner } from '~build-tasks/build-runner';
import { Validator } from '~parser/validator';
import { AwsUtil } from '~util/aws-util';
import { ConsoleUtil } from '~util/console-util';
import { GlobalState } from '~util/global-state';

const commandName = 'validate-tasks <tasksFile>';
const commandDescription = 'Will validate the tasks file, including configured tasks';
Expand Down Expand Up @@ -55,8 +56,10 @@ export class ValidateTasksCommand extends BaseCliCommand<IPerformTasksCommandArg

command.parsedParameters = this.parseCfnParameters(command.parameters);
const config = new BuildConfiguration(tasksFile, command.parsedParameters, command.TemplatingContext);
const template = await config.fixateOrganizationFile(command);
const state = await this.getState(command);

await config.fixateOrganizationFile(command);
GlobalState.Init(state, template);
const validationTasks = config.enumValidationTasks(command);

if (command.match) {
Expand Down
Loading