From 70dcdc8a6aaf0e597206d88e81d9ffa29172c6ad Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 12:10:17 +0100
Subject: [PATCH 1/9] chore: run yarn upgrade per package

---
 .github/workflows/yarn-upgrade.yml | 135 +++++++++++++++++++++++++----
 1 file changed, 120 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index fcc1587ef6..b77bffab0c 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -6,8 +6,16 @@ on:
     - cron: 37 13 * * 1
   workflow_dispatch: {}
 
+# We special-case @types/node because we want to stay on the current major (minimum supported node release)
+# We special-case @types/fs-extra because the current major (9.x) is broken with @types/node >= 10
+# We special-case typescript because it's not semantically versioned
+# We special-case constructs because we want to stay in control of the minimum compatible version
+# We special-case lerna because we have a patch on it that stops applying if Lerna upgrades. Remove this once https://github.com/lerna/lerna/pull/2874 releases.
+# We special-case graphology-types because the newer version has type definitions that are not compatible with our typescript version.
+# We special-case @types/prettier because the underlying TS types aren't supported by our TS version anymore since prettier v2.6.1
+
 jobs:
-  upgrade:
+  upgradeRoot:
     name: Yarn Upgrade
     permissions:
       contents: read
@@ -38,22 +46,12 @@ jobs:
         run: |-
           echo "list=$(node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')")" >> $GITHUB_OUTPUT
       - name: Run "ncu -u"
-        # We special-case @types/node because we want to stay on the current major (minimum supported node release)
-        # We special-case @types/fs-extra because the current major (9.x) is broken with @types/node >= 10
-        # We special-case typescript because it's not semantically versioned
-        # We special-case constructs because we want to stay in control of the minimum compatible version
-        # We special-case lerna because we have a patch on it that stops applying if Lerna upgrades. Remove this once https://github.com/lerna/lerna/pull/2874 releases.
-        # We special-case graphology-types because the newer version has type definitions that are not compatible with our typescript version.
-        # We special-case @types/prettier because the underlying TS types aren't supported by our TS version anymore since prettier v2.6.1
         run: |-
           # Upgrade dependencies at repository root
           ncu --upgrade --filter=@types/node,@types/fs-extra --target=minor
           ncu --upgrade --filter=typescript --target=patch
           ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,typescript,lerna,@types/prettier --target=minor
-          # Upgrade all the packages
-          lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
-          lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
-          lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,graphology-types,${{ steps.list-packages.outputs.list }}'  --target=minor
+
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
       - name: Run "yarn install"
         run: yarn install --prefer-offline
@@ -73,9 +71,9 @@ jobs:
           name: upgrade.patch
           path: ./upgrade.patch
 
-  pr:
-    name: Create Pull Request
-    needs: upgrade
+  prRoot:
+    name: Create Pull Request Root
+    needs: upgradeRoot
     runs-on: ubuntu-latest
     steps:
       - name: Check Out
@@ -107,3 +105,110 @@ jobs:
           labels: dependencies,auto-approve,ci/run-all
           team-reviewers: cdktf
           token: ${{ secrets.TERRAFORM_CDK_PUSH_GITHUB_TOKEN }}
