Add support for list and dict type tag

localstack · Oct 14, 2024 · 7dc9040 · 7dc9040
1 parent 29ba736
commit 7dc9040
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/moto/apigateway/models.py b/moto/apigateway/models.py
@@ -1658,7 +1658,7 @@ def create_rest_api(
     ) -> RestAPI:
         api_id = ApigwRestApiIdentifier(
             self.account_id, self.region_name, name
-        ).generate()
+        ).generate(tags=tags)
         rest_api = RestAPI(
             api_id,
             self.account_id,

diff --git a/moto/secretsmanager/models.py b/moto/secretsmanager/models.py
@@ -100,7 +100,7 @@ def __init__(
         self.name = secret_id
         self.arn = SecretsManagerSecretIdentifier(
             account_id, region_name, secret_id
-        ).generate()
+        ).generate(tags=tags)
         self.account_id = account_id
         self.region = region_name
         self.secret_string = secret_string

diff --git a/moto/utilities/id_generator.py b/moto/utilities/id_generator.py
@@ -8,7 +8,7 @@
 log = logging.getLogger(__name__)
 
 ExistingIds = Union[List[str], None]
-Tags = Union[Dict[str, str], None]
+Tags = Union[Dict[str, str], List[Dict[str, str]], None]
 
 # Custom resource tag to override the generated resource ID.
 TAG_KEY_CUSTOM_ID = "_custom_id_"
@@ -95,10 +95,16 @@ def add_id_source(
 
     @staticmethod
     def get_id_from_tags(id_source_context: IdSourceContext) -> Union[str, None]:
-        if tags := id_source_context.get("tags"):
+
+        if not (tags := id_source_context.get("tags")):
+            return None
+
+        if isinstance(tags, dict):
             return tags.get(TAG_KEY_CUSTOM_ID)
 
-        return None
+        if isinstance(tags, list):
+            return next((tag.get("Value") for tag in tags if tag.get("Key") == TAG_KEY_CUSTOM_ID), None)
+
 
     def get_custom_id_from_context(
         self, id_source_context: IdSourceContext