triage automation updates (#1754)

Azure · Dec 13, 2024 · 5c64ce3 · 5c64ce3
1 parent 06d650a
commit 5c64ce3
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 52 deletions.
diff --git a/.github/policies/eventResponder.yml b/.github/policies/eventResponder.yml
@@ -54,7 +54,7 @@ configuration:
               label: "Status: Won't Fix :broken_heart:"
           - closeIssue
 
-      - description: 'ITA11 - When a reply from anyone to an issue occurs, remove the "Needs: Author Feedback :ear:" label and label with "Needs: Attention :wave:"'
+      - description: 'ITA11 - When the author replies, remove the "Needs: Author Feedback :ear:" label and label with "Needs: Attention :wave:"'
         if:
           - or:
               - payloadType: Pull_Request_Review_Comment
@@ -64,9 +64,13 @@ configuration:
                 action: Closed
           - hasLabel:
               label: "Needs: Author Feedback :ear:"
+          - isActivitySender:
+              issueAuthor: true
         then:
           - removeLabel:
               label: "Needs: Author Feedback :ear:"
+          - removeLabel:
+              label: "Status: No Recent Activity :zzz:"
           - addLabel:
               label: "Needs: Attention :wave:"
 

diff --git a/.github/policies/scheduledSearches.yml b/.github/policies/scheduledSearches.yml
@@ -7,12 +7,11 @@ disabled: false
 configuration:
   resourceManagementConfiguration:
     scheduledSearches:
-      - description: "ITA04 - Label issues that have been marked as requiring author feedback but have not had any activity for 4 days."
+      - description: "ITA04 - Label issues and PRs that have been marked as requiring author feedback but have not had any activity for 4 days."
         frequencies:
           - hourly:
               hour: 3
         filters:
-          - isIssue
           - isOpen
           - hasLabel:
               label: "Needs: Author Feedback :ear:"
@@ -34,55 +33,55 @@ configuration:
                 >   - The "Status: No Recent Activity :zzz:" label must be removed.
                 >   - If applicable, the "Status: Long Term :hourglass_flowing_sand:" or the "Needs: Module Owner :mega:" label must be added.
 
-      - description: 'ITA05A - Close issues that have been marked as requiring author feedback but have not had any activity for 3 days, unless it''s been marked with the "Status long term" label.'
-        frequencies:
-          - hourly:
-              hour: 3
-        filters:
-          - isIssue
-          - isOpen
-          - hasLabel:
-              label: "Needs: Author Feedback :ear:"
-          - hasLabel:
-              label: "Status: No Recent Activity :zzz:"
-          - isNotLabeledWith:
-              label: "Needs: Module Owner :mega:"
-          - noActivitySince:
-              days: 3
-        actions:
-          - addReply:
-              reply: |
-                > [!WARNING]
-                > @${issueAuthor}, this issue will now be closed, as it has been marked as requiring author feedback but has not had any activity for **7 days**.
+      # - description: 'ITA05A - Close issues that have been marked as requiring author feedback but have not had any activity for 3 days, unless it''s been marked with the "Status long term" label.'
+      #   frequencies:
+      #     - hourly:
+      #         hour: 3
+      #   filters:
+      #     - isIssue
+      #     - isOpen
+      #     - hasLabel:
+      #         label: "Needs: Author Feedback :ear:"
+      #     - hasLabel:
+      #         label: "Status: No Recent Activity :zzz:"
+      #     - isNotLabeledWith:
+      #         label: "Needs: Module Owner :mega:"
+      #     - noActivitySince:
+      #         days: 3
+      #   actions:
+      #     - addReply:
+      #         reply: |
+      #           > [!WARNING]
+      #           > @${issueAuthor}, this issue will now be closed, as it has been marked as requiring author feedback but has not had any activity for **7 days**.
 
-                > [!TIP]
-                > In case this issue needs to be reopened (e.g., the author responds after the issue was closed), the "Status: No Recent Activity :zzz:" label must be removed.
-          - closeIssue
+      #           > [!TIP]
+      #           > In case this issue needs to be reopened (e.g., the author responds after the issue was closed), the "Status: No Recent Activity :zzz:" label must be removed.
+      #     - closeIssue
 
-      - description: 'ITA05B - Close issues that have been marked as requiring author feedback but have not had any activity for 3 days, unless it''s been marked with the "Status long term" label.'
-        frequencies:
-          - hourly:
-              hour: 3
-        filters:
-          - isIssue
-          - isOpen
-          - hasLabel:
-              label: "Needs: Author Feedback :ear:"
-          - hasLabel:
-              label: "Status: No Recent Activity :zzz:"
-          - isNotLabeledWith:
-              label: "Status: Long Term :hourglass_flowing_sand:"
-          - noActivitySince:
-              days: 3
-        actions:
-          - addReply:
-              reply: |
-                > [!WARNING]
-                > @${issueAuthor}, this issue will now be closed, as it has been marked as requiring author feedback but has not had any activity for **7 days**.
+      # - description: 'ITA05B - Close issues that have been marked as requiring author feedback but have not had any activity for 3 days, unless it''s been marked with the "Status long term" label.'
+      #   frequencies:
+      #     - hourly:
+      #         hour: 3
+      #   filters:
+      #     - isIssue
+      #     - isOpen
+      #     - hasLabel:
+      #         label: "Needs: Author Feedback :ear:"
+      #     - hasLabel:
+      #         label: "Status: No Recent Activity :zzz:"
+      #     - isNotLabeledWith:
+      #         label: "Status: Long Term :hourglass_flowing_sand:"
+      #     - noActivitySince:
+      #         days: 3
+      #   actions:
+      #     - addReply:
+      #         reply: |
+      #           > [!WARNING]
+      #           > @${issueAuthor}, this issue will now be closed, as it has been marked as requiring author feedback but has not had any activity for **7 days**.
 
-                > [!TIP]
-                > In case this issue needs to be reopened (e.g., the author responds after the issue was closed), the "Status: No Recent Activity :zzz:" label must be removed.
-          - closeIssue
+      #           > [!TIP]
+      #           > In case this issue needs to be reopened (e.g., the author responds after the issue was closed), the "Status: No Recent Activity :zzz:" label must be removed.
+      #     - closeIssue
 
       - description: 'ITA24 - Remind module owner(s) to start or continue working on this module if there was no activity on the Module Proposal issue for more than 3 weeks. "Add Needs: Attention :wave:" label.'
         frequencies:

diff --git a/docs/content/help-support/issue-triage/issue-triage-automation.md b/docs/content/help-support/issue-triage/issue-triage-automation.md
@@ -179,7 +179,7 @@ If an issue/PR has been labelled with "<mark style="background-color:#CB6BA2;col
 
 **Trigger criteria:**
 
-- Is an open issue.
+- Is an open issue/PR.
 - Had no activity in the last 4 days.
 - Has the "<mark style="background-color:#CB6BA2;color:white;">Needs: Author Feedback 👂</mark>" label added.
 - Does not have the "<mark style="background-color:#808080;color:white;">Status: No Recent Activity 💤</mark>" label added.
@@ -201,6 +201,10 @@ To prevent further actions to take effect, one of the following conditions must
 
 ### ITA05
 
+{{< hint type=warning >}}
+This rule is currently disabled in the AVM and BRM repositories.
+{{< /hint >}}
+
 If an issue/PR has been labelled with "<mark style="background-color:#808080;color:white;">Status: No Recent Activity 💤</mark>" and hasn't had any update in 3 days from that point, automatically close it and comment, unless the issue/PR has a "<mark style="background-color:#B60205;color:white;">Status: Long Term ⏳</mark>" - in which case, do not close it.
 
 **Schedule:**
@@ -317,15 +321,18 @@ When #wontfix is used in an issue, mark it by using the label of "<mark style="b
 
 ### ITA11
 
-When a reply from anyone to an issue occurs, remove the "<mark style="background-color:#CB6BA2;color:white;">Needs: Author Feedback 👂</mark>" label and label with "<mark style="background-color:#E99695;color:white;">Needs: Attention 👋</mark>".
+When the author replies, remove the "<mark style="background-color:#CB6BA2;color:white;">Needs: Author Feedback 👂</mark>" label and label with "<mark style="background-color:#E99695;color:white;">Needs: Attention 👋</mark>".
 
 **Trigger criteria:**
 
 - Any action on an issue comment or PR comment except closing.
 - Has the "<mark style="background-color:#CB6BA2;color:white;">Needs: Author Feedback 👂</mark>" label added.
+- The activity was initiated by the issue/PR author.
 
 **Action(s):**
 
+- Remove the "<mark style="background-color:#CB6BA2;color:white;">Needs: Author Feedback 👂</mark>" label.
+- Remove the "<mark style="background-color:#808080;color:white;">Status: No Recent Activity 💤</mark>" label.
 - Add the "<mark style="background-color:#E99695;color:white;">Needs: Attention 👋</mark>" label.
 
 ---
@@ -621,9 +628,13 @@ The below table details which repositories the above rules are applied to.
 | [ITA03BCP](#ita03bcp)       |                     |       ✔️       |                 |
 | [ITA03TF](#ita03tf)         |                     |                |       ✔️        |
 | [ITA04](#ita04)             |         ✔️          |       ✔️       |       ✔️        |
-| [ITA05](#ita05)             |         ✔️          |       ✔️       |       ✔️        |
+| [ITA05](#ita05)             |         [✔️]          |       [✔️]       |       ✔️        |
 | [ITA24](#ita24)             |          ✔️         |                |                 |
 
+{{< hint type="warning" >}}
+The ITA05 rule is currently disabled in the AVM and BRM repositories.
+{{< /hint >}}
+
 ### Rules applied for Event based automation
 
 | ID                          | AVM Core repository | BRM repository | TF repositories |