takomo 5.0.0 → 5.1.0

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

@@ -8,7 +8,9 @@ const neverthrow_1 = require("neverthrow");
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_config_sets_1 = require("../takomo-config-sets");
 const takomo_core_1 = require("../takomo-core");
-const takomo_util_1 = require("../takomo-util");
+const collections_1 = require("../utils/collections");
+const errors_1 = require("../utils/errors");
+const objects_1 = require("../utils/objects");
 const parse_deployment_groups_1 = require("./parser/parse-deployment-groups");
 const parse_target_schemas_1 = require("./parser/parse-target-schemas");
 const schema_1 = require("./schema");
@@ -19,7 +21,7 @@ const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploy
     const nonUniqueExternalTargets = externalTargetNames.filter((name) => externalTargetNames.filter(ramda_1.default.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 takomo_util_1.ValidationError("Validation errors in deployment configuration.", details));
+        return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration.", details));
     }
     const { error } = (0, schema_1.createDeploymentTargetsConfigSchema)({
         regions: ctx.regions,
@@ -29,9 +31,9 @@ const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploy
     });
     if (error) {
         const details = error.details.map((d) => d.message);
-        return (0, neverthrow_1.err)(new takomo_util_1.ValidationError("Validation errors in deployment configuration", details));
+        return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration", details));
     }
-    const vars = (0, takomo_util_1.merge)(ctx.variables.var, (0, takomo_core_1.parseVars)(record.vars));
+    const vars = (0, objects_1.merge)(ctx.variables.var, (0, takomo_core_1.parseVars)(record.vars));
     const targetsSchema = (0, parse_target_schemas_1.parseTargetSchemas)(record.targetsSchema);
     const parsedConfigSets = (0, takomo_config_sets_1.parseConfigSets)(record.configSets);
     const configSets = (0, takomo_config_sets_1.mergeConfigSets)(parsedConfigSets, externalConfigSets);
@@ -41,14 +43,14 @@ const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploy
     const bootstrapRoleName = (0, takomo_core_1.parseOptionalString)(record.bootstrapRoleName);
     const deploymentGroups = (0, parse_deployment_groups_1.parseDeploymentGroups)(externalDeploymentTargets, record.deploymentGroups, vars, deploymentRole, deploymentRoleName, bootstrapRole, bootstrapRoleName);
     const configuredStackGroups = deploymentGroups
-        .map((rootGroup) => (0, takomo_util_1.collectFromHierarchy)(rootGroup, (g) => g.children))
+        .map((rootGroup) => (0, collections_1.collectFromHierarchy)(rootGroup, (g) => g.children))
         .flat();
     if (externalDeploymentTargets.size > 0) {
         const configuredStackGroupPaths = configuredStackGroups.map(ramda_1.default.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 takomo_util_1.ValidationError("Validation errors in deployment configuration.", details));
+            return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration.", details));
         }
     }
     const targetNames = configuredStackGroups
