Simplify vpc id generation based on review feedback

simonrw · simonrw · commit 1eaec097b625 · 2024-11-13T17:28:17.000Z
diff --git a/localstack-core/localstack/services/ec2/patches.py b/localstack-core/localstack/services/ec2/patches.py
@@ -1,9 +1,8 @@
 import logging
-import random
-import string
 from typing import Optional
 
 from moto.ec2 import models as ec2_models
+from moto.utilities.id_generator import Tags
 
 from localstack.constants import TAG_KEY_CUSTOM_ID
 from localstack.services.ec2.exceptions import (
@@ -14,9 +13,7 @@
 from localstack.utils.id_generator import (
     ExistingIds,
     ResourceIdentifier,
-    Tags,
     localstack_id,
-    localstack_id_manager,
 )
 from localstack.utils.patch import patch
 
@@ -29,8 +26,8 @@ def generate_vpc_id(
     existing_ids: ExistingIds = None,
     tags: Tags = None,
 ) -> str:
-    suffix = "".join(random.choice(string.ascii_letters) for _ in range(17))
-    return f"vpc-{suffix}"
+    # We return an empty string here to differentiate between when a custom ID was used, or when it was randomly generated by `moto`.
+    return ""
 
 
 class VpcIdentifier(ResourceIdentifier):
@@ -122,17 +119,8 @@ def ec2_create_vpc(
         is_default: bool = False,
         **kwargs,
     ):
-        # Extract custom ID from tags if it exists
-        tags: list[dict[str, str]] = tags or []
-        custom_ids = [tag["Value"] for tag in tags if tag["Key"] == TAG_KEY_CUSTOM_ID]
-        custom_id = custom_ids[0] if len(custom_ids) > 0 else None
-
-        # try to generate a custom id from the id store
-        if not custom_id:
-            resource_identifier = VpcIdentifier(self.account_id, self.region_name, cidr_block)
-            id = localstack_id_manager.get_custom_id(resource_identifier)
-            if id:
-                custom_id = id
+        resource_identifier = VpcIdentifier(self.account_id, self.region_name, cidr_block)
+        custom_id = resource_identifier.generate(tags=tags)
 
         # Check if custom id is unique
         if custom_id and custom_id in self.vpcs:
