From 6c6d4a6c549c267dc703d78d38695c5180b0808b Mon Sep 17 00:00:00 2001
From: Chetan Aggarwal <chaggarwal@adobe.com>
Date: Thu, 29 Oct 2026 10:59:32 +0530
Subject: [PATCH 1/3] fix: Kodiak config so Jira security tickets are created

The 'App Builder' Jira component is archived, so every ticket create
failed silently. Use the 'Security' component and align with the other
App Builder repos: Security+ tickets, grouped, R1-R2, epic APPBLD-4876.
Drop the per-user assignee/watchers (unassigned tickets route to the
APPBLD default) and the redundant master branch filter (Kodiak only
tickets the default branch).
---
 .kodiak/config.yaml | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/.kodiak/config.yaml b/.kodiak/config.yaml
index 4581531..70e2df8 100644
--- a/.kodiak/config.yaml
+++ b/.kodiak/config.yaml
@@ -1,38 +1,22 @@
 version: 1.0
 
-#### If you have questions about this, please contact #kodiak-security on Slack. ####
-
-# Every repository requires a unique Service Now ID number. You need to create a new service using
-# the Service Registry Portal https://adobe.service-now.com/service_registry_portal.do#/search
-# You should NOT leave this default!
 snow:
-  - id: 537580 # Rundeck https://adobe.service-now.com/service_registry_portal.do#/service/537580
+  - id: 537580
 
 notifications:
   jira:
     default:
-      project: APPBLD # Project queue in which the security ticket will be created. Can be any valid JIRA project.
+      project: APPBLD
+      ticket_type: Security+
+      ticketing_method: grouped
       filters:
         include:
-          branch: master
-          risk_rating: R3 # Will ticket for R1-R3 issues
+          risk_rating: R2
       fields:
-        assignee:
-          name: gauravgu
-        customfield_11800: APPBLD-4876 # Jira epic security tickets will be assigned to.
-        watchers: # Everyone who is an admin on your repository should be a watcher.
-          - gauravgu
-          - akshijai
-          - anvishwa
-          - divysharma
-          - garora
-          - spaliwal
-          - sandeepr
-          - sachamol
-          - moganti
-        labels: # You can add additional labels to your tickets here.
+        labels:
           - "OriginatingProcess=Kodiak"
-          - "AB-Security"
-          - "kodiak-ticket"
+          - "Repository=aio-cli"
         components:
-          - name: "App Builder" # Add any you'd like 
\ No newline at end of file
+          - name: "CLI"
+          - name: "Security"
+        customfield_11800: "APPBLD-4876" # Epic Link: Kodiak Auto-Detected Vulnerabilities

From 4e3cb1a3851200c87a77218ef8423a996105f4a6 Mon Sep 17 00:00:00 2001
From: Chetan Aggarwal <chaggarwal@adobe.com>
Date: Mon, 2 Nov 2026 12:26:11 +0530
Subject: [PATCH 2/3] Preserve existing Kodiak comments, labels and branch
 filter

---
 .kodiak/config.yaml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.kodiak/config.yaml b/.kodiak/config.yaml
index 70e2df8..44e40cc 100644
--- a/.kodiak/config.yaml
+++ b/.kodiak/config.yaml
@@ -1,22 +1,28 @@
 version: 1.0
 
+#### If you have questions about this, please contact #kodiak-security on Slack. ####
+
+# Every repository requires a unique Service Now ID number. You need to create a new service using
+# the Service Registry Portal https://adobe.service-now.com/service_registry_portal.do#/search
+# You should NOT leave this default!
 snow:
-  - id: 537580
+  - id: 537580 # Rundeck https://adobe.service-now.com/service_registry_portal.do#/service/537580
 
 notifications:
   jira:
     default:
-      project: APPBLD
+      project: APPBLD # Project queue in which the security ticket will be created. Can be any valid JIRA project.
       ticket_type: Security+
       ticketing_method: grouped
       filters:
         include:
-          risk_rating: R2
+          branch: master
+          risk_rating: R2 # Will ticket for R1-R2 issues
       fields:
-        labels:
+        customfield_11800: APPBLD-4876 # Jira epic security tickets will be assigned to.
+        labels: # You can add additional labels to your tickets here.
           - "OriginatingProcess=Kodiak"
-          - "Repository=aio-cli"
+          - "AB-Security"
+          - "kodiak-ticket"
         components:
-          - name: "CLI"
-          - name: "Security"
-        customfield_11800: "APPBLD-4876" # Epic Link: Kodiak Auto-Detected Vulnerabilities
+          - name: "CLI" # Add any you'd like

From ab8f438c196b84b8d858c575c94830479833baa7 Mon Sep 17 00:00:00 2001
From: Chetan Aggarwal <chaggarwal@adobe.com>
Date: Mon, 2 Nov 2026 12:27:29 +0530
Subject: [PATCH 3/3] Include Security alongside the repository area component

---
 .kodiak/config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.kodiak/config.yaml b/.kodiak/config.yaml
index 44e40cc..f4ede7e 100644
--- a/.kodiak/config.yaml
+++ b/.kodiak/config.yaml
@@ -26,3 +26,4 @@ notifications:
           - "kodiak-ticket"
         components:
           - name: "CLI" # Add any you'd like
+          - name: "Security"