takomo 5.0.0-alpha.6 → 5.1.0
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/dist/index.d.ts +4 -3
- package/dist/index.js.map +1 -1
- package/dist/takomo-aws-clients/aws-client-provider.d.ts +1 -7
- package/dist/takomo-aws-clients/aws-client-provider.js +4 -6
- package/dist/takomo-aws-clients/aws-client-provider.js.map +1 -1
- package/dist/takomo-aws-clients/cloudformation/client.d.ts +4 -41
- package/dist/takomo-aws-clients/cloudformation/client.js +14 -13
- package/dist/takomo-aws-clients/cloudformation/client.js.map +1 -1
- package/dist/takomo-aws-clients/cloudformation/convert.d.ts +2 -16
- package/dist/takomo-aws-clients/cloudformation/convert.js +0 -15
- package/dist/takomo-aws-clients/cloudformation/convert.js.map +1 -1
- package/dist/takomo-aws-clients/cloudformation/rules/describe-change-set-rule.d.ts +1 -19
- package/dist/takomo-aws-clients/cloudformation/rules/describe-change-set-rule.js +2 -17
- package/dist/takomo-aws-clients/cloudformation/rules/describe-change-set-rule.js.map +1 -1
- package/dist/takomo-aws-clients/cloudtrail/client.d.ts +0 -6
- package/dist/takomo-aws-clients/cloudtrail/client.js +0 -3
- package/dist/takomo-aws-clients/cloudtrail/client.js.map +1 -1
- package/dist/takomo-aws-clients/cloudtrail/convert.d.ts +0 -3
- package/dist/takomo-aws-clients/cloudtrail/convert.js.map +1 -1
- package/dist/takomo-aws-clients/common/client.d.ts +2 -25
- package/dist/takomo-aws-clients/common/client.js +0 -15
- package/dist/takomo-aws-clients/common/client.js.map +1 -1
- package/dist/takomo-aws-clients/common/credentials.d.ts +1 -10
- package/dist/takomo-aws-clients/common/credentials.js +0 -6
- package/dist/takomo-aws-clients/common/credentials.js.map +1 -1
- package/dist/takomo-aws-clients/common/request-handler.d.ts +0 -3
- package/dist/takomo-aws-clients/common/request-handler.js +0 -3
- package/dist/takomo-aws-clients/common/request-handler.js.map +1 -1
- package/dist/takomo-aws-clients/common/request-listener.d.ts +1 -7
- package/dist/takomo-aws-clients/common/request-listener.js +2 -8
- package/dist/takomo-aws-clients/common/request-listener.js.map +1 -1
- package/dist/takomo-aws-clients/common/retry.d.ts +0 -3
- package/dist/takomo-aws-clients/common/retry.js +3 -6
- package/dist/takomo-aws-clients/common/retry.js.map +1 -1
- package/dist/takomo-aws-clients/organizations/client.d.ts +0 -6
- package/dist/takomo-aws-clients/organizations/client.js +0 -3
- package/dist/takomo-aws-clients/organizations/client.js.map +1 -1
- package/dist/takomo-aws-clients/organizations/convert.d.ts +0 -9
- package/dist/takomo-aws-clients/organizations/convert.js +0 -9
- package/dist/takomo-aws-clients/organizations/convert.js.map +1 -1
- package/dist/takomo-aws-clients/s3/client.d.ts +0 -6
- package/dist/takomo-aws-clients/s3/client.js +0 -3
- package/dist/takomo-aws-clients/s3/client.js.map +1 -1
- package/dist/takomo-aws-clients/sts/client.d.ts +0 -6
- package/dist/takomo-aws-clients/sts/client.js +0 -3
- package/dist/takomo-aws-clients/sts/client.js.map +1 -1
- package/dist/takomo-aws-clients/util.d.ts +0 -3
- package/dist/takomo-aws-clients/util.js +2 -5
- package/dist/takomo-aws-clients/util.js.map +1 -1
- package/dist/takomo-aws-model/cloudformation.d.ts +0 -9
- package/dist/takomo-aws-model/cloudformation.js +0 -9
- package/dist/takomo-aws-model/cloudformation.js.map +1 -1
- package/dist/takomo-aws-model/credentials.d.ts +0 -3
- package/dist/takomo-aws-model/error.d.ts +1 -4
- package/dist/takomo-aws-model/error.js +2 -5
- package/dist/takomo-aws-model/error.js.map +1 -1
- package/dist/takomo-aws-model/index.d.ts +1 -1
- package/dist/takomo-aws-model/index.js.map +1 -1
- package/dist/takomo-cli/common.d.ts +1 -1
- package/dist/takomo-cli/common.js +42 -37
- package/dist/takomo-cli/common.js.map +1 -1
- package/dist/takomo-cli/deployment-targets/common.d.ts +1 -1
- package/dist/takomo-cli/deployment-targets/run.d.ts +1 -1
- package/dist/takomo-cli/deployment-targets/show-config.d.ts +1 -1
- package/dist/takomo-cli/deployment-targets/validate-config.d.ts +1 -1
- package/dist/takomo-cli/options/parse-features-from-args.js +4 -4
- package/dist/takomo-cli/options/parse-features-from-args.js.map +1 -1
- package/dist/takomo-cli/options/parse-log-level.d.ts +1 -1
- package/dist/takomo-cli/options/parse-var-args.js +4 -3
- package/dist/takomo-cli/options/parse-var-args.js.map +1 -1
- package/dist/takomo-cli/options/parse-var-file-options.d.ts +1 -1
- package/dist/takomo-cli-io/cli-io.d.ts +1 -1
- package/dist/takomo-cli-io/cli-io.js +7 -6
- package/dist/takomo-cli-io/cli-io.js.map +1 -1
- package/dist/takomo-cli-io/common.d.ts +1 -1
- package/dist/takomo-cli-io/common.js +5 -4
- package/dist/takomo-cli-io/common.js.map +1 -1
- package/dist/takomo-cli-io/config-set/target-listener.d.ts +1 -1
- package/dist/takomo-cli-io/deployment-targets/deployment-operation-io.js +2 -2
- package/dist/takomo-cli-io/deployment-targets/deployment-operation-io.js.map +1 -1
- package/dist/takomo-cli-io/deployment-targets/run-targets-io.js +4 -3
- package/dist/takomo-cli-io/deployment-targets/run-targets-io.js.map +1 -1
- package/dist/takomo-cli-io/deployment-targets/show-config-io.js +5 -4
- package/dist/takomo-cli-io/deployment-targets/show-config-io.js.map +1 -1
- package/dist/takomo-cli-io/formatters.d.ts +2 -1
- package/dist/takomo-cli-io/formatters.js +17 -17
- package/dist/takomo-cli-io/formatters.js.map +1 -1
- package/dist/takomo-cli-io/iam/generate-iam-policies-io.js +2 -2
- package/dist/takomo-cli-io/iam/generate-iam-policies-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/common.d.ts +1 -1
- package/dist/takomo-cli-io/stacks/common.js +16 -6
- package/dist/takomo-cli-io/stacks/common.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/common.js +2 -2
- package/dist/takomo-cli-io/stacks/deploy-stacks/common.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.js +13 -12
- package/dist/takomo-cli-io/stacks/deploy-stacks/deploy-stacks-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/outputs.js +2 -2
- package/dist/takomo-cli-io/stacks/deploy-stacks/outputs.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/parameters.js +9 -9
- package/dist/takomo-cli-io/stacks/deploy-stacks/parameters.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/resources.js +11 -11
- package/dist/takomo-cli-io/stacks/deploy-stacks/resources.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/stack-policy.js +14 -12
- package/dist/takomo-cli-io/stacks/deploy-stacks/stack-policy.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/tags.js +8 -8
- package/dist/takomo-cli-io/stacks/deploy-stacks/tags.js.map +1 -1
- package/dist/takomo-cli-io/stacks/deploy-stacks/termination-protection.js +4 -4
- package/dist/takomo-cli-io/stacks/deploy-stacks/termination-protection.js.map +1 -1
- package/dist/takomo-cli-io/stacks/inspect/show-configuration-io.js +5 -4
- package/dist/takomo-cli-io/stacks/inspect/show-configuration-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/list-stacks-io.js +4 -3
- package/dist/takomo-cli-io/stacks/list-stacks-io.js.map +1 -1
- package/dist/takomo-cli-io/stacks/undeploy-stacks-io.js +5 -5
- package/dist/takomo-cli-io/stacks/undeploy-stacks-io.js.map +1 -1
- package/dist/takomo-config-repository-fs/cache.d.ts +2 -1
- package/dist/takomo-config-repository-fs/cache.js +10 -9
- package/dist/takomo-config-repository-fs/cache.js.map +1 -1
- package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.d.ts +1 -1
- package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.js +2 -2
- package/dist/takomo-config-repository-fs/config-sets/config-sets-loader.js.map +1 -1
- package/dist/takomo-config-repository-fs/constants.d.ts +1 -1
- package/dist/takomo-config-repository-fs/context/build-variables.d.ts +2 -1
- package/dist/takomo-config-repository-fs/context/build-variables.js +10 -7
- package/dist/takomo-config-repository-fs/context/build-variables.js.map +1 -1
- package/dist/takomo-config-repository-fs/context/create-file-system-command-context.d.ts +3 -1
- package/dist/takomo-config-repository-fs/context/create-file-system-command-context.js.map +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.d.ts +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js +10 -7
- package/dist/takomo-config-repository-fs/deployment-targets/config-repository.js.map +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js +6 -5
- package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js.map +1 -1
- package/dist/takomo-config-repository-fs/deployment-targets/parser.d.ts +3 -1
- package/dist/takomo-config-repository-fs/deployment-targets/parser.js +6 -4
- package/dist/takomo-config-repository-fs/deployment-targets/parser.js.map +1 -1
- package/dist/takomo-config-repository-fs/init/config-repository.d.ts +2 -1
- package/dist/takomo-config-repository-fs/init/config-repository.js +6 -5
- package/dist/takomo-config-repository-fs/init/config-repository.js.map +1 -1
- package/dist/takomo-config-repository-fs/init/samples.d.ts +1 -1
- package/dist/takomo-config-repository-fs/init/samples.js +3 -3
- package/dist/takomo-config-repository-fs/init/samples.js.map +1 -1
- package/dist/takomo-config-repository-fs/project/config.d.ts +1 -1
- package/dist/takomo-config-repository-fs/project/config.js +22 -19
- package/dist/takomo-config-repository-fs/project/config.js.map +1 -1
- package/dist/takomo-config-repository-fs/stacks/config-repository.d.ts +2 -1
- package/dist/takomo-config-repository-fs/stacks/config-repository.js +13 -11
- package/dist/takomo-config-repository-fs/stacks/config-repository.js.map +1 -1
- package/dist/takomo-config-repository-fs/stacks/config-tree.d.ts +3 -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.d.ts +2 -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.d.ts +3 -1
- package/dist/takomo-config-repository-fs/stacks/parser.js +12 -9
- package/dist/takomo-config-repository-fs/stacks/parser.js.map +1 -1
- package/dist/takomo-config-repository-fs/template-engine.d.ts +3 -1
- package/dist/takomo-config-repository-fs/template-engine.js +9 -8
- package/dist/takomo-config-repository-fs/template-engine.js.map +1 -1
- package/dist/takomo-core/cache.d.ts +0 -3
- package/dist/takomo-core/command.d.ts +3 -55
- package/dist/takomo-core/command.js +0 -18
- package/dist/takomo-core/command.js.map +1 -1
- package/dist/takomo-core/config.d.ts +2 -16
- package/dist/takomo-core/config.js +2 -8
- package/dist/takomo-core/config.js.map +1 -1
- package/dist/takomo-core/constants.js +2 -0
- package/dist/takomo-core/constants.js.map +1 -1
- package/dist/takomo-core/parser.d.ts +0 -27
- package/dist/takomo-core/parser.js +2 -29
- package/dist/takomo-core/parser.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/common/plan/config-set-execution-plan.d.ts +1 -1
- package/dist/takomo-deployment-targets-commands/common/plan/create-config-set-execution-plan.d.ts +1 -1
- package/dist/takomo-deployment-targets-commands/common/plan/select-deployment-groups.js +6 -5
- package/dist/takomo-deployment-targets-commands/common/plan/select-deployment-groups.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/command.js +2 -2
- package/dist/takomo-deployment-targets-commands/operation/command.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/confirm.js +1 -2
- package/dist/takomo-deployment-targets-commands/operation/confirm.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/create-deployment-target-variables.js +2 -2
- package/dist/takomo-deployment-targets-commands/operation/create-deployment-target-variables.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/execute.js +3 -4
- package/dist/takomo-deployment-targets-commands/operation/execute.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/operation/model.d.ts +2 -1
- package/dist/takomo-deployment-targets-commands/operation/plan.js +1 -2
- package/dist/takomo-deployment-targets-commands/operation/plan.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/run/command.js +2 -2
- package/dist/takomo-deployment-targets-commands/run/command.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/run/confirm.js +1 -2
- package/dist/takomo-deployment-targets-commands/run/confirm.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/run/model.d.ts +1 -1
- package/dist/takomo-deployment-targets-commands/run/plan.js +5 -5
- package/dist/takomo-deployment-targets-commands/run/plan.js.map +1 -1
- package/dist/takomo-deployment-targets-commands/run/run.d.ts +2 -1
- package/dist/takomo-deployment-targets-commands/run/run.js +14 -20
- package/dist/takomo-deployment-targets-commands/run/run.js.map +1 -1
- package/dist/takomo-deployment-targets-config/build-deployment-config.d.ts +2 -1
- package/dist/takomo-deployment-targets-config/build-deployment-config.js +12 -10
- package/dist/takomo-deployment-targets-config/build-deployment-config.js.map +1 -1
- package/dist/takomo-deployment-targets-config/parser/parse-deployment-groups.js +2 -2
- package/dist/takomo-deployment-targets-config/parser/parse-deployment-groups.js.map +1 -1
- package/dist/takomo-deployment-targets-config/parser/parse-deployment-targets.js +2 -2
- package/dist/takomo-deployment-targets-config/parser/parse-deployment-targets.js.map +1 -1
- package/dist/takomo-deployment-targets-context/index.d.ts +1 -1
- package/dist/takomo-deployment-targets-context/index.js +2 -2
- package/dist/takomo-deployment-targets-context/index.js.map +1 -1
- package/dist/takomo-deployment-targets-model/index.d.ts +1 -1
- package/dist/takomo-deployment-targets-model/index.js +3 -3
- package/dist/takomo-deployment-targets-model/index.js.map +1 -1
- package/dist/takomo-deployment-targets-repository/deployment-target-repository-registry.js +3 -3
- package/dist/takomo-deployment-targets-repository/deployment-target-repository-registry.js.map +1 -1
- package/dist/takomo-deployment-targets-repository/deployment-target-repository.d.ts +2 -1
- package/dist/takomo-deployment-targets-repository/deployment-target-repository.js.map +1 -1
- package/dist/takomo-deployment-targets-repository/errors.d.ts +2 -1
- package/dist/takomo-deployment-targets-repository/errors.js +2 -2
- package/dist/takomo-deployment-targets-repository/errors.js.map +1 -1
- package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.d.ts +1 -1
- package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js +16 -13
- package/dist/takomo-deployment-targets-repository/filesystem-deployment-target-repository.js.map +1 -1
- package/dist/takomo-deployment-targets-repository/organization-deployment-target-repository.js +8 -8
- package/dist/takomo-deployment-targets-repository/organization-deployment-target-repository.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/execute/command-path.d.ts +2 -1
- package/dist/takomo-execution-plans/config-set/execute/command-path.js +1 -2
- package/dist/takomo-execution-plans/config-set/execute/command-path.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/execute/config-set.d.ts +2 -1
- package/dist/takomo-execution-plans/config-set/execute/config-set.js +1 -2
- package/dist/takomo-execution-plans/config-set/execute/config-set.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/execute/group.d.ts +2 -1
- package/dist/takomo-execution-plans/config-set/execute/group.js +1 -2
- package/dist/takomo-execution-plans/config-set/execute/group.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/execute/plan.d.ts +2 -1
- package/dist/takomo-execution-plans/config-set/execute/plan.js +1 -2
- package/dist/takomo-execution-plans/config-set/execute/plan.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/execute/stage.d.ts +2 -1
- package/dist/takomo-execution-plans/config-set/execute/stage.js +1 -2
- package/dist/takomo-execution-plans/config-set/execute/stage.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/execute/target.d.ts +2 -1
- package/dist/takomo-execution-plans/config-set/execute/target.js +1 -2
- package/dist/takomo-execution-plans/config-set/execute/target.js.map +1 -1
- package/dist/takomo-execution-plans/config-set/model.d.ts +2 -1
- package/dist/takomo-iam-commands/command.js +3 -4
- package/dist/takomo-iam-commands/command.js.map +1 -1
- package/dist/takomo-init-command/command.js +3 -4
- package/dist/takomo-init-command/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/common/load-current-cf-stacks.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/common/load-current-cf-stacks.js +4 -3
- package/dist/takomo-stacks-commands/stacks/common/load-current-cf-stacks.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/common/states.d.ts +2 -2
- package/dist/takomo-stacks-commands/stacks/common/steps.js +1 -2
- package/dist/takomo-stacks-commands/stacks/common/steps.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/command.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/deploy-stack.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/deploy-stack.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/errors.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/errors.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/errors.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/execute-deploy-context.js +4 -10
- package/dist/takomo-stacks-commands/stacks/deploy/execute-deploy-context.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/model.d.ts +2 -1
- package/dist/takomo-stacks-commands/stacks/deploy/plan.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/plan.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/plan.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/states.d.ts +4 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-change-set-create.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-change-set-create.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-failed-stack-delete.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-failed-stack-delete.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-stack-create.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-stack-create.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-stack-update.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/initiate-stack-update.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/prepare-template.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/prepare-template.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/review-change-set.js +3 -3
- package/dist/takomo-stacks-commands/stacks/deploy/steps/review-change-set.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/upload-template.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/steps/upload-template.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/validate-parameters.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/validate-parameters.js +8 -7
- package/dist/takomo-stacks-commands/stacks/deploy/steps/validate-parameters.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/wait-change-set-to-be-ready.js +9 -6
- package/dist/takomo-stacks-commands/stacks/deploy/steps/wait-change-set-to-be-ready.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/wait-stack-create-or-update-to-complete.js +2 -1
- package/dist/takomo-stacks-commands/stacks/deploy/steps/wait-stack-create-or-update-to-complete.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/deploy/validate.js +2 -2
- package/dist/takomo-stacks-commands/stacks/deploy/validate.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/drift/command.js +2 -2
- package/dist/takomo-stacks-commands/stacks/drift/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/drift/detect-drift.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/drift/detect-drift.js +1 -2
- package/dist/takomo-stacks-commands/stacks/drift/detect-drift.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/inspect/configuration/command.js +5 -5
- package/dist/takomo-stacks-commands/stacks/inspect/configuration/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/inspect/dependency-graph/command.js +3 -4
- package/dist/takomo-stacks-commands/stacks/inspect/dependency-graph/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/list/command.js +2 -2
- package/dist/takomo-stacks-commands/stacks/list/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/list/list-stacks.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/list/list-stacks.js +1 -2
- package/dist/takomo-stacks-commands/stacks/list/list-stacks.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/command.js +2 -2
- package/dist/takomo-stacks-commands/stacks/undeploy/command.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/delete.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/errors.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/errors.js +2 -2
- package/dist/takomo-stacks-commands/stacks/undeploy/errors.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/execute-undeploy-context.js +2 -4
- package/dist/takomo-stacks-commands/stacks/undeploy/execute-undeploy-context.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/model.d.ts +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/plan.js +2 -2
- package/dist/takomo-stacks-commands/stacks/undeploy/plan.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/states.d.ts +3 -2
- package/dist/takomo-stacks-commands/stacks/undeploy/steps/initiate-stack-delete.js +2 -2
- package/dist/takomo-stacks-commands/stacks/undeploy/steps/initiate-stack-delete.js.map +1 -1
- package/dist/takomo-stacks-commands/stacks/undeploy/validate.js +4 -4
- package/dist/takomo-stacks-commands/stacks/undeploy/validate.js.map +1 -1
- package/dist/takomo-stacks-config/build-stack-config.d.ts +1 -1
- package/dist/takomo-stacks-config/build-stack-config.js +2 -2
- package/dist/takomo-stacks-config/build-stack-config.js.map +1 -1
- package/dist/takomo-stacks-config/build-stack-group-config.d.ts +1 -1
- package/dist/takomo-stacks-config/build-stack-group-config.js +2 -2
- package/dist/takomo-stacks-config/build-stack-group-config.js.map +1 -1
- package/dist/takomo-stacks-config/model.d.ts +1 -1
- package/dist/takomo-stacks-config/parse-stack-policy.js +3 -3
- package/dist/takomo-stacks-config/parse-stack-policy.js.map +1 -1
- package/dist/takomo-stacks-context/common.js +2 -2
- package/dist/takomo-stacks-context/common.js.map +1 -1
- package/dist/takomo-stacks-context/config/build-stack.d.ts +1 -1
- package/dist/takomo-stacks-context/config/build-stack.js +15 -12
- package/dist/takomo-stacks-context/config/build-stack.js.map +1 -1
- package/dist/takomo-stacks-context/config/build-stacks-context.d.ts +1 -1
- package/dist/takomo-stacks-context/config/build-stacks-context.js +3 -3
- package/dist/takomo-stacks-context/config/build-stacks-context.js.map +1 -1
- package/dist/takomo-stacks-context/config/create-stack-group-from-parent.js +2 -2
- package/dist/takomo-stacks-context/config/create-stack-group-from-parent.js.map +1 -1
- package/dist/takomo-stacks-context/config/create-stack-group.d.ts +1 -1
- package/dist/takomo-stacks-context/config/get-variables-for-stack-group.js +2 -2
- package/dist/takomo-stacks-context/config/get-variables-for-stack-group.js.map +1 -1
- package/dist/takomo-stacks-context/config/parameters.js +2 -2
- package/dist/takomo-stacks-context/config/parameters.js.map +1 -1
- package/dist/takomo-stacks-context/config/populate-properties-from-config-file.d.ts +1 -1
- package/dist/takomo-stacks-context/config/populate-properties-from-config-file.js +4 -3
- package/dist/takomo-stacks-context/config/populate-properties-from-config-file.js.map +1 -1
- package/dist/takomo-stacks-context/config/process-config-tree.d.ts +1 -1
- package/dist/takomo-stacks-context/config/process-config-tree.js +2 -2
- package/dist/takomo-stacks-context/config/process-config-tree.js.map +1 -1
- package/dist/takomo-stacks-context/dependencies.js +6 -6
- package/dist/takomo-stacks-context/dependencies.js.map +1 -1
- package/dist/takomo-stacks-context/errors.d.ts +1 -4
- package/dist/takomo-stacks-context/errors.js +2 -5
- package/dist/takomo-stacks-context/errors.js.map +1 -1
- package/dist/takomo-stacks-context/model.d.ts +5 -2
- package/dist/takomo-stacks-context/model.js +2 -2
- package/dist/takomo-stacks-context/model.js.map +1 -1
- package/dist/takomo-stacks-hooks/checksum-hook.d.ts +1 -1
- package/dist/takomo-stacks-hooks/checksum-hook.js +2 -2
- package/dist/takomo-stacks-hooks/checksum-hook.js.map +1 -1
- package/dist/takomo-stacks-hooks/cmd-hook.d.ts +0 -3
- package/dist/takomo-stacks-hooks/cmd-hook.js +4 -6
- package/dist/takomo-stacks-hooks/cmd-hook.js.map +1 -1
- package/dist/takomo-stacks-hooks/execute.d.ts +1 -4
- package/dist/takomo-stacks-hooks/execute.js +0 -3
- package/dist/takomo-stacks-hooks/execute.js.map +1 -1
- package/dist/takomo-stacks-hooks/hook-registry.d.ts +2 -1
- package/dist/takomo-stacks-hooks/hook-registry.js +2 -2
- package/dist/takomo-stacks-hooks/hook-registry.js.map +1 -1
- package/dist/takomo-stacks-model/command.d.ts +3 -14
- package/dist/takomo-stacks-model/command.js +0 -3
- package/dist/takomo-stacks-model/command.js.map +1 -1
- package/dist/takomo-stacks-model/common.d.ts +0 -6
- package/dist/takomo-stacks-model/context.d.ts +1 -4
- package/dist/takomo-stacks-model/hook.d.ts +1 -13
- package/dist/takomo-stacks-model/hook.js +0 -3
- package/dist/takomo-stacks-model/hook.js.map +1 -1
- package/dist/takomo-stacks-model/resolver.d.ts +1 -4
- package/dist/takomo-stacks-model/schemas.d.ts +2 -13
- package/dist/takomo-stacks-model/schemas.js +20 -26
- package/dist/takomo-stacks-model/schemas.js.map +1 -1
- package/dist/takomo-stacks-model/stack-group.d.ts +0 -9
- package/dist/takomo-stacks-model/stack-group.js +0 -3
- package/dist/takomo-stacks-model/stack-group.js.map +1 -1
- package/dist/takomo-stacks-model/stack.d.ts +3 -17
- package/dist/takomo-stacks-model/stack.js +0 -6
- package/dist/takomo-stacks-model/stack.js.map +1 -1
- package/dist/takomo-stacks-model/util.d.ts +0 -21
- package/dist/takomo-stacks-model/util.js +0 -21
- package/dist/takomo-stacks-model/util.js.map +1 -1
- package/dist/takomo-stacks-resolvers/cmd-resolver.js +4 -3
- package/dist/takomo-stacks-resolvers/cmd-resolver.js.map +1 -1
- package/dist/takomo-stacks-resolvers/external-stack-output-resolver.js +1 -1
- package/dist/takomo-stacks-resolvers/external-stack-output-resolver.js.map +1 -1
- package/dist/takomo-stacks-resolvers/file-contents-resolver.js +4 -4
- package/dist/takomo-stacks-resolvers/file-contents-resolver.js.map +1 -1
- package/dist/takomo-stacks-resolvers/resolver-registry.d.ts +1 -1
- package/dist/takomo-stacks-resolvers/resolver-registry.js +4 -4
- package/dist/takomo-stacks-resolvers/resolver-registry.js.map +1 -1
- package/dist/takomo-stacks-resolvers/secret-resolver.js +1 -1
- package/dist/takomo-stacks-resolvers/secret-resolver.js.map +1 -1
- package/dist/takomo-stacks-resolvers/ssm-resolver.js +1 -1
- package/dist/takomo-stacks-resolvers/ssm-resolver.js.map +1 -1
- package/dist/{takomo-util → utils}/collections.d.ts +0 -21
- package/dist/{takomo-util → utils}/collections.js +0 -21
- package/dist/utils/collections.js.map +1 -0
- package/dist/{takomo-util → utils}/colors.d.ts +0 -21
- package/dist/{takomo-util → utils}/colors.js +0 -21
- package/dist/utils/colors.js.map +1 -0
- package/dist/{takomo-util → utils}/date.d.ts +0 -3
- package/dist/{takomo-util → utils}/date.js +0 -3
- package/dist/utils/date.js.map +1 -0
- package/dist/{takomo-util → utils}/errors.d.ts +0 -9
- package/dist/{takomo-util → utils}/errors.js +0 -6
- package/dist/utils/errors.js.map +1 -0
- package/dist/{takomo-util → utils}/exec.d.ts +0 -0
- package/dist/{takomo-util → utils}/exec.js +0 -0
- package/dist/utils/exec.js.map +1 -0
- package/dist/{takomo-util → utils}/files.d.ts +0 -24
- package/dist/{takomo-util → utils}/files.js +0 -21
- package/dist/utils/files.js.map +1 -0
- package/dist/{takomo-util → utils}/json.d.ts +0 -13
- package/dist/{takomo-util → utils}/json.js +1 -15
- package/dist/utils/json.js.map +1 -0
- package/dist/{takomo-util → utils}/logging.d.ts +0 -9
- package/dist/{takomo-util → utils}/logging.js +0 -6
- package/dist/utils/logging.js.map +1 -0
- package/dist/{takomo-util → utils}/objects.d.ts +0 -9
- package/dist/{takomo-util → utils}/objects.js +0 -9
- package/dist/utils/objects.js.map +1 -0
- package/dist/{takomo-util → utils}/random.d.ts +0 -3
- package/dist/{takomo-util → utils}/random.js +0 -3
- package/dist/utils/random.js.map +1 -0
- package/dist/{takomo-util → utils}/rules.d.ts +0 -6
- package/dist/{takomo-util → utils}/rules.js +0 -3
- package/dist/utils/rules.js.map +1 -0
- package/dist/{takomo-util → utils}/scheduler.d.ts +0 -0
- package/dist/{takomo-util → utils}/scheduler.js +0 -0
- package/dist/utils/scheduler.js.map +1 -0
- package/dist/{takomo-util → utils}/strings.d.ts +0 -15
- package/dist/{takomo-util → utils}/strings.js +0 -15
- package/dist/utils/strings.js.map +1 -0
- package/dist/{takomo-util → utils}/system.d.ts +0 -3
- package/dist/{takomo-util → utils}/system.js +0 -3
- package/dist/utils/system.js.map +1 -0
- package/dist/{takomo-util → utils}/templating.d.ts +0 -12
- package/dist/{takomo-util → utils}/templating.js +0 -12
- package/dist/utils/templating.js.map +1 -0
- package/dist/utils/timer.d.ts +12 -0
- package/dist/utils/timer.js +71 -0
- package/dist/utils/timer.js.map +1 -0
- package/dist/{takomo-util → utils}/validation.d.ts +0 -6
- package/dist/{takomo-util → utils}/validation.js +0 -6
- package/dist/utils/validation.js.map +1 -0
- package/dist/{takomo-util → utils}/variables.d.ts +0 -9
- package/dist/{takomo-util → utils}/variables.js +0 -6
- package/dist/utils/variables.js.map +1 -0
- package/dist/{takomo-util → utils}/yaml.d.ts +0 -15
- package/dist/{takomo-util → utils}/yaml.js +0 -12
- package/dist/utils/yaml.js.map +1 -0
- package/package.json +2 -2
- package/dist/takomo-aws-clients/secrets/client.d.ts +0 -17
- package/dist/takomo-aws-clients/secrets/client.js +0 -30
- package/dist/takomo-aws-clients/secrets/client.js.map +0 -1
- package/dist/takomo-aws-clients/ssm/client.d.ts +0 -11
- package/dist/takomo-aws-clients/ssm/client.js +0 -26
- package/dist/takomo-aws-clients/ssm/client.js.map +0 -1
- package/dist/takomo-util/collections.js.map +0 -1
- package/dist/takomo-util/colors.js.map +0 -1
- package/dist/takomo-util/date.js.map +0 -1
- package/dist/takomo-util/errors.js.map +0 -1
- package/dist/takomo-util/exec.js.map +0 -1
- package/dist/takomo-util/files.js.map +0 -1
- package/dist/takomo-util/index.d.ts +0 -20
- package/dist/takomo-util/index.js +0 -49
- package/dist/takomo-util/index.js.map +0 -1
- package/dist/takomo-util/json.js.map +0 -1
- package/dist/takomo-util/logging.js.map +0 -1
- package/dist/takomo-util/objects.js.map +0 -1
- package/dist/takomo-util/random.js.map +0 -1
- package/dist/takomo-util/rules.js.map +0 -1
- package/dist/takomo-util/scheduler.js.map +0 -1
- package/dist/takomo-util/strings.js.map +0 -1
- package/dist/takomo-util/system.js.map +0 -1
- package/dist/takomo-util/templating.js.map +0 -1
- package/dist/takomo-util/timer.d.ts +0 -24
- package/dist/takomo-util/timer.js +0 -66
- package/dist/takomo-util/timer.js.map +0 -1
- package/dist/takomo-util/validation.js.map +0 -1
- package/dist/takomo-util/variables.js.map +0 -1
- package/dist/takomo-util/yaml.js.map +0 -1
|
@@ -11,7 +11,8 @@ const takomo_deployment_targets_model_1 = require("../../takomo-deployment-targe
|
|
|
11
11
|
const takomo_deployment_targets_repository_1 = require("../../takomo-deployment-targets-repository");
|
|
12
12
|
const takomo_stacks_hooks_1 = require("../../takomo-stacks-hooks");
|
|
13
13
|
const takomo_stacks_resolvers_1 = require("../../takomo-stacks-resolvers");
|
|
14
|
-
const
|
|
14
|
+
const errors_1 = require("../../utils/errors");
|
|
15
|
+
const files_1 = require("../../utils/files");
|
|
15
16
|
const cache_1 = require("../cache");
|
|
16
17
|
const config_sets_loader_1 = require("../config-sets/config-sets-loader");
|
|
17
18
|
const config_repository_1 = require("../stacks/config-repository");
|
|
@@ -54,7 +55,7 @@ const loadExternallyPersistedDeploymentTargets = async (ctx, logger, templateEng
|
|
|
54
55
|
});
|
|
55
56
|
if (error) {
|
|
56
57
|
const details = error.details.map((m) => ` - ${m.message}`).join("\n");
|
|
57
|
-
throw new
|
|
58
|
+
throw new errors_1.TakomoError(`Validation errors in deployment target configuration '${wrapper.source}':\n\n${details}`);
|
|
58
59
|
}
|
|
59
60
|
});
|
|
60
61
|
const mergedDeploymentTargets = (0, merge_deployment_target_configs_1.mergeDeploymentTargetConfigs)(deploymentTargets.map(ramda_1.default.prop("item")));
|
|
@@ -77,7 +78,7 @@ const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
|
|
|
77
78
|
const configSetStacksDir = legacy
|
|
78
79
|
? stacksDir
|
|
79
80
|
: (0, path_1.join)(configSetsDir, configSetName);
|
|
80
|
-
if (!(await (0,
|
|
81
|
+
if (!(await (0, files_1.dirExists)(configSetStacksDir))) {
|
|
81
82
|
throw new Error(`Config set directory not found: ${configSetStacksDir}`);
|
|
82
83
|
}
|
|
83
84
|
return (0, config_repository_1.createFileSystemStacksConfigRepository)({
|
|
@@ -86,8 +87,8 @@ const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
|
|
|
86
87
|
});
|
|
87
88
|
},
|
|
88
89
|
getDeploymentConfig: async () => {
|
|
89
|
-
if (!(await (0,
|
|
90
|
-
throw new
|
|
90
|
+
if (!(await (0, files_1.dirExists)(deploymentDir))) {
|
|
91
|
+
throw new errors_1.TakomoError(`Takomo deployment dir '${(0, path_1.basename)(deploymentDir)}' not found from the project dir ${projectDir}`);
|
|
91
92
|
}
|
|
92
93
|
const configFile = pathToDeploymentConfigFile
|
|
93
94
|
? resolveConfigFilePath(deploymentDir, pathToDeploymentConfigFile)
|
|
@@ -99,8 +100,10 @@ const createFileSystemDeploymentTargetsConfigRepository = async (props) => {
|
|
|
99
100
|
if (result.isOk()) {
|
|
100
101
|
return result.value;
|
|
101
102
|
}
|
|
102
|
-
const details = result.error.messages
|
|
103
|
-
|
|
103
|
+
const details = result.error.messages
|
|
104
|
+
.map((m) => ` - ${m}`)
|
|
105
|
+
.join("\n");
|
|
106
|
+
throw new errors_1.TakomoError(`Validation errors in deployment targets configuration file ${configFile}:\n\n${details}`);
|
|
104
107
|
},
|
|
105
108
|
};
|
|
106
109
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/config-repository.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAqC;AACrC,kDAAqB;AAIrB,6FAG+C;AAE/C,2FAG8C;AAC9C,qGAMmD;AAEnD,mEAA8D;AAC9D,2EAAgE;
|
|
1
|
+
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/config-repository.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAqC;AACrC,kDAAqB;AAIrB,6FAG+C;AAE/C,2FAG8C;AAC9C,qGAMmD;AAEnD,mEAA8D;AAC9D,2EAAgE;AAEhE,+CAAgD;AAChD,6CAAuD;AAGvD,oCAAgD;AAChD,0EAAmF;AACnF,mEAGoC;AACpC,uFAAgF;AAChF,qCAA0C;AAW1C,MAAM,qBAAqB,GAAG,CAC5B,aAAuB,EACvB,gBAA0B,EAChB,EAAE,CACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC;IAC9B,CAAC,CAAC,gBAAgB;IAClB,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAE3C,MAAM,iCAAiC,GAAG,KAAK,EAC7C,GAA2B,EAC3B,MAAiB,EACjB,cAA8B,EAC9B,iBAAoC,EACpC,KAAY,EACwC,EAAE;IACtD,MAAM,iBAAiB,GACrB,GAAG,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,IAAI,EAAE,CAAA;IAExD,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;QAClC,OAAO,EAAE,CAAA;KACV;IAED,MAAM,QAAQ,GAAG,IAAA,+EAAwC,GAAE,CAAA;IAC3D,QAAQ,CAAC,0CAA0C,CACjD,YAAY,EACZ,IAAA,yFAAkD,GAAE,CACrD,CAAA;IAED,QAAQ,CAAC,0CAA0C,CACjD,cAAc,EACd,IAAA,2FAAoD,GAAE,CACvD,CAAA;IAED,OAAO,OAAO,CAAC,GAAG,CAChB,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC/B,QAAQ,CAAC,8BAA8B,CAAC;QACtC,MAAM;QACN,GAAG;QACH,cAAc;QACd,MAAM;QACN,iBAAiB;QACjB,KAAK;KACN,CAAC,CACH,CACF,CAAA;AACH,CAAC,CAAA;AAED,MAAM,wCAAwC,GAAG,KAAK,EACpD,GAA2B,EAC3B,MAAiB,EACjB,cAA8B,EAC9B,iBAAoC,EACpC,KAAY,EAC+C,EAAE;IAC7D,MAAM,YAAY,GAAG,MAAM,iCAAiC,CAC1D,GAAG,EACH,MAAM,EACN,cAAc,EACd,iBAAiB,EACjB,KAAK,CACN,CAAA;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,IAAI,GAAG,EAAE,CAAA;KACjB;IAED,MAAM,qBAAqB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7C,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAC,CACnD,CAAA;IAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAA;IAEtD,MAAM,MAAM,GAAG,IAAA,6EAAsC,EAAC;QACpD,OAAO,EAAE,GAAG,CAAC,OAAO;KACrB,CAAC,CAAA;IAEF,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACpC,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;YAC9C,UAAU,EAAE,KAAK;YACjB,OAAO,EAAE,KAAK;SACf,CAAC,CAAA;QACF,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACvE,MAAM,IAAI,oBAAW,CACnB,yDAAyD,OAAO,CAAC,MAAM,SAAS,OAAO,EAAE,CAC1F,CAAA;SACF;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,uBAAuB,GAAG,IAAA,8DAA4B,EAC1D,iBAAiB,CAAC,GAAG,CAAC,eAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CACtC,CAAA;IAED,OAAO,IAAI,GAAG,CACZ,KAAK,CAAC,IAAI,CACR,MAAM,CAAC,OAAO,CACZ,eAAC,CAAC,OAAO,CAAC,eAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,uBAAuB,CAAC,CAClE,CACF,CACF,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,iDAAiD,GAAG,KAAK,EACpE,KAAuD,EACX,EAAE;IAC9C,MAAM,sBAAsB,GAAG,MAAM,IAAA,0DAAsC,EACzE,KAAK,CACN,CAAA;IAED,MAAM,EACJ,UAAU,EACV,+BAA+B,EAC/B,aAAa,EACb,aAAa,EACb,0BAA0B,EAC1B,MAAM,EACN,GAAG,EACH,SAAS,EACT,iBAAiB,EACjB,QAAQ,GACT,GAAG,KAAK,CAAA;IAET,MAAM,KAAK,GAAG,IAAA,6BAAqB,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;IACrD,IAAI,GAAG,CAAC,UAAU,EAAE;QAClB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;KACpB;IAED,MAAM,YAAY,GAAG,IAAA,wCAAkB,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IACnD,MAAM,gBAAgB,GAAG,IAAI,0CAAgB,CAAC,MAAM,CAAC,CAAA;IACrD,MAAM,cAAc,GAAG,IAAA,uEAAqC,EAAC,MAAM,CAAC,CAAA;IAEpE,MAAM,sBAAsB,CAAC,cAAc,CACzC,gBAAgB,EAChB,YAAY,EACZ,cAAc,CACf,CAAA;IAED,OAAO;QACL,GAAG,sBAAsB;QACzB,4BAA4B,EAAE,KAAK,EACjC,aAA4B,EAC5B,MAAe,EACkB,EAAE;YACnC,MAAM,kBAAkB,GAAG,MAAM;gBAC/B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,aAAa,CAAC,CAAA;YAEtC,IAAI,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,kBAAkB,CAAC,CAAC,EAAE;gBAC1C,MAAM,IAAI,KAAK,CAAC,mCAAmC,kBAAkB,EAAE,CAAC,CAAA;aACzE;YAED,OAAO,IAAA,0DAAsC,EAAC;gBAC5C,GAAG,KAAK;gBACR,SAAS,EAAE,kBAAkB;aAC9B,CAAC,CAAA;QACJ,CAAC;QACD,mBAAmB,EAAE,KAAK,IAA+B,EAAE;YACzD,IAAI,CAAC,CAAC,MAAM,IAAA,iBAAS,EAAC,aAAa,CAAC,CAAC,EAAE;gBACrC,MAAM,IAAI,oBAAW,CACnB,0BAA0B,IAAA,eAAQ,EAChC,aAAa,CACd,oCAAoC,UAAU,EAAE,CAClD,CAAA;aACF;YAED,MAAM,UAAU,GAAG,0BAA0B;gBAC3C,CAAC,CAAC,qBAAqB,CAAC,aAAa,EAAE,0BAA0B,CAAC;gBAClE,CAAC,CAAC,IAAA,WAAI,EAAC,aAAa,EAAE,+BAA+B,CAAC,CAAA;YAExD,MAAM,UAAU,GAAG,MAAM,IAAA,wBAAe,EACtC,GAAG,EACH,MAAM,EACN,sBAAsB,CAAC,cAAc,EACrC,UAAU,CACX,CAAA;YAED,MAAM,yBAAyB,GAC7B,MAAM,wCAAwC,CAC5C,GAAG,EACH,MAAM,EACN,sBAAsB,CAAC,cAAc,EACrC,iBAAiB,EACjB,KAAK,CACN,CAAA;YAEH,MAAM,kBAAkB,GAAG,MAAM,IAAA,oDAA+B,EAC9D,aAAa,CACd,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,IAAA,wDAAqB,EACxC,GAAG,EACH,MAAM,EACN,cAAc,EACd,yBAAyB,EACzB,kBAAkB,EAClB,UAAU,CACX,CAAA;YACD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;gBACjB,OAAO,MAAM,CAAC,KAAK,CAAA;aACpB;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ;iBAClC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;iBAC/B,IAAI,CAAC,IAAI,CAAC,CAAA;YACb,MAAM,IAAI,oBAAW,CACnB,8DAA8D,UAAU,QAAQ,OAAO,EAAE,CAC1F,CAAA;QACH,CAAC;KACF,CAAA;AACH,CAAC,CAAA;AA3GY,QAAA,iDAAiD,qDA2G7D"}
|
package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js
CHANGED
|
@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.mergeDeploymentTargetConfigs = void 0;
|
|
7
7
|
const ramda_1 = __importDefault(require("ramda"));
|
|
8
|
-
const
|
|
8
|
+
const collections_1 = require("../../utils/collections");
|
|
9
|
+
const objects_1 = require("../../utils/objects");
|
|
9
10
|
const mergeDeploymentTargetConfigsInternal = ([first, second, ...rest]) => {
|
|
10
11
|
if (!second) {
|
|
11
12
|
return first;
|
|
@@ -13,17 +14,17 @@ const mergeDeploymentTargetConfigsInternal = ([first, second, ...rest]) => {
|
|
|
13
14
|
const merged = {
|
|
14
15
|
name: second.name,
|
|
15
16
|
accountId: second.accountId ?? first.accountId,
|
|
16
|
-
configSets: (0,
|
|
17
|
+
configSets: (0, collections_1.mergeArrays)({
|
|
17
18
|
first: first.configSets ?? [],
|
|
18
19
|
second: second.configSets ?? [],
|
|
19
20
|
}),
|
|
20
|
-
vars: (0,
|
|
21
|
+
vars: (0, objects_1.merge)(first.vars ?? {}, second.vars ?? {}),
|
|
21
22
|
deploymentGroupPath: second.deploymentGroupPath,
|
|
22
|
-
labels: (0,
|
|
23
|
+
labels: (0, collections_1.mergeArrays)({
|
|
23
24
|
first: first.labels ?? [],
|
|
24
25
|
second: second.labels ?? [],
|
|
25
26
|
}),
|
|
26
|
-
bootstrapConfigSets: (0,
|
|
27
|
+
bootstrapConfigSets: (0, collections_1.mergeArrays)({
|
|
27
28
|
first: first.bootstrapConfigSets ?? [],
|
|
28
29
|
second: second.bootstrapConfigSets ?? [],
|
|
29
30
|
}),
|
package/dist/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-deployment-target-configs.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,
|
|
1
|
+
{"version":3,"file":"merge-deployment-target-configs.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/merge-deployment-target-configs.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAqB;AAErB,yDAAqD;AACrD,iDAA2C;AAE3C,MAAM,oCAAoC,GAAG,CAAC,CAC5C,KAAK,EACL,MAAM,EACN,GAAG,IAAI,CACmC,EAA8B,EAAE;IAC1E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,CAAA;KACb;IAED,MAAM,MAAM,GAA+B;QACzC,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS;QAC9C,UAAU,EAAE,IAAA,yBAAW,EAAC;YACtB,KAAK,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE;YAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,IAAI,EAAE;SAChC,CAAC;QACF,IAAI,EAAE,IAAA,eAAK,EAAC,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QAChD,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,MAAM,EAAE,IAAA,yBAAW,EAAC;YAClB,KAAK,EAAE,KAAK,CAAC,MAAM,IAAI,EAAE;YACzB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;SAC5B,CAAC;QACF,mBAAmB,EAAE,IAAA,yBAAW,EAAC;YAC/B,KAAK,EAAE,KAAK,CAAC,mBAAmB,IAAI,EAAE;YACtC,MAAM,EAAE,MAAM,CAAC,mBAAmB,IAAI,EAAE;SACzC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM;QACrC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB;QACzE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;QAC7D,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW;QACpD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,IAAI,KAAK,CAAC,iBAAiB;QACtE,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa;KAC3D,CAAA;IAED,OAAO,oCAAoC,CAAC,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AAEM,MAAM,4BAA4B,GAAG,CAC1C,KAAgD,EACL,EAAE;IAC7C,MAAM,WAAW,GAAG,eAAC,CAAC,OAAO,CAAC,eAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;IACpD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAC/C,oCAAoC,CACrC,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,4BAA4B,gCAOxC"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
1
|
import { CommandContext } from "../../takomo-core";
|
|
2
|
-
import { FilePath
|
|
2
|
+
import { FilePath } from "../../utils/files";
|
|
3
|
+
import { TkmLogger } from "../../utils/logging";
|
|
4
|
+
import { TemplateEngine } from "../../utils/templating";
|
|
3
5
|
export declare const parseConfigFile: (ctx: CommandContext, logger: TkmLogger, templateEngine: TemplateEngine, pathToFile: FilePath) => Promise<Record<string, unknown>>;
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseConfigFile = void 0;
|
|
4
|
-
const
|
|
4
|
+
const files_1 = require("../../utils/files");
|
|
5
|
+
const templating_1 = require("../../utils/templating");
|
|
6
|
+
const yaml_1 = require("../../utils/yaml");
|
|
5
7
|
const parseConfigFile = async (ctx, logger, templateEngine, pathToFile) => {
|
|
6
8
|
const { confidentialValuesLoggingEnabled, variables } = ctx;
|
|
7
|
-
const contents = await (0,
|
|
9
|
+
const contents = await (0, files_1.readFileContents)(pathToFile);
|
|
8
10
|
const filterFn = confidentialValuesLoggingEnabled
|
|
9
11
|
? (obj) => obj
|
|
10
12
|
: (obj) => {
|
|
@@ -15,9 +17,9 @@ const parseConfigFile = async (ctx, logger, templateEngine, pathToFile) => {
|
|
|
15
17
|
};
|
|
16
18
|
logger.traceText("Raw deployment groups config file:", () => contents);
|
|
17
19
|
logger.traceObject(`Render deployment groups config file using variables:`, () => variables, filterFn);
|
|
18
|
-
const rendered = await (0,
|
|
20
|
+
const rendered = await (0, templating_1.renderTemplate)(templateEngine, pathToFile, contents, variables);
|
|
19
21
|
logger.traceText("Final rendered deployment groups config file:", () => rendered);
|
|
20
|
-
return (0,
|
|
22
|
+
return (0, yaml_1.parseYaml)(pathToFile, rendered) ?? {};
|
|
21
23
|
};
|
|
22
24
|
exports.parseConfigFile = parseConfigFile;
|
|
23
25
|
//# sourceMappingURL=parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/parser.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/deployment-targets/parser.ts"],"names":[],"mappings":";;;AACA,6CAA8D;AAE9D,uDAAuE;AACvE,2CAA4C;AAErC,MAAM,eAAe,GAAG,KAAK,EAClC,GAAmB,EACnB,MAAiB,EACjB,cAA8B,EAC9B,UAAoB,EACc,EAAE;IACpC,MAAM,EAAE,gCAAgC,EAAE,SAAS,EAAE,GAAG,GAAG,CAAA;IAE3D,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAA;IAEnD,MAAM,QAAQ,GAAG,gCAAgC;QAC/C,CAAC,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG;QACnB,CAAC,CAAC,CAAC,GAAQ,EAAE,EAAE;YACX,OAAO;gBACL,GAAG,GAAG;gBACN,GAAG,EAAE,OAAO;aACb,CAAA;QACH,CAAC,CAAA;IAEL,MAAM,CAAC,SAAS,CAAC,oCAAoC,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAA;IACtE,MAAM,CAAC,WAAW,CAChB,uDAAuD,EACvD,GAAG,EAAE,CAAC,SAAS,EACf,QAAQ,CACT,CAAA;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,2BAAc,EACnC,cAAc,EACd,UAAU,EACV,QAAQ,EACR,SAAS,CACV,CAAA;IAED,MAAM,CAAC,SAAS,CACd,+CAA+C,EAC/C,GAAG,EAAE,CAAC,QAAQ,CACf,CAAA;IAED,OAAO,IAAA,gBAAS,EAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAA;AAC9C,CAAC,CAAA;AAvCY,QAAA,eAAe,mBAuC3B"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CommandContext } from "../../takomo-core";
|
|
2
2
|
import { ProjectConfigRepository } from "../../takomo-init-command";
|
|
3
|
-
import { FilePath
|
|
3
|
+
import { FilePath } from "../../utils/files";
|
|
4
|
+
import { TkmLogger } from "../../utils/logging";
|
|
4
5
|
interface FileSystemProjectConfigRepositoryProps {
|
|
5
6
|
readonly ctx: CommandContext;
|
|
6
7
|
readonly logger: TkmLogger;
|
|
@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.createFileSystemProjectConfigRepository = void 0;
|
|
7
7
|
const easy_table_1 = __importDefault(require("easy-table"));
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const
|
|
9
|
+
const errors_1 = require("../../utils/errors");
|
|
10
|
+
const files_1 = require("../../utils/files");
|
|
10
11
|
const samples_1 = require("./samples");
|
|
11
12
|
const createDescription = ({ stacksDir, helpersDir, hooksDir, partialsDir, templatesDir, resolversDir, }, createSamples) => {
|
|
12
13
|
const table = new easy_table_1.default();
|
|
@@ -56,18 +57,18 @@ const createDescription = ({ stacksDir, helpersDir, hooksDir, partialsDir, templ
|
|
|
56
57
|
const checkForExistingDirs = async (projectDir, dirs) => {
|
|
57
58
|
const dirsWithInfo = await Promise.all(dirs.map(async (dir) => ({
|
|
58
59
|
dir: (0, path_1.basename)(dir),
|
|
59
|
-
exists: await (0,
|
|
60
|
+
exists: await (0, files_1.dirExists)(dir),
|
|
60
61
|
})));
|
|
61
62
|
const existingDirs = dirsWithInfo.filter((d) => d.exists).map((d) => d.dir);
|
|
62
63
|
if (existingDirs.length > 0) {
|
|
63
64
|
const existingDirsString = existingDirs.map((d) => ` - ${d}`).join("\n");
|
|
64
|
-
throw new
|
|
65
|
+
throw new errors_1.TakomoError(`Could not initialize a new project in directory: ${projectDir}.\n\n` +
|
|
65
66
|
"Following directories already exists in the target directory:\n\n" +
|
|
66
67
|
existingDirsString);
|
|
67
68
|
}
|
|
68
69
|
};
|
|
69
70
|
const createDirs = async (dirs) => {
|
|
70
|
-
await Promise.all(dirs.map(async (d) => (0,
|
|
71
|
+
await Promise.all(dirs.map(async (d) => (0, files_1.createDir)(d)));
|
|
71
72
|
};
|
|
72
73
|
const createRootStackConfigFile = async (rootStackGroupFile, info) => {
|
|
73
74
|
let contents = "";
|
|
@@ -81,7 +82,7 @@ const createRootStackConfigFile = async (rootStackGroupFile, info) => {
|
|
|
81
82
|
contents += `regions:\n`;
|
|
82
83
|
info.regions.forEach((r) => (contents += ` - ${r}\n`));
|
|
83
84
|
}
|
|
84
|
-
await (0,
|
|
85
|
+
await (0, files_1.createFile)(rootStackGroupFile, contents);
|
|
85
86
|
};
|
|
86
87
|
const createFileSystemProjectConfigRepository = async (props2) => {
|
|
87
88
|
const { projectDir, stacksDir, templatesDir, partialsDir, hooksDir, helpersDir, resolversDir, stackGroupConfigFileName, } = props2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/init/config-repository.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAC9B,+BAAqC;
|
|
1
|
+
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/init/config-repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import { FilePath } from "../../
|
|
1
|
+
import { FilePath } from "../../utils/files";
|
|
2
2
|
export declare const createSampleFiles: (stacksDir: FilePath, templatesDir: FilePath) => Promise<void>;
|
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createSampleFiles = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
-
const
|
|
8
|
+
const files_1 = require("../../utils/files");
|
|
9
9
|
const vpcStackConfig = `# Takomo sample VPC stack configuration.
|
|
10
10
|
# The corresponding CloudFormation template can be found from templates/vpc.yml
|
|
11
11
|
regions: eu-west-1
|
|
@@ -28,8 +28,8 @@ Resources:
|
|
|
28
28
|
const createSampleFiles = async (stacksDir, templatesDir) => {
|
|
29
29
|
const pathToStackConfig = path_1.default.join(stacksDir, "vpc.yml");
|
|
30
30
|
const pathToStackTemplate = path_1.default.join(templatesDir, "vpc.yml");
|
|
31
|
-
await (0,
|
|
32
|
-
await (0,
|
|
31
|
+
await (0, files_1.createFile)(pathToStackConfig, vpcStackConfig);
|
|
32
|
+
await (0, files_1.createFile)(pathToStackTemplate, vpcStackTemplate);
|
|
33
33
|
};
|
|
34
34
|
exports.createSampleFiles = createSampleFiles;
|
|
35
35
|
//# sourceMappingURL=samples.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/init/samples.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"samples.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/init/samples.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,6CAAwD;AAExD,MAAM,cAAc,GAAG;;;;;CAKtB,CAAA;AAED,MAAM,gBAAgB,GAAG;;;;;;;;;;;;CAYxB,CAAA;AAEM,MAAM,iBAAiB,GAAG,KAAK,EACpC,SAAmB,EACnB,YAAsB,EACP,EAAE;IACjB,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IACzD,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;IAC9D,MAAM,IAAA,kBAAU,EAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA;IACnD,MAAM,IAAA,kBAAU,EAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAA;AACzD,CAAC,CAAA;AARY,QAAA,iBAAiB,qBAQ7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import Joi from "joi";
|
|
2
2
|
import { ExternalHandlebarsHelperConfig, ExternalResolverConfig, Features, InternalTakomoProjectConfig, TakomoProjectDeploymentTargetsConfig } from "../../takomo-core";
|
|
3
|
-
import { FilePath } from "../../
|
|
3
|
+
import { FilePath } from "../../utils/files";
|
|
4
4
|
export declare const parseExternalResolver: (value: any) => ExternalResolverConfig;
|
|
5
5
|
export declare const parseExternalHandlebarsHelper: (value: any) => ExternalHandlebarsHelperConfig;
|
|
6
6
|
export declare const parseExternalHandlebarsHelpers: (value: any) => ReadonlyArray<ExternalHandlebarsHelperConfig>;
|
|
@@ -9,7 +9,10 @@ const path_1 = require("path");
|
|
|
9
9
|
const ramda_1 = __importDefault(require("ramda"));
|
|
10
10
|
const semver_1 = __importDefault(require("semver"));
|
|
11
11
|
const takomo_core_1 = require("../../takomo-core");
|
|
12
|
-
const
|
|
12
|
+
const collections_1 = require("../../utils/collections");
|
|
13
|
+
const errors_1 = require("../../utils/errors");
|
|
14
|
+
const files_1 = require("../../utils/files");
|
|
15
|
+
const yaml_1 = require("../../utils/yaml");
|
|
13
16
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
14
17
|
const { version } = require("../../../package.json");
|
|
15
18
|
const validateRequiredVersion = (configFilePath, requiredVersion) => {
|
|
@@ -17,7 +20,7 @@ const validateRequiredVersion = (configFilePath, requiredVersion) => {
|
|
|
17
20
|
return;
|
|
18
21
|
}
|
|
19
22
|
if (!semver_1.default.satisfies(version, requiredVersion)) {
|
|
20
|
-
throw new
|
|
23
|
+
throw new errors_1.TakomoError(`Current Takomo version ${version} does not satisfy the required version range ` +
|
|
21
24
|
`${requiredVersion} specified in the project configuration file ${configFilePath}`, {
|
|
22
25
|
instructions: ["Upgrade Takomo to satisfy the version requirement"],
|
|
23
26
|
});
|
|
@@ -57,7 +60,7 @@ const parseExternalHandlebarsHelpers = (value) => {
|
|
|
57
60
|
return value.map(exports.parseExternalHandlebarsHelper);
|
|
58
61
|
};
|
|
59
62
|
exports.parseExternalHandlebarsHelpers = parseExternalHandlebarsHelpers;
|
|
60
|
-
const parseFilePaths = (projectDir, value) => (0, takomo_core_1.parseStringArray)(value).map((f) => (0,
|
|
63
|
+
const parseFilePaths = (projectDir, value) => (0, takomo_core_1.parseStringArray)(value).map((f) => (0, files_1.expandFilePath)(projectDir, f));
|
|
61
64
|
const parseExternalResolvers = (value) => {
|
|
62
65
|
if (value === null || value === undefined) {
|
|
63
66
|
return [];
|
|
@@ -101,7 +104,7 @@ const parseProjectConfigItem = (projectDir, { absolutePath, contents }, parentCo
|
|
|
101
104
|
});
|
|
102
105
|
if (error) {
|
|
103
106
|
const details = error.details.map((d) => ` - ${d.message}`).join("\n");
|
|
104
|
-
throw new
|
|
107
|
+
throw new errors_1.TakomoError(`${error.details.length} validation error(s) in project config file ${absolutePath}:\n\n${details}`);
|
|
105
108
|
}
|
|
106
109
|
const dirPath = (0, path_1.dirname)(absolutePath);
|
|
107
110
|
const regions = contents.regions ?? [];
|
|
@@ -114,57 +117,57 @@ const parseProjectConfigItem = (projectDir, { absolutePath, contents }, parentCo
|
|
|
114
117
|
const schemasDir = parseFilePaths(dirPath, contents.schemasDir);
|
|
115
118
|
const deploymentTargets = (0, exports.parseDeploymentTargetsConfig)(contents.deploymentTargets);
|
|
116
119
|
return {
|
|
117
|
-
regions: (0,
|
|
118
|
-
resolvers: (0,
|
|
120
|
+
regions: (0, collections_1.mergeArrays)({ first: parentConfig.regions, second: regions }),
|
|
121
|
+
resolvers: (0, collections_1.mergeArrays)({
|
|
119
122
|
first: parentConfig.resolvers,
|
|
120
123
|
second: resolvers,
|
|
121
124
|
equals: (a, b) => a.package === b.package && a.name === b.name,
|
|
122
125
|
}),
|
|
123
|
-
helpers: (0,
|
|
126
|
+
helpers: (0, collections_1.mergeArrays)({
|
|
124
127
|
first: parentConfig.helpers,
|
|
125
128
|
second: helpers,
|
|
126
129
|
equals: (a, b) => a.package === b.package && a.name === b.name,
|
|
127
130
|
}),
|
|
128
|
-
helpersDir: (0,
|
|
131
|
+
helpersDir: (0, collections_1.mergeArrays)({
|
|
129
132
|
first: parentConfig.helpersDir,
|
|
130
133
|
second: helpersDir,
|
|
131
134
|
}),
|
|
132
|
-
partialsDir: (0,
|
|
135
|
+
partialsDir: (0, collections_1.mergeArrays)({
|
|
133
136
|
first: parentConfig.partialsDir,
|
|
134
137
|
second: partialsDir,
|
|
135
138
|
}),
|
|
136
|
-
schemasDir: (0,
|
|
139
|
+
schemasDir: (0, collections_1.mergeArrays)({
|
|
137
140
|
first: parentConfig.schemasDir,
|
|
138
141
|
second: schemasDir,
|
|
139
142
|
}),
|
|
140
143
|
features: { ...parentConfig.features, ...features },
|
|
141
|
-
varFiles: (0,
|
|
144
|
+
varFiles: (0, collections_1.mergeArrays)({ first: parentConfig.varFiles, second: varFiles }),
|
|
142
145
|
requiredVersion: contents.requiredVersion ?? parentConfig.requiredVersion,
|
|
143
146
|
deploymentTargets: deploymentTargets ?? parentConfig.deploymentTargets,
|
|
144
147
|
};
|
|
145
148
|
};
|
|
146
149
|
exports.parseProjectConfigItem = parseProjectConfigItem;
|
|
147
150
|
const collectProjectConfigFileHierarchy = async (projectDir, pathConfigFile, collected = [], referencingConfigFilePath) => {
|
|
148
|
-
const absolutePath = (0,
|
|
151
|
+
const absolutePath = (0, files_1.expandFilePath)(projectDir, pathConfigFile);
|
|
149
152
|
if (collected.some((i) => i.absolutePath === absolutePath)) {
|
|
150
153
|
const filePaths = collected.map((p) => p.absolutePath).join(" -> ");
|
|
151
|
-
throw new
|
|
154
|
+
throw new errors_1.TakomoError(`Circular inheritance of project config files detected: ${filePaths} -> ${absolutePath}`);
|
|
152
155
|
}
|
|
153
|
-
if (!(await (0,
|
|
156
|
+
if (!(await (0, files_1.fileExists)(absolutePath))) {
|
|
154
157
|
if (referencingConfigFilePath) {
|
|
155
|
-
throw new
|
|
158
|
+
throw new errors_1.TakomoError(`Project config file ${absolutePath} not found. It's referenced in file ${referencingConfigFilePath}`);
|
|
156
159
|
}
|
|
157
160
|
else {
|
|
158
|
-
throw new
|
|
161
|
+
throw new errors_1.TakomoError(`Project config file ${absolutePath} not found`);
|
|
159
162
|
}
|
|
160
163
|
}
|
|
161
|
-
const contents = (await (0,
|
|
164
|
+
const contents = (await (0, yaml_1.parseYamlFile)(absolutePath)) ?? {};
|
|
162
165
|
const pair = { absolutePath, contents };
|
|
163
166
|
if (!contents.extends) {
|
|
164
167
|
return [...collected, pair];
|
|
165
168
|
}
|
|
166
169
|
if (typeof contents.extends !== "string") {
|
|
167
|
-
throw new
|
|
170
|
+
throw new errors_1.TakomoError(`Expected property 'extends' to be a string in file ${absolutePath}`);
|
|
168
171
|
}
|
|
169
172
|
return (0, exports.collectProjectConfigFileHierarchy)(projectDir, contents.extends, [...collected, pair], absolutePath);
|
|
170
173
|
};
|
|
@@ -227,7 +230,7 @@ const parseProjectConfigFiles = async (projectDir, [currentItem, ...rest], proje
|
|
|
227
230
|
return parseProjectConfigFiles(projectDir, rest, updatedProjectConfig);
|
|
228
231
|
};
|
|
229
232
|
const loadProjectConfig = async (projectDir, pathConfigFile, overrideFeatures) => {
|
|
230
|
-
if (!(await (0,
|
|
233
|
+
if (!(await (0, files_1.fileExists)(pathConfigFile))) {
|
|
231
234
|
return createDefaultProjectConfig(takomo_core_1.DEFAULT_REGIONS.slice());
|
|
232
235
|
}
|
|
233
236
|
const projectConfigItems = await (0, exports.collectProjectConfigFileHierarchy)(projectDir, pathConfigFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/project/config.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqB;AACrB,+BAA8B;AAC9B,kDAAqB;AACrB,oDAA2B;AAE3B,mDAU0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/project/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { InternalCommandContext } from "../../takomo-core";
|
|
2
2
|
import { StacksConfigRepository } from "../../takomo-stacks-context";
|
|
3
|
-
import { FilePath
|
|
3
|
+
import { FilePath } from "../../utils/files";
|
|
4
|
+
import { TkmLogger } from "../../utils/logging";
|
|
4
5
|
export interface FileSystemStacksConfigRepositoryProps {
|
|
5
6
|
readonly ctx: InternalCommandContext;
|
|
6
7
|
readonly logger: TkmLogger;
|
|
@@ -6,13 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.createFileSystemStacksConfigRepository = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const takomo_stacks_model_1 = require("../../takomo-stacks-model");
|
|
9
|
-
const
|
|
9
|
+
const errors_1 = require("../../utils/errors");
|
|
10
|
+
const files_1 = require("../../utils/files");
|
|
11
|
+
const templating_1 = require("../../utils/templating");
|
|
10
12
|
const template_engine_1 = require("../template-engine");
|
|
11
13
|
const config_tree_1 = require("./config-tree");
|
|
12
14
|
const extensions_1 = require("./extensions");
|
|
13
15
|
const parser_1 = require("./parser");
|
|
14
16
|
const createFileSystemStacksConfigRepository = async ({ ctx, logger, stacksDir, resolversDir, helpersDir, hooksDir, partialsDir, configFileExtension, stackGroupConfigFileName, templatesDir, schemasDir, blueprintsDir, }) => {
|
|
15
|
-
const templateEngine = (0,
|
|
17
|
+
const templateEngine = (0, templating_1.createTemplateEngine)();
|
|
16
18
|
ctx.projectConfig.helpers.forEach((config) => {
|
|
17
19
|
logger.debug(`Register Handlebars helper from NPM package: ${config.package}`);
|
|
18
20
|
// eslint-disable-next-line
|
|
@@ -21,24 +23,24 @@ const createFileSystemStacksConfigRepository = async ({ ctx, logger, stacksDir,
|
|
|
21
23
|
? { ...helper, name: config.name }
|
|
22
24
|
: helper;
|
|
23
25
|
if (typeof helperWithName.fn !== "function") {
|
|
24
|
-
throw new
|
|
26
|
+
throw new errors_1.TakomoError(`Handlebars helper loaded from an NPM package ${config.package} does not export property 'fn' of type function`);
|
|
25
27
|
}
|
|
26
28
|
if (typeof helperWithName.name !== "string") {
|
|
27
|
-
throw new
|
|
29
|
+
throw new errors_1.TakomoError(`Handlebars helper loaded from an NPM package ${config.package} does not export property 'name' of type string`);
|
|
28
30
|
}
|
|
29
31
|
templateEngine.registerHelper(helperWithName.name, helperWithName.fn);
|
|
30
32
|
});
|
|
31
|
-
const defaultHelpersDirExists = await (0,
|
|
33
|
+
const defaultHelpersDirExists = await (0, files_1.dirExists)(helpersDir);
|
|
32
34
|
const additionalHelpersDirs = ctx.projectConfig.helpersDir;
|
|
33
35
|
const helpersDirs = defaultHelpersDirExists
|
|
34
36
|
? [helpersDir, ...additionalHelpersDirs]
|
|
35
37
|
: additionalHelpersDirs;
|
|
36
|
-
const defaultPartialsDirExists = await (0,
|
|
38
|
+
const defaultPartialsDirExists = await (0, files_1.dirExists)(partialsDir);
|
|
37
39
|
const additionalPartialsDirs = ctx.projectConfig.partialsDir;
|
|
38
40
|
const partialsDirs = defaultPartialsDirExists
|
|
39
41
|
? [partialsDir, ...additionalPartialsDirs]
|
|
40
42
|
: additionalPartialsDirs;
|
|
41
|
-
const defaultSchemasDirExists = await (0,
|
|
43
|
+
const defaultSchemasDirExists = await (0, files_1.dirExists)(schemasDir);
|
|
42
44
|
const additionalSchemasDirs = ctx.projectConfig.schemasDir;
|
|
43
45
|
const schemasDirs = defaultSchemasDirExists
|
|
44
46
|
? [schemasDir, ...additionalSchemasDirs]
|
|
@@ -49,13 +51,13 @@ const createFileSystemStacksConfigRepository = async ({ ctx, logger, stacksDir,
|
|
|
49
51
|
]);
|
|
50
52
|
const getStackTemplateContentsFromFile = async (variables, filename, dynamic) => {
|
|
51
53
|
const pathToTemplate = path_1.default.join(templatesDir, filename);
|
|
52
|
-
const content = await (0,
|
|
54
|
+
const content = await (0, files_1.readFileContents)(pathToTemplate);
|
|
53
55
|
if (!dynamic) {
|
|
54
56
|
return content;
|
|
55
57
|
}
|
|
56
58
|
logger.traceText("Raw template body:", () => content);
|
|
57
59
|
logger.traceObject("Render template using variables:", () => variables);
|
|
58
|
-
const renderedContent = await (0,
|
|
60
|
+
const renderedContent = await (0, templating_1.renderTemplate)(templateEngine, pathToTemplate, content, variables);
|
|
59
61
|
logger.traceText("Final rendered template:", () => renderedContent);
|
|
60
62
|
return renderedContent;
|
|
61
63
|
};
|
|
@@ -65,7 +67,7 @@ const createFileSystemStacksConfigRepository = async ({ ctx, logger, stacksDir,
|
|
|
65
67
|
}
|
|
66
68
|
logger.traceText("Raw template body:", () => content);
|
|
67
69
|
logger.traceObject("Render template using variables:", () => variables);
|
|
68
|
-
const renderedContent = await (0,
|
|
70
|
+
const renderedContent = await (0, templating_1.renderTemplate)(templateEngine, "inlined template", content, variables);
|
|
69
71
|
logger.traceText("Final rendered template:", () => renderedContent);
|
|
70
72
|
return renderedContent;
|
|
71
73
|
};
|
|
@@ -91,7 +93,7 @@ const createFileSystemStacksConfigRepository = async ({ ctx, logger, stacksDir,
|
|
|
91
93
|
},
|
|
92
94
|
getBlueprint: async (blueprint, variables) => {
|
|
93
95
|
const pathToBlueprint = path_1.default.join(blueprintsDir, blueprint);
|
|
94
|
-
if (!(await (0,
|
|
96
|
+
if (!(await (0, files_1.fileExists)(pathToBlueprint))) {
|
|
95
97
|
throw new Error(`Blueprint file ${blueprint} not found!`);
|
|
96
98
|
}
|
|
97
99
|
return (0, parser_1.parseBlueprintConfigFile)(ctx, variables, templateEngine, logger, pathToBlueprint);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-repository.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AASvB,mEAIkC;
|
|
1
|
+
{"version":3,"file":"config-repository.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { FilePath } from "../../../src/utils/files";
|
|
1
2
|
import { CommandContext } from "../../takomo-core";
|
|
2
3
|
import { StackGroupConfigNode } from "../../takomo-stacks-context";
|
|
3
4
|
import { StackGroupPath } from "../../takomo-stacks-model";
|
|
4
|
-
import {
|
|
5
|
+
import { TkmLogger } from "../../utils/logging";
|
|
6
|
+
import { TemplateEngine } from "../../utils/templating";
|
|
5
7
|
export declare const buildStackGroupConfigNode: (ctx: CommandContext, templateEngine: TemplateEngine, logger: TkmLogger, configFileExtension: string, stackGroupConfigFileName: string, stackGroupDir: FilePath, stackGroupPath: StackGroupPath, parentStackGroupPath?: StackGroupPath) => Promise<StackGroupConfigNode>;
|
|
@@ -8,12 +8,12 @@ const path_1 = __importDefault(require("path"));
|
|
|
8
8
|
const readdirp_1 = __importDefault(require("readdirp"));
|
|
9
9
|
const takomo_stacks_model_1 = require("../../takomo-stacks-model");
|
|
10
10
|
const takomo_stacks_schema_1 = require("../../takomo-stacks-schema");
|
|
11
|
-
const
|
|
11
|
+
const validation_1 = require("../../utils/validation");
|
|
12
12
|
const parser_1 = require("./parser");
|
|
13
13
|
const buildStackGroupConfigNode = async (ctx, templateEngine, logger, configFileExtension, stackGroupConfigFileName, stackGroupDir, stackGroupPath, parentStackGroupPath) => {
|
|
14
14
|
logger.debug(`Process stack group ${stackGroupPath} from dir: ${stackGroupDir}`);
|
|
15
15
|
const { stackGroupName } = (0, takomo_stacks_schema_1.createStacksSchemas)({ regions: ctx.regions });
|
|
16
|
-
(0,
|
|
16
|
+
(0, validation_1.validate)(stackGroupName, path_1.default.basename(stackGroupDir), `Directory ${stackGroupDir} name is not suitable for a stack group`);
|
|
17
17
|
const files = await readdirp_1.default.promise(stackGroupDir, {
|
|
18
18
|
alwaysStat: true,
|
|
19
19
|
depth: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-tree.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-tree.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AACvB,wDAA+B;
|
|
1
|
+
{"version":3,"file":"config-tree.js","sourceRoot":"","sources":["../../../src/takomo-config-repository-fs/stacks/config-tree.ts"],"names":[],"mappings":"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"}
|