From 7e3831279dcd97f2b95315afcac0bd762d031db1 Mon Sep 17 00:00:00 2001
From: Jesse Szwedko <jesse@szwedko.me>
Date: Fri, 30 Jun 2023 16:22:19 -0700
Subject: [PATCH] Revert "chore(ci): fix gardener issues comment workflow
 (#17825)"

This reverts commit 47c3da1f21d3cc3d4af09d321ae3754972e0a150.
---
 .github/workflows/gardener_issue_comment.yml | 57 ++++++++++----------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/gardener_issue_comment.yml b/.github/workflows/gardener_issue_comment.yml
index 18ee687a44b17..8ea89fb315145 100644
--- a/.github/workflows/gardener_issue_comment.yml
+++ b/.github/workflows/gardener_issue_comment.yml
@@ -26,44 +26,45 @@ jobs:
           status_field_id="PVTF_lADOAQFeYs4AAsTrzgAXRuU" # Status
           triage_option_id="2a08fafa"
 
-          # Query for project items for the given issue
-          project_items="$(gh api graphql -f query='
-            query($item_id: ID!) {
-              node(id: $item_id) {
-                ... on Issue {
-                  projectItems(first: 50) {
-                    ... on ProjectV2ItemConnection {
-                      nodes {
-                        fieldValueByName(name: "Status") {
-                          ... on ProjectV2ItemFieldSingleSelectValue {
-                            name
-                          }
-                        }
-                        ... on ProjectV2Item {
-                          project {
-                            ... on ProjectV2 {
-                              id
-                            }
-                          }
-                        }
-                      }
-                    }
+          # ensures that the issue is already on board but also seems to be the only way to fetch
+          # the item id
+          item_id="$(gh api graphql -f query='
+            mutation($project_id: ID!, $content_id: ID!) {
+                addProjectV2ItemById(input: {projectId: $project_id, contentId: $content_id}) {
+                  item {
+                    id
                   }
                 }
-              }
-            }' -f item_id="$issue_id"
+            }' -f project_id="$project_id" -f content_id="$issue_id" -q '.data.addProjectV2ItemById.item.id'
           )"
 
-          # Extract the item in the Gardener project
-          current_status=$(echo $project_items | jq -r '.data.node.projectItems.nodes[] | select(.project.id == $project_id) | .fieldValueByName.name')
+          echo "item_id: $item_id"
 
-          if [ -z "$current_status" ] ; then
+          if [ -z "$item_id" ] ; then
             echo "Issue not found in Gardener board"
             exit 0
           else
-            echo "Found issue on Gardener board. Current issue status is: '${current_status}'"
+            echo "Found issue on Gardener board"
           fi
 
+          current_status="$(gh api graphql -f query='
+            query($item_id: ID!) {
+              node(id: $item_id) {
+                ... on ProjectV2Item {
+                  fieldValueByName(name: "Status") {
+                    ... on ProjectV2ItemFieldSingleSelectValue {
+                      name
+                    }
+                  }
+                }
+              }
+            }' -f item_id="$item_id"
+          )"
+
+          current_status=$(echo $current_status | jq -c -r '.["data"]["node"]["fieldValueByName"]["name"]')
+
+          echo "Current issue status is: '${current_status}'"
+
           if [ "$current_status" = "Blocked / Waiting" ] ; then
             echo "Moving issue from 'Blocked / Waiting' to 'Triage'"
             gh api graphql -f query='