cdktn 0.25.0-pre.8 → 0.25.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/.jsii +2194 -424
- package/README.md +12 -0
- package/lib/annotations.js +4 -4
- package/lib/app.js +54 -5
- package/lib/aspect.js +3 -4
- package/lib/asset-hash.d.ts +75 -0
- package/lib/asset-hash.js +129 -0
- package/lib/asset-staging.d.ts +180 -0
- package/lib/asset-staging.js +464 -0
- package/lib/assets.d.ts +401 -0
- package/lib/assets.js +333 -0
- package/lib/backends/azurerm-backend.js +4 -6
- package/lib/backends/cloud-backend.js +15 -12
- package/lib/backends/consul-backend.js +4 -6
- package/lib/backends/cos-backend.js +4 -6
- package/lib/backends/gcs-backend.js +4 -6
- package/lib/backends/http-backend.js +4 -6
- package/lib/backends/local-backend.js +38 -7
- package/lib/backends/oss-backend.js +4 -6
- package/lib/backends/pg-backend.js +4 -6
- package/lib/backends/remote-backend.js +8 -10
- package/lib/backends/s3-backend.js +4 -6
- package/lib/backends/swift-backend.js +4 -6
- package/lib/complex-computed-list.js +114 -65
- package/lib/errors.d.ts +16 -0
- package/lib/errors.js +51 -3
- package/lib/functions/provider-function.js +2 -4
- package/lib/functions/terraform-functions.generated.js +2 -4
- package/lib/ignore-strategy.d.ts +82 -0
- package/lib/ignore-strategy.js +29 -0
- package/lib/importable-resource.js +8 -6
- package/lib/index.d.ts +4 -0
- package/lib/index.js +28 -2
- package/lib/manifest.js +49 -11
- package/lib/private/fs.d.ts +74 -2
- package/lib/private/fs.js +129 -17
- package/lib/private/unique.js +35 -2
- package/lib/resource.js +3 -4
- package/lib/synthesize/synthesizer.js +51 -25
- package/lib/terraform-asset.d.ts +68 -5
- package/lib/terraform-asset.js +127 -40
- package/lib/terraform-backend.js +3 -4
- package/lib/terraform-count.js +3 -4
- package/lib/terraform-data-resource.d.ts +1 -1
- package/lib/terraform-data-resource.js +18 -13
- package/lib/terraform-data-source.js +10 -4
- package/lib/terraform-dynamic-block.js +5 -2
- package/lib/terraform-dynamic-expression.js +4 -1
- package/lib/terraform-element.js +34 -6
- package/lib/terraform-ephemeral-resource.js +10 -4
- package/lib/terraform-functions.js +2 -4
- package/lib/terraform-hcl-module.js +3 -4
- package/lib/terraform-iterator.js +11 -12
- package/lib/terraform-local.js +3 -4
- package/lib/terraform-module-asset.js +39 -4
- package/lib/terraform-module.js +8 -4
- package/lib/terraform-operators.js +2 -4
- package/lib/terraform-output.js +7 -4
- package/lib/terraform-provider.js +5 -4
- package/lib/terraform-provisioner.js +2 -4
- package/lib/terraform-remote-state.js +5 -5
- package/lib/terraform-resource-targets.js +3 -7
- package/lib/terraform-resource.js +23 -7
- package/lib/terraform-stack.js +38 -38
- package/lib/terraform-variable.js +25 -22
- package/lib/testing/adapters/jest.d.ts +2 -1
- package/lib/testing/adapters/jest.js +3 -3
- package/lib/testing/index.js +42 -8
- package/lib/testing/matchers.d.ts +34 -30
- package/lib/testing/matchers.js +329 -93
- package/lib/tfExpression.js +25 -8
- package/lib/tokens/lazy.js +11 -7
- package/lib/tokens/private/dependency.js +2 -2
- package/lib/tokens/private/encoding.js +6 -1
- package/lib/tokens/private/intrinsic.js +6 -1
- package/lib/tokens/private/resolve.js +2 -5
- package/lib/tokens/private/token-map.js +4 -6
- package/lib/tokens/private/uniqueid.js +35 -2
- package/lib/tokens/resolvable.js +4 -6
- package/lib/tokens/string-fragments.js +6 -10
- package/lib/tokens/token.js +15 -18
- package/lib/upgrade-id-aspect.js +37 -6
- package/lib/validations/index.d.ts +0 -1
- package/lib/validations/index.js +1 -2
- package/lib/validations/target-versions.js +39 -2
- package/lib/validations/validate-function-version-support.js +2 -1
- package/lib/validations/validate-provider-function-target-support.js +2 -1
- package/lib/validations/validate-provider-presence.js +10 -9
- package/package.json +21 -7
- package/scripts/pack.mjs +27 -12
- package/lib/validations/validate-binary-version.d.ts +0 -23
- package/lib/validations/validate-binary-version.js +0 -54
- package/lib/validations/validate-terraform-version.d.ts +0 -13
- package/lib/validations/validate-terraform-version.js +0 -21
|
@@ -10,19 +10,20 @@ const terraform_stack_1 = require("../terraform-stack");
|
|
|
10
10
|
* used are defined via Constructs.
|
|
11
11
|
*/
|
|
12
12
|
class ValidateProviderPresence {
|
|
13
|
+
host;
|
|
14
|
+
/**
|
|
15
|
+
* All provider names found in the construct tree.
|
|
16
|
+
*/
|
|
17
|
+
providerNames = new Set();
|
|
18
|
+
/**
|
|
19
|
+
* All TerraformProviders found in the construct tree.
|
|
20
|
+
*/
|
|
21
|
+
foundProviders = [];
|
|
13
22
|
/**
|
|
14
23
|
* Creates a ValidateProviderPresence
|
|
15
24
|
*/
|
|
16
25
|
constructor(host) {
|
|
17
26
|
this.host = host;
|
|
18
|
-
/**
|
|
19
|
-
* All provider names found in the construct tree.
|
|
20
|
-
*/
|
|
21
|
-
this.providerNames = new Set();
|
|
22
|
-
/**
|
|
23
|
-
* All TerraformProviders found in the construct tree.
|
|
24
|
-
*/
|
|
25
|
-
this.foundProviders = [];
|
|
26
27
|
}
|
|
27
28
|
/**
|
|
28
29
|
* Checks the construct tree recursively
|
|
@@ -62,4 +63,4 @@ class ValidateProviderPresence {
|
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
exports.ValidateProviderPresence = ValidateProviderPresence;
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
66
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtcHJvdmlkZXItcHJlc2VuY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmFsaWRhdGlvbnMvdmFsaWRhdGUtcHJvdmlkZXItcHJlc2VuY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsOERBQTBEO0FBQzFELDhEQUEwRDtBQUMxRCxvRUFBK0Q7QUFDL0Qsd0RBQW9EO0FBRXBEOzs7R0FHRztBQUNILE1BQWEsd0JBQXdCO0lBYWI7SUFadEI7O09BRUc7SUFDSSxhQUFhLEdBQWdCLElBQUksR0FBRyxFQUFFLENBQUM7SUFDOUM7O09BRUc7SUFDSSxjQUFjLEdBQXdCLEVBQUUsQ0FBQztJQUVoRDs7T0FFRztJQUNILFlBQXNCLElBQWdCO1FBQWhCLFNBQUksR0FBSixJQUFJLENBQVk7SUFBRyxDQUFDO0lBRTFDOztPQUVHO0lBQ0ksS0FBSyxDQUFDLElBQWdCO1FBQzNCLElBQ0Usc0NBQWlCLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDO1lBQzNDLDJDQUFtQixDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQyxFQUMvQyxDQUFDO1lBQ0QsSUFDRSxJQUFJLENBQUMsMEJBQTBCO2dCQUMvQixJQUFJLENBQUMsMEJBQTBCLENBQUMsWUFBWSxLQUFLLFdBQVcsRUFDNUQsQ0FBQztnQkFDRCxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsMEJBQTBCLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDdkUsQ0FBQztRQUNILENBQUM7UUFFRCxJQUFJLHNDQUFpQixDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDaEQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDakMsQ0FBQztRQUVELEtBQUssTUFBTSxLQUFLLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUN2QyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3BCLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxRQUFRO1FBQ2IsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFdEIsTUFBTSxnQkFBZ0IsR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUN0RSxPQUFPLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQzlCLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsMEJBQTBCLEVBQUUsWUFBWSxLQUFLLElBQUksQ0FDM0QsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDbEMsT0FBTyxFQUFFLENBQUM7UUFDWixDQUFDO2FBQU0sQ0FBQztZQUNOLE1BQU0sS0FBSyxHQUFHLGdDQUFjLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUMzQyxPQUFPO2dCQUNMLG9KQUNFLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFDYixrQ0FBa0MsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFO2FBQ2hFLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBL0RELDREQStEQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIENvcHlyaWdodCAoYykgSGFzaGlDb3JwLCBJbmNcbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBNUEwtMi4wXG5pbXBvcnQgeyBJQ29uc3RydWN0LCBJVmFsaWRhdGlvbiB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBUZXJyYWZvcm1Qcm92aWRlciB9IGZyb20gXCIuLi90ZXJyYWZvcm0tcHJvdmlkZXJcIjtcbmltcG9ydCB7IFRlcnJhZm9ybVJlc291cmNlIH0gZnJvbSBcIi4uL3RlcnJhZm9ybS1yZXNvdXJjZVwiO1xuaW1wb3J0IHsgVGVycmFmb3JtRGF0YVNvdXJjZSB9IGZyb20gXCIuLi90ZXJyYWZvcm0tZGF0YS1zb3VyY2VcIjtcbmltcG9ydCB7IFRlcnJhZm9ybVN0YWNrIH0gZnJvbSBcIi4uL3RlcnJhZm9ybS1zdGFja1wiO1xuXG4vKipcbiAqIEEgdmFsaWRhdGlvbiB0aGF0IGlzIGFkZGVkIGJ5IGRlZmF1bHQsIGVuc3VyaW5nIHRoYXQgYWxsIHByb3ZpZGVyc1xuICogdXNlZCBhcmUgZGVmaW5lZCB2aWEgQ29uc3RydWN0cy5cbiAqL1xuZXhwb3J0IGNsYXNzIFZhbGlkYXRlUHJvdmlkZXJQcmVzZW5jZSBpbXBsZW1lbnRzIElWYWxpZGF0aW9uIHtcbiAgLyoqXG4gICAqIEFsbCBwcm92aWRlciBuYW1lcyBmb3VuZCBpbiB0aGUgY29uc3RydWN0IHRyZWUuXG4gICAqL1xuICBwdWJsaWMgcHJvdmlkZXJOYW1lczogU2V0PHN0cmluZz4gPSBuZXcgU2V0KCk7XG4gIC8qKlxuICAgKiBBbGwgVGVycmFmb3JtUHJvdmlkZXJzIGZvdW5kIGluIHRoZSBjb25zdHJ1Y3QgdHJlZS5cbiAgICovXG4gIHB1YmxpYyBmb3VuZFByb3ZpZGVyczogVGVycmFmb3JtUHJvdmlkZXJbXSA9IFtdO1xuXG4gIC8qKlxuICAgKiBDcmVhdGVzIGEgVmFsaWRhdGVQcm92aWRlclByZXNlbmNlXG4gICAqL1xuICBjb25zdHJ1Y3Rvcihwcm90ZWN0ZWQgaG9zdDogSUNvbnN0cnVjdCkge31cblxuICAvKipcbiAgICogQ2hlY2tzIHRoZSBjb25zdHJ1Y3QgdHJlZSByZWN1cnNpdmVseVxuICAgKi9cbiAgcHVibGljIGNoZWNrKG5vZGU6IElDb25zdHJ1Y3QpIHtcbiAgICBpZiAoXG4gICAgICBUZXJyYWZvcm1SZXNvdXJjZS5pc1RlcnJhZm9ybVJlc291cmNlKG5vZGUpIHx8XG4gICAgICBUZXJyYWZvcm1EYXRhU291cmNlLmlzVGVycmFmb3JtRGF0YVNvdXJjZShub2RlKVxuICAgICkge1xuICAgICAgaWYgKFxuICAgICAgICBub2RlLnRlcnJhZm9ybUdlbmVyYXRvck1ldGFkYXRhICYmXG4gICAgICAgIG5vZGUudGVycmFmb3JtR2VuZXJhdG9yTWV0YWRhdGEucHJvdmlkZXJOYW1lICE9PSBcInRlcnJhZm9ybVwiXG4gICAgICApIHtcbiAgICAgICAgdGhpcy5wcm92aWRlck5hbWVzLmFkZChub2RlLnRlcnJhZm9ybUdlbmVyYXRvck1ldGFkYXRhLnByb3ZpZGVyTmFtZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKFRlcnJhZm9ybVByb3ZpZGVyLmlzVGVycmFmb3JtUHJvdmlkZXIobm9kZSkpIHtcbiAgICAgIHRoaXMuZm91bmRQcm92aWRlcnMucHVzaChub2RlKTtcbiAgICB9XG5cbiAgICBmb3IgKGNvbnN0IGNoaWxkIG9mIG5vZGUubm9kZS5jaGlsZHJlbikge1xuICAgICAgdGhpcy5jaGVjayhjaGlsZCk7XG4gICAgfVxuICB9XG5cbiAgLyoqXG4gICAqIFJ1biB0aGUgdmFsaWRhdGlvblxuICAgKi9cbiAgcHVibGljIHZhbGlkYXRlKCkge1xuICAgIHRoaXMuY2hlY2sodGhpcy5ob3N0KTtcblxuICAgIGNvbnN0IG1pc3NpbmdQcm92aWRlcnMgPSBBcnJheS5mcm9tKHRoaXMucHJvdmlkZXJOYW1lcykuZmlsdGVyKChuYW1lKSA9PiB7XG4gICAgICByZXR1cm4gIXRoaXMuZm91bmRQcm92aWRlcnMuc29tZShcbiAgICAgICAgKHApID0+IHAudGVycmFmb3JtR2VuZXJhdG9yTWV0YWRhdGE/LnByb3ZpZGVyTmFtZSA9PT0gbmFtZSxcbiAgICAgICk7XG4gICAgfSk7XG5cbiAgICBpZiAobWlzc2luZ1Byb3ZpZGVycy5sZW5ndGggPT09IDApIHtcbiAgICAgIHJldHVybiBbXTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgc3RhY2sgPSBUZXJyYWZvcm1TdGFjay5vZih0aGlzLmhvc3QpO1xuICAgICAgcmV0dXJuIFtcbiAgICAgICAgYEZvdW5kIHJlc291cmNlcyB3aXRob3V0IGEgbWF0Y2hpbmcgcHJvdmlkZXIgY29uc3RydWN0LiBQbGVhc2UgbWFrZSBzdXJlIHRvIGFkZCBwcm92aWRlciBjb25zdHJ1Y3RzIFtlLmcuIG5ldyBSYW5kb21Qcm92aWRlciguLi4pXSB0byB5b3VyIHN0YWNrICcke1xuICAgICAgICAgIHN0YWNrLm5vZGUuaWRcbiAgICAgICAgfScgZm9yIHRoZSBmb2xsb3dpbmcgcHJvdmlkZXJzOiAke21pc3NpbmdQcm92aWRlcnMuam9pbihcIiwgXCIpfWAsXG4gICAgICBdO1xuICAgIH1cbiAgfVxufVxuIl19
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cdktn",
|
|
3
|
-
"version": "0.25.0
|
|
3
|
+
"version": "0.25.0",
|
|
4
4
|
"description": "Cloud Development Kit for Terraform",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "jsii --silence-warnings reserved-word",
|
|
@@ -20,13 +20,27 @@
|
|
|
20
20
|
"nx": {
|
|
21
21
|
"tags": [
|
|
22
22
|
"unit-test:terraform"
|
|
23
|
-
]
|
|
23
|
+
],
|
|
24
|
+
"targets": {
|
|
25
|
+
"build": {
|
|
26
|
+
"outputs": [
|
|
27
|
+
"{projectRoot}/lib",
|
|
28
|
+
"{projectRoot}/.jsii",
|
|
29
|
+
"{projectRoot}/tsconfig.json"
|
|
30
|
+
]
|
|
31
|
+
}
|
|
32
|
+
}
|
|
24
33
|
},
|
|
25
34
|
"keywords": [
|
|
26
35
|
"cdk",
|
|
27
36
|
"cdktf",
|
|
28
37
|
"cdktn",
|
|
29
|
-
"terraform"
|
|
38
|
+
"terraform",
|
|
39
|
+
"cdk for terraform",
|
|
40
|
+
"terraform-cdk",
|
|
41
|
+
"cdk terrain",
|
|
42
|
+
"opentofu",
|
|
43
|
+
"infrastructure as code"
|
|
30
44
|
],
|
|
31
45
|
"jsii": {
|
|
32
46
|
"outdir": "dist",
|
|
@@ -80,9 +94,9 @@
|
|
|
80
94
|
"@types/node": "22.20.1",
|
|
81
95
|
"@types/semver": "7.7.1",
|
|
82
96
|
"constructs": "10.6.0",
|
|
83
|
-
"jsii": "~
|
|
84
|
-
"jsii-pacmak": "1.
|
|
85
|
-
"typescript": "
|
|
97
|
+
"jsii": "~6.0.0",
|
|
98
|
+
"jsii-pacmak": "1.140.0",
|
|
99
|
+
"typescript": "~6.0.0"
|
|
86
100
|
},
|
|
87
101
|
"dependencies": {
|
|
88
102
|
"fflate": "0.8.3",
|
|
@@ -96,6 +110,6 @@
|
|
|
96
110
|
],
|
|
97
111
|
"stability": "experimental",
|
|
98
112
|
"peerDependencies": {
|
|
99
|
-
"constructs": "
|
|
113
|
+
"constructs": "^10.6.0"
|
|
100
114
|
}
|
|
101
115
|
}
|
package/scripts/pack.mjs
CHANGED
|
@@ -127,21 +127,36 @@ function copySourceFiles(sourceFiles) {
|
|
|
127
127
|
* --no-package-lock: don't pollute staging with a fresh lockfile.
|
|
128
128
|
* --prefer-offline: use the local npm cache before the network.
|
|
129
129
|
* --ignore-scripts: don't run install scripts of bundled deps; bundling needs the tree on disk only.
|
|
130
|
+
*
|
|
131
|
+
* A cached packument older than a dependency bump makes --prefer-offline report
|
|
132
|
+
* ETARGET ("No matching version found") for a version that exists. Outside CI we
|
|
133
|
+
* retry once with --prefer-online; in CI we let it fail, so a stale cache can
|
|
134
|
+
* never quietly change what gets packaged.
|
|
130
135
|
*/
|
|
131
136
|
function installRuntimeDeps() {
|
|
132
137
|
console.log("Installing runtime deps into staging via npm...");
|
|
133
|
-
|
|
134
|
-
"
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
138
|
+
const args = [
|
|
139
|
+
"install",
|
|
140
|
+
"--omit=dev",
|
|
141
|
+
"--omit=optional",
|
|
142
|
+
"--no-package-lock",
|
|
143
|
+
"--ignore-scripts",
|
|
144
|
+
];
|
|
145
|
+
try {
|
|
146
|
+
run("npm", [...args, "--prefer-offline"], {
|
|
147
|
+
cwd: stagingDir,
|
|
148
|
+
...NPM_SPAWN_OPTS,
|
|
149
|
+
});
|
|
150
|
+
} catch (err) {
|
|
151
|
+
if (process.env.CI) throw err;
|
|
152
|
+
console.log(
|
|
153
|
+
"npm install failed with --prefer-offline; retrying with --prefer-online in case the local cache is stale...",
|
|
154
|
+
);
|
|
155
|
+
run("npm", [...args, "--prefer-online"], {
|
|
156
|
+
cwd: stagingDir,
|
|
157
|
+
...NPM_SPAWN_OPTS,
|
|
158
|
+
});
|
|
159
|
+
}
|
|
145
160
|
}
|
|
146
161
|
|
|
147
162
|
/**
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import { IValidation } from "constructs";
|
|
2
|
-
/**
|
|
3
|
-
* A validation that can be applied to a construct that will error if the
|
|
4
|
-
* construct is being used in an environment with a version of a binary lower than the specified version.
|
|
5
|
-
*
|
|
6
|
-
* TODO(target-versions): legacy synth-time binary probe that predates
|
|
7
|
-
* OpenTofu support and the declared `targetVersions` model. Existing
|
|
8
|
-
* consumers (e.g. ValidateTerraformVersion for resource moves) should
|
|
9
|
-
* migrate to ValidateFeatureTargetSupport, leaving installed-binary
|
|
10
|
-
* verification to the opt-in validateInstalledBinary CLI behavior. Left
|
|
11
|
-
* unchanged here only to keep this PR small; the migration is tracked in
|
|
12
|
-
* #275. Note this class is not exported from the cdktn package root, so the
|
|
13
|
-
* change is behavioral (synth no longer shelling out), not a symbol-level
|
|
14
|
-
* public-API break.
|
|
15
|
-
*/
|
|
16
|
-
export declare class ValidateBinaryVersion implements IValidation {
|
|
17
|
-
protected binary: string;
|
|
18
|
-
protected versionConstraint: string;
|
|
19
|
-
protected versionCommand: string;
|
|
20
|
-
protected hint?: string | undefined;
|
|
21
|
-
constructor(binary: string, versionConstraint: string, versionCommand: string, hint?: string | undefined);
|
|
22
|
-
validate(): string[];
|
|
23
|
-
}
|
|
@@ -1,54 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ValidateBinaryVersion = void 0;
|
|
4
|
-
const child_process_1 = require("child_process");
|
|
5
|
-
const semver = require("semver");
|
|
6
|
-
/**
|
|
7
|
-
* A validation that can be applied to a construct that will error if the
|
|
8
|
-
* construct is being used in an environment with a version of a binary lower than the specified version.
|
|
9
|
-
*
|
|
10
|
-
* TODO(target-versions): legacy synth-time binary probe that predates
|
|
11
|
-
* OpenTofu support and the declared `targetVersions` model. Existing
|
|
12
|
-
* consumers (e.g. ValidateTerraformVersion for resource moves) should
|
|
13
|
-
* migrate to ValidateFeatureTargetSupport, leaving installed-binary
|
|
14
|
-
* verification to the opt-in validateInstalledBinary CLI behavior. Left
|
|
15
|
-
* unchanged here only to keep this PR small; the migration is tracked in
|
|
16
|
-
* #275. Note this class is not exported from the cdktn package root, so the
|
|
17
|
-
* change is behavioral (synth no longer shelling out), not a symbol-level
|
|
18
|
-
* public-API break.
|
|
19
|
-
*/
|
|
20
|
-
class ValidateBinaryVersion {
|
|
21
|
-
constructor(binary, versionConstraint, versionCommand, hint) {
|
|
22
|
-
this.binary = binary;
|
|
23
|
-
this.versionConstraint = versionConstraint;
|
|
24
|
-
this.versionCommand = versionCommand;
|
|
25
|
-
this.hint = hint;
|
|
26
|
-
}
|
|
27
|
-
validate() {
|
|
28
|
-
try {
|
|
29
|
-
const versionOfCommand = (0, child_process_1.execSync)(this.versionCommand, {
|
|
30
|
-
stdio: "pipe",
|
|
31
|
-
}).toString();
|
|
32
|
-
const semverRegex = /\d+\.\d+\.\d+/;
|
|
33
|
-
const version = versionOfCommand.match(semverRegex);
|
|
34
|
-
if (!version) {
|
|
35
|
-
return [
|
|
36
|
-
`Could not determine version of ${this.binary} (running ${this.versionCommand})`,
|
|
37
|
-
];
|
|
38
|
-
}
|
|
39
|
-
if (!semver.satisfies(version[0], this.versionConstraint)) {
|
|
40
|
-
return [
|
|
41
|
-
`${this.binary} version ${version[0]} is lower than the required version ${this.versionConstraint} for this construct. ${this.hint || ""}`,
|
|
42
|
-
];
|
|
43
|
-
}
|
|
44
|
-
return [];
|
|
45
|
-
}
|
|
46
|
-
catch (e) {
|
|
47
|
-
return [
|
|
48
|
-
`Could not determine version of ${this.binary}, ${this.versionCommand} failed: ${e}`,
|
|
49
|
-
];
|
|
50
|
-
}
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
exports.ValidateBinaryVersion = ValidateBinaryVersion;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtYmluYXJ5LXZlcnNpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmFsaWRhdGlvbnMvdmFsaWRhdGUtYmluYXJ5LXZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsaURBQXlDO0FBQ3pDLGlDQUFpQztBQUVqQzs7Ozs7Ozs7Ozs7OztHQWFHO0FBQ0gsTUFBYSxxQkFBcUI7SUFDaEMsWUFDWSxNQUFjLEVBQ2QsaUJBQXlCLEVBQ3pCLGNBQXNCLEVBQ3RCLElBQWE7UUFIYixXQUFNLEdBQU4sTUFBTSxDQUFRO1FBQ2Qsc0JBQWlCLEdBQWpCLGlCQUFpQixDQUFRO1FBQ3pCLG1CQUFjLEdBQWQsY0FBYyxDQUFRO1FBQ3RCLFNBQUksR0FBSixJQUFJLENBQVM7SUFDdEIsQ0FBQztJQUVHLFFBQVE7UUFDYixJQUFJLENBQUM7WUFDSCxNQUFNLGdCQUFnQixHQUFHLElBQUEsd0JBQVEsRUFBQyxJQUFJLENBQUMsY0FBYyxFQUFFO2dCQUNyRCxLQUFLLEVBQUUsTUFBTTthQUNkLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUVkLE1BQU0sV0FBVyxHQUFHLGVBQWUsQ0FBQztZQUNwQyxNQUFNLE9BQU8sR0FBRyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDcEQsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNiLE9BQU87b0JBQ0wsa0NBQWtDLElBQUksQ0FBQyxNQUFNLGFBQWEsSUFBSSxDQUFDLGNBQWMsR0FBRztpQkFDakYsQ0FBQztZQUNKLENBQUM7WUFFRCxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUUsQ0FBQztnQkFDMUQsT0FBTztvQkFDTCxHQUFHLElBQUksQ0FBQyxNQUFNLFlBQ1osT0FBTyxDQUFDLENBQUMsQ0FDWCx1Q0FDRSxJQUFJLENBQUMsaUJBQ1Asd0JBQXdCLElBQUksQ0FBQyxJQUFJLElBQUksRUFBRSxFQUFFO2lCQUMxQyxDQUFDO1lBQ0osQ0FBQztZQUNELE9BQU8sRUFBRSxDQUFDO1FBQ1osQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDWCxPQUFPO2dCQUNMLGtDQUFrQyxJQUFJLENBQUMsTUFBTSxLQUFLLElBQUksQ0FBQyxjQUFjLFlBQVksQ0FBQyxFQUFFO2FBQ3JGLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztDQUNGO0FBdENELHNEQXNDQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIENvcHlyaWdodCAoYykgSGFzaGlDb3JwLCBJbmNcbi8vIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBNUEwtMi4wXG5pbXBvcnQgeyBJVmFsaWRhdGlvbiB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBleGVjU3luYyB9IGZyb20gXCJjaGlsZF9wcm9jZXNzXCI7XG5pbXBvcnQgKiBhcyBzZW12ZXIgZnJvbSBcInNlbXZlclwiO1xuXG4vKipcbiAqIEEgdmFsaWRhdGlvbiB0aGF0IGNhbiBiZSBhcHBsaWVkIHRvIGEgY29uc3RydWN0IHRoYXQgd2lsbCBlcnJvciBpZiB0aGVcbiAqIGNvbnN0cnVjdCBpcyBiZWluZyB1c2VkIGluIGFuIGVudmlyb25tZW50IHdpdGggYSB2ZXJzaW9uIG9mIGEgYmluYXJ5IGxvd2VyIHRoYW4gdGhlIHNwZWNpZmllZCB2ZXJzaW9uLlxuICpcbiAqIFRPRE8odGFyZ2V0LXZlcnNpb25zKTogbGVnYWN5IHN5bnRoLXRpbWUgYmluYXJ5IHByb2JlIHRoYXQgcHJlZGF0ZXNcbiAqIE9wZW5Ub2Z1IHN1cHBvcnQgYW5kIHRoZSBkZWNsYXJlZCBgdGFyZ2V0VmVyc2lvbnNgIG1vZGVsLiBFeGlzdGluZ1xuICogY29uc3VtZXJzIChlLmcuIFZhbGlkYXRlVGVycmFmb3JtVmVyc2lvbiBmb3IgcmVzb3VyY2UgbW92ZXMpIHNob3VsZFxuICogbWlncmF0ZSB0byBWYWxpZGF0ZUZlYXR1cmVUYXJnZXRTdXBwb3J0LCBsZWF2aW5nIGluc3RhbGxlZC1iaW5hcnlcbiAqIHZlcmlmaWNhdGlvbiB0byB0aGUgb3B0LWluIHZhbGlkYXRlSW5zdGFsbGVkQmluYXJ5IENMSSBiZWhhdmlvci4gTGVmdFxuICogdW5jaGFuZ2VkIGhlcmUgb25seSB0byBrZWVwIHRoaXMgUFIgc21hbGw7IHRoZSBtaWdyYXRpb24gaXMgdHJhY2tlZCBpblxuICogIzI3NS4gTm90ZSB0aGlzIGNsYXNzIGlzIG5vdCBleHBvcnRlZCBmcm9tIHRoZSBjZGt0biBwYWNrYWdlIHJvb3QsIHNvIHRoZVxuICogY2hhbmdlIGlzIGJlaGF2aW9yYWwgKHN5bnRoIG5vIGxvbmdlciBzaGVsbGluZyBvdXQpLCBub3QgYSBzeW1ib2wtbGV2ZWxcbiAqIHB1YmxpYy1BUEkgYnJlYWsuXG4gKi9cbmV4cG9ydCBjbGFzcyBWYWxpZGF0ZUJpbmFyeVZlcnNpb24gaW1wbGVtZW50cyBJVmFsaWRhdGlvbiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByb3RlY3RlZCBiaW5hcnk6IHN0cmluZyxcbiAgICBwcm90ZWN0ZWQgdmVyc2lvbkNvbnN0cmFpbnQ6IHN0cmluZyxcbiAgICBwcm90ZWN0ZWQgdmVyc2lvbkNvbW1hbmQ6IHN0cmluZyxcbiAgICBwcm90ZWN0ZWQgaGludD86IHN0cmluZyxcbiAgKSB7fVxuXG4gIHB1YmxpYyB2YWxpZGF0ZSgpIHtcbiAgICB0cnkge1xuICAgICAgY29uc3QgdmVyc2lvbk9mQ29tbWFuZCA9IGV4ZWNTeW5jKHRoaXMudmVyc2lvbkNvbW1hbmQsIHtcbiAgICAgICAgc3RkaW86IFwicGlwZVwiLFxuICAgICAgfSkudG9TdHJpbmcoKTtcblxuICAgICAgY29uc3Qgc2VtdmVyUmVnZXggPSAvXFxkK1xcLlxcZCtcXC5cXGQrLztcbiAgICAgIGNvbnN0IHZlcnNpb24gPSB2ZXJzaW9uT2ZDb21tYW5kLm1hdGNoKHNlbXZlclJlZ2V4KTtcbiAgICAgIGlmICghdmVyc2lvbikge1xuICAgICAgICByZXR1cm4gW1xuICAgICAgICAgIGBDb3VsZCBub3QgZGV0ZXJtaW5lIHZlcnNpb24gb2YgJHt0aGlzLmJpbmFyeX0gKHJ1bm5pbmcgJHt0aGlzLnZlcnNpb25Db21tYW5kfSlgLFxuICAgICAgICBdO1xuICAgICAgfVxuXG4gICAgICBpZiAoIXNlbXZlci5zYXRpc2ZpZXModmVyc2lvblswXSwgdGhpcy52ZXJzaW9uQ29uc3RyYWludCkpIHtcbiAgICAgICAgcmV0dXJuIFtcbiAgICAgICAgICBgJHt0aGlzLmJpbmFyeX0gdmVyc2lvbiAke1xuICAgICAgICAgICAgdmVyc2lvblswXVxuICAgICAgICAgIH0gaXMgbG93ZXIgdGhhbiB0aGUgcmVxdWlyZWQgdmVyc2lvbiAke1xuICAgICAgICAgICAgdGhpcy52ZXJzaW9uQ29uc3RyYWludFxuICAgICAgICAgIH0gZm9yIHRoaXMgY29uc3RydWN0LiAke3RoaXMuaGludCB8fCBcIlwifWAsXG4gICAgICAgIF07XG4gICAgICB9XG4gICAgICByZXR1cm4gW107XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgcmV0dXJuIFtcbiAgICAgICAgYENvdWxkIG5vdCBkZXRlcm1pbmUgdmVyc2lvbiBvZiAke3RoaXMuYmluYXJ5fSwgJHt0aGlzLnZlcnNpb25Db21tYW5kfSBmYWlsZWQ6ICR7ZX1gLFxuICAgICAgXTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Copyright (c) HashiCorp, Inc.
|
|
3
|
-
* SPDX-License-Identifier: MPL-2.0
|
|
4
|
-
*/
|
|
5
|
-
import { ValidateBinaryVersion } from "./validate-binary-version";
|
|
6
|
-
/**
|
|
7
|
-
* Validates the existence of a Terraform binary and with a certain version or higher.
|
|
8
|
-
*/
|
|
9
|
-
export declare class ValidateTerraformVersion extends ValidateBinaryVersion {
|
|
10
|
-
protected versionConstraint: string;
|
|
11
|
-
protected hint?: string | undefined;
|
|
12
|
-
constructor(versionConstraint: string, hint?: string | undefined);
|
|
13
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/**
|
|
3
|
-
* Copyright (c) HashiCorp, Inc.
|
|
4
|
-
* SPDX-License-Identifier: MPL-2.0
|
|
5
|
-
*/
|
|
6
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.ValidateTerraformVersion = void 0;
|
|
8
|
-
const util_1 = require("../util");
|
|
9
|
-
const validate_binary_version_1 = require("./validate-binary-version");
|
|
10
|
-
/**
|
|
11
|
-
* Validates the existence of a Terraform binary and with a certain version or higher.
|
|
12
|
-
*/
|
|
13
|
-
class ValidateTerraformVersion extends validate_binary_version_1.ValidateBinaryVersion {
|
|
14
|
-
constructor(versionConstraint, hint) {
|
|
15
|
-
super(util_1.terraformBinaryName, versionConstraint, `${util_1.terraformBinaryName} version`, hint);
|
|
16
|
-
this.versionConstraint = versionConstraint;
|
|
17
|
-
this.hint = hint;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
exports.ValidateTerraformVersion = ValidateTerraformVersion;
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGUtdGVycmFmb3JtLXZlcnNpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdmFsaWRhdGlvbnMvdmFsaWRhdGUtdGVycmFmb3JtLXZlcnNpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7R0FHRzs7O0FBRUgsa0NBQThDO0FBQzlDLHVFQUFrRTtBQUVsRTs7R0FFRztBQUNILE1BQWEsd0JBQXlCLFNBQVEsK0NBQXFCO0lBQ2pFLFlBQ1ksaUJBQXlCLEVBQ3pCLElBQWE7UUFFdkIsS0FBSyxDQUNILDBCQUFtQixFQUNuQixpQkFBaUIsRUFDakIsR0FBRywwQkFBbUIsVUFBVSxFQUNoQyxJQUFJLENBQ0wsQ0FBQztRQVJRLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBUTtRQUN6QixTQUFJLEdBQUosSUFBSSxDQUFTO0lBUXpCLENBQUM7Q0FDRjtBQVpELDREQVlDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDb3B5cmlnaHQgKGMpIEhhc2hpQ29ycCwgSW5jLlxuICogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IE1QTC0yLjBcbiAqL1xuXG5pbXBvcnQgeyB0ZXJyYWZvcm1CaW5hcnlOYW1lIH0gZnJvbSBcIi4uL3V0aWxcIjtcbmltcG9ydCB7IFZhbGlkYXRlQmluYXJ5VmVyc2lvbiB9IGZyb20gXCIuL3ZhbGlkYXRlLWJpbmFyeS12ZXJzaW9uXCI7XG5cbi8qKlxuICogVmFsaWRhdGVzIHRoZSBleGlzdGVuY2Ugb2YgYSBUZXJyYWZvcm0gYmluYXJ5IGFuZCB3aXRoIGEgY2VydGFpbiB2ZXJzaW9uIG9yIGhpZ2hlci5cbiAqL1xuZXhwb3J0IGNsYXNzIFZhbGlkYXRlVGVycmFmb3JtVmVyc2lvbiBleHRlbmRzIFZhbGlkYXRlQmluYXJ5VmVyc2lvbiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByb3RlY3RlZCB2ZXJzaW9uQ29uc3RyYWludDogc3RyaW5nLFxuICAgIHByb3RlY3RlZCBoaW50Pzogc3RyaW5nLFxuICApIHtcbiAgICBzdXBlcihcbiAgICAgIHRlcnJhZm9ybUJpbmFyeU5hbWUsXG4gICAgICB2ZXJzaW9uQ29uc3RyYWludCxcbiAgICAgIGAke3RlcnJhZm9ybUJpbmFyeU5hbWV9IHZlcnNpb25gLFxuICAgICAgaGludCxcbiAgICApO1xuICB9XG59XG4iXX0=
|