projen-cdktf-hybrid-construct 0.3.2 → 0.3.4

package/node_modules/tslib/tslib.js

@@ -12,12 +12,16 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global global, define, System, Reflect, Promise */
+/* global global, define, Symbol, Reflect, Promise, SuppressedError */
 var __extends;
 var __assign;
 var __rest;
 var __decorate;
 var __param;
+var __esDecorate;
+var __runInitializers;
+var __propKey;
+var __setFunctionName;
 var __metadata;
 var __awaiter;
 var __generator;
@@ -38,6 +42,8 @@ var __classPrivateFieldGet;
 var __classPrivateFieldSet;
 var __classPrivateFieldIn;
 var __createBinding;
+var __addDisposableResource;
+var __disposeResources;
 (function (factory) {
     var root = typeof global === "object" ? global : typeof self === "object" ? self : typeof this === "object" ? this : {};
     if (typeof define === "function" && define.amd) {
@@ -105,6 +111,51 @@ var __createBinding;
         return function (target, key) { decorator(target, key, paramIndex); }
     };
 
+    __esDecorate = function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+        function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+        var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+        var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+        var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+        var _, done = false;
+        for (var i = decorators.length - 1; i >= 0; i--) {
+            var context = {};
+            for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+            for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+            context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+            var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+            if (kind === "accessor") {
+                if (result === void 0) continue;
+                if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+                if (_ = accept(result.get)) descriptor.get = _;
+                if (_ = accept(result.set)) descriptor.set = _;
+                if (_ = accept(result.init)) initializers.unshift(_);
+            }
+            else if (_ = accept(result)) {
+                if (kind === "field") initializers.unshift(_);
+                else descriptor[key] = _;
+            }
+        }
+        if (target) Object.defineProperty(target, contextIn.name, descriptor);
+        done = true;
+    };
+
+    __runInitializers = function (thisArg, initializers, value) {
+        var useValue = arguments.length > 2;
+        for (var i = 0; i < initializers.length; i++) {
+            value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+        }
+        return useValue ? value : void 0;
+    };
+
+    __propKey = function (x) {
+        return typeof x === "symbol" ? x : "".concat(x);
+    };
+
+    __setFunctionName = function (f, name, prefix) {
+        if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+        return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+    };
+
     __metadata = function (metadataKey, metadataValue) {
         if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
     };
@@ -125,7 +176,7 @@ var __createBinding;
         function verb(n) { return function (v) { return step([n, v]); }; }
         function step(op) {
             if (f) throw new TypeError("Generator is already executing.");
-            while (_) try {
+            while (g && (g = 0, op[0] && (_ = 0)), _) try {
                 if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
                 if (y = 0, t) op = [op[0] & 2, t.value];
                 switch (op[0]) {
@@ -237,7 +288,7 @@ var __createBinding;
     __asyncDelegator = function (o) {
         var i, p;
         return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
     };
 
     __asyncValues = function (o) {
@@ -289,11 +340,62 @@ var __createBinding;
         return typeof state === "function" ? receiver === state : state.has(receiver);
     };
 
+    __addDisposableResource = function (env, value, async) {
+        if (value !== null && value !== void 0) {
+            if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+            var dispose;
+            if (async) {
+                if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+                dispose = value[Symbol.asyncDispose];
+            }
+            if (dispose === void 0) {
+                if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+                dispose = value[Symbol.dispose];
+            }
+            if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+            env.stack.push({ value: value, dispose: dispose, async: async });
+        }
+        else if (async) {
+            env.stack.push({ async: true });
+        }
+        return value;
+    };
+
+    var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+        var e = new Error(message);
+        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+    };
+
+    __disposeResources = function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new _SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        function next() {
+            while (env.stack.length) {
+                var rec = env.stack.pop();
+                try {
+                    var result = rec.dispose && rec.dispose.call(rec.value);
+                    if (rec.async) return Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+
     exporter("__extends", __extends);
     exporter("__assign", __assign);
     exporter("__rest", __rest);
     exporter("__decorate", __decorate);
     exporter("__param", __param);
+    exporter("__esDecorate", __esDecorate);
+    exporter("__runInitializers", __runInitializers);
+    exporter("__propKey", __propKey);
+    exporter("__setFunctionName", __setFunctionName);
     exporter("__metadata", __metadata);
     exporter("__awaiter", __awaiter);
     exporter("__generator", __generator);
@@ -314,4 +416,6 @@ var __createBinding;
     exporter("__classPrivateFieldGet", __classPrivateFieldGet);
     exporter("__classPrivateFieldSet", __classPrivateFieldSet);
     exporter("__classPrivateFieldIn", __classPrivateFieldIn);
+    exporter("__addDisposableResource", __addDisposableResource);
+    exporter("__disposeResources", __disposeResources);
 });

package/package.json

@@ -29,6 +29,8 @@
     "test:watch": "npx projen test:watch",
     "unbump": "npx projen unbump",
     "upgrade": "npx projen upgrade",
+    "upgrade:hybrid": "npx projen upgrade:hybrid",
+    "upgrade:terraform": "npx projen upgrade:terraform",
     "watch": "npx projen watch",
     "projen": "npx projen"
   },
@@ -42,34 +44,35 @@
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
     "@types/jest": "^27",
-    "@types/node": "^14",
+    "@types/node": "^16",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
+    "comment-json": "^4.2.3",
     "eslint": "^8",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-node": "^0.3.6",
+    "eslint-config-prettier": "^8.10.0",
+    "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^2.7.1",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^4.2.1",
     "fs-extra": "^10.1.0",
     "glob": "^7.2.3",
     "jest": "^27",
-    "jest-junit": "^13",
-    "jsii": "^1.63.2",
-    "jsii-diff": "^1.63.2",
-    "jsii-docgen": "^7.0.63",
-    "jsii-pacmak": "^1.63.2",
-    "json-schema": "^0.4.0",
+    "jest-junit": "^15",
+    "jsii": "^5.1.0",
+    "jsii-diff": "^1.87.0",
+    "jsii-docgen": "^9.0.0",
+    "jsii-pacmak": "^1.87.0",
+    "jsii-rosetta": "^5.1.0",
     "npm-check-updates": "^16",
-    "prettier": "^2.7.1",
-    "projen": "0.63.25",
+    "prettier": "^2.8.8",
+    "projen": "0.72.18",
     "standard-version": "^9",
     "ts-jest": "^27",
     "ts-node": "10.9.1",
-    "typescript": "^4.7.4"
+    "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "projen": ">= 0.63.25"
+    "projen": ">= 0.72.18"
   },
   "dependencies": {
     "change-case": "^4.1.2"
@@ -79,7 +82,7 @@
   ],
   "main": "lib/index.js",
   "license": "MPL-2.0",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "jest": {
     "testMatch": [
       "<rootDir>/src/**/__tests__/**/*.ts?(x)",
@@ -130,10 +133,5 @@
       "rootDir": "src"
     }
   },
-  "resolutions": {
-    "@types/responselike": "1.0.0",
-    "got": "12.3.1",
-    "@types/prettier": "2.6.0"
-  },
-  "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
+  "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"."
 }

package/projenrc/auto-approve.ts

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { javascript } from "projen";
+import { JobPermission } from "projen/lib/github/workflows-model";
+
+/**
+ * Approves PRs with the "auto-approve" label
+ */
+export class AutoApprove {
+  constructor(project: javascript.NodeProject) {
+    const workflow = project.github?.addWorkflow("auto-approve");
+
+    if (!workflow) throw new Error("no workflow defined");
+
+    workflow.on({
+      pullRequest: {
+        types: ["opened", "labeled", "ready_for_review", "reopened"],
+      },
+    });
+
+    workflow.addJobs({
+      approve: {
+        runsOn: ["ubuntu-latest"],
+        if: "contains(github.event.pull_request.labels.*.name, 'auto-approve') && github.event.pull_request.draft == false",
+        steps: [
+          {
+            name: "Checkout PR",
+            uses: "actions/checkout@v3",
+            with: {
+              ref: "${{ github.event.pull_request.head.ref }}",
+              repository:
+                "${{ github.event.pull_request.head.repo.full_name }}",
+            },
+          },
+          {
+            name: "Auto-approve PRs by other users as team-tf-cdk",
+            if: "github.event.pull_request.user.login != 'team-tf-cdk'",
+            run: "gh pr review ${{ github.event.pull_request.number }} --approve",
+            env: {
+              GH_TOKEN: "${{ secrets.PROJEN_GITHUB_TOKEN }}",
+            },
+          },
+          {
+            name: "Auto-approve PRs by team-tf-cdk as github-actions[bot]",
+            if: "github.event.pull_request.user.login == 'team-tf-cdk'",
+            run: "gh pr review ${{ github.event.pull_request.number }} --approve",
+            env: {
+              GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}",
+            },
+          },
+        ],
+        permissions: {
+          contents: JobPermission.READ,
+          pullRequests: JobPermission.WRITE,
+        },
+      },
+    });
+  }
+}

package/projenrc/automerge.ts

@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { javascript } from "projen";
+import { JobPermission } from "projen/lib/github/workflows-model";
+
+/**
+ * Merges PRs with the "automerge" label
+ */
+export class Automerge {
+  constructor(project: javascript.NodeProject) {
+    const workflow = project.github?.addWorkflow("automerge");
+
+    if (!workflow) throw new Error("no workflow defined");
+
+    workflow.on({
+      pullRequest: {
+        types: [
+          "opened",
+          "labeled",
+          "ready_for_review",
+          "reopened",
+          "synchronize",
+        ],
+      },
+    });
+
+    (workflow.concurrency as any) = "${{ github.workflow }}-${{ github.ref }}";
+
+    workflow.addJobs({
+      automerge: {
+        runsOn: ["ubuntu-latest"],
+        if: "contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.draft == false",
+        steps: [
+          {
+            name: "Checkout",
+            uses: "actions/checkout@v3",
+          },
+          {
+            name: "Turn on automerge for this PR",
+            run: "gh pr merge --auto --squash ${{ github.event.pull_request.number }}",
+            env: {
+              GH_TOKEN: "${{ secrets.PROJEN_GITHUB_TOKEN }}",
+            },
+          },
+        ],
+        permissions: {
+          contents: JobPermission.READ,
+        },
+      },
+    });
+  }
+}

package/projenrc/customized-license.ts

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { IResolver, License } from "projen";
+import { TypeScriptProject } from "projen/lib/typescript";
+
+const SPDX = "MPL-2.0";
+
+export class CustomizedLicense extends License {
+  constructor(project: TypeScriptProject) {
+    super(project, { spdx: SPDX });
+
+    project.addFields({ license: SPDX });
+  }
+
+  synthesizeContent(resolver: IResolver) {
+    return (
+      "Copyright (c) 2022 HashiCorp, Inc.\n\n" +
+      super.synthesizeContent(resolver)
+    );
+  }
+}

package/projenrc/upgrade-cdktf.ts

@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { javascript } from "projen";
+import { JobPermission } from "projen/lib/github/workflows-model";
+
+/**
+ * Checks for new versions of CDKTF and creates a PR with an upgrade change if there are changes.
+ */
+export class UpgradeCDKTF {
+  constructor(project: javascript.NodeProject) {
+    const workflow = project.github?.addWorkflow("upgrade-cdktf");
+
+    if (!workflow) throw new Error("no workflow defined");
+
+    workflow.on({
+      schedule: [{ cron: "49 */6 * * *" }], // Runs four times a day
+      workflowDispatch: {}, // allow manual triggering
+    });
+
+    (workflow.concurrency as any) = "${{ github.workflow }}-${{ github.ref }}";
+
+    workflow.addJobs({
+      upgrade: {
+        name: "Upgrade CDKTF",
+        runsOn: ["ubuntu-latest"],
+        steps: [
+          {
+            name: "Checkout",
+            uses: "actions/checkout@v3",
+          },
+          {
+            name: "Install",
+            run: "yarn install",
+          },
+          {
+            name: "Get current CDKTF version",
+            id: "current_version",
+            run: [
+              `OLD_VERSION=$(npm list cdktf --depth=0 --json | jq -r '.dependencies.cdktf.version')`,
+              `OLD_VERSION_SHORT=$(cut -d "." -f 2 <<< "$OLD_VERSION")`,
+              `echo "value=$OLD_VERSION" >> $GITHUB_OUTPUT`,
+              `echo "short=$OLD_VERSION_SHORT" >> $GITHUB_OUTPUT`,
+            ].join("\n"),
+            // NOTE: No, there is no good way to do this in Yarn, until (if) we upgrade to Yarn 2+ (see below)
+          },
+          {
+            name: "Get latest CDKTF version",
+            id: "latest_version",
+            run: [
+              `CDKTF_VERSION=$(yarn info cdktf --json | jq -r '.data.version')`,
+              `CDKTF_VERSION_SHORT=$(cut -d "." -f 2 <<< "$CDKTF_VERSION")`,
+              `echo "value=$CDKTF_VERSION" >> $GITHUB_OUTPUT`,
+              `echo "short=$CDKTF_VERSION_SHORT" >> $GITHUB_OUTPUT`,
+            ].join("\n"),
+            // IMPORTANT: the above behavior changed in Yarn 2+; `yarn info` instead gives the version of the installed package
+            // If/when we upgrade we'll likely want to switch to `yarn npm info`: https://yarnpkg.com/cli/npm/info
+          },
+          {
+            name: "Run upgrade script",
+            if: "steps.current_version.outputs.short != steps.latest_version.outputs.short",
+            run: "scripts/update-cdktf.sh ${{ steps.latest_version.outputs.value }}",
+          },
+          {
+            name: "Create draft pull request",
+            if: "steps.current_version.outputs.short != steps.latest_version.outputs.short",
+            uses: "peter-evans/create-pull-request@v3",
+            with: {
+              "commit-message":
+                "chore!: upgrade to cdktf ${{ steps.latest_version.outputs.value }}",
+              branch:
+                "auto/upgrade-cdktf-${{ steps.latest_version.outputs.short }}",
+              base: "main",
+              title:
+                "chore!: upgrade to cdktf ${{ steps.latest_version.outputs.value }}",
+              body: [
+                "This PR initiates the upgrade of CDKTF from version `${{ steps.current_version.outputs.value }}` to version `${{ steps.latest_version.outputs.value }}`.",
+                "Unfortunately, not everything can be automated, and the following steps need to be completed manually:",
+                " ",
+                "- [ ] Update `@cdktf/tf-module-stack` to a version compatible with `cdktf@${{ steps.latest_version.outputs.value }}` [here](https://github.com/cdktf/projen-cdktf-hybrid-construct/blob/ad6fff04398e309fa5f09e12b1c658f1a51937d5/src/hybrid-module.ts#L194). Look up the version [here](https://www.npmjs.com/package/@cdktf/tf-module-stack?activeTab=versions).",
+                "- [ ] Run `npx projen build`",
+                " ",
+                "Please checkout this PR, complete the above steps, push the changes to this branch, and then mark this PR as ready for review to complete the upgrade. Thanks!",
+              ].join("\n"),
+              labels: "automerge,auto-approve,dependencies",
+              token: "${{ secrets.PROJEN_GITHUB_TOKEN }}",
+              author: "team-tf-cdk <github-team-tf-cdk@hashicorp.com>",
+              committer: "team-tf-cdk <github-team-tf-cdk@hashicorp.com>",
+              signoff: true,
+              "delete-branch": true,
+              draft: true,
+            },
+          },
+        ],
+        env: {
+          CI: "true",
+          CHECKPOINT_DISABLE: "1",
+        },
+        permissions: {
+          contents: JobPermission.READ,
+        },
+      },
+    });
+  }
+}

package/scripts/update-cdktf.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+set -ex
+
+PROJECT_ROOT=$(cd "$(dirname "${BASH_SOURCE:-$0}")/.." && pwd)
+CDKTF_VERSION=$1
+
+if [ -z "$CDKTF_VERSION" ]; then
+  echo "Usage: $0 <cdktf-version>"
+  exit 1
+fi
+
+echo "Updating /src cdktf version to $CDKTF_VERSION"
+yarn
+find ./src -type f -name "*.ts" -print0 | xargs -0 sed -i "s/const cdktfVersion = options.cdktfVersion || \".*\"/const cdktfVersion = options.cdktfVersion || \"$CDKTF_VERSION\"/"
+# @TODO This is a hack and will stop working when CDKTF goes 1.0
+find ./src -type f -name "*.ts" -print0 | xargs -0 sed -i "s/@default \"0\..*\"/@default \"$CDKTF_VERSION\"/"
+
+echo "Updating README"
+sed -i 's/`cdktf` >= .*/`cdktf` >= '"$CDKTF_VERSION"'/' "$PROJECT_ROOT/README.md"
+
+npx projen build
+
+echo "Updating examples"
+# Loop through all examples and update the cdktf version
+for example in $(find "$PROJECT_ROOT/examples" -mindepth 1 -maxdepth 1 -type d); do
+  echo "Updating example $example"
+  cd "$example"
+  yarn
+  sed -i "s/cdktfVersion: \".*\",/cdktfVersion: \"$CDKTF_VERSION\",/" ./.projenrc.ts
+  CI=0 npx projen
+done
+
+echo "Done"