projen-cdktf-hybrid-construct 0.3.2 → 0.3.3

package/.copywrite.hcl

@@ -0,0 +1,22 @@
+schema_version = 1
+
+project {
+  license        = "MPL-2.0"
+  copyright_year = 2022
+
+  # (OPTIONAL) A list of globs that should not have copyright/license headers.
+  # Supports doublestar glob patterns for more flexibility in defining which
+  # files or folders should be ignored
+  header_ignore = [
+    # "vendors/**",
+    # "**autogen**",
+    "**/node_modules/**",
+    "**/.mergify.yml",
+    "**/.github/workflows/*.yml",
+    "**/coverage/**",
+    "**/test-reports/**",
+    "**/dist/**",
+    "examples/**", # this probably should have the headers, but I'm tired of fighting Projen
+    "test/helper.ts",
+  ]
+}

package/.gitattributes

@@ -1,17 +1,18 @@
-# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen".
 
 *.snap linguist-generated
 /.eslintrc.json linguist-generated
 /.gitattributes linguist-generated
 /.github/pull_request_template.md linguist-generated
 /.github/workflows/auto-approve.yml linguist-generated
+/.github/workflows/automerge.yml linguist-generated
 /.github/workflows/build.yml linguist-generated
 /.github/workflows/pull-request-lint.yml linguist-generated
 /.github/workflows/release.yml linguist-generated
 /.github/workflows/upgrade-main.yml linguist-generated
 /.gitignore linguist-generated
-/.mergify.yml linguist-generated
 /.npmignore linguist-generated
