takomo 7.4.3 → 8.0.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/tkm.mjs +1 -1
- package/dist/aws/s3/client.d.ts +1 -0
- package/dist/aws/s3/client.js +6 -0
- package/dist/aws/s3/client.js.map +1 -1
- package/dist/cli-io/deployment-targets/run-targets-io.js +2 -2
- package/dist/cli-io/deployment-targets/run-targets-io.js.map +1 -1
- package/dist/command/stacks/deploy/steps/upload-template.js +17 -3
- package/dist/command/stacks/deploy/steps/upload-template.js.map +1 -1
- package/dist/index.d.ts +31 -29
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/parser/common-parser.js +3 -1
- package/dist/parser/common-parser.js.map +1 -1
- package/dist/parser/config-set-parser.js +2 -0
- package/dist/parser/config-set-parser.js.map +1 -1
- package/dist/parser/project-config-parser.js +18 -5
- package/dist/parser/project-config-parser.js.map +1 -1
- package/dist/parser/stacks/build-stack-config.d.ts +2 -1
- package/dist/parser/stacks/build-stack-config.js +3 -0
- package/dist/parser/stacks/build-stack-config.js.map +1 -1
- package/dist/parser/stacks/build-stack-group-config.d.ts +2 -1
- package/dist/parser/stacks/build-stack-group-config.js +3 -0
- package/dist/parser/stacks/build-stack-group-config.js.map +1 -1
- package/dist/parser/targets/build-deployment-config.d.ts +2 -1
- package/dist/parser/targets/build-deployment-config.js +4 -0
- package/dist/parser/targets/build-deployment-config.js.map +1 -1
- package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.js +6 -5
- package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.js.map +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/parser.d.ts +2 -1
- package/dist/takomo-config-repository-fs/deployment-targets/parser.js +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/parser.js.map +1 -1
- package/dist/takomo-config-repository-fs/stacks/config-tree.js +2 -2
- package/dist/takomo-config-repository-fs/stacks/config-tree.js.map +1 -1
- package/dist/takomo-config-repository-fs/stacks/extensions.js +4 -4
- package/dist/takomo-config-repository-fs/stacks/extensions.js.map +1 -1
- package/dist/takomo-config-repository-fs/stacks/parser.js +15 -7
- package/dist/takomo-config-repository-fs/stacks/parser.js.map +1 -1
- package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js +7 -3
- package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js.map +1 -1
- package/dist/templating/handlebars/load-handlebars-helpers.js +2 -2
- package/dist/templating/handlebars/load-handlebars-helpers.js.map +1 -1
- package/dist/templating/handlebars/load-handlebars-partials.js +2 -2
- package/dist/templating/handlebars/load-handlebars-partials.js.map +1 -1
- package/dist/utils/esbuild.js +1 -1
- package/dist/utils/json.js.map +1 -1
- package/dist/utils/yaml.d.ts +4 -3
- package/dist/utils/yaml.js +6 -2
- package/dist/utils/yaml.js.map +1 -1
- package/package.json +42 -44
package/bin/tkm.mjs
CHANGED
package/dist/aws/s3/client.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { InternalAwsClientProps } from "../common/client.js";
|
|
2
2
|
export interface S3Client {
|
|
3
3
|
readonly putObject: (bucketName: string, key: string, object: string) => Promise<boolean>;
|
|
4
|
+
readonly getBucketLocation: (bucketName: string) => Promise<string>;
|
|
4
5
|
}
|
|
5
6
|
export declare const createS3Client: (props: InternalAwsClientProps) => S3Client;
|
package/dist/aws/s3/client.js
CHANGED
|
@@ -17,8 +17,14 @@ export const createS3Client = (props) => {
|
|
|
17
17
|
Body: object,
|
|
18
18
|
})
|
|
19
19
|
.then(() => true);
|
|
20
|
+
const getBucketLocation = (bucketName) => client
|
|
21
|
+
.getBucketLocation({
|
|
22
|
+
Bucket: bucketName,
|
|
23
|
+
})
|
|
24
|
+
.then((r) => r.LocationConstraint ?? "us-east-1");
|
|
20
25
|
return {
|
|
21
26
|
putObject,
|
|
27
|
+
getBucketLocation,
|
|
22
28
|
};
|
|
23
29
|
};
|
|
24
30
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/aws/s3/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EACL,4BAA4B,EAC5B,mCAAmC,GACpC,MAAM,+BAA+B,CAAA;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/aws/s3/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAA;AAEvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EACL,4BAA4B,EAC5B,mCAAmC,GACpC,MAAM,+BAA+B,CAAA;AAYtC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAA6B,EAAY,EAAE;IACxE,MAAM,MAAM,GAAG,IAAI,EAAE,CAAC;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,WAAW,EAAE,KAAK,CAAC,kBAAkB;QACrC,aAAa,EAAE,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC;QAChD,cAAc,EAAE,oBAAoB,CAAC,EAAE,CAAC;KACzC,CAAC,CAAA;IAEF,MAAM,CAAC,eAAe,CAAC,GAAG,CACxB,4BAA4B,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,EACpE,mCAAmC,CACpC,CAAA;IAED,MAAM,SAAS,GAAG,CAChB,UAAkB,EAClB,GAAW,EACX,MAAc,EACI,EAAE,CACpB,MAAM;SACH,SAAS,CAAC;QACT,MAAM,EAAE,UAAU;QAClB,GAAG,EAAE,GAAG;QACR,IAAI,EAAE,MAAM;KACb,CAAC;SACD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;IAErB,MAAM,iBAAiB,GAAG,CAAC,UAAkB,EAAmB,EAAE,CAChE,MAAM;SACH,iBAAiB,CAAC;QACjB,MAAM,EAAE,UAAU;KACnB,CAAC;SACD,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,IAAI,WAAW,CAAC,CAAA;IAErD,OAAO;QACL,SAAS;QACT,iBAAiB;KAClB,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import _ from "lodash";
|
|
2
2
|
import { splitTextInLines } from "../../utils/strings.js";
|
|
3
3
|
import { formatYaml } from "../../utils/yaml.js";
|
|
4
4
|
import { createBaseIO } from "../cli-io.js";
|
|
@@ -24,7 +24,7 @@ export const createRunTargetsIO = (props) => {
|
|
|
24
24
|
const confirmRun = async ({ groups }) => {
|
|
25
25
|
io.subheader({ text: "Targets run plan", marginTop: true });
|
|
26
26
|
io.longMessage(splitTextInLines(70, confirmDescription), false, false, 0);
|
|
27
|
-
const targetCount =
|
|
27
|
+
const targetCount = _.sum(groups.map((g) => g.targets.length));
|
|
28
28
|
io.message({
|
|
29
29
|
text: `Following ${targetCount} targets will be run:`,
|
|
30
30
|
marginTop: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-targets-io.js","sourceRoot":"","sources":["../../../src/cli-io/deployment-targets/run-targets-io.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"run-targets-io.js","sourceRoot":"","sources":["../../../src/cli-io/deployment-targets/run-targets-io.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { uuid } from "../../../../utils/strings.js";
|
|
2
|
+
const buildTemplateS3Url = (bucketName, key, location) => {
|
|
3
|
+
const locationPart = location !== "us-east-1" ? `${location}.` : "";
|
|
4
|
+
return `https://${bucketName}.s3.${locationPart}amazonaws.com/${key}`;
|
|
5
|
+
};
|
|
2
6
|
export const uploadTemplate = async (state) => {
|
|
3
7
|
const { stack, templateBody, logger, transitions, ctx } = state;
|
|
4
8
|
const templateBucket = stack.templateBucket;
|
|
@@ -6,8 +10,6 @@ export const uploadTemplate = async (state) => {
|
|
|
6
10
|
logger.debug("No template bucket configured");
|
|
7
11
|
return transitions.validateTemplate(state);
|
|
8
12
|
}
|
|
9
|
-
const key = `${templateBucket.keyPrefix || ""}${stack.name}-${Date.now()}.yml`;
|
|
10
|
-
const templateS3Url = `https://s3.amazonaws.com/${templateBucket.name}/${key}`;
|
|
11
13
|
logger.debugObject("Template bucket configured:", () => templateBucket);
|
|
12
14
|
const s3Client = await ctx.awsClientProvider.createS3Client({
|
|
13
15
|
credentialProvider: stack.credentialManager.getCredentialProvider(),
|
|
@@ -15,8 +17,20 @@ export const uploadTemplate = async (state) => {
|
|
|
15
17
|
id: uuid(),
|
|
16
18
|
logger,
|
|
17
19
|
});
|
|
20
|
+
const location = await s3Client.getBucketLocation(templateBucket.name);
|
|
21
|
+
// S3 client needs to be in the same region as the bucket is
|
|
22
|
+
const uploadClient = location === stack.region
|
|
23
|
+
? s3Client
|
|
24
|
+
: await ctx.awsClientProvider.createS3Client({
|
|
25
|
+
credentialProvider: stack.credentialManager.getCredentialProvider(),
|
|
26
|
+
region: location,
|
|
27
|
+
id: uuid(),
|
|
28
|
+
logger,
|
|
29
|
+
});
|
|
30
|
+
const key = `${templateBucket.keyPrefix ?? ""}${stack.name}-${Date.now()}.yml`;
|
|
31
|
+
const templateS3Url = buildTemplateS3Url(templateBucket.name, key, location);
|
|
18
32
|
logger.debug(`Upload template to: ${templateS3Url}`);
|
|
19
|
-
await
|
|
33
|
+
await uploadClient.putObject(templateBucket.name, key, templateBody);
|
|
20
34
|
return transitions.validateTemplate({ ...state, templateS3Url });
|
|
21
35
|
};
|
|
22
36
|
//# sourceMappingURL=upload-template.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-template.js","sourceRoot":"","sources":["../../../../../src/command/stacks/deploy/steps/upload-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAInD,MAAM,CAAC,MAAM,cAAc,GAA2C,KAAK,EACzE,KAAK,EACL,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAE/D,MAAM,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;IAE3C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAC7C,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"upload-template.js","sourceRoot":"","sources":["../../../../../src/command/stacks/deploy/steps/upload-template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAA;AAInD,MAAM,kBAAkB,GAAG,CACzB,UAAkB,EAClB,GAAW,EACX,QAAiB,EACT,EAAE;IACV,MAAM,YAAY,GAAG,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;IACnE,OAAO,WAAW,UAAU,OAAO,YAAY,iBAAiB,GAAG,EAAE,CAAA;AACvE,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAA2C,KAAK,EACzE,KAAK,EACL,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,KAAK,CAAA;IAE/D,MAAM,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;IAE3C,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAC7C,OAAO,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,CAAA;IAEvE,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;QAC1D,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,CAAC,qBAAqB,EAAE;QACnE,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,EAAE,EAAE,IAAI,EAAE;QACV,MAAM;KACP,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;IAEtE,4DAA4D;IAC5D,MAAM,YAAY,GAChB,QAAQ,KAAK,KAAK,CAAC,MAAM;QACvB,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,MAAM,GAAG,CAAC,iBAAiB,CAAC,cAAc,CAAC;YACzC,kBAAkB,EAAE,KAAK,CAAC,iBAAiB,CAAC,qBAAqB,EAAE;YACnE,MAAM,EAAE,QAAQ;YAChB,EAAE,EAAE,IAAI,EAAE;YACV,MAAM;SACP,CAAC,CAAA;IAER,MAAM,GAAG,GAAG,GAAG,cAAc,CAAC,SAAS,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,MAAM,CAAA;IAC9E,MAAM,aAAa,GAAG,kBAAkB,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;IAE5E,MAAM,CAAC,KAAK,CAAC,uBAAuB,aAAa,EAAE,CAAC,CAAA;IACpD,MAAM,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,CAAA;IAEpE,OAAO,WAAW,CAAC,gBAAgB,CAAC,EAAE,GAAG,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;AAClE,CAAC,CAAA"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,32 +1,34 @@
|
|
|
1
1
|
import "source-map-support/register.js";
|
|
2
|
-
export { BaseCloudFormationStack, CloudFormationStack, StackCapability, StackDriftInformation, StackDriftStatus, StackOutput, StackParameter, StackStatus, } from "./aws/cloudformation/model.js";
|
|
3
|
-
export { CredentialManager } from "./aws/common/credentials.js";
|
|
4
|
-
export { CallerIdentity, Tag } from "./aws/common/model.js";
|
|
2
|
+
export type { BaseCloudFormationStack, CloudFormationStack, StackCapability, StackDriftInformation, StackDriftStatus, StackOutput, StackParameter, StackStatus, } from "./aws/cloudformation/model.js";
|
|
3
|
+
export type { CredentialManager } from "./aws/common/credentials.js";
|
|
4
|
+
export type { CallerIdentity, Tag } from "./aws/common/model.js";
|
|
5
5
|
export { run } from "./cli/index.js";
|
|
6
|
-
export { HookOutputValues, StackOperationVariables, } from "./command/command-model.js";
|
|
7
|
-
export { MapFunction, MapFunctionProps, ReduceFunction, ReduceFunctionProps, } from "./command/targets/run/model.js";
|
|
8
|
-
export { ContextVars, EnvVars, Variables, Vars } from "./common/model.js";
|
|
9
|
-
export { ConfigSetInstruction, ConfigSetInstructionsHolder, ConfigSetName, StageName, } from "./config-sets/config-set-model.js";
|
|
10
|
-
export { ParameterConfig } from "./config/common-config.js";
|
|
11
|
-
export { DeploymentTargetRepositoryConfig, TakomoProjectConfig, TakomoProjectDeploymentTargetsConfig, } from "./config/project-config.js";
|
|
12
|
-
export { DeploymentTargetConfig } from "./config/targets-config.js";
|
|
13
|
-
export { CommandContext } from "./context/command-context.js";
|
|
14
|
-
export { StacksContext } from "./context/stacks-context.js";
|
|
15
|
-
export { TakomoConfig, TakomoConfigProps, TakomoConfigProvider, } from "./extensions/config-customizer.js";
|
|
16
|
-
export { HookProvider } from "./hooks/hook-provider.js";
|
|
17
|
-
export { Hook, HookConfig, HookInput, HookName, HookOperation, HookOutput, HookOutputObject, HookStage, HookStatus, HookType, } from "./hooks/hook.js";
|
|
18
|
-
export { ResolverConfig, ResolverProvider, ResolverProviderSchemaProps, } from "./resolvers/resolver-provider.js";
|
|
19
|
-
export { Resolver, ResolverInput } from "./resolvers/resolver.js";
|
|
20
|
-
export { Stack } from "./stacks/stack.js";
|
|
21
|
-
export { CommandRole, OutputFormat } from "./takomo-core/command.js";
|
|
22
|
-
export { InitSchemaProps, SchemaProvider, } from "./takomo-stacks-model/schemas.js";
|
|
23
|
-
export { DeploymentStatus, Label } from "./targets/targets-model.js";
|
|
6
|
+
export type { HookOutputValues, StackOperationVariables, } from "./command/command-model.js";
|
|
7
|
+
export type { MapFunction, MapFunctionProps, ReduceFunction, ReduceFunctionProps, } from "./command/targets/run/model.js";
|
|
8
|
+
export type { ContextVars, EnvVars, Variables, Vars } from "./common/model.js";
|
|
9
|
+
export type { ConfigSetInstruction, ConfigSetInstructionsHolder, ConfigSetName, StageName, } from "./config-sets/config-set-model.js";
|
|
10
|
+
export type { ParameterConfig } from "./config/common-config.js";
|
|
11
|
+
export type { DeploymentTargetRepositoryConfig, TakomoProjectConfig, TakomoProjectDeploymentTargetsConfig, } from "./config/project-config.js";
|
|
12
|
+
export type { DeploymentTargetConfig } from "./config/targets-config.js";
|
|
13
|
+
export type { CommandContext } from "./context/command-context.js";
|
|
14
|
+
export type { StacksContext } from "./context/stacks-context.js";
|
|
15
|
+
export type { TakomoConfig, TakomoConfigProps, TakomoConfigProvider, } from "./extensions/config-customizer.js";
|
|
16
|
+
export type { HookProvider } from "./hooks/hook-provider.js";
|
|
17
|
+
export type { Hook, HookConfig, HookInput, HookName, HookOperation, HookOutput, HookOutputObject, HookStage, HookStatus, HookType, } from "./hooks/hook.js";
|
|
18
|
+
export type { ResolverConfig, ResolverProvider, ResolverProviderSchemaProps, } from "./resolvers/resolver-provider.js";
|
|
19
|
+
export type { Resolver, ResolverInput } from "./resolvers/resolver.js";
|
|
20
|
+
export type { Stack } from "./stacks/stack.js";
|
|
21
|
+
export type { CommandRole, OutputFormat } from "./takomo-core/command.js";
|
|
22
|
+
export type { InitSchemaProps, SchemaProvider, } from "./takomo-stacks-model/schemas.js";
|
|
23
|
+
export type { DeploymentStatus, Label } from "./targets/targets-model.js";
|
|
24
24
|
export { EjsTemplateEngineProvider } from "./templating/ejs/ejs-template-engine-provider.js";
|
|
25
|
-
export { HandlebarsHelperProvider, InitHandlebarsHelperProps, } from "./templating/handlebars/handlebars-helper-provider.js";
|
|
26
|
-
export { HandlebarsHelper } from "./templating/handlebars/handlebars-helper.js";
|
|
27
|
-
export { HandlebarsTemplateEngineProvider
|
|
28
|
-
export {
|
|
29
|
-
export {
|
|
30
|
-
export {
|
|
31
|
-
export {
|
|
32
|
-
export {
|
|
25
|
+
export type { HandlebarsHelperProvider, InitHandlebarsHelperProps, } from "./templating/handlebars/handlebars-helper-provider.js";
|
|
26
|
+
export type { HandlebarsHelper } from "./templating/handlebars/handlebars-helper.js";
|
|
27
|
+
export { HandlebarsTemplateEngineProvider } from "./templating/handlebars/handlebars-template-engine-provider.js";
|
|
28
|
+
export type { HandlebarsTemplateEngineProviderProps } from "./templating/handlebars/handlebars-template-engine-provider.js";
|
|
29
|
+
export type { TemplateEngineProps, TemplateEngineProvider, } from "./templating/template-engine-provider.js";
|
|
30
|
+
export type { HandlebarsCompileOptions, HandlebarsHelperOptions, HandlebarsTemplateDelegate, } from "./templating/handlebars/handlebars-template-engine.js";
|
|
31
|
+
export { HandlebarsSafeString } from "./templating/handlebars/handlebars-template-engine.js";
|
|
32
|
+
export type { RenderTemplateFileProps, RenderTemplateProps, TemplateEngine, } from "./templating/template-engine.js";
|
|
33
|
+
export type { FilePath } from "./utils/files.js";
|
|
34
|
+
export type { LogLevel, TkmLogger } from "./utils/logging.js";
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import "source-map-support/register.js";
|
|
2
2
|
export { run } from "./cli/index.js";
|
|
3
3
|
export { EjsTemplateEngineProvider } from "./templating/ejs/ejs-template-engine-provider.js";
|
|
4
|
-
export { HandlebarsTemplateEngineProvider
|
|
5
|
-
export { HandlebarsSafeString
|
|
4
|
+
export { HandlebarsTemplateEngineProvider } from "./templating/handlebars/handlebars-template-engine-provider.js";
|
|
5
|
+
export { HandlebarsSafeString } from "./templating/handlebars/handlebars-template-engine.js";
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAA;AAavC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AA0DpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAA;AAM5F,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAA;AAavC,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AA0DpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAA;AAM5F,OAAO,EAAE,gCAAgC,EAAE,MAAM,gEAAgE,CAAA;AAWjH,OAAO,EAAE,oBAAoB,EAAE,MAAM,uDAAuD,CAAA"}
|
|
@@ -52,11 +52,13 @@ export const parseRegex = (path, pattern) => {
|
|
|
52
52
|
try {
|
|
53
53
|
return pattern ? new RegExp(pattern) : undefined;
|
|
54
54
|
}
|
|
55
|
-
catch
|
|
55
|
+
catch {
|
|
56
56
|
throw new TakomoError(`Invalid regex pattern ${pattern} provided in ${path}`);
|
|
57
57
|
}
|
|
58
58
|
};
|
|
59
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
59
60
|
export const parseVars = (value) => value ?? {};
|
|
61
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
60
62
|
export const parseCommandRole = (value) => parse(value, () => undefined, (value) => ({
|
|
61
63
|
iamRoleArn: value,
|
|
62
64
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-parser.js","sourceRoot":"","sources":["../../src/parser/common-parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"common-parser.js","sourceRoot":"","sources":["../../src/parser/common-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as R from "ramda";
|
|
2
2
|
import { DEFAULT_STAGE_NAME, } from "../config-sets/config-set-model.js";
|
|
3
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
3
4
|
export const parseConfigSets = (value) => {
|
|
4
5
|
if (value === null || value === undefined) {
|
|
5
6
|
return [];
|
|
@@ -38,6 +39,7 @@ const parseConfigSetInstruction = (value) => {
|
|
|
38
39
|
};
|
|
39
40
|
}
|
|
40
41
|
if (typeof value === "object") {
|
|
42
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
41
43
|
const o = value;
|
|
42
44
|
return {
|
|
43
45
|
name: o.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-set-parser.js","sourceRoot":"","sources":["../../src/parser/config-set-parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config-set-parser.js","sourceRoot":"","sources":["../../src/parser/config-set-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ const validateRequiredVersion = async (configFilePath, requiredVersion) => {
|
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
27
28
|
export const parseExternalResolver = (value) => {
|
|
28
29
|
if (typeof value === "string") {
|
|
29
30
|
return {
|
|
@@ -35,7 +36,9 @@ export const parseExternalResolver = (value) => {
|
|
|
35
36
|
package: value.package,
|
|
36
37
|
};
|
|
37
38
|
};
|
|
38
|
-
export const parseExternalHandlebarsHelper = (
|
|
39
|
+
export const parseExternalHandlebarsHelper = (
|
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
41
|
+
value) => {
|
|
39
42
|
if (typeof value === "string") {
|
|
40
43
|
return {
|
|
41
44
|
package: value,
|
|
@@ -46,7 +49,9 @@ export const parseExternalHandlebarsHelper = (value) => {
|
|
|
46
49
|
package: value.package,
|
|
47
50
|
};
|
|
48
51
|
};
|
|
49
|
-
export const parseExternalHandlebarsHelpers = (
|
|
52
|
+
export const parseExternalHandlebarsHelpers = (
|
|
53
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
54
|
+
value) => {
|
|
50
55
|
if (value === null || value === undefined) {
|
|
51
56
|
return [];
|
|
52
57
|
}
|
|
@@ -56,7 +61,9 @@ export const parseExternalHandlebarsHelpers = (value) => {
|
|
|
56
61
|
return value.map(parseExternalHandlebarsHelper);
|
|
57
62
|
};
|
|
58
63
|
const parseFilePaths = (projectDir, value) => parseStringArray(value).map((f) => expandFilePath(projectDir, f));
|
|
59
|
-
export const parseExternalResolvers = (
|
|
64
|
+
export const parseExternalResolvers = (
|
|
65
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
66
|
+
value) => {
|
|
60
67
|
if (value === null || value === undefined) {
|
|
61
68
|
return [];
|
|
62
69
|
}
|
|
@@ -65,6 +72,7 @@ export const parseExternalResolvers = (value) => {
|
|
|
65
72
|
}
|
|
66
73
|
return value.map(parseExternalResolver);
|
|
67
74
|
};
|
|
75
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
68
76
|
export const parseFeatures = (value) => {
|
|
69
77
|
const defaults = defaultFeatures();
|
|
70
78
|
if (value === null || value === undefined) {
|
|
@@ -72,7 +80,9 @@ export const parseFeatures = (value) => {
|
|
|
72
80
|
}
|
|
73
81
|
return { ...defaults, ...value };
|
|
74
82
|
};
|
|
75
|
-
export const parseDeploymentTargetsConfig = (
|
|
83
|
+
export const parseDeploymentTargetsConfig = (
|
|
84
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
85
|
+
value) => {
|
|
76
86
|
if (value === null || value === undefined) {
|
|
77
87
|
return undefined;
|
|
78
88
|
}
|
|
@@ -89,7 +99,9 @@ export const parseDeploymentTargetsConfig = (value) => {
|
|
|
89
99
|
repository: [repository],
|
|
90
100
|
};
|
|
91
101
|
};
|
|
92
|
-
const parseEsbuildConfig = (projectDir,
|
|
102
|
+
const parseEsbuildConfig = (projectDir,
|
|
103
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
104
|
+
value) => {
|
|
93
105
|
if (value === null || value === undefined) {
|
|
94
106
|
return undefined;
|
|
95
107
|
}
|
|
@@ -166,6 +178,7 @@ export const collectProjectConfigFileHierarchy = async (projectDir, pathConfigFi
|
|
|
166
178
|
throw new TakomoError(`Project config file ${absolutePath} not found`);
|
|
167
179
|
}
|
|
168
180
|
}
|
|
181
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
169
182
|
const contents = (await parseYamlFile(absolutePath)) ?? {};
|
|
170
183
|
const pair = { absolutePath, contents };
|
|
171
184
|
if (!contents.extends) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config-parser.js","sourceRoot":"","sources":["../../src/parser/project-config-parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project-config-parser.js","sourceRoot":"","sources":["../../src/parser/project-config-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,5 @@ import { Result } from "neverthrow";
|
|
|
2
2
|
import { StackConfig } from "../../config/stack-config.js";
|
|
3
3
|
import { CommandContext } from "../../context/command-context.js";
|
|
4
4
|
import { ValidationError } from "../../utils/errors.js";
|
|
5
|
-
|
|
5
|
+
import { ParsedYamlDocument } from "../../utils/yaml.js";
|
|
6
|
+
export declare const buildStackConfig: (ctx: CommandContext, record: ParsedYamlDocument, configType: "stack" | "blueprint") => Result<StackConfig, ValidationError>;
|
|
@@ -24,6 +24,9 @@ export const buildStackConfig = (ctx, record, configType) => {
|
|
|
24
24
|
const details = error.details.map((d) => d.message);
|
|
25
25
|
return err(new ValidationError("Validation errors in stack configuration", details));
|
|
26
26
|
}
|
|
27
|
+
if (typeof record === "number" || typeof record === "string") {
|
|
28
|
+
throw new Error("Invalid yaml document");
|
|
29
|
+
}
|
|
27
30
|
const schemas = parseSchemas(record.schemas);
|
|
28
31
|
const data = parseData(record.data);
|
|
29
32
|
const hooks = parseHooks(record.hooks);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-stack-config.js","sourceRoot":"","sources":["../../../src/parser/stacks/build-stack-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAA;AAG5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAA;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,EACnB,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"build-stack-config.js","sourceRoot":"","sources":["../../../src/parser/stacks/build-stack-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,5 @@ import { Result } from "neverthrow";
|
|
|
2
2
|
import { StackGroupConfig } from "../../config/stack-group-config.js";
|
|
3
3
|
import { CommandContext } from "../../context/command-context.js";
|
|
4
4
|
import { ValidationError } from "../../utils/errors.js";
|
|
5
|
-
|
|
5
|
+
import { ParsedYamlDocument } from "../../utils/yaml.js";
|
|
6
|
+
export declare const buildStackGroupConfig: (ctx: CommandContext, record: ParsedYamlDocument) => Result<StackGroupConfig, ValidationError>;
|
|
@@ -22,6 +22,9 @@ export const buildStackGroupConfig = (ctx, record) => {
|
|
|
22
22
|
const details = error.details.map((d) => d.message);
|
|
23
23
|
return err(new ValidationError("Validation errors in stack group configuration", details));
|
|
24
24
|
}
|
|
25
|
+
if (typeof record === "number" || typeof record === "string") {
|
|
26
|
+
throw new Error("Invalid yaml document");
|
|
27
|
+
}
|
|
25
28
|
const schemas = parseSchemas(record.schemas);
|
|
26
29
|
const data = parseData(record.data);
|
|
27
30
|
const hooks = parseHooks(record.hooks);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-stack-group-config.js","sourceRoot":"","sources":["../../../src/parser/stacks/build-stack-group-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAA;AAG5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,EACnB,wBAAwB,EACxB,gBAAgB,GACjB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"build-stack-group-config.js","sourceRoot":"","sources":["../../../src/parser/stacks/build-stack-group-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,4 +5,5 @@ import { CommandContext } from "../../context/command-context.js";
|
|
|
5
5
|
import { DeploymentGroupPath, DeploymentTargetsSchemaRegistry } from "../../targets/targets-model.js";
|
|
6
6
|
import { ValidationError } from "../../utils/errors.js";
|
|
7
7
|
import { TkmLogger } from "../../utils/logging.js";
|
|
8
|
-
|
|
8
|
+
import { ParsedYamlDocument } from "../../utils/yaml.js";
|
|
9
|
+
export declare const buildDeploymentConfig: (ctx: CommandContext, logger: TkmLogger, schemaRegistry: DeploymentTargetsSchemaRegistry, externalDeploymentTargets: Map<DeploymentGroupPath, ReadonlyArray<unknown>>, externalConfigSets: Map<ConfigSetName, ConfigSet>, record: ParsedYamlDocument) => Promise<Result<DeploymentConfig, ValidationError>>;
|
|
@@ -10,6 +10,7 @@ import { parseDeploymentGroups } from "./parse-deployment-groups.js";
|
|
|
10
10
|
import { parseTargetSchemas } from "./parse-target-schemas.js";
|
|
11
11
|
export const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externalDeploymentTargets, externalConfigSets, record) => {
|
|
12
12
|
const externalTargetNames = Array.from(externalDeploymentTargets.values())
|
|
13
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
14
|
.map((targets) => targets.map((t) => t.name))
|
|
14
15
|
.flat();
|
|
15
16
|
const nonUniqueExternalTargets = externalTargetNames.filter((name) => externalTargetNames.filter(R.equals(name)).length > 1);
|
|
@@ -27,6 +28,9 @@ export const buildDeploymentConfig = async (ctx, logger, schemaRegistry, externa
|
|
|
27
28
|
const details = error.details.map((d) => d.message);
|
|
28
29
|
return err(new ValidationError("Validation errors in deployment configuration", details));
|
|
29
30
|
}
|
|
31
|
+
if (typeof record === "number" || typeof record === "string") {
|
|
32
|
+
throw new Error("Invalid yaml document");
|
|
33
|
+
}
|
|
30
34
|
const vars = merge(ctx.variables.var, parseVars(record.vars));
|
|
31
35
|
const targetsSchema = parseTargetSchemas(record.targetsSchema);
|
|
32
36
|
const parsedConfigSets = parseConfigSets(record.configSets);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-deployment-config.js","sourceRoot":"","sources":["../../../src/parser/targets/build-deployment-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAA;AAC5C,OAAO,KAAK,CAAC,MAAM,OAAO,CAAA;AAQ1B,OAAO,EAAE,mCAAmC,EAAE,MAAM,kDAAkD,CAAA;AAKtG,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,GACV,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"build-deployment-config.js","sourceRoot":"","sources":["../../../src/parser/targets/build-deployment-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,20 @@
|
|
|
1
|
-
import
|
|
2
|
-
import readdirp from "readdirp";
|
|
1
|
+
import { readdirpPromise } from "readdirp";
|
|
3
2
|
import { ROOT_STACK_GROUP_PATH } from "../../takomo-stacks-model/constants.js";
|
|
4
3
|
import { arrayToMap } from "../../utils/collections.js";
|
|
5
4
|
export const loadConfigSetsFromConfigSetsDir = async (configSetsDir) => {
|
|
6
|
-
const dirs = await
|
|
5
|
+
const dirs = await readdirpPromise(configSetsDir, {
|
|
7
6
|
alwaysStat: true,
|
|
8
7
|
depth: 1,
|
|
9
8
|
type: "directories",
|
|
10
9
|
});
|
|
11
|
-
return arrayToMap(dirs
|
|
10
|
+
return arrayToMap(dirs
|
|
11
|
+
.map((d) => d.basename)
|
|
12
|
+
.map((name) => ({
|
|
12
13
|
name,
|
|
13
14
|
description: "",
|
|
14
15
|
vars: {},
|
|
15
16
|
commandPaths: [ROOT_STACK_GROUP_PATH],
|
|
16
17
|
legacy: false,
|
|
17
|
-
})),
|
|
18
|
+
})), (f) => f.name);
|
|
18
19
|
};
|
|
19
20
|
//# sourceMappingURL=config-sets-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-sets-loader.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/config-sets/config-sets-loader.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"config-sets-loader.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/config-sets/config-sets-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,aAAuB,EACiB,EAAE;IAC1C,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,aAAa,EAAE;QAChD,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,CAAC;QACR,IAAI,EAAE,aAAa;KACpB,CAAC,CAAA;IAEF,OAAO,UAAU,CACf,IAAI;SACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;SACtB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACd,IAAI;QACJ,WAAW,EAAE,EAAE;QACf,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,CAAC,qBAAqB,CAAC;QACrC,MAAM,EAAE,KAAK;KACd,CAAC,CAAC,EACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -2,4 +2,5 @@ import { CommandContext } from "../../context/command-context.js";
|
|
|
2
2
|
import { TemplateEngine } from "../../templating/template-engine.js";
|
|
3
3
|
import { FilePath } from "../../utils/files.js";
|
|
4
4
|
import { TkmLogger } from "../../utils/logging.js";
|
|
5
|
-
|
|
5
|
+
import { ParsedYamlDocument } from "../../utils/yaml.js";
|
|
6
|
+
export declare const parseConfigFile: (ctx: CommandContext, logger: TkmLogger, templateEngine: TemplateEngine, pathToFile: FilePath) => Promise<ParsedYamlDocument>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/parser.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/parser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAsB,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEnE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,GAAmB,EACnB,MAAiB,EACjB,cAA8B,EAC9B,UAAoB,EACS,EAAE;IAC/B,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;IAEzB,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC;QACvD,UAAU;QACV,SAAS;KACV,CAAC,CAAA;IAEF,OAAO,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;AACxC,CAAC,CAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import
|
|
2
|
+
import { readdirpPromise } from "readdirp";
|
|
3
3
|
import { createStacksSchemas } from "../../schema/stacks-schema.js";
|
|
4
4
|
import { ROOT_STACK_GROUP_PATH } from "../../takomo-stacks-model/constants.js";
|
|
5
5
|
import { validate } from "../../utils/validation.js";
|
|
@@ -8,7 +8,7 @@ export const buildStackGroupConfigNode = async (ctx, templateEngine, logger, con
|
|
|
8
8
|
logger.debug(`Process stack group ${stackGroupPath} from dir: ${stackGroupDir}`);
|
|
9
9
|
const { stackGroupName } = createStacksSchemas({ regions: ctx.regions });
|
|
10
10
|
validate(stackGroupName, path.basename(stackGroupDir), `Directory ${stackGroupDir} name is not suitable for a stack group`);
|
|
11
|
-
const files = await
|
|
11
|
+
const files = await readdirpPromise(stackGroupDir, {
|
|
12
12
|
alwaysStat: true,
|
|
13
13
|
depth: 0,
|
|
14
14
|
fileFilter: (e) => e.basename.endsWith(configFileExtension),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-tree.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-tree.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"config-tree.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { readdirpPromise } from "readdirp";
|
|
2
2
|
import { dirExists } from "../../utils/files.js";
|
|
3
3
|
export const loadCustomResolvers = async (resolversDir, logger, resolverRegistry) => {
|
|
4
4
|
if (!(await dirExists(resolversDir))) {
|
|
@@ -6,7 +6,7 @@ export const loadCustomResolvers = async (resolversDir, logger, resolverRegistry
|
|
|
6
6
|
return;
|
|
7
7
|
}
|
|
8
8
|
logger.debug(`Found resolvers dir: ${resolversDir}`);
|
|
9
|
-
const resolverFiles = await
|
|
9
|
+
const resolverFiles = await readdirpPromise(resolversDir, {
|
|
10
10
|
alwaysStat: true,
|
|
11
11
|
depth: 100,
|
|
12
12
|
type: "files",
|
|
@@ -22,7 +22,7 @@ export const loadCustomHooks = async (hooksDir, logger, hookRegistry) => {
|
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
24
|
logger.debug(`Found hooks dir: ${hooksDir}`);
|
|
25
|
-
const hookFiles = await
|
|
25
|
+
const hookFiles = await readdirpPromise(hooksDir, {
|
|
26
26
|
alwaysStat: true,
|
|
27
27
|
depth: 100,
|
|
28
28
|
type: "files",
|
|
@@ -38,7 +38,7 @@ export const loadCustomSchemas = async ({ schemasDirs, logger, registry, }) => {
|
|
|
38
38
|
throw new Error(`Schemas dir not found: ${schemasDir}`);
|
|
39
39
|
}
|
|
40
40
|
logger.debug(`Found schemas dir: ${schemasDir}`);
|
|
41
|
-
const schemaFiles = await
|
|
41
|
+
const schemaFiles = await readdirpPromise(schemasDir, {
|
|
42
42
|
alwaysStat: true,
|
|
43
43
|
depth: 100,
|
|
44
44
|
type: "files",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAI1C,OAAO,EAAE,SAAS,EAAY,MAAM,sBAAsB,CAAA;AAG1D,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,YAAsB,EACtB,MAAiB,EACjB,gBAAkC,EACnB,EAAE;IACjB,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,KAAK,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAA;QACxD,OAAM;IACR,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,wBAAwB,YAAY,EAAE,CAAC,CAAA;IAEpD,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE;QACxD,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;KAC9C,CAAC,CAAA;IAEF,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,gBAAgB,CAAC,wBAAwB,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;IACxE,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,QAAkB,EAClB,MAAiB,EACjB,YAA0B,EACX,EAAE;IACjB,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACnC,OAAM;IACR,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAA;IAE5C,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE;QAChD,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,OAAO;QACb,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;KAC9C,CAAC,CAAA;IAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,YAAY,CAAC,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAChE,CAAC;AACH,CAAC,CAAA;AAQD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,WAAW,EACX,MAAM,EACN,QAAQ,GACe,EAAiB,EAAE;IAC1C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,0BAA0B,UAAU,EAAE,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,UAAU,EAAE,CAAC,CAAA;QAEhD,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,UAAU,EAAE;YACpD,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;SAC9C,CAAC,CAAA;QAEF,WAAW;aACR,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;aACtB,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -2,27 +2,35 @@ import { buildStackConfig } from "../../parser/stacks/build-stack-config.js";
|
|
|
2
2
|
import { buildStackGroupConfig } from "../../parser/stacks/build-stack-group-config.js";
|
|
3
3
|
import { TakomoError } from "../../utils/errors.js";
|
|
4
4
|
import { parseYaml } from "../../utils/yaml.js";
|
|
5
|
-
export const parseBlueprintConfigFile = async (ctx,
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
export const parseBlueprintConfigFile = async (ctx,
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
7
|
+
variables, templateEngine, logger, pathToFile) => parseStackConfigFileInternal(ctx, variables, templateEngine, logger, pathToFile, "blueprint");
|
|
8
|
+
export const parseStackConfigFile = async (ctx,
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
10
|
+
variables, templateEngine, logger, pathToFile) => parseStackConfigFileInternal(ctx, variables, templateEngine, logger, pathToFile, "stack");
|
|
11
|
+
const parseStackConfigFileInternal = async (ctx,
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
|
+
variables, templateEngine, logger, pathToFile, configType) => {
|
|
8
14
|
const rendered = await templateEngine.renderTemplateFile({
|
|
9
15
|
pathToFile,
|
|
10
16
|
variables,
|
|
11
17
|
});
|
|
12
|
-
const parsedFile =
|
|
13
|
-
const result =
|
|
18
|
+
const parsedFile = parseYaml(pathToFile, rendered);
|
|
19
|
+
const result = buildStackConfig(ctx, parsedFile, configType);
|
|
14
20
|
if (result.isOk()) {
|
|
15
21
|
return result.value;
|
|
16
22
|
}
|
|
17
23
|
const details = result.error.messages.map((m) => `- ${m}`).join("\n");
|
|
18
24
|
throw new TakomoError(`Validation errors in ${configType} file ${pathToFile}:\n${details}`);
|
|
19
25
|
};
|
|
20
|
-
export const parseStackGroupConfigFile = async (ctx,
|
|
26
|
+
export const parseStackGroupConfigFile = async (ctx,
|
|
27
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
28
|
+
variables, templateEngine, logger, pathToFile) => {
|
|
21
29
|
const rendered = await templateEngine.renderTemplateFile({
|
|
22
30
|
pathToFile,
|
|
23
31
|
variables,
|
|
24
32
|
});
|
|
25
|
-
const parsedFile =
|
|
33
|
+
const parsedFile = parseYaml(pathToFile, rendered);
|
|
26
34
|
const result = buildStackGroupConfig(ctx, parsedFile);
|
|
27
35
|
if (result.isOk()) {
|
|
28
36
|
return result.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAA;AAEvF,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,GAAmB,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/parser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAA;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAA;AAEvF,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAC3C,GAAmB;AACnB,8DAA8D;AAC9D,SAAc,EACd,cAA8B,EAC9B,MAAiB,EACjB,UAAoB,EACE,EAAE,CACxB,4BAA4B,CAC1B,GAAG,EACH,SAAS,EACT,cAAc,EACd,MAAM,EACN,UAAU,EACV,WAAW,CACZ,CAAA;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,GAAmB;AACnB,8DAA8D;AAC9D,SAAc,EACd,cAA8B,EAC9B,MAAiB,EACjB,UAAoB,EACE,EAAE,CACxB,4BAA4B,CAC1B,GAAG,EACH,SAAS,EACT,cAAc,EACd,MAAM,EACN,UAAU,EACV,OAAO,CACR,CAAA;AAEH,MAAM,4BAA4B,GAAG,KAAK,EACxC,GAAmB;AACnB,8DAA8D;AAC9D,SAAc,EACd,cAA8B,EAC9B,MAAiB,EACjB,UAAoB,EACpB,UAAiC,EACX,EAAE;IACxB,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC;QACvD,UAAU;QACV,SAAS;KACV,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAClD,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;IAC5D,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9E,MAAM,IAAI,WAAW,CACnB,wBAAwB,UAAU,SAAS,UAAU,MAAM,OAAO,EAAE,CACrE,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,GAAmB;AACnB,8DAA8D;AAC9D,SAAc,EACd,cAA8B,EAC9B,MAAiB,EACjB,UAAoB,EACO,EAAE;IAC7B,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,kBAAkB,CAAC;QACvD,UAAU;QACV,SAAS;KACV,CAAC,CAAA;IAEF,MAAM,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IAClD,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;IAErD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9E,MAAM,IAAI,WAAW,CACnB,uDAAuD,UAAU,MAAM,OAAO,EAAE,CACjF,CAAA;AACH,CAAC,CAAA"}
|
package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { basename, dirname, relative } from "path";
|
|
2
|
-
import
|
|
2
|
+
import { readdirpPromise } from "readdirp";
|
|
3
3
|
import { TakomoError } from "../utils/errors.js";
|
|
4
4
|
import { dirExists, expandFilePath } from "../utils/files.js";
|
|
5
5
|
import { parseYaml } from "../utils/yaml.js";
|
|
@@ -24,7 +24,11 @@ const loadDeploymentTargetFile = async (props) => {
|
|
|
24
24
|
pathToFile,
|
|
25
25
|
variables,
|
|
26
26
|
});
|
|
27
|
-
const
|
|
27
|
+
const parsedItem = parseYaml(pathToFile, rendered);
|
|
28
|
+
if (typeof parsedItem === "number" || typeof parsedItem === "string") {
|
|
29
|
+
throw new Error("Invalid yaml document");
|
|
30
|
+
}
|
|
31
|
+
const item = parsedItem;
|
|
28
32
|
const deploymentGroupPath = resolveDeploymentGroupPath(item, props);
|
|
29
33
|
const name = resolveDeploymentTargetName(item, props);
|
|
30
34
|
return {
|
|
@@ -59,7 +63,7 @@ export const createFileSystemDeploymentTargetRepositoryProvider = () => {
|
|
|
59
63
|
throw new TakomoError(`Invalid deployment target repository config - directory '${expandedDir}' given in 'dir' property does not exist`);
|
|
60
64
|
}
|
|
61
65
|
logger.debug(`Load deployment targets from dir: ${expandedDir}`);
|
|
62
|
-
const deploymentTargetFiles = await
|
|
66
|
+
const deploymentTargetFiles = await readdirpPromise(expandedDir, {
|
|
63
67
|
alwaysStat: true,
|
|
64
68
|
depth: 100,
|
|
65
69
|
type: "files",
|
package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filesystem-deployment-target-repository.js","sourceRoot":"","sources":["../../src/takomo-deployment-targets-repository/filesystem-deployment-target-repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAClD,OAAO,
|
|
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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { readdirpPromise } from "readdirp";
|
|
2
2
|
import { TakomoError } from "../../utils/errors.js";
|
|
3
3
|
import { dirExists } from "../../utils/files.js";
|
|
4
4
|
export const loadHandlebarsHelpers = async (helpersDirs, logger, te) => {
|
|
@@ -7,7 +7,7 @@ export const loadHandlebarsHelpers = async (helpersDirs, logger, te) => {
|
|
|
7
7
|
logger.warn(`Helpers dir ${helpersDir} does not exist`);
|
|
8
8
|
continue;
|
|
9
9
|
}
|
|
10
|
-
const helperFiles = await
|
|
10
|
+
const helperFiles = await readdirpPromise(helpersDir, {
|
|
11
11
|
alwaysStat: true,
|
|
12
12
|
depth: 100,
|
|
13
13
|
type: "files",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-handlebars-helpers.js","sourceRoot":"","sources":["../../../src/templating/handlebars/load-handlebars-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"load-handlebars-helpers.js","sourceRoot":"","sources":["../../../src/templating/handlebars/load-handlebars-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,SAAS,EAAY,MAAM,sBAAsB,CAAA;AAI1D,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,WAAoC,EACpC,MAAiB,EACjB,EAA4B,EACb,EAAE;IACjB,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,eAAe,UAAU,iBAAiB,CAAC,CAAA;YACvD,SAAQ;QACV,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,UAAU,EAAE;YACpD,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;SAC9C,CAAC,CAAA;QAEF,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;YAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,MAAM,IAAI,WAAW,CACnB,+BAA+B,UAAU,CAAC,QAAQ,EAAE,CACrD,CAAA;YACH,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,WAAW,CACnB,8BAA8B,UAAU,CAAC,QAAQ,EAAE,CACpD,CAAA;YACH,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;gBACvB,MAAM,IAAI,WAAW,CAAC,4BAA4B,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;YAC1E,CAAC;YAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;YACvD,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC3D,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { readdirpPromise } from "readdirp";
|
|
2
2
|
import { dirExists } from "../../utils/files.js";
|
|
3
3
|
export const loadHandlebarsPartials = async (partialsDirs, logger, te) => {
|
|
4
4
|
for (const partialsDir of partialsDirs) {
|
|
@@ -6,7 +6,7 @@ export const loadHandlebarsPartials = async (partialsDirs, logger, te) => {
|
|
|
6
6
|
logger.warn(`Partials dir ${partialsDir} does not exist`);
|
|
7
7
|
continue;
|
|
8
8
|
}
|
|
9
|
-
const partialFiles = await
|
|
9
|
+
const partialFiles = await readdirpPromise(partialsDir, {
|
|
10
10
|
alwaysStat: true,
|
|
11
11
|
depth: 100,
|
|
12
12
|
type: "files",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-handlebars-partials.js","sourceRoot":"","sources":["../../../src/templating/handlebars/load-handlebars-partials.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"load-handlebars-partials.js","sourceRoot":"","sources":["../../../src/templating/handlebars/load-handlebars-partials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAY,MAAM,sBAAsB,CAAA;AAI1D,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,YAAqC,EACrC,MAAiB,EACjB,EAA4B,EACb,EAAE;IACjB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,gBAAgB,WAAW,iBAAiB,CAAC,CAAA;YACzD,SAAQ;QACV,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE;YACtD,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,OAAO;SACd,CAAC,CAAA;QAEF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAC/D,MAAM,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;QACtD,CAAC;IACH,CAAC;AACH,CAAC,CAAA"}
|
package/dist/utils/esbuild.js
CHANGED
package/dist/utils/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE,CACtD,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE,CACtD,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAE,CAAA;AAE5C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAY,EAAU,EAAE,CACnD,SAAS,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAE,CAAA;AAE/B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAa,EAAU,EAAE,CAAC,SAAS,CAAC,IAAI,CAAE,CAAA"}
|
package/dist/utils/yaml.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { FilePath } from "./files.js";
|
|
2
2
|
export type YamlFormattedString = string;
|
|
3
|
-
export
|
|
4
|
-
export declare const
|
|
5
|
-
export declare const
|
|
3
|
+
export type ParsedYamlDocument = Record<string, unknown> | string | number;
|
|
4
|
+
export declare const parseYamlString: (contents: YamlFormattedString) => ParsedYamlDocument;
|
|
5
|
+
export declare const parseYaml: (filePath: FilePath, contents: YamlFormattedString) => ParsedYamlDocument;
|
|
6
|
+
export declare const parseYamlFile: (pathToYamlFile: FilePath) => Promise<ParsedYamlDocument>;
|
|
6
7
|
export declare const formatYaml: (object: unknown) => YamlFormattedString;
|
package/dist/utils/yaml.js
CHANGED
|
@@ -3,10 +3,14 @@ import stringify from "json-stable-stringify";
|
|
|
3
3
|
import { TakomoError } from "./errors.js";
|
|
4
4
|
import { readFileContents } from "./files.js";
|
|
5
5
|
import { buildErrorMessage } from "./templating.js";
|
|
6
|
-
export const parseYamlString = (contents) =>
|
|
6
|
+
export const parseYamlString = (contents) => {
|
|
7
|
+
const parsed = yaml.load(contents);
|
|
8
|
+
return parsed ? parsed : {};
|
|
9
|
+
};
|
|
7
10
|
export const parseYaml = (filePath, contents) => {
|
|
8
11
|
try {
|
|
9
|
-
return
|
|
12
|
+
return parseYamlString(contents);
|
|
13
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
10
14
|
}
|
|
11
15
|
catch (e) {
|
|
12
16
|
if (e.name === "YAMLException") {
|
package/dist/utils/yaml.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAY,gBAAgB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"yaml.js","sourceRoot":"","sources":["../../src/utils/yaml.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,SAAS,MAAM,uBAAuB,CAAA;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAY,gBAAgB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAMnD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAA6B,EACT,EAAE;IACtB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAClC,OAAO,MAAM,CAAC,CAAC,CAAE,MAA6B,CAAC,CAAC,CAAC,EAAE,CAAA;AACrD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,QAAkB,EAClB,QAA6B,EACT,EAAE;IACtB,IAAI,CAAC;QACH,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAA;QAChC,8DAA8D;IAChE,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YAC/B,MAAM,YAAY,GAAG,iBAAiB,CACpC,yCAAyC,QAAQ,EAAE,EACnD,QAAQ,EACR;gBACE,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC;gBAC5B,aAAa,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC;gBAC/B,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;gBAC1B,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC;gBAC7B,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB,CACF,CAAA;YAED,MAAM,IAAI,WAAW,CAAC,YAAY,CAAC,CAAA;QACrC,CAAC;QAED,MAAM,YAAY,GAAG,iBAAiB,CACpC,yCAAyC,QAAQ,EAAE,EACnD,QAAQ,EACR,CAAC,CACF,CAAA;QAED,MAAM,IAAI,WAAW,CAAC,YAAY,CAAC,CAAA;IACrC,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,cAAwB,EACK,EAAE,CAC/B,gBAAgB,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAA;AAE5E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAe,EAAuB,EAAE,CACjE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAE,CAAC,EAAE;IACxC,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,GAAG;IACd,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,IAAI;CACf,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "takomo",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0-alpha.1",
|
|
4
4
|
"description": "Organize, configure and deploy CloudFormation stacks.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"aws",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"dist"
|
|
32
32
|
],
|
|
33
33
|
"engines": {
|
|
34
|
-
"node": ">=
|
|
34
|
+
"node": ">=22.16.0"
|
|
35
35
|
},
|
|
36
36
|
"os": [
|
|
37
37
|
"darwin",
|
|
@@ -79,87 +79,85 @@
|
|
|
79
79
|
}
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
|
-
"ts-jest": "29.
|
|
83
|
-
"@jest/globals": "
|
|
84
|
-
"@aws-sdk/client-ec2": "3.
|
|
85
|
-
"@commitlint/cli": "19.8.
|
|
86
|
-
"@commitlint/config-conventional": "19.8.
|
|
87
|
-
"@jest/console": "
|
|
82
|
+
"ts-jest": "29.4.0",
|
|
83
|
+
"@jest/globals": "30.0.0",
|
|
84
|
+
"@aws-sdk/client-ec2": "3.828.0",
|
|
85
|
+
"@commitlint/cli": "19.8.1",
|
|
86
|
+
"@commitlint/config-conventional": "19.8.1",
|
|
87
|
+
"@jest/console": "30.0.0",
|
|
88
88
|
"@takomo/test-custom-helper-lowercase": "0.0.1",
|
|
89
89
|
"@takomo/test-custom-helper-uppercase": "0.0.1",
|
|
90
90
|
"@takomo/test-custom-resolver-code": "0.0.1",
|
|
91
91
|
"@takomo/test-custom-resolver-name": "0.0.1",
|
|
92
|
-
"@types/diff": "5.2.3",
|
|
93
92
|
"@types/folder-hash": "4.0.4",
|
|
94
|
-
"@types/jest": "
|
|
93
|
+
"@types/jest": "30.0.0",
|
|
95
94
|
"@types/jmespath": "0.15.2",
|
|
96
95
|
"@types/js-yaml": "4.0.9",
|
|
97
|
-
"@types/
|
|
98
|
-
"@types/node": "20.14.9",
|
|
96
|
+
"@types/node": "22.14.1",
|
|
99
97
|
"@types/ramda": "0.29.11",
|
|
100
98
|
"@types/semver": "7.7.0",
|
|
101
99
|
"@types/uuid": "10.0.0",
|
|
102
100
|
"@types/yargs": "17.0.33",
|
|
103
101
|
"@types/ejs": "3.1.5",
|
|
104
|
-
"@types/lodash": "4.17.
|
|
105
|
-
"@typescript-eslint/eslint-plugin": "8.
|
|
106
|
-
"@typescript-eslint/parser": "8.
|
|
102
|
+
"@types/lodash": "4.17.17",
|
|
103
|
+
"@typescript-eslint/eslint-plugin": "8.34.0",
|
|
104
|
+
"@typescript-eslint/parser": "8.34.0",
|
|
107
105
|
"depcheck": "1.4.7",
|
|
108
|
-
"eslint": "9.
|
|
109
|
-
"eslint-config-prettier": "
|
|
110
|
-
"eslint-plugin-prettier": "5.
|
|
111
|
-
"@eslint/js": "9.
|
|
106
|
+
"eslint": "9.29.0",
|
|
107
|
+
"eslint-config-prettier": "10.1.5",
|
|
108
|
+
"eslint-plugin-prettier": "5.4.1",
|
|
109
|
+
"@eslint/js": "9.29.0",
|
|
112
110
|
"@eslint/eslintrc": "3.3.1",
|
|
113
111
|
"husky": "9.1.7",
|
|
114
|
-
"jest": "
|
|
112
|
+
"jest": "30.0.0",
|
|
115
113
|
"jest-environment-testenv-recycler": "0.0.21",
|
|
116
|
-
"jest-mock-extended": "
|
|
114
|
+
"jest-mock-extended": "4.0.0",
|
|
117
115
|
"prettier": "3.5.3",
|
|
118
116
|
"prettier-plugin-organize-imports": "4.1.0",
|
|
119
|
-
"lint-staged": "
|
|
117
|
+
"lint-staged": "16.1.2",
|
|
120
118
|
"ts-node": "10.9.2",
|
|
121
|
-
"typedoc": "0.28.
|
|
122
|
-
"typescript": "5.8.
|
|
123
|
-
"semantic-release": "24.2.
|
|
124
|
-
"npm-check-updates": "
|
|
119
|
+
"typedoc": "0.28.5",
|
|
120
|
+
"typescript": "5.8.3",
|
|
121
|
+
"semantic-release": "24.2.5",
|
|
122
|
+
"npm-check-updates": "18.0.1"
|
|
125
123
|
},
|
|
126
124
|
"dependencies": {
|
|
127
|
-
"@aws-sdk/client-cloudformation": "3.
|
|
128
|
-
"@aws-sdk/client-cloudtrail": "3.
|
|
129
|
-
"@aws-sdk/client-organizations": "3.
|
|
130
|
-
"@aws-sdk/client-s3": "3.
|
|
131
|
-
"@aws-sdk/client-secrets-manager": "3.
|
|
132
|
-
"@aws-sdk/client-ssm": "3.
|
|
133
|
-
"@aws-sdk/client-sts": "3.
|
|
134
|
-
"@aws-sdk/credential-providers": "3.
|
|
125
|
+
"@aws-sdk/client-cloudformation": "3.828.0",
|
|
126
|
+
"@aws-sdk/client-cloudtrail": "3.828.0",
|
|
127
|
+
"@aws-sdk/client-organizations": "3.828.0",
|
|
128
|
+
"@aws-sdk/client-s3": "3.828.0",
|
|
129
|
+
"@aws-sdk/client-secrets-manager": "3.828.0",
|
|
130
|
+
"@aws-sdk/client-ssm": "3.828.0",
|
|
131
|
+
"@aws-sdk/client-sts": "3.828.0",
|
|
132
|
+
"@aws-sdk/credential-providers": "3.828.0",
|
|
135
133
|
"@smithy/middleware-retry": "2.3.1",
|
|
136
134
|
"@smithy/node-http-handler": "2.5.0",
|
|
137
|
-
"@aws-sdk/types": "3.
|
|
135
|
+
"@aws-sdk/types": "3.821.0",
|
|
138
136
|
"chalk": "5.4.1",
|
|
139
137
|
"cockatiel": "3.2.1",
|
|
140
138
|
"date-and-time": "3.6.0",
|
|
141
|
-
"diff": "
|
|
142
|
-
"dotenv": "16.
|
|
143
|
-
"dotenv-expand": "12.0.
|
|
139
|
+
"diff": "8.0.2",
|
|
140
|
+
"dotenv": "16.5.0",
|
|
141
|
+
"dotenv-expand": "12.0.2",
|
|
144
142
|
"easy-table": "1.2.0",
|
|
145
143
|
"folder-hash": "4.1.1",
|
|
146
144
|
"handlebars": "4.7.8",
|
|
147
|
-
"@inquirer/prompts": "7.
|
|
145
|
+
"@inquirer/prompts": "7.5.3",
|
|
148
146
|
"jmespath": "0.16.0",
|
|
149
147
|
"joi": "17.13.3",
|
|
150
148
|
"js-yaml": "4.1.0",
|
|
151
|
-
"json-stable-stringify": "1.
|
|
149
|
+
"json-stable-stringify": "1.3.0",
|
|
152
150
|
"neverthrow": "8.2.0",
|
|
153
151
|
"p-queue": "8.1.0",
|
|
154
152
|
"pretty-ms": "9.2.0",
|
|
155
153
|
"ramda": "0.30.1",
|
|
156
|
-
"readdirp": "
|
|
157
|
-
"semver": "7.7.
|
|
154
|
+
"readdirp": "4.1.2",
|
|
155
|
+
"semver": "7.7.2",
|
|
158
156
|
"source-map-support": "0.5.21",
|
|
159
157
|
"ts-dedent": "2.2.0",
|
|
160
158
|
"uuid": "11.1.0",
|
|
161
|
-
"yargs": "
|
|
162
|
-
"esbuild": "0.25.
|
|
159
|
+
"yargs": "18.0.0",
|
|
160
|
+
"esbuild": "0.25.5",
|
|
163
161
|
"ejs": "3.1.10",
|
|
164
162
|
"lodash": "4.17.21"
|
|
165
163
|
}
|