From 22050fb3221a77788c31eb77454eec841a2a48e1 Mon Sep 17 00:00:00 2001
From: JIHUN KIM <shblue21@naver.com>
Date: Thu, 11 Jan 2024 23:21:01 +0900
Subject: [PATCH] feat: add larger instance types for MSK cluster (#1947)

feat: add larger instance types for MSK cluster

This commit adds support for larger instance types (kafka.m5.8xlarge, kafka.m5.12xlarge, kafka.m5.16xlarge, kafka.m5.24xlarge) to the MSK cluster module.
Now users can choose from a wider range of instance sizes when creating an MSK cluster.
If the provisioning MSK supports m6 and m7 in the future, may want to consider removing the choice syntax.
(Provisioning M5 types are not expected to be added anymore, The m5 has a maximum of 24 xlarge types.
SUMMARY

Fixes #1946
ISSUE TYPE

Feature Pull Request

COMPONENT NAME

msk_cluster
ADDITIONAL INFORMATION

Link to MSK Provisioning Instance Types documentation

https://docs.aws.amazon.com/msk/latest/developerguide/msk-create-cluster.html#broker-instance-types

Reviewed-by: Alina Buzachis
Reviewed-by: JIHUN KIM <jihunkimkw@gmail.com>
Reviewed-by: Mark Chappell
(cherry picked from commit 2b5d71d8ad9d5711318cb58bfb7ead148782a059)
---
 .../1947-add_support_msk_addtinal_type.yml    |  2 ++
 plugins/modules/msk_cluster.py                | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 changelogs/fragments/1947-add_support_msk_addtinal_type.yml

diff --git a/changelogs/fragments/1947-add_support_msk_addtinal_type.yml b/changelogs/fragments/1947-add_support_msk_addtinal_type.yml
new file mode 100644
index 00000000000..4c55f7b78f6
--- /dev/null
+++ b/changelogs/fragments/1947-add_support_msk_addtinal_type.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- msk_cluster - Support for additional ``m5`` and ``m7g`` types of MSK clusters (https://github.com/ansible-collections/community.aws/pull/1947).
\ No newline at end of file
diff --git a/plugins/modules/msk_cluster.py b/plugins/modules/msk_cluster.py
index aa0383294b2..9ecf053f87f 100644
--- a/plugins/modules/msk_cluster.py
+++ b/plugins/modules/msk_cluster.py
@@ -54,6 +54,17 @@
             - kafka.m5.xlarge
             - kafka.m5.2xlarge
             - kafka.m5.4xlarge
+            - kafka.m5.8xlarge
+            - kafka.m5.12xlarge
+            - kafka.m5.16xlarge
+            - kafka.m5.24xlarge
+            - kafka.m7g.large
+            - kafka.m7g.xlarge
+            - kafka.m7g.2xlarge
+            - kafka.m7g.4xlarge
+            - kafka.m7g.8xlarge
+            - kafka.m7g.12xlarge
+            - kafka.m7g.16xlarge
         default: kafka.t3.small
         type: str
     ebs_volume_size:
@@ -662,6 +673,17 @@ def main():
                 "kafka.m5.xlarge",
                 "kafka.m5.2xlarge",
                 "kafka.m5.4xlarge",
+                "kafka.m5.8xlarge",
+                "kafka.m5.12xlarge",
+                "kafka.m5.16xlarge",
+                "kafka.m5.24xlarge",
+                "kafka.m7g.large",
+                "kafka.m7g.xlarge",
+                "kafka.m7g.2xlarge",
+                "kafka.m7g.4xlarge",
+                "kafka.m7g.8xlarge",
+                "kafka.m7g.12xlarge",
+                "kafka.m7g.16xlarge",
             ],
             default="kafka.t3.small",
         ),