+
+  upgradePackage:
+    name: Yarn Upgrade
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    container:
+      image: docker.mirror.hashicorp.services/hashicorp/jsii-terraform
+    strategy:
+      fail-fast: false
+      matrix:
+        package:
+          [
+            cdktf,
+            cdktf-cli,
+            "@cdktf/hcl2cdk",
+            "@cdktf/hcl2json",
+            "@cdktf/provider-schema",
+            "@cdktf/provider-generator",
+            "@cdktf/commons",
+            "@cdktf/cli-core",
+          ]
+    outputs:
+      package: ${{matrix.package}}
+    steps:
+      - name: Check Out
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - name: Get yarn cache directory path
+        id: global-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+        with:
+          path: ${{ steps.global-cache-dir-path.outputs.dir }}
+          key: yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-upgrade
+          restore-keys: |
+            yarn-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-
+            yarn-${{ runner.os }}-
+      - name: ensure correct user
+        run: chown -R root /__w/terraform-cdk
+      - name: Install Tools
+        run: |-
+          npm -g install lerna npm-check-updates@^9.0.0
+      - name: List Mono-Repo Packages
+        id: list-packages
+        # These need to be ignored from the `ncu` runs!
+        run: |-
+          echo "list=$(node -p "$(lerna ls --all --json 2>/dev/null).map(item => item.name).join(',')")" >> $GITHUB_OUTPUT
+      - name: Run "ncu -u"
+        run: |-
+          # Upgrade all the packages
+          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
+          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --filter=typescript --target=patch
+          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,graphology-types,${{ steps.list-packages.outputs.list }}'  --target=minor
+      # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
+      - name: Run "yarn install"
+        run: yarn install --prefer-offline
+
+      - name: Run "yarn upgrade"
+        run: yarn upgrade
+
+      # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
+      # Creating a pull request requires write permissions and it's best to keep write privileges isolated.
+      - name: Create Patch
+        run: |-
+          git add .
+          git diff --patch --staged > ./upgrade.patch
+      - name: Upload Patch
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        id: patch
+        with:
+          name: upgrade-${{ matrix.package }}.patch
+          path: ./upgrade.patch
+
+  prPackage:
+    name: Create Pull Request Root
+    needs: upgradePackage
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+
+      - name: Download patch
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: upgrade-${{needs.upgradePackage.outputs.package}}.patch
+
+      - name: Apply patch
+        run: '[ -s ./upgrade.patch ] && git apply ./upgrade.patch || echo "Empty patch. Skipping."'
+
+      - name: Remove patch file
+        run: '[ -s ./upgrade.patch ] && rm ./upgrade.patch || echo "Empty patch. Skipping."'
+
+      - name: Make Pull Request
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
+        with:
+          # Git commit details
+          branch: automation/yarn-upgrade
+          commit-message: |-
+            chore(${{needs.upgradePackage.outputs.package}}): npm-check-updates && yarn upgrade
+            Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
+          # Pull Request details
+          title: "chore(${{needs.upgradePackage.outputs.package}}): npm-check-updates && yarn upgrade"
+          body: |-
+            Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
+          labels: dependencies,auto-approve,ci/run-all
+          team-reviewers: cdktf
+          token: ${{ secrets.TERRAFORM_CDK_PUSH_GITHUB_TOKEN }}

From e610b2589bbd11742aee94b1d187a7e058a4242f Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 14:03:16 +0100
Subject: [PATCH 2/9] chore: fix patch name conflicts

---
 .github/workflows/yarn-upgrade.yml | 52 +++++++++++++++++-------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index b77bffab0c..986a3ac0cd 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   upgradeRoot:
-    name: Yarn Upgrade
+    name: Yarn Upgrade Root
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -107,7 +107,7 @@ jobs:
           token: ${{ secrets.TERRAFORM_CDK_PUSH_GITHUB_TOKEN }}
 
   upgradePackage:
-    name: Yarn Upgrade
+    name: Yarn Upgrade Package
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -117,18 +117,26 @@ jobs:
       fail-fast: false
       matrix:
         package:
-          [
-            cdktf,
-            cdktf-cli,
-            "@cdktf/hcl2cdk",
-            "@cdktf/hcl2json",
-            "@cdktf/provider-schema",
-            "@cdktf/provider-generator",
-            "@cdktf/commons",
-            "@cdktf/cli-core",
-          ]
+          - name: cdktf
+            patchName: cdktf
+          - name: cdktf-cli
+            patchName: cdktf-cli
+          - name: "@cdktf/hcl2cdk"
+            patchName: "hcl2cdk"
+          - name: "@cdktf/hcl2json"
+            patchName: "hcl2json"
+          - name: "@cdktf/provider-schema"
+            patchName: "provider-schema"
+          - name: "@cdktf/provider-generator"
+            patchName: "provider-generator"
+          - name: "@cdktf/commons"
+            patchName: "commons"
+          - name: "@cdktf/cli-core"
+            patchName: "cli-core"
+
     outputs:
-      package: ${{matrix.package}}
+      packageName: ${{matrix.package.name}}
+      packagePatchName: ${{matrix.package.patchName}}
     steps:
       - name: Check Out
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
@@ -155,9 +163,9 @@ jobs:
       - name: Run "ncu -u"
         run: |-
           # Upgrade all the packages
-          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
-          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --filter=typescript --target=patch
-          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,graphology-types,${{ steps.list-packages.outputs.list }}'  --target=minor
+          lerna exec --scope '${{ matrix.package.name }}' ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
+          lerna exec --scope '${{ matrix.package.name }}' ncu -- --upgrade --filter=typescript --target=patch
+          lerna exec --scope '${{ matrix.package.name }}' ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,graphology-types,${{ steps.list-packages.outputs.list }}'  --target=minor
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
       - name: Run "yarn install"
         run: yarn install --prefer-offline
@@ -175,11 +183,11 @@ jobs:
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         id: patch
         with:
-          name: upgrade-${{ matrix.package }}.patch
+          name: upgrade-${{ matrix.package.patchName }}.patch
           path: ./upgrade.patch
 
   prPackage:
