takomo 5.6.0 → 6.0.0-alpha.2

package/dist/parser/targets/build-deployment-config.js

@@ -1,29 +1,23 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildDeploymentConfig = void 0;
-const neverthrow_1 = require("neverthrow");
-const ramda_1 = __importDefault(require("ramda"));
-const deployment_targets_config_schema_1 = require("../../schema/deployment-targets-config-schema");
-const collections_1 = require("../../utils/collections");
-const errors_1 = require("../../utils/errors");
-const objects_1 = require("../../utils/objects");
-const common_parser_1 = require("../common-parser");
-const config_set_parser_1 = require("../config-set-parser");
-const parse_deployment_groups_1 = require("./parse-deployment-groups");
-const parse_target_schemas_1 = require("./parse-target-schemas");
-const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploymentTargets, externalConfigSets, record) => {
+import { err, ok } from "neverthrow";
+import * as R from "ramda";
+import { createDeploymentTargetsConfigSchema } from "../../schema/deployment-targets-config-schema.js";
+import { collectFromHierarchy } from "../../utils/collections.js";
+import { ValidationError } from "../../utils/errors.js";
+import { merge } from "../../utils/objects.js";
+import { parseCommandRole, parseOptionalString, parseVars, } from "../common-parser.js";
+import { mergeConfigSets, parseConfigSets } from "../config-set-parser.js";
+import { parseDeploymentGroups } from "./parse-deployment-groups.js";
+import { parseTargetSchemas } from "./parse-target-schemas.js";
+export const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploymentTargets, externalConfigSets, record) => {
     const externalTargetNames = Array.from(externalDeploymentTargets.values())
         .map((targets) => targets.map((t) => t.name))
         .flat();
-    const nonUniqueExternalTargets = externalTargetNames.filter((name) => externalTargetNames.filter(ramda_1.default.equals(name)).length > 1);
+    const nonUniqueExternalTargets = externalTargetNames.filter((name) => externalTargetNames.filter(R.equals(name)).length > 1);
     if (nonUniqueExternalTargets.length > 0) {
         const details = nonUniqueExternalTargets.map((d) => `Deployment target '${d}' is specified more than once in the externally configured targets`);
-        return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration.", details));
+        return err(new ValidationError("Validation errors in deployment configuration.", details));
     }
-    const { error } = (0, deployment_targets_config_schema_1.createDeploymentTargetsConfigSchema)({
+    const { error } = createDeploymentTargetsConfigSchema({
         regions: ctx.regions,
     }).validate(record, {
         abortEarly: false,
@@ -31,56 +25,51 @@ const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploy
     });
     if (error) {
         const details = error.details.map((d) => d.message);
-        return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration", details));
+        return err(new ValidationError("Validation errors in deployment configuration", details));
     }
-    const vars = (0, objects_1.merge)(ctx.variables.var, (0, common_parser_1.parseVars)(record.vars));
-    const targetsSchema = (0, parse_target_schemas_1.parseTargetSchemas)(record.targetsSchema);
-    const parsedConfigSets = (0, config_set_parser_1.parseConfigSets)(record.configSets);
-    const configSets = (0, config_set_parser_1.mergeConfigSets)(parsedConfigSets, externalConfigSets);
-    const deploymentRole = (0, common_parser_1.parseCommandRole)(record.deploymentRole);
-    const deploymentRoleName = (0, common_parser_1.parseOptionalString)(record.deploymentRoleName);
-    const bootstrapRole = (0, common_parser_1.parseCommandRole)(record.bootstrapRole);
-    const bootstrapRoleName = (0, common_parser_1.parseOptionalString)(record.bootstrapRoleName);
-    const deploymentGroups = (0, parse_deployment_groups_1.parseDeploymentGroups)(externalDeploymentTargets, record.deploymentGroups, vars, deploymentRole, deploymentRoleName, bootstrapRole, bootstrapRoleName);
+    const vars = merge(ctx.variables.var, parseVars(record.vars));
+    const targetsSchema = parseTargetSchemas(record.targetsSchema);
+    const parsedConfigSets = parseConfigSets(record.configSets);
+    const configSets = mergeConfigSets(parsedConfigSets, externalConfigSets);
+    const deploymentRole = parseCommandRole(record.deploymentRole);
+    const deploymentRoleName = parseOptionalString(record.deploymentRoleName);
+    const deploymentGroups = parseDeploymentGroups(externalDeploymentTargets, record.deploymentGroups, vars, deploymentRole, deploymentRoleName);
     const configuredStackGroups = deploymentGroups
-        .map((rootGroup) => (0, collections_1.collectFromHierarchy)(rootGroup, (g) => g.children))
+        .map((rootGroup) => collectFromHierarchy(rootGroup, (g) => g.children))
         .flat();
     if (externalDeploymentTargets.size > 0) {
-        const configuredStackGroupPaths = configuredStackGroups.map(ramda_1.default.prop("path"));
+        const configuredStackGroupPaths = configuredStackGroups.map(R.prop("path"));
         const externalGroupsNotConfigured = Array.from(externalDeploymentTargets.keys()).filter((e) => !configuredStackGroupPaths.includes(e));
         if (externalGroupsNotConfigured.length > 0) {
             const details = externalGroupsNotConfigured.map((d) => `Deployment group '${d}' is not found from the configuration file but is referenced in externally configured targets.`);
-            return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration.", details));
+            return err(new ValidationError("Validation errors in deployment configuration.", details));
         }
     }
     const targetNames = configuredStackGroups
-        .map((g) => g.targets.map(ramda_1.default.prop("name")))
+        .map((g) => g.targets.map(R.prop("name")))
         .flat();
-    const nonUniqueTargets = targetNames.filter((targetName) => targetNames.filter(ramda_1.default.equals(targetName)).length > 1);
+    const nonUniqueTargets = targetNames.filter((targetName) => targetNames.filter(R.equals(targetName)).length > 1);
     if (nonUniqueTargets.length > 0) {
         const details = nonUniqueTargets.map((d) => `Target '${d}' is defined more than once in the configuration.`);
-        return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration.", details));
+        return err(new ValidationError("Validation errors in deployment configuration.", details));
     }
     const validationError = await validateDeploymentTargets(ctx, schemaRegistry, targetsSchema, deploymentGroups);
     if (validationError) {
-        return (0, neverthrow_1.err)(validationError);
+        return err(validationError);
     }
-    return (0, neverthrow_1.ok)({
+    return ok({
         vars,
         configSets,
         deploymentGroups,
         targetsSchema,
         deploymentRole,
         deploymentRoleName,
-        bootstrapRole,
-        bootstrapRoleName,
     });
 };
-exports.buildDeploymentConfig = buildDeploymentConfig;
 const validateDeploymentTargets = async (ctx, schemaRegistry, targetsSchema, deploymentGroups) => {
     const allTargets = deploymentGroups
         .reduce((collected, group) => {
-        return [...collected, ...(0, collections_1.collectFromHierarchy)(group, (g) => g.children)];
+        return [...collected, ...collectFromHierarchy(group, (g) => g.children)];
     }, new Array())
         .map((group) => group.targets.reduce((collected, target) => {
         return { ...collected, [`${group.path}/${target.name}`]: target };
@@ -99,8 +88,8 @@ const validateDeploymentTargets = async (ctx, schemaRegistry, targetsSchema, dep
             convert: false,
         });
         if (error) {
-            const details = error.details.map(ramda_1.default.prop("message"));
-            return new errors_1.ValidationError("Validation errors in deployment configuration", details);
+            const details = error.details.map(R.prop("message"));
+            return new ValidationError("Validation errors in deployment configuration", details);
         }
     }
     for (const group of deploymentGroups) {
@@ -116,8 +105,8 @@ const validateDeploymentTargets = async (ctx, schemaRegistry, targetsSchema, dep
                 convert: false,
             });
             if (error) {
-                const details = error.details.map(ramda_1.default.prop("message"));
-                return new errors_1.ValidationError("Validation errors in deployment configuration", details);
+                const details = error.details.map(R.prop("message"));
+                return new ValidationError("Validation errors in deployment configuration", details);
             }
         }
     }

package/dist/parser/targets/build-deployment-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-deployment-config.js","sourceRoot":"","sources":["../../../src/parser/targets/build-deployment-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-deployment-config.js","sourceRoot":"","sources":["../../../src/parser/targets/build-deployment-config.ts"],"names":[],"mappings":"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"}

package/dist/parser/targets/parse-deployment-groups.d.ts

@@ -1,6 +1,6 @@
-import { IamRoleName } from "../../aws/common/model";
-import { Vars } from "../../common/model";
-import { DeploymentGroupConfig } from "../../config/targets-config";
-import { CommandRole } from "../../takomo-core/command";
-import { DeploymentGroupPath } from "../../targets/targets-model";
-export declare const parseDeploymentGroups: (externalDeploymentTargets: Map<DeploymentGroupPath, ReadonlyArray<unknown>>, value: any, inheritedVars: Vars, inheritedDeploymentRole: CommandRole | undefined, inheritedDeploymentRoleName: IamRoleName | undefined, inheritedBootstrapRole: CommandRole | undefined, inheritedBootstrapRoleName: IamRoleName | undefined) => DeploymentGroupConfig[];
+import { IamRoleName } from "../../aws/common/model.js";
+import { Vars } from "../../common/model.js";
+import { DeploymentGroupConfig } from "../../config/targets-config.js";
+import { CommandRole } from "../../takomo-core/command.js";
+import { DeploymentGroupPath } from "../../targets/targets-model.js";
+export declare const parseDeploymentGroups: (externalDeploymentTargets: Map<DeploymentGroupPath, ReadonlyArray<unknown>>, value: any, inheritedVars: Vars, inheritedDeploymentRole: CommandRole | undefined, inheritedDeploymentRoleName: IamRoleName | undefined) => DeploymentGroupConfig[];

package/dist/parser/targets/parse-deployment-groups.js

@@ -1,65 +1,51 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDeploymentGroups = void 0;
-const ramda_1 = __importDefault(require("ramda"));
-const objects_1 = require("../../utils/objects");
-const common_parser_1 = require("../common-parser");
-const config_set_parser_1 = require("../config-set-parser");
-const parse_deployment_status_1 = require("./parse-deployment-status");
-const parse_deployment_targets_1 = require("./parse-deployment-targets");
-const parse_target_schemas_1 = require("./parse-target-schemas");
-const util_1 = require("./util");
-const parseDeploymentGroup = (externalDeploymentTargets, groupPath, config, inheritedVars, inheritedConfigSets, inheritedBootstrapConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName) => {
+import * as R from "ramda";
+import { merge } from "../../utils/objects.js";
+import { parseCommandRole, parseStringArray, parseVars, } from "../common-parser.js";
+import { mergeConfigSetInstructions, parseConfigSetInstructions, } from "../config-set-parser.js";
+import { parseDeploymentStatus } from "./parse-deployment-status.js";
+import { parseDeploymentTargets } from "./parse-deployment-targets.js";
+import { parseTargetSchemas } from "./parse-target-schemas.js";
+import { fillMissingDeploymentGroups } from "./util.js";
+const parseDeploymentGroup = (externalDeploymentTargets, groupPath, config, inheritedVars, inheritedConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName) => {
     const group = config[groupPath];
     const groupPathDepth = groupPath.split("/").length;
     const childPaths = Object.keys(config).filter((key) => key.startsWith(`${groupPath}/`));
     const directChildPaths = childPaths.filter((key) => key.split("/").length === groupPathDepth + 1);
-    const configuredConfigSets = (0, config_set_parser_1.parseConfigSetInstructions)(group.configSets);
-    const configSets = (0, config_set_parser_1.mergeConfigSetInstructions)(configuredConfigSets, inheritedConfigSets);
-    const configuredBootstrapConfigSets = (0, config_set_parser_1.parseConfigSetInstructions)(group.bootstrapConfigSets);
-    const bootstrapConfigSets = (0, config_set_parser_1.mergeConfigSetInstructions)(configuredBootstrapConfigSets, inheritedBootstrapConfigSets);
-    const configuredLabels = (0, common_parser_1.parseStringArray)(group?.labels);
-    const labels = ramda_1.default.uniq([...inheritedLabels, ...configuredLabels]);
-    const targetsSchema = (0, parse_target_schemas_1.parseTargetSchemas)(group?.targetsSchema);
-    const vars = (0, objects_1.merge)(inheritedVars, (0, common_parser_1.parseVars)(group?.vars));
-    const deploymentRole = (0, common_parser_1.parseCommandRole)(group?.deploymentRole) ?? inheritedDeploymentRole;
+    const configuredConfigSets = parseConfigSetInstructions(group.configSets);
+    const configSets = mergeConfigSetInstructions(configuredConfigSets, inheritedConfigSets);
+    const configuredLabels = parseStringArray(group?.labels);
+    const labels = R.uniq([...inheritedLabels, ...configuredLabels]);
+    const targetsSchema = parseTargetSchemas(group?.targetsSchema);
+    const vars = merge(inheritedVars, parseVars(group?.vars));
+    const deploymentRole = parseCommandRole(group?.deploymentRole) ?? inheritedDeploymentRole;
     const deploymentRoleName = group?.deploymentRoleName ?? inheritedDeploymentRoleName;
-    const bootstrapRole = (0, common_parser_1.parseCommandRole)(group?.bootstrapRole) ?? inheritedBootstrapRole;
-    const bootstrapRoleName = group?.bootstrapRoleName ?? inheritedBootstrapRoleName;
-    const children = directChildPaths.map((childPath) => parseDeploymentGroup(externalDeploymentTargets, childPath, config, vars, configSets, bootstrapConfigSets, labels, deploymentRole, deploymentRoleName, bootstrapRole, bootstrapRoleName));
+    const children = directChildPaths.map((childPath) => parseDeploymentGroup(externalDeploymentTargets, childPath, config, vars, configSets, labels, deploymentRole, deploymentRoleName));
     const externalTargets = externalDeploymentTargets.get(groupPath) ?? [];
     const allTargets = [...(group?.targets ?? []), ...externalTargets];
-    const targets = (0, parse_deployment_targets_1.parseDeploymentTargets)(allTargets, vars, configSets, bootstrapConfigSets, labels, deploymentRole, deploymentRoleName, bootstrapRole, bootstrapRoleName);
+    const targets = parseDeploymentTargets(allTargets, vars, configSets, labels, deploymentRole, deploymentRoleName);
     const name = groupPath.split("/").reverse()[0];
     return {
         name,
         children,
         targets,
         configSets,
-        bootstrapConfigSets,
         labels,
         targetsSchema,
         vars,
         deploymentRole,
-        bootstrapRole,
         deploymentRoleName,
-        bootstrapRoleName,
         path: groupPath,
         description: group?.description,
         priority: group?.priority ?? 0,
-        status: (0, parse_deployment_status_1.parseDeploymentStatus)(group?.status),
+        status: parseDeploymentStatus(group?.status),
     };
 };
-const parseDeploymentGroups = (externalDeploymentTargets, value, inheritedVars, inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName) => {
+export const parseDeploymentGroups = (externalDeploymentTargets, value, inheritedVars, inheritedDeploymentRole, inheritedDeploymentRoleName) => {
     if (value === null || value === undefined) {
         return [];
     }
-    const filledValue = (0, util_1.fillMissingDeploymentGroups)(value);
-    const rootGroupPaths = ramda_1.default.uniq(Object.keys(filledValue).map((key) => key.split("/")[0]));
-    return rootGroupPaths.map((rootPath) => parseDeploymentGroup(externalDeploymentTargets, rootPath, filledValue, inheritedVars, [], [], [], inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName));
+    const filledValue = fillMissingDeploymentGroups(value);
+    const rootGroupPaths = R.uniq(Object.keys(filledValue).map((key) => key.split("/")[0]));
+    return rootGroupPaths.map((rootPath) => parseDeploymentGroup(externalDeploymentTargets, rootPath, filledValue, inheritedVars, [], [], inheritedDeploymentRole, inheritedDeploymentRoleName));
 };
-exports.parseDeploymentGroups = parseDeploymentGroups;
 //# sourceMappingURL=parse-deployment-groups.js.map

package/dist/parser/targets/parse-deployment-groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-deployment-groups.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-groups.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-deployment-groups.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-groups.ts"],"names":[],"mappings":"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"}

package/dist/parser/targets/parse-deployment-status.d.ts

@@ -1,2 +1,2 @@
-import { DeploymentStatus } from "../../targets/targets-model";
+import { DeploymentStatus } from "../../targets/targets-model.js";
 export declare const parseDeploymentStatus: (value: any) => DeploymentStatus;

package/dist/parser/targets/parse-deployment-status.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDeploymentStatus = void 0;
-const parseDeploymentStatus = (value) => {
+export const parseDeploymentStatus = (value) => {
     if (!value) {
         return "active";
     }
@@ -14,5 +11,4 @@ const parseDeploymentStatus = (value) => {
             throw new Error(`Unsupported deployment status: '${value}'`);
     }
 };
-exports.parseDeploymentStatus = parseDeploymentStatus;
 //# sourceMappingURL=parse-deployment-status.js.map

package/dist/parser/targets/parse-deployment-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-deployment-status.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-status.ts"],"names":[],"mappings":";;;AAEO,MAAM,qBAAqB,GAAG,CAAC,KAAU,EAAoB,EAAE;IACpE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,QAAQ,CAAA;KAChB;IAED,QAAQ,KAAK,EAAE;QACb,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAA;QACjB,KAAK,UAAU;YACb,OAAO,UAAU,CAAA;QACnB;YACE,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,GAAG,CAAC,CAAA;KAC/D;AACH,CAAC,CAAA;AAbY,QAAA,qBAAqB,yBAajC"}
+{"version":3,"file":"parse-deployment-status.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-status.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAAU,EAAoB,EAAE;IACpE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,QAAQ,CAAA;KAChB;IAED,QAAQ,KAAK,EAAE;QACb,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAA;QACjB,KAAK,UAAU;YACb,OAAO,UAAU,CAAA;QACnB;YACE,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,GAAG,CAAC,CAAA;KAC/D;AACH,CAAC,CAAA"}

package/dist/parser/targets/parse-deployment-targets.d.ts

@@ -1,8 +1,8 @@
-import { IamRoleName } from "../../aws/common/model";
-import { Vars } from "../../common/model";
-import { ConfigSetInstruction } from "../../config-sets/config-set-model";
-import { DeploymentTargetConfig } from "../../config/targets-config";
-import { CommandRole } from "../../takomo-core/command";
-import { Label } from "../../targets/targets-model";
-export declare const parseDeploymentTarget: (value: any, inheritedVars: Vars, inheritedConfigSets: ReadonlyArray<ConfigSetInstruction>, inheritedBootstrapConfigSets: ReadonlyArray<ConfigSetInstruction>, inheritedLabels: ReadonlyArray<Label>, inheritedDeploymentRole: CommandRole | undefined, inheritedDeploymentRoleName: IamRoleName | undefined, inheritedBootstrapRole: CommandRole | undefined, inheritedBootstrapRoleName: IamRoleName | undefined) => DeploymentTargetConfig;
-export declare const parseDeploymentTargets: (value: any, inheritedVars: Vars, inheritedConfigSets: ReadonlyArray<ConfigSetInstruction>, inheritedBootstrapConfigSets: ReadonlyArray<ConfigSetInstruction>, inheritedLabels: ReadonlyArray<Label>, inheritedDeploymentRole: CommandRole | undefined, inheritedDeploymentRoleName: IamRoleName | undefined, inheritedBootstrapRole: CommandRole | undefined, inheritedBootstrapRoleName: IamRoleName | undefined) => ReadonlyArray<DeploymentTargetConfig>;
+import { IamRoleName } from "../../aws/common/model.js";
+import { Vars } from "../../common/model.js";
+import { ConfigSetInstruction } from "../../config-sets/config-set-model.js";
+import { DeploymentTargetConfig } from "../../config/targets-config.js";
+import { CommandRole } from "../../takomo-core/command.js";
+import { Label } from "../../targets/targets-model.js";
+export declare const parseDeploymentTarget: (value: any, inheritedVars: Vars, inheritedConfigSets: ReadonlyArray<ConfigSetInstruction>, inheritedLabels: ReadonlyArray<Label>, inheritedDeploymentRole: CommandRole | undefined, inheritedDeploymentRoleName: IamRoleName | undefined) => DeploymentTargetConfig;
+export declare const parseDeploymentTargets: (value: any, inheritedVars: Vars, inheritedConfigSets: ReadonlyArray<ConfigSetInstruction>, inheritedLabels: ReadonlyArray<Label>, inheritedDeploymentRole: CommandRole | undefined, inheritedDeploymentRoleName: IamRoleName | undefined) => ReadonlyArray<DeploymentTargetConfig>;

package/dist/parser/targets/parse-deployment-targets.js

@@ -1,49 +1,34 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseDeploymentTargets = exports.parseDeploymentTarget = void 0;
-const ramda_1 = __importDefault(require("ramda"));
-const objects_1 = require("../../utils/objects");
-const common_parser_1 = require("../common-parser");
-const config_set_parser_1 = require("../config-set-parser");
-const parse_deployment_status_1 = require("./parse-deployment-status");
-const parseDeploymentTarget = (value, inheritedVars, inheritedConfigSets, inheritedBootstrapConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName) => {
-    const configuredConfigSets = (0, config_set_parser_1.parseConfigSetInstructions)(value.configSets);
-    const configSets = (0, config_set_parser_1.mergeConfigSetInstructions)(configuredConfigSets, inheritedConfigSets);
-    const configuredBootstrapConfigSets = (0, config_set_parser_1.parseConfigSetInstructions)(value.bootstrapConfigSets);
-    const bootstrapConfigSets = (0, config_set_parser_1.mergeConfigSetInstructions)(configuredBootstrapConfigSets, inheritedBootstrapConfigSets);
-    const configuredLabels = (0, common_parser_1.parseStringArray)(value.labels);
-    const labels = ramda_1.default.uniq([...inheritedLabels, ...configuredLabels]);
-    const vars = (0, objects_1.merge)(inheritedVars, (0, common_parser_1.parseVars)(value.vars));
-    const deploymentRole = (0, common_parser_1.parseCommandRole)(value.deploymentRole) ?? inheritedDeploymentRole;
-    const bootstrapRole = (0, common_parser_1.parseCommandRole)(value.bootstrapRole) ?? inheritedBootstrapRole;
+import * as R from "ramda";
+import { merge } from "../../utils/objects.js";
+import { parseCommandRole, parseStringArray, parseVars, } from "../common-parser.js";
+import { mergeConfigSetInstructions, parseConfigSetInstructions, } from "../config-set-parser.js";
+import { parseDeploymentStatus } from "./parse-deployment-status.js";
+export const parseDeploymentTarget = (value, inheritedVars, inheritedConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName) => {
+    const configuredConfigSets = parseConfigSetInstructions(value.configSets);
+    const configSets = mergeConfigSetInstructions(configuredConfigSets, inheritedConfigSets);
+    const configuredLabels = parseStringArray(value.labels);
+    const labels = R.uniq([...inheritedLabels, ...configuredLabels]);
+    const vars = merge(inheritedVars, parseVars(value.vars));
+    const deploymentRole = parseCommandRole(value.deploymentRole) ?? inheritedDeploymentRole;
     const deploymentRoleName = value.deploymentRoleName ?? inheritedDeploymentRoleName;
-    const bootstrapRoleName = value.bootstrapRoleName ?? inheritedBootstrapRoleName;
     return {
         configSets,
-        bootstrapConfigSets,
         labels,
         vars,
         name: value.name,
         description: value.description,
         accountId: value.accountId,
         deploymentRole,
-        bootstrapRole,
         deploymentRoleName,
-        bootstrapRoleName,
-        status: (0, parse_deployment_status_1.parseDeploymentStatus)(value.status),
+        status: parseDeploymentStatus(value.status),
     };
 };
-exports.parseDeploymentTarget = parseDeploymentTarget;
-const parseDeploymentTargets = (value, inheritedVars, inheritedConfigSets, inheritedBootstrapConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName) => {
+export const parseDeploymentTargets = (value, inheritedVars, inheritedConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName) => {
     if (value === null || value === undefined) {
         return [];
     }
     return value
-        .map((target) => (0, exports.parseDeploymentTarget)(target, inheritedVars, inheritedConfigSets, inheritedBootstrapConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName))
+        .map((target) => parseDeploymentTarget(target, inheritedVars, inheritedConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName))
         .sort((a, b) => a.name.localeCompare(b.name));
 };
-exports.parseDeploymentTargets = parseDeploymentTargets;
 //# sourceMappingURL=parse-deployment-targets.js.map

package/dist/parser/targets/parse-deployment-targets.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-deployment-targets.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-targets.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAOrB,iDAA2C;AAC3C,oDAAgF;AAChF,4DAG6B;AAC7B,uEAAiE;AAE1D,MAAM,qBAAqB,GAAG,CACnC,KAAU,EACV,aAAmB,EACnB,mBAAwD,EACxD,4BAAiE,EACjE,eAAqC,EACrC,uBAAgD,EAChD,2BAAoD,EACpD,sBAA+C,EAC/C,0BAAmD,EAC3B,EAAE;IAC1B,MAAM,oBAAoB,GAAG,IAAA,8CAA0B,EAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,IAAA,8CAA0B,EAC3C,oBAAoB,EACpB,mBAAmB,CACpB,CAAA;IAED,MAAM,6BAA6B,GAAG,IAAA,8CAA0B,EAC9D,KAAK,CAAC,mBAAmB,CAC1B,CAAA;IACD,MAAM,mBAAmB,GAAG,IAAA,8CAA0B,EACpD,6BAA6B,EAC7B,4BAA4B,CAC7B,CAAA;IAED,MAAM,gBAAgB,GAAG,IAAA,gCAAgB,EAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,eAAC,CAAC,IAAI,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAA;IAChE,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,aAAa,EAAE,IAAA,yBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAExD,MAAM,cAAc,GAClB,IAAA,gCAAgB,EAAC,KAAK,CAAC,cAAc,CAAC,IAAI,uBAAuB,CAAA;IACnE,MAAM,aAAa,GACjB,IAAA,gCAAgB,EAAC,KAAK,CAAC,aAAa,CAAC,IAAI,sBAAsB,CAAA;IACjE,MAAM,kBAAkB,GACtB,KAAK,CAAC,kBAAkB,IAAI,2BAA2B,CAAA;IACzD,MAAM,iBAAiB,GACrB,KAAK,CAAC,iBAAiB,IAAI,0BAA0B,CAAA;IAEvD,OAAO;QACL,UAAU;QACV,mBAAmB;QACnB,MAAM;QACN,IAAI;QACJ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,cAAc;QACd,aAAa;QACb,kBAAkB;QAClB,iBAAiB;QACjB,MAAM,EAAE,IAAA,+CAAqB,EAAC,KAAK,CAAC,MAAM,CAAC;KAC5C,CAAA;AACH,CAAC,CAAA;AApDY,QAAA,qBAAqB,yBAoDjC;AAEM,MAAM,sBAAsB,GAAG,CACpC,KAAU,EACV,aAAmB,EACnB,mBAAwD,EACxD,4BAAiE,EACjE,eAAqC,EACrC,uBAAgD,EAChD,2BAAoD,EACpD,sBAA+C,EAC/C,0BAAmD,EACZ,EAAE;IACzC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;QACzC,OAAO,EAAE,CAAA;KACV;IAED,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CACnB,IAAA,6BAAqB,EACnB,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,4BAA4B,EAC5B,eAAe,EACf,uBAAuB,EACvB,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,CAC3B,CACF;SACA,IAAI,CAAC,CAAC,CAAyB,EAAE,CAAyB,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAA;AACL,CAAC,CAAA;AAhCY,QAAA,sBAAsB,0BAgClC"}
+{"version":3,"file":"parse-deployment-targets.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-deployment-targets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAO1B,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,GACV,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,GAC3B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEpE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAU,EACV,aAAmB,EACnB,mBAAwD,EACxD,eAAqC,EACrC,uBAAgD,EAChD,2BAAoD,EAC5B,EAAE;IAC1B,MAAM,oBAAoB,GAAG,0BAA0B,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,0BAA0B,CAC3C,oBAAoB,EACpB,mBAAmB,CACpB,CAAA;IAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACvD,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAA;IAChE,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAExD,MAAM,cAAc,GAClB,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,uBAAuB,CAAA;IACnE,MAAM,kBAAkB,GACtB,KAAK,CAAC,kBAAkB,IAAI,2BAA2B,CAAA;IAEzD,OAAO;QACL,UAAU;QACV,MAAM;QACN,IAAI;QACJ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,cAAc;QACd,kBAAkB;QAClB,MAAM,EAAE,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC;KAC5C,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAU,EACV,aAAmB,EACnB,mBAAwD,EACxD,eAAqC,EACrC,uBAAgD,EAChD,2BAAoD,EACb,EAAE;IACzC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;QACzC,OAAO,EAAE,CAAA;KACV;IAED,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CACnB,qBAAqB,CACnB,MAAM,EACN,aAAa,EACb,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,2BAA2B,CAC5B,CACF;SACA,IAAI,CAAC,CAAC,CAAyB,EAAE,CAAyB,EAAE,EAAE,CAC7D,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAC7B,CAAA;AACL,CAAC,CAAA"}

package/dist/parser/targets/parse-target-schemas.d.ts

@@ -1,3 +1,3 @@
-import { SchemaConfig } from "../../config/targets-config";
+import { SchemaConfig } from "../../config/targets-config.js";
 export declare const parseTargetSchema: (value: unknown) => SchemaConfig;
 export declare const parseTargetSchemas: (value: unknown) => ReadonlyArray<SchemaConfig>;

package/dist/parser/targets/parse-target-schemas.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTargetSchemas = exports.parseTargetSchema = void 0;
-const parseTargetSchema = (value) => {
+export const parseTargetSchema = (value) => {
     if (typeof value === "string") {
         return {
             name: value,
@@ -12,14 +9,12 @@ const parseTargetSchema = (value) => {
     }
     throw new Error(`Expected schema to be of type string or object`);
 };
-exports.parseTargetSchema = parseTargetSchema;
-const parseTargetSchemas = (value) => {
+export const parseTargetSchemas = (value) => {
     if (value === undefined || value === null) {
         return [];
     }
     return Array.isArray(value)
-        ? value.map(exports.parseTargetSchema)
-        : [(0, exports.parseTargetSchema)(value)];
+        ? value.map(parseTargetSchema)
+        : [parseTargetSchema(value)];
 };
-exports.parseTargetSchemas = parseTargetSchemas;
 //# sourceMappingURL=parse-target-schemas.js.map

package/dist/parser/targets/parse-target-schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-target-schemas.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-target-schemas.ts"],"names":[],"mappings":";;;AAEO,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAgB,EAAE;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO;YACL,IAAI,EAAE,KAAK;SACZ,CAAA;KACF;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAqB,CAAA;KAC7B;IAED,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;AACnE,CAAC,CAAA;AAZY,QAAA,iBAAiB,qBAY7B;AAEM,MAAM,kBAAkB,GAAG,CAChC,KAAc,EACe,EAAE;IAC/B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;QACzC,OAAO,EAAE,CAAA;KACV;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAiB,CAAC;QAC9B,CAAC,CAAC,CAAC,IAAA,yBAAiB,EAAC,KAAK,CAAC,CAAC,CAAA;AAChC,CAAC,CAAA;AAVY,QAAA,kBAAkB,sBAU9B"}
+{"version":3,"file":"parse-target-schemas.js","sourceRoot":"","sources":["../../../src/parser/targets/parse-target-schemas.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAgB,EAAE;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO;YACL,IAAI,EAAE,KAAK;SACZ,CAAA;KACF;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAqB,CAAA;KAC7B;IAED,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;AACnE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAc,EACe,EAAE;IAC/B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;QACzC,OAAO,EAAE,CAAA;KACV;IAED,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC9B,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAA;AAChC,CAAC,CAAA"}

package/dist/parser/targets/util.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillMissingDeploymentGroups = void 0;
-const fillMissingDeploymentGroups = (value) => {
+export const fillMissingDeploymentGroups = (value) => {
     for (const key of Object.keys(value)) {
         const parts = key.split("/");
         for (let i = 1; i <= parts.length; i++) {
@@ -13,5 +10,4 @@ const fillMissingDeploymentGroups = (value) => {
     }
     return value;
 };
-exports.fillMissingDeploymentGroups = fillMissingDeploymentGroups;
 //# sourceMappingURL=util.js.map

package/dist/parser/targets/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/parser/targets/util.ts"],"names":[],"mappings":";;;AAAO,MAAM,2BAA2B,GAAG,CACzC,KAA8B,EACL,EAAE;IAC3B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACpC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC1C,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE;gBACtB,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;aACnB;SACF;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAdY,QAAA,2BAA2B,+BAcvC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/parser/targets/util.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,KAA8B,EACL,EAAE;IAC3B,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACpC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC1C,IAAI,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE;gBACtB,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;aACnB;SACF;KACF;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/resolvers/cmd-resolver.d.ts

@@ -1,2 +1,2 @@
-import { ResolverProvider } from "./resolver-provider";
+import { ResolverProvider } from "./resolver-provider.js";
 export declare const createCmdResolverProvider: () => ResolverProvider;

package/dist/resolvers/cmd-resolver.js

@@ -1,19 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCmdResolverProvider = void 0;
-const ramda_1 = __importDefault(require("ramda"));
-const util_1 = require("../aws/util");
-const exec_1 = require("../utils/exec");
-const files_1 = require("../utils/files");
+import * as R from "ramda";
+import { prepareAwsEnvVariables } from "../aws/util.js";
+import { executeShellCommand } from "../utils/exec.js";
+import { expandFilePath } from "../utils/files.js";
 const captureValue = (capture, output) => {
     switch (capture) {
         case "all":
             return output;
         case "last-line":
-            return ramda_1.default.last(output.split("\n")) ?? "";
+            return R.last(output.split("\n")) ?? "";
         default:
             throw new Error(`Unknown value for capture: ${capture}`);
     }
@@ -29,15 +23,15 @@ const init = async ({ command, exposeStackCredentials, exposeStackRegion, captur
                 ? await stack.credentialManager.getCredentials()
                 : undefined;
             const region = exposeStackRegion === true ? stack.region : undefined;
-            const env = (0, util_1.prepareAwsEnvVariables)({
+            const env = prepareAwsEnvVariables({
                 env: process.env,
                 credentials,
                 region,
             });
-            const { stdout, success, error } = await (0, exec_1.executeShellCommand)({
+            const { stdout, success, error } = await executeShellCommand({
                 command,
                 env,
-                cwd: cwd ? (0, files_1.expandFilePath)(ctx.projectDir, cwd) : ctx.projectDir,
+                cwd: cwd ? expandFilePath(ctx.projectDir, cwd) : ctx.projectDir,
                 stdoutListener: (data) => logger.info(data),
                 stderrListener: (data) => logger.error(data),
             });
@@ -56,10 +50,9 @@ const schema = ({ joi, base }) => base.keys({
     cwd: joi.string(),
     capture: joi.string().valid("all", "last-line"),
 });
-const createCmdResolverProvider = () => ({
+export const createCmdResolverProvider = () => ({
     name,
     init,
     schema,
 });
-exports.createCmdResolverProvider = createCmdResolverProvider;
 //# sourceMappingURL=cmd-resolver.js.map

package/dist/resolvers/cmd-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd-resolver.js","sourceRoot":"","sources":["../../src/resolvers/cmd-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cmd-resolver.js","sourceRoot":"","sources":["../../src/resolvers/cmd-resolver.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/external-stack-output-resolver.d.ts

@@ -1,2 +1,2 @@
-import { ResolverProvider } from "./resolver-provider";
+import { ResolverProvider } from "./resolver-provider.js";
 export declare const createExternalStackOutputResolverProvider: () => ResolverProvider;