From ecc9bf3c8bcd162a8ba27655613188f61d0783b2 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 7 Nov 2024 08:39:48 +1100
Subject: [PATCH] [8.15] Add InfoSec team members as Ironbank project
 maintainers (#199148) (#199222)

# Backport

This will backport the following commits from `main` to `8.15`:
- [Add InfoSec team members as Ironbank project maintainers
(#199148)](https://github.com/elastic/kibana/pull/199148)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Larry
Gregory","email":"larry.gregory@elastic.co"},"sourceCommit":{"committedDate":"2024-11-06T20:04:31Z","message":"Add
InfoSec team members as Ironbank project maintainers
(#199148)\n\nElastic's InfoSec organization has agreed to provide
justifications to\r\nElastic's IronBank images. We are adding members of
that org to Kibana's\r\nhardening manifest, listing them as project
maintainers.\r\n\r\nThis PR:\r\n1/ Adds select members of the infosec
organization\r\n2/ Keeps a few members from Operations and Platform
Security, in order\r\nto monitor in an observational capacity\r\n3/
Removes engineers who are no longer responsible for the upkeep
on\r\nthis project.\r\n4/ Reorganizes the maintainers
list","sha":"896b9c09fe6ec061390f7cf249a0227d65454e12","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Security","release_note:skip","Feature:Hardening","v9.0.0","backport:all-open"],"title":"Add
InfoSec team members as Ironbank project
maintainers","number":199148,"url":"https://github.com/elastic/kibana/pull/199148","mergeCommit":{"message":"Add
InfoSec team members as Ironbank project maintainers
(#199148)\n\nElastic's InfoSec organization has agreed to provide
justifications to\r\nElastic's IronBank images. We are adding members of
that org to Kibana's\r\nhardening manifest, listing them as project
maintainers.\r\n\r\nThis PR:\r\n1/ Adds select members of the infosec
organization\r\n2/ Keeps a few members from Operations and Platform
Security, in order\r\nto monitor in an observational capacity\r\n3/
Removes engineers who are no longer responsible for the upkeep
on\r\nthis project.\r\n4/ Reorganizes the maintainers
list","sha":"896b9c09fe6ec061390f7cf249a0227d65454e12"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199148","number":199148,"mergeCommit":{"message":"Add
InfoSec team members as Ironbank project maintainers
(#199148)\n\nElastic's InfoSec organization has agreed to provide
justifications to\r\nElastic's IronBank images. We are adding members of
that org to Kibana's\r\nhardening manifest, listing them as project
maintainers.\r\n\r\nThis PR:\r\n1/ Adds select members of the infosec
organization\r\n2/ Keeps a few members from Operations and Platform
Security, in order\r\nto monitor in an observational capacity\r\n3/
Removes engineers who are no longer responsible for the upkeep
on\r\nthis project.\r\n4/ Reorganizes the maintainers
list","sha":"896b9c09fe6ec061390f7cf249a0227d65454e12"}}]}] BACKPORT-->

Co-authored-by: Larry Gregory <larry.gregory@elastic.co>
---
 .../ironbank/hardening_manifest.yaml          | 64 +++++++++++--------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
index 287739cc03fea..d1d76367b4ec3 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
@@ -42,39 +42,47 @@ resources:
       value: 0ce56bde1853fed3e53282505bac65707385275a27816c29712ab04c187aa249797c82c58759b2b36c210d4e2683eda92359d739a8045cb8385c2c34d37cc9e1
 # List of project maintainers
 maintainers:
+  # AppEx Operations Members
+  - email: 'brad.white@elastic.co'
+    name: 'Brad White'
+    username: 'brad.white'
+    cht_member: false
   - email: 'jon@elastic.co'
     name: 'Jonathan Budzenski'
     username: 'jbudz'
     cht_member: false
-  - email: 'brad.white@elastic.co'
-    name: 'Brad White'
-    username: 'brad.white'
+  # AppEx Platform Security Members
+  - email: 'aleh.zasypkin@elastic.co'
+    name: 'Aleh Zasypkin'
+    username: 'azasypkin'
+    cht_member: false
+  - email: 'larry.gregory@elastic.co'
+    name: 'Larry Gregory'
+    username: 'legrego'
+    cht_member: false
+  # InfoSec Members
+  - email: 'abby.zumstein@elastic.co'
+    name: 'Abby Zumstein'
+    username: 'azumstein'
+    cht_member: false
+  - email: 'arsalan.khan@elastic.co'
+    name: 'Arsalan Khan'
+    username: 'khanarsalan'
+    cht_member: false
+  - email: 'iaroslava.zhomir@elastic.co'
+    name: 'Slava Zhomir'
+    username: 'slava-elastic'
+    cht_member: false
+  - email: 'ryan.kam@elastic.co'
+    name: 'Ryan Kam'
+    username: 'ryankam'
+    cht_member: false
+  - email: 'saumya.shree@elastic.co'
+    name: 'Saumya Shree'
+    username: 'shreesaumya'
     cht_member: false
+  # CHT Members
   - email: 'klepal_alexander@bah.com'
     name: 'Alexander Klepal'
     username: 'alexander.klepal'
-    cht_member: true
-  - cht_member: false
-    email: larry.gregory@elastic.co
-    name: Larry Gregory
-    username: legrego
-  - cht_member: false
-    email: aleh.zasypkin@elastic.co
-    name: Aleh Zasypkin
-    username: azasypkin
-  - cht_member: false
-    email: kurt.greiner@elastic.co
-    name: Kurt Greiner
-    username: kc13greiner
-  - cht_member: false
-    email: jeramy.soucy@elastic.co
-    name: Jeramy Soucy
-    username: jeramysoucy
-  - cht_member: false
-    email: sid.mantri@elastic.co
-    name: Sid Mantri
-    username: sidmantri
-  - cht_member: false
-    email: elena.shostak@elastic.co
-    name: Elena Shostak
-    username: elena.shostak
+    cht_member: true
\ No newline at end of file