-    name: Create Pull Request Root
+    name: Create Pull Request Package
     needs: upgradePackage
     runs-on: ubuntu-latest
     steps:
@@ -189,7 +197,7 @@ jobs:
       - name: Download patch
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
-          name: upgrade-${{needs.upgradePackage.outputs.package}}.patch
+          name: upgrade-${{needs.upgradePackage.outputs.packagePatchName}}.patch
 
       - name: Apply patch
         run: '[ -s ./upgrade.patch ] && git apply ./upgrade.patch || echo "Empty patch. Skipping."'
@@ -203,12 +211,12 @@ jobs:
           # Git commit details
           branch: automation/yarn-upgrade
           commit-message: |-
-            chore(${{needs.upgradePackage.outputs.package}}): npm-check-updates && yarn upgrade
+            chore(${{needs.upgradePackage.outputs.packageName}}): npm-check-updates && yarn upgrade
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
           # Pull Request details
-          title: "chore(${{needs.upgradePackage.outputs.package}}): npm-check-updates && yarn upgrade"
+          title: "chore(${{needs.upgradePackage.outputs.packageName}}): npm-check-updates && yarn upgrade"
           body: |-
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
-          labels: dependencies,auto-approve,ci/run-all
+          labels: dependencies,auto-approve
           team-reviewers: cdktf
           token: ${{ secrets.TERRAFORM_CDK_PUSH_GITHUB_TOKEN }}

From e9f2130dd258a24efd4a5a25bed90c9ec61dae00 Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 14:15:43 +0100
Subject: [PATCH 3/9] chore: move PR creation into main workflow

---
 .github/workflows/yarn-upgrade.yml | 66 ++++++------------------------
 1 file changed, 12 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 986a3ac0cd..087b97b7ae 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -117,26 +117,16 @@ jobs:
       fail-fast: false
       matrix:
         package:
-          - name: cdktf
-            patchName: cdktf
-          - name: cdktf-cli
-            patchName: cdktf-cli
-          - name: "@cdktf/hcl2cdk"
-            patchName: "hcl2cdk"
-          - name: "@cdktf/hcl2json"
-            patchName: "hcl2json"
-          - name: "@cdktf/provider-schema"
-            patchName: "provider-schema"
-          - name: "@cdktf/provider-generator"
-            patchName: "provider-generator"
-          - name: "@cdktf/commons"
-            patchName: "commons"
-          - name: "@cdktf/cli-core"
-            patchName: "cli-core"
-
-    outputs:
-      packageName: ${{matrix.package.name}}
-      packagePatchName: ${{matrix.package.patchName}}
+          [
+            cdktf,
+            cdktf-cli,
+            "@cdktf/hcl2cdk",
+            "@cdktf/hcl2json",
+            "@cdktf/provider-schema",
+            "@cdktf/provider-generator",
+            "@cdktf/commons",
+            "@cdktf/cli-core",
+          ]
     steps:
       - name: Check Out
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
@@ -173,48 +163,16 @@ jobs:
       - name: Run "yarn upgrade"
         run: yarn upgrade
 
-      # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
-      # Creating a pull request requires write permissions and it's best to keep write privileges isolated.
-      - name: Create Patch
-        run: |-
-          git add .
-          git diff --patch --staged > ./upgrade.patch
-      - name: Upload Patch
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-        id: patch
-        with:
-          name: upgrade-${{ matrix.package.patchName }}.patch
-          path: ./upgrade.patch
-
-  prPackage:
-    name: Create Pull Request Package
-    needs: upgradePackage
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
-      - name: Download patch
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: upgrade-${{needs.upgradePackage.outputs.packagePatchName}}.patch
-
-      - name: Apply patch
-        run: '[ -s ./upgrade.patch ] && git apply ./upgrade.patch || echo "Empty patch. Skipping."'
-
-      - name: Remove patch file
-        run: '[ -s ./upgrade.patch ] && rm ./upgrade.patch || echo "Empty patch. Skipping."'
-
       - name: Make Pull Request
         uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
         with:
           # Git commit details
           branch: automation/yarn-upgrade
           commit-message: |-
-            chore(${{needs.upgradePackage.outputs.packageName}}): npm-check-updates && yarn upgrade
+            chore(${{matrix.package.name}}): npm-check-updates && yarn upgrade
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
           # Pull Request details
-          title: "chore(${{needs.upgradePackage.outputs.packageName}}): npm-check-updates && yarn upgrade"
+          title: "chore(${{matrix.package.name}}): npm-check-updates && yarn upgrade"
           body: |-
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
           labels: dependencies,auto-approve