+/.npmrc linguist-generated
 /.prettierignore linguist-generated
 /.prettierrc.json linguist-generated
 /.projen/** linguist-generated

package/.jsii

@@ -11,7 +11,7 @@
     "change-case": "^4.1.2"
   },
   "dependencies": {
-    "projen": ">= 0.63.25"
+    "projen": ">= 0.72.18"
   },
   "dependencyClosure": {
     "projen": {
@@ -59,7 +59,7 @@
     "stability": "stable"
   },
   "homepage": "https://github.com/cdktf/projen-cdktf-hybrid-construct.git",
-  "jsiiVersion": "1.63.2 (build a8a8833)",
+  "jsiiVersion": "5.1.11 (build 1dfe48d)",
   "license": "MPL-2.0",
   "metadata": {
     "jsii": {
@@ -94,7 +94,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/hybrid-module.ts",
-        "line": 6
+        "line": 11
       },
       "name": "ConstructExamplesOption",
       "properties": [
@@ -106,7 +106,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 8
+            "line": 13
           },
           "name": "enabled",
           "type": {
@@ -121,7 +121,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 10
+            "line": 15
           },
           "name": "folder",
           "optional": true,
@@ -149,7 +149,7 @@
         },
         "locationInModule": {
           "filename": "src/hybrid-module.ts",
-          "line": 166
+          "line": 171
         },
         "parameters": [
           {
@@ -163,7 +163,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/hybrid-module.ts",
-        "line": 165
+        "line": 170
       },
       "name": "HybridModule",
       "symbolId": "src/hybrid-module:HybridModule"
@@ -181,7 +181,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/hybrid-module.ts",
-        "line": 24
+        "line": 29
       },
       "name": "HybridModuleOptions",
       "properties": [
@@ -198,7 +198,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 30
+            "line": 35
           },
           "name": "cdktfVersion",
           "optional": true,
@@ -219,7 +219,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 50
+            "line": 55
           },
           "name": "constructExamples",
           "optional": true,
@@ -237,7 +237,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 36
+            "line": 41
           },
           "name": "constructVersion",
           "optional": true,
@@ -254,7 +254,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 57
+            "line": 62
           },
           "name": "projectId",
           "optional": true,
@@ -271,7 +271,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 62
+            "line": 67
           },
           "name": "runPlan",
           "optional": true,
@@ -292,7 +292,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 43
+            "line": 48
           },
           "name": "terraformExamples",
           "optional": true,
@@ -313,7 +313,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/hybrid-module.ts",
-        "line": 13
+        "line": 18
       },
       "name": "TerraformExamplesOption",
       "properties": [
@@ -325,7 +325,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 15
+            "line": 20
           },
           "name": "enabled",
           "type": {
@@ -340,7 +340,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 21
+            "line": 26
           },
           "name": "exampleCode",
           "optional": true,
@@ -356,7 +356,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 17
+            "line": 22
           },
           "name": "folder",
           "optional": true,
@@ -372,7 +372,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/hybrid-module.ts",
-            "line": 19
+            "line": 24
           },
           "name": "providerConfig",
           "optional": true,
@@ -400,7 +400,7 @@
         },
         "locationInModule": {
           "filename": "src/terraform-module.ts",
-          "line": 50
+          "line": 55
         },
         "parameters": [
           {
@@ -414,7 +414,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "src/terraform-module.ts",
-        "line": 49
+        "line": 54
       },
       "name": "TerraformModule",
       "symbolId": "src/terraform-module:TerraformModule"
@@ -432,7 +432,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/terraform-module.ts",
-        "line": 15
+        "line": 20
       },
       "name": "TerraformModuleOptions",
       "properties": [
@@ -448,7 +448,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 38
+            "line": 43
           },
           "name": "terraformModules",
           "type": {
@@ -473,7 +473,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 21
+            "line": 26
           },
           "name": "cdktfVersion",
           "optional": true,
@@ -491,7 +491,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 27
+            "line": 32
           },
           "name": "constructVersion",
           "optional": true,
@@ -507,7 +507,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 41
+            "line": 46
           },
           "name": "projectId",
           "optional": true,
@@ -524,7 +524,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 32
+            "line": 37
           },
           "name": "terraformProviders",
           "optional": true,
@@ -550,7 +550,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "src/terraform-module.ts",
-        "line": 6
+        "line": 11
       },
       "name": "TerraformVersionConstraint",
       "properties": [
@@ -562,7 +562,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 8
+            "line": 13
           },
           "name": "name",
           "type": {
@@ -577,7 +577,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 10
+            "line": 15
           },
           "name": "source",
           "type": {
@@ -592,7 +592,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "src/terraform-module.ts",
-            "line": 12
+            "line": 17
           },
           "name": "version",
           "type": {
@@ -603,6 +603,6 @@
       "symbolId": "src/terraform-module:TerraformVersionConstraint"
     }
   },
-  "version": "0.3.2",
-  "fingerprint": "bZ7Q7d5l37hbr5e8SjbMPOYcJFRyKhSvsjcOJ8Rdd+E="
+  "version": "0.3.3",
+  "fingerprint": "cy4yWPaPy4Kq4VzFFOeNhUPtwSEtmeJdCgcdeClKU+I="
 }

package/.prettierignore

@@ -1 +1 @@
-# ~~ 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.ts

@@ -1,26 +1,26 @@
-import { IResolver, License } from "projen";
-import { JsiiProject } from "projen/lib/cdk";
-import { NpmAccess } from "projen/lib/javascript";
-import { TypeScriptProject } from "projen/lib/typescript";
-
-const SPDX = "MPL-2.0";
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
 
-class CustomizedLicense extends License {
-  constructor(project: TypeScriptProject) {
-    super(project, { spdx: SPDX });
+import { JsiiProject } from "projen/lib/cdk";
+import { NpmAccess, UpgradeDependenciesSchedule } from "projen/lib/javascript";
+import { AutoApprove } from "./projenrc/auto-approve";
+import { Automerge } from "./projenrc/automerge";
+import { CustomizedLicense } from "./projenrc/customized-license";
 
-    project.addFields({ license: SPDX });
-  }
+const name = "projen-cdktf-hybrid-construct";
 
-  synthesizeContent(resolver: IResolver) {
-    return (
-      "Copyright (c) 2022 HashiCorp, Inc.\n\n" +
-      super.synthesizeContent(resolver)
-    );
-  }
-}
+const githubActionPinnedVersions = {
+  "actions/checkout": "c85c95e3d7251135ab7dc9ce3241c5835cc595a9", // v3.5.3
+  "actions/download-artifact": "9bc31d5ccc31df68ecc42ccf4149144866c47d8a", // v3.0.2
+  "actions/setup-node": "64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c", // v3.6.0
+  "actions/upload-artifact": "0b7f8abb1508181956e8e162db84b466c27e18ce", // v3.1.2
+  "amannn/action-semantic-pull-request":
+    "c3cd5d1ea3580753008872425915e343e351ab54", // v5.2.0
+  "peter-evans/create-pull-request": "284f54f989303d2699d373481a0cfa13ad5a6666", // v5.0.1
+};
 
-const name = "projen-cdktf-hybrid-construct";
 const project = new JsiiProject({
   defaultReleaseBranch: "main",
   name,
@@ -37,34 +37,41 @@ const project = new JsiiProject({
   release: true,
   releaseToNpm: true,
   npmAccess: NpmAccess.PUBLIC,
-  autoApproveUpgrades: true,
-  autoApproveOptions: {
-    label: "auto-approve",
-    allowedUsernames: ["DanielMSchmidt", "github-bot"],
+  mergify: false,
+  depsUpgradeOptions: {
+    workflowOptions: {
+      labels: ["auto-approve", "automerge", "dependencies"],
+      schedule: UpgradeDependenciesSchedule.WEEKLY,
+    },
   },
   gitignore: [".idea/"],
   workflowGitIdentity: {
     name: "team-tf-cdk",
     email: "github-team-tf-cdk@hashicorp.com",
   },
+  jsiiVersion: "^5.1.0",
 });
 project.tsconfig?.exclude?.push("src/exampleCode/**");
 project.tsconfig?.exclude?.push("example/**");
 project.tsconfig?.exclude?.push("examples/**");
 
-project.addPeerDeps("projen@>= 0.63.25");
+project.addPeerDeps("projen@>= 0.72.18");
 project.addBundledDeps("change-case");
 project.addDevDeps(
   "fs-extra",
   "glob",
-  "projen@0.63.25",
+  "projen@^0.72.18",
   "@types/fs-extra",
   "@types/glob",
   "@types/change-case",
-  "ts-node@10.9.1"
+  "ts-node@10.9.1",
+  "jsii-docgen@^9.0.0",
+  "comment-json"
 );
 
 new CustomizedLicense(project);
+new AutoApprove(project);
+new Automerge(project);
 
 project.addPackageIgnore("examples");
 
@@ -75,11 +82,39 @@ project.addTask("buildExample:hybrid", {
   exec: "git clean -dfx . && rm -rf lib modules src terraform construct-examples && yarn && yarn projen && yarn && yarn build",
   cwd: "./examples/hybrid-module",
 });
-
 project.addTask("buildExample:terraform", {
   exec: "git clean -dfx . && rm -rf lib modules src terraform construct-examples && yarn && yarn projen && yarn && yarn build",
   cwd: "./examples/terraform-module",
 });
 
+project.addTask("upgrade:hybrid", {
+  exec: "yarn projen upgrade",
+  cwd: "./examples/hybrid-module",
+});
+project.addTask("upgrade:terraform", {
+  exec: "yarn projen upgrade",
+  cwd: "./examples/terraform-module",
+});
+project.removeTask("post-upgrade");
+project.addTask("post-upgrade", {
+  description: "Runs after upgrading dependencies",
+  exec: "yarn projen upgrade:hybrid && yarn projen upgrade:terraform",
+});
+
 project.testTask.exec("yarn buildExample");
+
+// Run copywrite tool to add copyright headers to all files
+project.buildWorkflow?.addPostBuildSteps(
+  {
+    name: "Setup Copywrite tool",
+    uses: "hashicorp/setup-copywrite@867a1a2a064a0626db322392806428f7dc59cb3e", // v1.1.2
+  },
+  { name: "Add headers using Copywrite tool", run: "copywrite headers" }
+);
+
+// Use pinned versions of github actions
+Object.entries(githubActionPinnedVersions).forEach(([action, sha]) => {
+  project.github?.actions.set(action, `${action}@${sha}`);
+});
+
 project.synth();