@@ -57,7 +59,7 @@ const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploy
     const nonUniqueTargets = targetNames.filter((targetName) => targetNames.filter(ramda_1.default.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 takomo_util_1.ValidationError("Validation errors in deployment configuration.", details));
+        return (0, neverthrow_1.err)(new errors_1.ValidationError("Validation errors in deployment configuration.", details));
     }
     const validationError = await validateDeploymentTargets(ctx, schemaRegistry, targetsSchema, deploymentGroups);
     if (validationError) {
@@ -78,7 +80,7 @@ exports.buildDeploymentConfig = buildDeploymentConfig;
 const validateDeploymentTargets = async (ctx, schemaRegistry, targetsSchema, deploymentGroups) => {
     const allTargets = deploymentGroups
         .reduce((collected, group) => {
-        return [...collected, ...(0, takomo_util_1.collectFromHierarchy)(group, (g) => g.children)];
+        return [...collected, ...(0, collections_1.collectFromHierarchy)(group, (g) => g.children)];
     }, new Array())
         .map((group) => group.targets.reduce((collected, target) => {
         return { ...collected, [`${group.path}/${target.name}`]: target };
@@ -98,7 +100,7 @@ const validateDeploymentTargets = async (ctx, schemaRegistry, targetsSchema, dep
         });
         if (error) {
             const details = error.details.map(ramda_1.default.prop("message"));
-            return new takomo_util_1.ValidationError("Validation errors in deployment configuration", details);
+            return new errors_1.ValidationError("Validation errors in deployment configuration", details);
         }
     }
     for (const group of deploymentGroups) {
@@ -115,7 +117,7 @@ const validateDeploymentTargets = async (ctx, schemaRegistry, targetsSchema, dep
             });
             if (error) {
                 const details = error.details.map(ramda_1.default.prop("message"));
-                return new takomo_util_1.ValidationError("Validation errors in deployment configuration", details);
+                return new errors_1.ValidationError("Validation errors in deployment configuration", details);
             }
         }
     }

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

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

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

@@ -7,7 +7,7 @@ exports.parseDeploymentGroups = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_config_sets_1 = require("../../takomo-config-sets");
 const takomo_core_1 = require("../../takomo-core");
-const takomo_util_1 = require("../../takomo-util");
+const objects_1 = require("../../utils/objects");
 const util_1 = require("../util");
 const parse_deployment_status_1 = require("./parse-deployment-status");
 const parse_deployment_targets_1 = require("./parse-deployment-targets");
@@ -24,7 +24,7 @@ const parseDeploymentGroup = (externalDeploymentTargets, groupPath, config, inhe
     const configuredLabels = (0, takomo_core_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, takomo_util_1.merge)(inheritedVars, (0, takomo_core_1.parseVars)(group?.vars));
+    const vars = (0, objects_1.merge)(inheritedVars, (0, takomo_core_1.parseVars)(group?.vars));
     const deploymentRole = (0, takomo_core_1.parseCommandRole)(group?.deploymentRole) ?? inheritedDeploymentRole;
     const deploymentRoleName = group?.deploymentRoleName ?? inheritedDeploymentRoleName;
     const bootstrapRole = (0, takomo_core_1.parseCommandRole)(group?.bootstrapRole) ?? inheritedBootstrapRole;

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

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

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

@@ -7,7 +7,7 @@ exports.parseDeploymentTargets = exports.parseDeploymentTarget = void 0;
 const ramda_1 = __importDefault(require("ramda"));
 const takomo_config_sets_1 = require("../../takomo-config-sets");
 const takomo_core_1 = require("../../takomo-core");
-const takomo_util_1 = require("../../takomo-util");
+const objects_1 = require("../../utils/objects");
 const parse_deployment_status_1 = require("./parse-deployment-status");
 const parseDeploymentTarget = (value, inheritedVars, inheritedConfigSets, inheritedBootstrapConfigSets, inheritedLabels, inheritedDeploymentRole, inheritedDeploymentRoleName, inheritedBootstrapRole, inheritedBootstrapRoleName) => {
     const configuredConfigSets = (0, takomo_config_sets_1.parseConfigSetInstructions)(value.configSets);
@@ -16,7 +16,7 @@ const parseDeploymentTarget = (value, inheritedVars, inheritedConfigSets, inheri
     const bootstrapConfigSets = (0, takomo_config_sets_1.mergeConfigSetInstructions)(configuredBootstrapConfigSets, inheritedBootstrapConfigSets);
     const configuredLabels = (0, takomo_core_1.parseStringArray)(value.labels);
     const labels = ramda_1.default.uniq([...inheritedLabels, ...configuredLabels]);
-    const vars = (0, takomo_util_1.merge)(inheritedVars, (0, takomo_core_1.parseVars)(value.vars));
+    const vars = (0, objects_1.merge)(inheritedVars, (0, takomo_core_1.parseVars)(value.vars));
     const deploymentRole = (0, takomo_core_1.parseCommandRole)(value.deploymentRole) ?? inheritedDeploymentRole;
     const bootstrapRole = (0, takomo_core_1.parseCommandRole)(value.bootstrapRole) ?? inheritedBootstrapRole;
     const deploymentRoleName = value.deploymentRoleName ?? inheritedDeploymentRoleName;

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

@@ -1 +1 @@
-{"version":3,"file":"parse-deployment-targets.js","sourceRoot":"","sources":["../../../src/takomo-deployment-targets-config/parser/parse-deployment-targets.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,iEAIiC;AACjC,mDAM0B;AAE1B,mDAAyC;AAEzC,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,+CAA0B,EAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,IAAA,+CAA0B,EAC3C,oBAAoB,EACpB,mBAAmB,CACpB,CAAA;IAED,MAAM,6BAA6B,GAAG,IAAA,+CAA0B,EAC9D,KAAK,CAAC,mBAAmB,CAC1B,CAAA;IACD,MAAM,mBAAmB,GAAG,IAAA,+CAA0B,EACpD,6BAA6B,EAC7B,4BAA4B,CAC7B,CAAA;IAED,MAAM,gBAAgB,GAAG,IAAA,8BAAgB,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,mBAAK,EAAC,aAAa,EAAE,IAAA,uBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAExD,MAAM,cAAc,GAClB,IAAA,8BAAgB,EAAC,KAAK,CAAC,cAAc,CAAC,IAAI,uBAAuB,CAAA;IACnE,MAAM,aAAa,GACjB,IAAA,8BAAgB,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/takomo-deployment-targets-config/parser/parse-deployment-targets.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,iEAIiC;AACjC,mDAM0B;AAE1B,iDAA2C;AAE3C,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,+CAA0B,EAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,IAAA,+CAA0B,EAC3C,oBAAoB,EACpB,mBAAmB,CACpB,CAAA;IAED,MAAM,6BAA6B,GAAG,IAAA,+CAA0B,EAC9D,KAAK,CAAC,mBAAmB,CAC1B,CAAA;IACD,MAAM,mBAAmB,GAAG,IAAA,+CAA0B,EACpD,6BAA6B,EAC7B,4BAA4B,CAC7B,CAAA;IAED,MAAM,gBAAgB,GAAG,IAAA,8BAAgB,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,uBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAExD,MAAM,cAAc,GAClB,IAAA,8BAAgB,EAAC,KAAK,CAAC,cAAc,CAAC,IAAI,uBAAuB,CAAA;IACnE,MAAM,aAAa,GACjB,IAAA,8BAAgB,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"}

package/dist/takomo-deployment-targets-context/index.d.ts

@@ -4,7 +4,7 @@ import { InternalCommandContext } from "../takomo-core";
 import { DeploymentConfig, DeploymentGroupConfig } from "../takomo-deployment-targets-config";
 import { DeploymentGroupPath } from "../takomo-deployment-targets-model";
 import { StacksConfigRepository } from "../takomo-stacks-context";
-import { TkmLogger } from "../takomo-util";
+import { TkmLogger } from "../utils/logging";
 export interface DeploymentTargetsConfigRepository extends StacksConfigRepository {
     readonly getDeploymentConfig: () => Promise<DeploymentConfig>;
     readonly createStacksConfigRepository: (configSetName: ConfigSetName, legacy: boolean) => Promise<StacksConfigRepository>;

package/dist/takomo-deployment-targets-context/index.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeploymentTargetsContext = void 0;
 const takomo_config_sets_1 = require("../takomo-config-sets");
-const takomo_util_1 = require("../takomo-util");
+const collections_1 = require("../utils/collections");
 const createDeploymentTargetsContext = async ({ ctx, configRepository, credentialManager, logger, }) => {
     const { autoConfirmEnabled, variables } = ctx;
     const deploymentConfig = await configRepository.getDeploymentConfig();
     const deploymentGroups = deploymentConfig.deploymentGroups
-        .map((group) => (0, takomo_util_1.collectFromHierarchy)(group, (o) => o.children))
+        .map((group) => (0, collections_1.collectFromHierarchy)(group, (o) => o.children))
         .flat();
     const rootDeploymentGroups = deploymentConfig.deploymentGroups;
     return {

package/dist/takomo-deployment-targets-context/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-context/index.ts"],"names":[],"mappings":";;;AAIA,8DAM8B;AAQ9B,gDAAgE;AAiCzD,MAAM,8BAA8B,GAAG,KAAK,EAAE,EACnD,GAAG,EACH,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,GAC8B,EAAqC,EAAE;IAC3E,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;IAE7C,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,EAAE,CAAA;IAErE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB;SACvD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,kCAAoB,EAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC9D,IAAI,EAAE,CAAA;IAET,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,gBAAgB,CAAA;IAE9D,OAAO;QACL,GAAG,GAAG;QACN,gBAAgB;QAChB,oBAAoB;QACpB,MAAM;QACN,iBAAiB;QACjB,kBAAkB;QAClB,SAAS;QACT,gBAAgB;QAChB,cAAc,EAAE,GAAG;QAEnB,SAAS,EAAE,GAA6B,EAAE,CAAC,CAAC,uCAAkB,CAAC;QAC/D,kBAAkB,EAAE,CAAC,IAAyB,EAAyB,EAAE;YACvE,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;YACnE,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAA;aACvD;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QAED,kBAAkB,EAAE,CAAC,IAAyB,EAAW,EAAE,CACzD,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QACvD,YAAY,EAAE,CAAC,IAAmB,EAAW,EAAE,CAC7C,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;QAC1D,YAAY,EAAE,CAAC,IAAmB,EAAa,EAAE;YAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;YAC1E,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAA;aAC/C;YAED,OAAO,SAAS,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAlDY,QAAA,8BAA8B,kCAkD1C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-context/index.ts"],"names":[],"mappings":";;;AACA,8DAM8B;AAQ9B,sDAA2D;AAkCpD,MAAM,8BAA8B,GAAG,KAAK,EAAE,EACnD,GAAG,EACH,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,GAC8B,EAAqC,EAAE;IAC3E,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;IAE7C,MAAM,gBAAgB,GAAG,MAAM,gBAAgB,CAAC,mBAAmB,EAAE,CAAA;IAErE,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,gBAAgB;SACvD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,kCAAoB,EAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;SAC9D,IAAI,EAAE,CAAA;IAET,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,gBAAgB,CAAA;IAE9D,OAAO;QACL,GAAG,GAAG;QACN,gBAAgB;QAChB,oBAAoB;QACpB,MAAM;QACN,iBAAiB;QACjB,kBAAkB;QAClB,SAAS;QACT,gBAAgB;QAChB,cAAc,EAAE,GAAG;QAEnB,SAAS,EAAE,GAA6B,EAAE,CAAC,CAAC,uCAAkB,CAAC;QAC/D,kBAAkB,EAAE,CAAC,IAAyB,EAAyB,EAAE;YACvE,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;YACnE,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAA;aACvD;YAED,OAAO,KAAK,CAAA;QACd,CAAC;QAED,kBAAkB,EAAE,CAAC,IAAyB,EAAW,EAAE,CACzD,gBAAgB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QACvD,YAAY,EAAE,CAAC,IAAmB,EAAW,EAAE,CAC7C,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC;QAC1D,YAAY,EAAE,CAAC,IAAmB,EAAa,EAAE;YAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;YAC1E,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAA;aAC/C;YAED,OAAO,SAAS,CAAA;QAClB,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAlDY,QAAA,8BAA8B,kCAkD1C"}

package/dist/takomo-deployment-targets-model/index.d.ts

@@ -1,7 +1,7 @@
 import { AnySchema } from "joi";
 import { CommandContext } from "../takomo-core";
 import { SchemaName, SchemaRegistry } from "../takomo-stacks-model";
-import { TkmLogger } from "../takomo-util";
+import { TkmLogger } from "../utils/logging";
 export declare type DeploymentGroupName = string;
 export declare type DeploymentTargetName = string;
 export declare type DeploymentTargetNamePattern = string;

package/dist/takomo-deployment-targets-model/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeploymentTargetsSchemaRegistry = void 0;
 const joi_1 = __importDefault(require("joi"));
 const takomo_stacks_model_1 = require("../takomo-stacks-model");
-const takomo_util_1 = require("../takomo-util");
+const errors_1 = require("../utils/errors");
 const createDeploymentTargetsSchemaRegistry = (logger) => {
     const schemaRegistry = (0, takomo_stacks_model_1.createSchemaRegistry)(logger);
     return {
@@ -24,7 +24,7 @@ const createDeploymentTargetsSchemaRegistry = (logger) => {
                     base: (0, takomo_stacks_model_1.defaultSchema)(name),
                 });
                 if (!joi_1.default.isSchema(schema)) {
-                    throw new takomo_util_1.TakomoError(`Error initializing schema '${name}' for deployment group '${deploymentGroupPath}':\n\n` +
+                    throw new errors_1.TakomoError(`Error initializing schema '${name}' for deployment group '${deploymentGroupPath}':\n\n` +
                         `  - value returned from schema function is not a Joi schema object`);
                 }
                 const { error } = schema.validate(props, {
@@ -35,7 +35,7 @@ const createDeploymentTargetsSchemaRegistry = (logger) => {
                     const details = error.details
                         .map((d) => `  - ${d.message}`)
                         .join("\n");
-                    throw new takomo_util_1.TakomoError(`${error.details.length} validation error(s) in schema '${name}' configuration for deployment group '${deploymentGroupPath}':\n\n${details}`);
+                    throw new errors_1.TakomoError(`${error.details.length} validation error(s) in schema '${name}' configuration for deployment group '${deploymentGroupPath}':\n\n${details}`);
                 }
             }
             return provider.init({

package/dist/takomo-deployment-targets-model/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-model/index.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AAEpC,gEAK+B;AAC/B,gDAAuD;AAkBhD,MAAM,qCAAqC,GAAG,CACnD,MAAiB,EACgB,EAAE;IACnC,MAAM,cAAc,GAAG,IAAA,0CAAoB,EAAC,MAAM,CAAC,CAAA;IACnD,OAAO;QACL,GAAG,cAAc;QACjB,2BAA2B,EAAE,KAAK,EAChC,GAAmB,EACnB,mBAAwC,EACxC,IAAgB,EAChB,KAA8B,EACV,EAAE;YACtB,MAAM,CAAC,KAAK,CACV,sBAAsB,IAAI,2BAA2B,mBAAmB,GAAG,CAC5E,CAAA;YACD,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YACjD,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,GAAG,CAAC,CAAA;aAC3D;YAED,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;oBAC7B,GAAG;oBACH,GAAG,EAAE,aAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;oBACrC,IAAI,EAAE,IAAA,mCAAa,EAAC,IAAI,CAAC;iBAC1B,CAAC,CAAA;gBAEF,IAAI,CAAC,aAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,IAAI,yBAAW,CACnB,8BAA8B,IAAI,2BAA2B,mBAAmB,QAAQ;wBACtF,oEAAoE,CACvE,CAAA;iBACF;gBAED,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE;oBACvC,UAAU,EAAE,KAAK;oBACjB,OAAO,EAAE,KAAK;iBACf,CAAC,CAAA;gBACF,IAAI,KAAK,EAAE;oBACT,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO;yBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;yBAC9B,IAAI,CAAC,IAAI,CAAC,CAAA;oBACb,MAAM,IAAI,yBAAW,CACnB,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,mCAAmC,IAAI,yCAAyC,mBAAmB,SAAS,OAAO,EAAE,CAC7I,CAAA;iBACF;aACF;YAED,OAAO,QAAQ,CAAC,IAAI,CAAC;gBACnB,GAAG,EAAE,aAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;gBACrC,GAAG;gBACH,KAAK;aACN,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAvDY,QAAA,qCAAqC,yCAuDjD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-model/index.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAoC;AAEpC,gEAK+B;AAC/B,4CAA6C;AAmBtC,MAAM,qCAAqC,GAAG,CACnD,MAAiB,EACgB,EAAE;IACnC,MAAM,cAAc,GAAG,IAAA,0CAAoB,EAAC,MAAM,CAAC,CAAA;IACnD,OAAO;QACL,GAAG,cAAc;QACjB,2BAA2B,EAAE,KAAK,EAChC,GAAmB,EACnB,mBAAwC,EACxC,IAAgB,EAChB,KAA8B,EACV,EAAE;YACtB,MAAM,CAAC,KAAK,CACV,sBAAsB,IAAI,2BAA2B,mBAAmB,GAAG,CAC5E,CAAA;YACD,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YACjD,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,GAAG,CAAC,CAAA;aAC3D;YAED,IAAI,QAAQ,CAAC,MAAM,EAAE;gBACnB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;oBAC7B,GAAG;oBACH,GAAG,EAAE,aAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;oBACrC,IAAI,EAAE,IAAA,mCAAa,EAAC,IAAI,CAAC;iBAC1B,CAAC,CAAA;gBAEF,IAAI,CAAC,aAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,IAAI,oBAAW,CACnB,8BAA8B,IAAI,2BAA2B,mBAAmB,QAAQ;wBACtF,oEAAoE,CACvE,CAAA;iBACF;gBAED,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE;oBACvC,UAAU,EAAE,KAAK;oBACjB,OAAO,EAAE,KAAK;iBACf,CAAC,CAAA;gBACF,IAAI,KAAK,EAAE;oBACT,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO;yBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;yBAC9B,IAAI,CAAC,IAAI,CAAC,CAAA;oBACb,MAAM,IAAI,oBAAW,CACnB,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,mCAAmC,IAAI,yCAAyC,mBAAmB,SAAS,OAAO,EAAE,CAC7I,CAAA;iBACF;aACF;YAED,OAAO,QAAQ,CAAC,IAAI,CAAC;gBACnB,GAAG,EAAE,aAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;gBACrC,GAAG;gBACH,KAAK;aACN,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAvDY,QAAA,qCAAqC,yCAuDjD"}

package/dist/takomo-deployment-targets-repository/deployment-target-repository-registry.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeploymentTargetRepositoryRegistry = void 0;
-const takomo_util_1 = require("../takomo-util");
+const errors_1 = require("../utils/errors");
 const createDeploymentTargetRepositoryRegistry = () => {
     const providers = new Map();
     const registerDeploymentTargetRepositoryProvider = (type, provider) => {
         if (providers.has(type)) {
-            throw new takomo_util_1.TakomoError(`Deployment target repository provider already registered for type '${type}'`);
+            throw new errors_1.TakomoError(`Deployment target repository provider already registered for type '${type}'`);
         }
         providers.set(type, provider);
     };
     const initDeploymentTargetRepository = ({ ctx, config, logger, templateEngine, credentialManager, cache, }) => {
         const provider = providers.get(config.type);
         if (!provider) {
-            throw new takomo_util_1.TakomoError(`Unknown account repository type: '${config.type}'`);
+            throw new errors_1.TakomoError(`Unknown account repository type: '${config.type}'`);
         }
         return provider.initDeploymentTargetRepository({
             ctx,

package/dist/takomo-deployment-targets-repository/deployment-target-repository-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployment-target-repository-registry.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/deployment-target-repository-registry.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAiBrC,MAAM,wCAAwC,GACnD,GAAuC,EAAE;IACvC,MAAM,SAAS,GAAG,IAAI,GAAG,EAGtB,CAAA;IAEH,MAAM,0CAA0C,GAAG,CACjD,IAAoC,EACpC,QAA4C,EACtC,EAAE;QACR,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,IAAI,yBAAW,CACnB,sEAAsE,IAAI,GAAG,CAC9E,CAAA;SACF;QAED,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC/B,CAAC,CAAA;IAED,MAAM,8BAA8B,GAAG,CAAC,EACtC,GAAG,EACH,MAAM,EACN,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,KAAK,GAC+B,EAAuC,EAAE;QAC7E,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3C,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,yBAAW,CACnB,qCAAqC,MAAM,CAAC,IAAI,GAAG,CACpD,CAAA;SACF;QAED,OAAO,QAAQ,CAAC,8BAA8B,CAAC;YAC7C,GAAG;YACH,MAAM;YACN,cAAc;YACd,MAAM;YACN,iBAAiB;YACjB,KAAK;SACN,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,OAAO;QACL,0CAA0C;QAC1C,8BAA8B;KAC/B,CAAA;AACH,CAAC,CAAA;AAjDU,QAAA,wCAAwC,4CAiDlD"}
+{"version":3,"file":"deployment-target-repository-registry.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/deployment-target-repository-registry.ts"],"names":[],"mappings":";;;AACA,4CAA6C;AAiBtC,MAAM,wCAAwC,GACnD,GAAuC,EAAE;IACvC,MAAM,SAAS,GAAG,IAAI,GAAG,EAGtB,CAAA;IAEH,MAAM,0CAA0C,GAAG,CACjD,IAAoC,EACpC,QAA4C,EACtC,EAAE;QACR,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,IAAI,oBAAW,CACnB,sEAAsE,IAAI,GAAG,CAC9E,CAAA;SACF;QAED,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC/B,CAAC,CAAA;IAED,MAAM,8BAA8B,GAAG,CAAC,EACtC,GAAG,EACH,MAAM,EACN,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,KAAK,GAC+B,EAAuC,EAAE;QAC7E,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3C,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,oBAAW,CACnB,qCAAqC,MAAM,CAAC,IAAI,GAAG,CACpD,CAAA;SACF;QAED,OAAO,QAAQ,CAAC,8BAA8B,CAAC;YAC7C,GAAG;YACH,MAAM;YACN,cAAc;YACd,MAAM;YACN,iBAAiB;YACjB,KAAK;SACN,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,OAAO;QACL,0CAA0C;QAC1C,8BAA8B;KAC/B,CAAA;AACH,CAAC,CAAA;AAjDU,QAAA,wCAAwC,4CAiDlD"}

package/dist/takomo-deployment-targets-repository/deployment-target-repository.d.ts

@@ -4,7 +4,8 @@ import { Region } from "../takomo-aws-model";
 import { Cache, DeploymentTargetRepositoryConfig, InternalCommandContext } from "../takomo-core";
 import { DeploymentTargetConfig } from "../takomo-deployment-targets-config";
 import { DeploymentGroupPath, DeploymentTargetName } from "../takomo-deployment-targets-model";
-import { TemplateEngine, TkmLogger } from "../takomo-util";
+import { TkmLogger } from "../utils/logging";
+import { TemplateEngine } from "../utils/templating";
 export interface DeploymentTargetConfigItem extends Partial<DeploymentTargetConfig> {
     readonly name: DeploymentTargetName;
     readonly deploymentGroupPath: DeploymentGroupPath;

package/dist/takomo-deployment-targets-repository/deployment-target-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployment-target-repository.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/deployment-target-repository.ts"],"names":[],"mappings":";;;AAcA,0FAAoF;AAuC7E,MAAM,sCAAsC,GAAG,CACpD,KAAkD,EAChC,EAAE;IACpB,MAAM,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAC7C,IAAA,iEAA8B,EAAC,KAAK,CAAC,CAAA;IAEvC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ,EAAE;KACpD,CAAC,CAAA;AACJ,CAAC,CAAA;AATY,QAAA,sCAAsC,0CASlD"}
+{"version":3,"file":"deployment-target-repository.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/deployment-target-repository.ts"],"names":[],"mappings":";;;AAaA,0FAAoF;AAwC7E,MAAM,sCAAsC,GAAG,CACpD,KAAkD,EAChC,EAAE;IACpB,MAAM,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,GAC7C,IAAA,iEAA8B,EAAC,KAAK,CAAC,CAAA;IAEvC,OAAO,gBAAgB,CAAC,IAAI,CAAC;QAC3B,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ,EAAE;KACpD,CAAC,CAAA;AACJ,CAAC,CAAA;AATY,QAAA,sCAAsC,0CASlD"}

package/dist/takomo-deployment-targets-repository/errors.d.ts

@@ -1,4 +1,5 @@
-import { FilePath, TakomoError } from "../takomo-util";
+import { TakomoError } from "../utils/errors";
+import { FilePath } from "../utils/files";
 export declare class InvalidDeploymentTargetFileLocationError extends TakomoError {
     constructor(pathToFile: FilePath, baseDir: FilePath);
 }

package/dist/takomo-deployment-targets-repository/errors.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InvalidDeploymentTargetFileLocationError = void 0;
-const takomo_util_1 = require("../takomo-util");
-class InvalidDeploymentTargetFileLocationError extends takomo_util_1.TakomoError {
+const errors_1 = require("../utils/errors");
+class InvalidDeploymentTargetFileLocationError extends errors_1.TakomoError {
     constructor(pathToFile, baseDir) {
         super(`Deployment target file ${pathToFile} must not be directly in ${baseDir} dir`, {
             instructions: [

package/dist/takomo-deployment-targets-repository/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/errors.ts"],"names":[],"mappings":";;;AAAA,gDAAsD;AAEtD,MAAa,wCAAyC,SAAQ,yBAAW;IACvE,YAAY,UAAoB,EAAE,OAAiB;QACjD,KAAK,CACH,0BAA0B,UAAU,4BAA4B,OAAO,MAAM,EAC7E;YACE,YAAY,EAAE;gBACZ,+BAA+B,OAAO,4CAA4C;aACnF;YACD,IAAI,EACF,sEAAsE;gBACtE,2EAA2E;gBAC3E,yBAAyB;SAC5B,CACF,CAAA;IACH,CAAC;CACF;AAfD,4FAeC"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/errors.ts"],"names":[],"mappings":";;;AAAA,4CAA6C;AAG7C,MAAa,wCAAyC,SAAQ,oBAAW;IACvE,YAAY,UAAoB,EAAE,OAAiB;QACjD,KAAK,CACH,0BAA0B,UAAU,4BAA4B,OAAO,MAAM,EAC7E;YACE,YAAY,EAAE;gBACZ,+BAA+B,OAAO,4CAA4C;aACnF;YACD,IAAI,EACF,sEAAsE;gBACtE,2EAA2E;gBAC3E,yBAAyB;SAC5B,CACF,CAAA;IACH,CAAC;CACF;AAfD,4FAeC"}

package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.d.ts

@@ -1,5 +1,5 @@
 import { DeploymentGroupPath, DeploymentTargetName } from "../takomo-deployment-targets-model";
-import { FilePath } from "../takomo-util";
+import { FilePath } from "../utils/files";
 import { DeploymentTargetRepositoryProvider } from "./deployment-target-repository";
 export declare const inferDeploymentGroupPathFromFilePath: (baseDir: FilePath, pathToFile: FilePath) => DeploymentGroupPath;
 export declare const inferDeploymentTargetName: (pathToFile: FilePath) => DeploymentTargetName;

package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js

@@ -6,12 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFileSystemDeploymentTargetRepositoryProvider = exports.inferDeploymentTargetName = exports.inferDeploymentGroupPathFromFilePath = void 0;
 const path_1 = require("path");
 const readdirp_1 = __importDefault(require("readdirp"));
-const takomo_util_1 = require("../takomo-util");
-const errors_1 = require("./errors");
+const errors_1 = require("../utils/errors");
+const files_1 = require("../utils/files");
+const templating_1 = require("../utils/templating");
+const yaml_1 = require("../utils/yaml");
+const errors_2 = require("./errors");
 const inferDeploymentGroupPathFromFilePath = (baseDir, pathToFile) => {
     const parentDir = (0, path_1.dirname)(pathToFile);
     if (parentDir === baseDir) {
-        throw new errors_1.InvalidDeploymentTargetFileLocationError(pathToFile, baseDir);
+        throw new errors_2.InvalidDeploymentTargetFileLocationError(pathToFile, baseDir);
     }
     return (0, path_1.relative)(baseDir, parentDir);
 };
@@ -26,9 +29,9 @@ const resolveDeploymentTargetName = (item, { inferDeploymentTargetNameFromFileNa
     : item.name;
 const loadDeploymentTargetFile = async (props) => {
     const { templateEngine, variables, pathToFile } = props;
-    const contents = await (0, takomo_util_1.readFileContents)(pathToFile);
-    const rendered = await (0, takomo_util_1.renderTemplate)(templateEngine, pathToFile, contents, variables);
-    const item = (await (0, takomo_util_1.parseYaml)(pathToFile, rendered));
+    const contents = await (0, files_1.readFileContents)(pathToFile);
+    const rendered = await (0, templating_1.renderTemplate)(templateEngine, pathToFile, contents, variables);
+    const item = (await (0, yaml_1.parseYaml)(pathToFile, rendered));
     const deploymentGroupPath = resolveDeploymentGroupPath(item, props);
     const name = resolveDeploymentTargetName(item, props);
     return {
@@ -44,23 +47,23 @@ const createFileSystemDeploymentTargetRepositoryProvider = () => {
     return {
         initDeploymentTargetRepository: async ({ templateEngine, logger, ctx, config, }) => {
             if (config.dir === undefined || config.dir === null) {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'dir' property not found");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'dir' property not found");
             }
             const deploymentTargetsDir = config.dir;
             if (typeof deploymentTargetsDir !== "string") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'dir' property must be of type 'string'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'dir' property must be of type 'string'");
             }
             const inferDeploymentGroupPathFromDirName = config.inferDeploymentGroupPathFromDirName ?? false;
             if (typeof inferDeploymentGroupPathFromDirName !== "boolean") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentGroupPathFromDirName' property must be of type 'boolean'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentGroupPathFromDirName' property must be of type 'boolean'");
             }
             const inferDeploymentTargetNameFromFileName = config.inferDeploymentTargetNameFromFileName ?? false;
             if (typeof inferDeploymentTargetNameFromFileName !== "boolean") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentTargetNameFromFileName' property must be of type 'boolean'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentTargetNameFromFileName' property must be of type 'boolean'");
             }
-            const expandedDir = (0, takomo_util_1.expandFilePath)(ctx.projectDir, deploymentTargetsDir);
-            if (!(await (0, takomo_util_1.dirExists)(expandedDir))) {
-                throw new takomo_util_1.TakomoError(`Invalid deployment target repository config - directory '${expandedDir}' given in 'dir' property does not exist`);
+            const expandedDir = (0, files_1.expandFilePath)(ctx.projectDir, deploymentTargetsDir);
+            if (!(await (0, files_1.dirExists)(expandedDir))) {
+                throw new errors_1.TakomoError(`Invalid deployment target repository config - directory '${expandedDir}' given in 'dir' property does not exist`);
             }
             logger.debug(`Load deployment targets from dir: ${expandedDir}`);
             const deploymentTargetFiles = await readdirp_1.default.promise(expandedDir, {

package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js.map

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

package/dist/takomo-deployment-targets-repository/organization-deployment-target-repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrganizationDeploymentTargetRepositoryProvider = exports.resolveDeploymentTargetName = exports.resolveDeploymentGroupPath = exports.buildDeploymentTargetName = void 0;
-const takomo_util_1 = require("../takomo-util");
+const errors_1 = require("../utils/errors");
 const buildDeploymentTargetName = ({ name, id }) => name
     .toLowerCase()
     .replace(/[():\/]/g, "")
@@ -67,33 +67,33 @@ const createOrganizationDeploymentTargetRepositoryProvider = () => {
         initDeploymentTargetRepository: async ({ logger, ctx, config, credentialManager, cache, }) => {
             const id = config.id;
             if (id === null || id === undefined) {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'id' property is required");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'id' property is required");
             }
             if (typeof id !== "string") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'id' property must be of type 'string'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'id' property must be of type 'string'");
             }
             const cacheKey = `deployment-target-repository/organization-${id}.v1.json`;
             const organizationReaderRoleArn = config.organizationReaderRoleArn;
             if (organizationReaderRoleArn &&
                 typeof organizationReaderRoleArn !== "string") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'organizationReaderRoleArn' property must be of type 'string'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'organizationReaderRoleArn' property must be of type 'string'");
             }
             const inferDeploymentGroupPathFromOUPath = config.inferDeploymentGroupPathFromOUPath ?? true;
             if (typeof inferDeploymentGroupPathFromOUPath !== "boolean") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentGroupPathFromOUPath' property must be of type 'boolean'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentGroupPathFromOUPath' property must be of type 'boolean'");
             }
             const inferDeploymentTargetNameFromAccountName = config.inferDeploymentTargetNameFromAccountName ?? true;
             if (typeof inferDeploymentTargetNameFromAccountName !== "boolean") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentTargetNameFromAccountName' property must be of type 'boolean'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'inferDeploymentTargetNameFromAccountName' property must be of type 'boolean'");
             }
             const cacheEnabled = config.cache ?? false;
             if (typeof cacheEnabled !== "boolean") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'cache' property must be of type 'boolean'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'cache' property must be of type 'boolean'");
             }
             const rootDeploymentGroupPath = config.rootDeploymentGroupPath;
             if (rootDeploymentGroupPath &&
                 typeof rootDeploymentGroupPath !== "string") {
-                throw new takomo_util_1.TakomoError("Invalid deployment target repository config - 'rootDeploymentGroupPath' property must be of type 'string'");
+                throw new errors_1.TakomoError("Invalid deployment target repository config - 'rootDeploymentGroupPath' property must be of type 'string'");
             }
             const listDeploymentTargets = async () => {
                 if (cacheEnabled) {

package/dist/takomo-deployment-targets-repository/organization-deployment-target-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization-deployment-target-repository.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/organization-deployment-target-repository.ts"],"names":[],"mappings":";;;AAMA,gDAA4C;AAOrC,MAAM,yBAAyB,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAW,EAAE,EAAE,CACjE,IAAI;KACD,WAAW,EAAE;KACb,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;KACvB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;IACrB,2CAA2C;IAC3C,gDAAgD;IAChD,+BAA+B;KAC9B,KAAK,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACxB,GAAG;IACH,EAAE,CAAA;AAXS,QAAA,yBAAyB,6BAWlC;AAEG,MAAM,0BAA0B,GAAG,CACxC,MAAc,EACd,uBAA6C,EACxB,EAAE,CACvB,uBAAuB;IACrB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,uBAAuB,CAAC;IACjD,CAAC,CAAC,MAAM,CAAA;AANC,QAAA,0BAA0B,8BAM3B;AAEZ,MAAM,0BAA0B,GAAG,KAAK,EAAE,EACxC,MAAM,EACN,MAAM,EACN,wCAAwC,EACxC,uBAAuB,GACN,EAEjB,EAAE;IACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,uBAAuB,EAAE,CAAA;IAClD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACnB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,OAAO,GACX,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnB,MAAM;YACN,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAA,mCAA2B,EAC/B,CAAC,EACD,wCAAwC,CACzC;gBACD,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,EAAE;gBACV,mBAAmB,EAAE,IAAA,kCAA0B,EAC7C,EAAE,CAAC,IAAI,EACP,uBAAuB,CACxB;gBACD,IAAI,EAAE,EAAE;gBACR,mBAAmB,EAAE,EAAE;gBACvB,UAAU,EAAE,EAAE;gBACd,SAAS,EAAE,CAAC,CAAC,EAAE;aAChB;SACF,CAAC,CAAC,CAAA;QAEL,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CACH,CAAA;IAED,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAA;AACjC,CAAC,CAAA;AAEM,MAAM,2BAA2B,GAAG,CACzC,OAAgB,EAChB,wCAAiD,EAC3B,EAAE,CACxB,wCAAwC;IACtC,CAAC,CAAC,IAAA,iCAAyB,EAAC,OAAO,CAAC;IACpC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAA;AANH,QAAA,2BAA2B,+BAMxB;AAEhB,MAAM,uBAAuB,GAAG,KAAK,EAAE,EACrC,MAAM,EACN,MAAM,EACN,wCAAwC,EACxC,uBAAuB,GAAG,MAAM,GACf,EAEjB,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,YAAY,EAAE,CAAA;IAC5C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,MAAM;QACN,IAAI,EAAE;YACJ,IAAI,EAAE,IAAA,mCAA2B,EAC/B,CAAC,EACD,wCAAwC,CACzC;YACD,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE;YACV,mBAAmB,EAAE,uBAAuB;YAC5C,IAAI,EAAE,EAAE;YACR,mBAAmB,EAAE,EAAE;YACvB,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,CAAC,CAAC,EAAE;SAChB;KACF,CAAC,CAAC,CAAA;AACL,CAAC,CAAA;AAUD,MAAM,WAAW,GAAG,KAAK,EACvB,KAAuB,EACoC,EAAE,CAC7D,KAAK,CAAC,kCAAkC;IACtC,CAAC,CAAC,0BAA0B,CAAC,KAAK,CAAC;IACnC,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;AAE7B,MAAM,oDAAoD,GAC/D,GAAuC,EAAE;IACvC,OAAO;QACL,8BAA8B,EAAE,KAAK,EAAE,EACrC,MAAM,EACN,GAAG,EACH,MAAM,EACN,iBAAiB,EACjB,KAAK,GACN,EAAuC,EAAE;YACxC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAA;YACpB,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAE;gBACnC,MAAM,IAAI,yBAAW,CACnB,yEAAyE,CAC1E,CAAA;aACF;YAED,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;gBAC1B,MAAM,IAAI,yBAAW,CACnB,sFAAsF,CACvF,CAAA;aACF;YAED,MAAM,QAAQ,GAAG,6CAA6C,EAAE,UAAU,CAAA;YAE1E,MAAM,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAA;YAClE,IACE,yBAAyB;gBACzB,OAAO,yBAAyB,KAAK,QAAQ,EAC7C;gBACA,MAAM,IAAI,yBAAW,CACnB,6GAA6G,CAC9G,CAAA;aACF;YAED,MAAM,kCAAkC,GACtC,MAAM,CAAC,kCAAkC,IAAI,IAAI,CAAA;YACnD,IAAI,OAAO,kCAAkC,KAAK,SAAS,EAAE;gBAC3D,MAAM,IAAI,yBAAW,CACnB,uHAAuH,CACxH,CAAA;aACF;YAED,MAAM,wCAAwC,GAC5C,MAAM,CAAC,wCAAwC,IAAI,IAAI,CAAA;YACzD,IAAI,OAAO,wCAAwC,KAAK,SAAS,EAAE;gBACjE,MAAM,IAAI,yBAAW,CACnB,6HAA6H,CAC9H,CAAA;aACF;YAED,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,IAAI,KAAK,CAAA;YAC1C,IAAI,OAAO,YAAY,KAAK,SAAS,EAAE;gBACrC,MAAM,IAAI,yBAAW,CACnB,0FAA0F,CAC3F,CAAA;aACF;YAED,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAA;YAC9D,IACE,uBAAuB;gBACvB,OAAO,uBAAuB,KAAK,QAAQ,EAC3C;gBACA,MAAM,IAAI,yBAAW,CACnB,2GAA2G,CAC5G,CAAA;aACF;YAED,MAAM,qBAAqB,GAAG,KAAK,IAEjC,EAAE;gBACF,IAAI,YAAY,EAAE;oBAChB,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;oBAE9C,IAAI,YAAY,EAAE;wBAChB,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;wBAClD,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;wBACnD,OAAO,kBAAsE,CAAA;qBAC9E;iBACF;gBAED,IAAI,yBAAyB,EAAE;oBAC7B,MAAM,CAAC,IAAI,CACT,kDAAkD,EAAE,gBAAgB,yBAAyB,EAAE,CAChG,CAAA;iBACF;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,kDAAkD,EAAE,GAAG,CAAC,CAAA;iBACrE;gBAED,MAAM,EAAE,GAAG,yBAAyB;oBAClC,CAAC,CAAC,MAAM,iBAAiB,CAAC,8BAA8B,CACpD,yBAAmC,CACpC;oBACH,CAAC,CAAC,iBAAiB,CAAA;gBAErB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;oBACnE,MAAM;oBACN,EAAE,EAAE,gBAAgB,EAAE,EAAE;oBACxB,MAAM,EAAE,WAAW;oBACnB,kBAAkB,EAAE,EAAE,CAAC,qBAAqB,EAAE;iBAC/C,CAAC,CAAA;gBAEF,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC;oBAC1C,MAAM,EAAE,gBAAgB,EAAE,EAAE;oBAC5B,MAAM;oBACN,kCAAkC;oBAClC,wCAAwC;oBACxC,uBAAuB,EACrB,uBAA8C;iBACjD,CAAC,CAAA;gBAEF,MAAM,CAAC,KAAK,CACV,UAAU,iBAAiB,CAAC,MAAM,8CAA8C,EAAE,GAAG,CACtF,CAAA;gBAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAA;gBAE9D,IAAI,YAAY,EAAE;oBAChB,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAA;iBACjE;gBAED,OAAO,qBAAqB,CAAA;YAC9B,CAAC,CAAA;YAED,OAAO;gBACL,qBAAqB;aACtB,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAjIU,QAAA,oDAAoD,wDAiI9D"}
+{"version":3,"file":"organization-deployment-target-repository.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/organization-deployment-target-repository.ts"],"names":[],"mappings":";;;AAMA,4CAA6C;AAOtC,MAAM,yBAAyB,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAW,EAAE,EAAE,CACjE,IAAI;KACD,WAAW,EAAE;KACb,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;KACvB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;KACnB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;IACrB,2CAA2C;IAC3C,gDAAgD;IAChD,+BAA+B;KAC9B,KAAK,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACxB,GAAG;IACH,EAAE,CAAA;AAXS,QAAA,yBAAyB,6BAWlC;AAEG,MAAM,0BAA0B,GAAG,CACxC,MAAc,EACd,uBAA6C,EACxB,EAAE,CACvB,uBAAuB;IACrB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,uBAAuB,CAAC;IACjD,CAAC,CAAC,MAAM,CAAA;AANC,QAAA,0BAA0B,8BAM3B;AAEZ,MAAM,0BAA0B,GAAG,KAAK,EAAE,EACxC,MAAM,EACN,MAAM,EACN,wCAAwC,EACxC,uBAAuB,GACN,EAEjB,EAAE;IACF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,uBAAuB,EAAE,CAAA;IAClD,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,GAAG,CACzC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACnB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;QACtD,MAAM,OAAO,GACX,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACnB,MAAM;YACN,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAA,mCAA2B,EAC/B,CAAC,EACD,wCAAwC,CACzC;gBACD,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,EAAE;gBACV,mBAAmB,EAAE,IAAA,kCAA0B,EAC7C,EAAE,CAAC,IAAI,EACP,uBAAuB,CACxB;gBACD,IAAI,EAAE,EAAE;gBACR,mBAAmB,EAAE,EAAE;gBACvB,UAAU,EAAE,EAAE;gBACd,SAAS,EAAE,CAAC,CAAC,EAAE;aAChB;SACF,CAAC,CAAC,CAAA;QAEL,OAAO,OAAO,CAAA;IAChB,CAAC,CAAC,CACH,CAAA;IAED,OAAO,iBAAiB,CAAC,IAAI,EAAE,CAAA;AACjC,CAAC,CAAA;AAEM,MAAM,2BAA2B,GAAG,CACzC,OAAgB,EAChB,wCAAiD,EAC3B,EAAE,CACxB,wCAAwC;IACtC,CAAC,CAAC,IAAA,iCAAyB,EAAC,OAAO,CAAC;IACpC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAA;AANH,QAAA,2BAA2B,+BAMxB;AAEhB,MAAM,uBAAuB,GAAG,KAAK,EAAE,EACrC,MAAM,EACN,MAAM,EACN,wCAAwC,EACxC,uBAAuB,GAAG,MAAM,GACf,EAEjB,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,YAAY,EAAE,CAAA;IAC5C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1B,MAAM;QACN,IAAI,EAAE;YACJ,IAAI,EAAE,IAAA,mCAA2B,EAC/B,CAAC,EACD,wCAAwC,CACzC;YACD,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,EAAE;YACV,mBAAmB,EAAE,uBAAuB;YAC5C,IAAI,EAAE,EAAE;YACR,mBAAmB,EAAE,EAAE;YACvB,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,CAAC,CAAC,EAAE;SAChB;KACF,CAAC,CAAC,CAAA;AACL,CAAC,CAAA;AAUD,MAAM,WAAW,GAAG,KAAK,EACvB,KAAuB,EACoC,EAAE,CAC7D,KAAK,CAAC,kCAAkC;IACtC,CAAC,CAAC,0BAA0B,CAAC,KAAK,CAAC;IACnC,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAA;AAE7B,MAAM,oDAAoD,GAC/D,GAAuC,EAAE;IACvC,OAAO;QACL,8BAA8B,EAAE,KAAK,EAAE,EACrC,MAAM,EACN,GAAG,EACH,MAAM,EACN,iBAAiB,EACjB,KAAK,GACN,EAAuC,EAAE;YACxC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAA;YACpB,IAAI,EAAE,KAAK,IAAI,IAAI,EAAE,KAAK,SAAS,EAAE;gBACnC,MAAM,IAAI,oBAAW,CACnB,yEAAyE,CAC1E,CAAA;aACF;YAED,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;gBAC1B,MAAM,IAAI,oBAAW,CACnB,sFAAsF,CACvF,CAAA;aACF;YAED,MAAM,QAAQ,GAAG,6CAA6C,EAAE,UAAU,CAAA;YAE1E,MAAM,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAA;YAClE,IACE,yBAAyB;gBACzB,OAAO,yBAAyB,KAAK,QAAQ,EAC7C;gBACA,MAAM,IAAI,oBAAW,CACnB,6GAA6G,CAC9G,CAAA;aACF;YAED,MAAM,kCAAkC,GACtC,MAAM,CAAC,kCAAkC,IAAI,IAAI,CAAA;YACnD,IAAI,OAAO,kCAAkC,KAAK,SAAS,EAAE;gBAC3D,MAAM,IAAI,oBAAW,CACnB,uHAAuH,CACxH,CAAA;aACF;YAED,MAAM,wCAAwC,GAC5C,MAAM,CAAC,wCAAwC,IAAI,IAAI,CAAA;YACzD,IAAI,OAAO,wCAAwC,KAAK,SAAS,EAAE;gBACjE,MAAM,IAAI,oBAAW,CACnB,6HAA6H,CAC9H,CAAA;aACF;YAED,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,IAAI,KAAK,CAAA;YAC1C,IAAI,OAAO,YAAY,KAAK,SAAS,EAAE;gBACrC,MAAM,IAAI,oBAAW,CACnB,0FAA0F,CAC3F,CAAA;aACF;YAED,MAAM,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAA;YAC9D,IACE,uBAAuB;gBACvB,OAAO,uBAAuB,KAAK,QAAQ,EAC3C;gBACA,MAAM,IAAI,oBAAW,CACnB,2GAA2G,CAC5G,CAAA;aACF;YAED,MAAM,qBAAqB,GAAG,KAAK,IAEjC,EAAE;gBACF,IAAI,YAAY,EAAE;oBAChB,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;oBAE9C,IAAI,YAAY,EAAE;wBAChB,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;wBAClD,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;wBACnD,OAAO,kBAAsE,CAAA;qBAC9E;iBACF;gBAED,IAAI,yBAAyB,EAAE;oBAC7B,MAAM,CAAC,IAAI,CACT,kDAAkD,EAAE,gBAAgB,yBAAyB,EAAE,CAChG,CAAA;iBACF;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,kDAAkD,EAAE,GAAG,CAAC,CAAA;iBACrE;gBAED,MAAM,EAAE,GAAG,yBAAyB;oBAClC,CAAC,CAAC,MAAM,iBAAiB,CAAC,8BAA8B,CACpD,yBAAmC,CACpC;oBACH,CAAC,CAAC,iBAAiB,CAAA;gBAErB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;oBACnE,MAAM;oBACN,EAAE,EAAE,gBAAgB,EAAE,EAAE;oBACxB,MAAM,EAAE,WAAW;oBACnB,kBAAkB,EAAE,EAAE,CAAC,qBAAqB,EAAE;iBAC/C,CAAC,CAAA;gBAEF,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC;oBAC1C,MAAM,EAAE,gBAAgB,EAAE,EAAE;oBAC5B,MAAM;oBACN,kCAAkC;oBAClC,wCAAwC;oBACxC,uBAAuB,EACrB,uBAA8C;iBACjD,CAAC,CAAA;gBAEF,MAAM,CAAC,KAAK,CACV,UAAU,iBAAiB,CAAC,MAAM,8CAA8C,EAAE,GAAG,CACtF,CAAA;gBAED,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAA;gBAE9D,IAAI,YAAY,EAAE;oBAChB,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC,CAAA;iBACjE;gBAED,OAAO,qBAAqB,CAAA;YAC9B,CAAC,CAAA;YAED,OAAO;gBACL,qBAAqB;aACtB,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AAjIU,QAAA,oDAAoD,wDAiI9D"}

package/dist/takomo-execution-plans/config-set/execute/command-path.d.ts

@@ -2,7 +2,8 @@ import { InternalCredentialManager } from "../../../takomo-aws-clients";
 import { ConfigSet } from "../../../takomo-config-sets";
 import { CommandOutput, OperationState } from "../../../takomo-core";
 import { CommandPath } from "../../../takomo-stacks-model";
-import { Timer, TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
+import { Timer } from "../../../utils/timer";
 import { CommandPathExecutionResult, ConfigSetExecutionTarget, ConfigSetTargetExecutor } from "../model";
 export interface ExecuteCommandPathProps<R extends CommandOutput, C> {
     readonly target: ConfigSetExecutionTarget<C>;

package/dist/takomo-execution-plans/config-set/execute/command-path.js

@@ -12,11 +12,10 @@ const executeCommandPath = async ({ timer, commandPath, executor, target, state,
         logger,
         timer,
     });
-    timer.stop();
     return {
         result,
         commandPath,
-        timer,
+        timer: timer.stop(),
         status: result.status,
         success: result.success,
         message: result.message,

package/dist/takomo-execution-plans/config-set/execute/command-path.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-path.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/command-path.ts"],"names":[],"mappings":";;;AAsBO,MAAM,kBAAkB,GAAG,KAAK,EAA8B,EACnE,KAAK,EACL,WAAW,EACX,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,wBAAwB,EACxB,SAAS,GACqB,EAA0C,EAAE;IAC1E,MAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAA;IACnD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;QAC5B,WAAW;QACX,wBAAwB;QACxB,MAAM;QACN,SAAS;QACT,KAAK;QACL,MAAM;QACN,KAAK;KACN,CAAC,CAAA;IAEF,KAAK,CAAC,IAAI,EAAE,CAAA;IACZ,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAA;AACH,CAAC,CAAA;AA9BY,QAAA,kBAAkB,sBA8B9B"}
+{"version":3,"file":"command-path.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/command-path.ts"],"names":[],"mappings":";;;AAuBO,MAAM,kBAAkB,GAAG,KAAK,EAA8B,EACnE,KAAK,EACL,WAAW,EACX,QAAQ,EACR,MAAM,EACN,KAAK,EACL,MAAM,EACN,wBAAwB,EACxB,SAAS,GACqB,EAA0C,EAAE;IAC1E,MAAM,CAAC,IAAI,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAA;IACnD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC;QAC5B,WAAW;QACX,wBAAwB;QACxB,MAAM;QACN,SAAS;QACT,KAAK;QACL,MAAM;QACN,KAAK;KACN,CAAC,CAAA;IAEF,OAAO;QACL,MAAM;QACN,WAAW;QACX,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAA;AACH,CAAC,CAAA;AA7BY,QAAA,kBAAkB,sBA6B9B"}

package/dist/takomo-execution-plans/config-set/execute/config-set.d.ts

@@ -1,7 +1,8 @@
 import { InternalCredentialManager } from "../../../takomo-aws-clients";
 import { ConfigSetContext } from "../../../takomo-config-sets";
 import { CommandOutput, OperationState } from "../../../takomo-core";
-import { Timer, TkmLogger } from "../../../takomo-util";
+import { TkmLogger } from "../../../utils/logging";
+import { Timer } from "../../../utils/timer";
 import { ConfigSetExecution, ConfigSetExecutionResult, ConfigSetExecutionTarget, ConfigSetTargetExecutor } from "../model";
 export interface ExecuteConfigSetProps<R extends CommandOutput, C> {
     readonly executor: ConfigSetTargetExecutor<R, C>;

package/dist/takomo-execution-plans/config-set/execute/config-set.js

@@ -23,12 +23,11 @@ const executeConfigSet = async ({ configSet: executionConfigSet, timer, state, l
         }
         results.push(result);
     }
-    timer.stop();
     return {
         ...(0, takomo_core_1.resolveCommandOutputBase)(results),
         configSetName: executionConfigSet.name,
         results,
-        timer,
+        timer: timer.stop(),
     };
 };
 exports.executeConfigSet = executeConfigSet;

package/dist/takomo-execution-plans/config-set/execute/config-set.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-set.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/config-set.ts"],"names":[],"mappings":";;;AAKA,sDAI6B;AAS7B,iDAAmD;AAa5C,MAAM,gBAAgB,GAAG,KAAK,EAA8B,EACjE,SAAS,EAAE,kBAAkB,EAC7B,KAAK,EACL,KAAK,EACL,MAAM,EACN,GAAG,EACH,QAAQ,EACR,MAAM,EACN,wBAAwB,GACI,EAAwC,EAAE;IACtE,MAAM,CAAC,IAAI,CAAC,sBAAsB,kBAAkB,CAAC,IAAI,GAAG,CAAC,CAAA;IAC7D,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,IAAI,KAAK,EAAiC,CAAA;IAE1D,KAAK,MAAM,WAAW,IAAI,kBAAkB,CAAC,YAAY,EAAE;QACzD,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAkB,EAAO;YAC5C,MAAM;YACN,WAAW;YACX,KAAK;YACL,QAAQ;YACR,MAAM;YACN,wBAAwB;YACxB,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;SACrC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAA;SACpB;QAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,KAAK,CAAC,IAAI,EAAE,CAAA;IACZ,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,aAAa,EAAE,kBAAkB,CAAC,IAAI;QACtC,OAAO;QACP,KAAK;KACN,CAAA;AACH,CAAC,CAAA;AAxCY,QAAA,gBAAgB,oBAwC5B"}
+{"version":3,"file":"config-set.js","sourceRoot":"","sources":["../../../../src/takomo-execution-plans/config-set/execute/config-set.ts"],"names":[],"mappings":";;;AAEA,sDAI6B;AAU7B,iDAAmD;AAa5C,MAAM,gBAAgB,GAAG,KAAK,EAA8B,EACjE,SAAS,EAAE,kBAAkB,EAC7B,KAAK,EACL,KAAK,EACL,MAAM,EACN,GAAG,EACH,QAAQ,EACR,MAAM,EACN,wBAAwB,GACI,EAAwC,EAAE;IACtE,MAAM,CAAC,IAAI,CAAC,sBAAsB,kBAAkB,CAAC,IAAI,GAAG,CAAC,CAAA;IAC7D,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;IAC3D,MAAM,OAAO,GAAG,IAAI,KAAK,EAAiC,CAAA;IAE1D,KAAK,MAAM,WAAW,IAAI,kBAAkB,CAAC,YAAY,EAAE;QACzD,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAkB,EAAO;YAC5C,MAAM;YACN,WAAW;YACX,KAAK;YACL,QAAQ;YACR,MAAM;YACN,wBAAwB;YACxB,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;SACrC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAA;SACpB;QAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;KACrB;IAED,OAAO;QACL,GAAG,IAAA,sCAAwB,EAAC,OAAO,CAAC;QACpC,aAAa,EAAE,kBAAkB,CAAC,IAAI;QACtC,OAAO;QACP,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE;KACpB,CAAA;AACH,CAAC,CAAA;AAvCY,QAAA,gBAAgB,oBAuC5B"}