From 6b195b9b1f31ac1bd762559ee2c7aba3c71efd66 Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 14:16:48 +0100
Subject: [PATCH 4/9] chore: use matrix name as branch name

---
 .github/workflows/yarn-upgrade.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 087b97b7ae..d5d6017f6f 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -167,7 +167,7 @@ jobs:
         uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
         with:
           # Git commit details
-          branch: automation/yarn-upgrade
+          branch: automation/yarn-upgrade-${{ matrix.package.name }}
           commit-message: |-
             chore(${{matrix.package.name}}): npm-check-updates && yarn upgrade
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.

From b57541e8795521155c4fc59dc416445ea2354d41 Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 15:05:37 +0100
Subject: [PATCH 5/9] chore: set the author

---
 .github/workflows/yarn-upgrade.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index d5d6017f6f..e7d51e23e4 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -178,3 +178,4 @@ jobs:
           labels: dependencies,auto-approve
           team-reviewers: cdktf
           token: ${{ secrets.TERRAFORM_CDK_PUSH_GITHUB_TOKEN }}
+          author: team-tf-cdk <github-team-tf-cdk@hashicorp.com>

From 6e2ed255551f81d5851286260bd78264ecfec481 Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 15:43:38 +0100
Subject: [PATCH 6/9] chore: set git identity

---
 .github/workflows/yarn-upgrade.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index e7d51e23e4..0eee63e5ae 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -163,6 +163,11 @@ jobs:
       - name: Run "yarn upgrade"
         run: yarn upgrade
 
+      - name: Set git identity
+        run: |-
+          git config --global user.email "github-team-tf-cdk@hashicorp.com"
+          git config --global user.name "team-tf-cdk"
+
       - name: Make Pull Request
         uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
         with:

From bec15435e96e8c0afe15187e7c8abb3295efe0e3 Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 15:47:02 +0100
Subject: [PATCH 7/9] chore: use package name

---
 .github/workflows/yarn-upgrade.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 0eee63e5ae..348beea19f 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -172,12 +172,12 @@ jobs:
         uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
         with:
           # Git commit details
-          branch: automation/yarn-upgrade-${{ matrix.package.name }}
+          branch: automation/yarn-upgrade-${{ matrix.package }}
           commit-message: |-
-            chore(${{matrix.package.name}}): npm-check-updates && yarn upgrade
+            chore(${{matrix.package}}): npm-check-updates && yarn upgrade
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
           # Pull Request details
-          title: "chore(${{matrix.package.name}}): npm-check-updates && yarn upgrade"
+          title: "chore(${{matrix.package}}): npm-check-updates && yarn upgrade"
           body: |-
             Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
           labels: dependencies,auto-approve

From 259900cf55ced66b5896db3689172eaf39f2c5fb Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 2 Nov 2023 16:32:58 +0100
Subject: [PATCH 8/9] chore: use correct scope

---
 .github/workflows/yarn-upgrade.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 348beea19f..ed8d5ff6ef 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -153,9 +153,9 @@ jobs:
       - name: Run "ncu -u"
         run: |-
           # Upgrade all the packages
-          lerna exec --scope '${{ matrix.package.name }}' ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
-          lerna exec --scope '${{ matrix.package.name }}' ncu -- --upgrade --filter=typescript --target=patch
-          lerna exec --scope '${{ matrix.package.name }}' ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,graphology-types,${{ steps.list-packages.outputs.list }}'  --target=minor
+          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
+          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --filter=typescript --target=patch
+          lerna exec --scope '${{ matrix.package }}' ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,graphology-types,${{ steps.list-packages.outputs.list }}'  --target=minor
       # This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn upgrade" to run)
       - name: Run "yarn install"
         run: yarn install --prefer-offline

From f06e4c16c5a200c48b7af85c74e78ab40ff0f78e Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Fri, 3 Nov 2023 14:17:52 +0100
Subject: [PATCH 9/9] chore: remove yarn upgrade step

---
 .github/workflows/yarn-upgrade.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index ed8d5ff6ef..874d095d39 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -56,9 +56,6 @@ jobs:
       - name: Run "yarn install"
         run: yarn install --prefer-offline
 
-      - name: Run "yarn upgrade"
-        run: yarn upgrade
-
       # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
       # Creating a pull request requires write permissions and it's best to keep write privileges isolated.
       - name: Create Patch
@@ -160,9 +157,6 @@ jobs:
       - name: Run "yarn install"
         run: yarn install --prefer-offline
 
-      - name: Run "yarn upgrade"
-        run: yarn upgrade
-
       - name: Set git identity
         run: |-
           git config --global user.email "github-team-tf-cdk@hashicorp.com"