refactor(config): move AWS-shaped naming defaults out of shared config

Follow-up to the earlier ec2_instance/region migration. The shared
NamingConfig still carried AWS-only vocabulary that non-AWS providers
would never use:

- naming.patterns: dropped spot_fleet / ec2_fleet / asg regexes (no
  shared reader consumes them — only AWS validators do; confirmed via
  grep). They belong on AWSNamingConfig.
- naming.fleet_types (instant/request/maintain) and naming.price_types
  (ondemand/spot/heterogeneous): removed from the shared schema — these
  are AWS EC2 fleet/pricing concepts, read only by AWS provider code.

Both default_config.json files (packaged + repo sample) updated to
match.

Deferred (documented with TODO): the AWS-specific *prefix* keys
(launch_template/instance/fleet/spot_fleet/asg) remain on the shared
prefix schemas because ConfigurationAdapter.get_resource_prefix
dispatches through hasattr() on those field names; removing them needs
an AWS-specific accessor first. performance.caching.ami_resolution
likewise stays for now — it is entangled in the shared performance
schema and is a cosmetic leak (non-AWS providers simply ignore it),
not a functional one.

Author: fgogolli

config/default_config.json

@@ -41,16 +41,6 @@
       "audit_logs": "audit_logs",
       "metrics_logs": "metrics_logs"
     },
-    "fleet_types": {
-      "instant": "instant",
-      "request": "request",
-      "maintain": "maintain"
-    },
-    "price_types": {
-      "ondemand": "ondemand",
-      "spot": "spot",
-      "heterogeneous": "heterogeneous"
-    },
     "statuses": {
       "request": {
         "pending": "pending",
@@ -80,19 +70,14 @@
       }
     },
     "patterns": {
-      "spot_fleet": "^sfr-[a-f0-9]+$",
-      "ec2_fleet": "^fleet-[a-f0-9]+$",
-      "asg": "^[a-zA-Z0-9_-]+$",
-      "request_id": "^(req|ret)-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
+      "request_id": "^(req|ret)-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$",
+      "tag_key": "^[\\w\\s+=.@-]+$",
+      "cidr_block": "^(\\d{1,3}\\.){3}\\d{1,3}/\\d{1,2}$"
     },
     "prefixes": {
       "default": "",
       "request": "req-",
       "return_prefix": "ret-",
-      "launch_template": "",
-      "instance": "",
-      "fleet": "",
-      "asg": "",
       "tag": ""
     }
   },
@@ -268,11 +253,6 @@
       "default": "",
       "request": "req-",
       "return_prefix": "ret-",
-      "launch_template": "",
-      "instance": "",
-      "fleet": "",
-      "spot_fleet": "",
-      "asg": "",
       "tag": ""
     }
   }

src/orb/config/default_config.json

@@ -33,16 +33,6 @@
       "audit_logs": "audit_logs",
       "metrics_logs": "metrics_logs"
     },
-    "fleet_types": {
-      "instant": "instant",
-      "request": "request",
-      "maintain": "maintain"
-    },
-    "price_types": {
-      "ondemand": "ondemand",
-      "spot": "spot",
-      "heterogeneous": "heterogeneous"
-    },
     "statuses": {
       "request": {
         "pending": "pending",
@@ -72,19 +62,14 @@
       }
     },
     "patterns": {
-      "spot_fleet": "^sfr-[a-f0-9]+$",
-      "ec2_fleet": "^fleet-[a-f0-9]+$",
-      "asg": "^[a-zA-Z0-9_-]+$",
-      "request_id": "^(req|ret)-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
+      "request_id": "^(req|ret)-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$",
+      "tag_key": "^[\\w\\s+=.@-]+$",
+      "cidr_block": "^(\\d{1,3}\\.){3}\\d{1,3}/\\d{1,2}$"
     },
     "prefixes": {
       "default": "",
       "request": "req-",
       "return_prefix": "ret-",
-      "launch_template": "",
-      "instance": "",
-      "fleet": "",
-      "asg": "",
       "tag": ""
     }
   },
@@ -260,11 +245,6 @@
       "default": "",
       "request": "req-",
       "return_prefix": "ret-",
-      "launch_template": "",
-      "instance": "",
-      "fleet": "",
-      "spot_fleet": "",
-      "asg": "",
       "tag": ""
     }
   }

src/orb/config/schemas/common_schema.py

@@ -6,7 +6,18 @@
 
 
 class ResourcePrefixConfig(BaseModel):
-    """Resource prefix configuration."""
+    """Resource prefix configuration.
+
+    The generic keys (default, request, return_prefix, tag) are provider-agnostic.
+    The AWS-specific keys (launch_template, instance, fleet, spot_fleet, asg) are
+    kept here because ``ConfigurationAdapter.get_resource_prefix(key)`` dispatches
+    through ``hasattr(prefixes, key)`` and AWS handler code passes AWS resource-type
+    strings.  Their default values are empty strings and they are absent from the
+    packaged default_config.json.
+    TODO: move launch_template/instance/fleet/spot_fleet/asg to AWSNamingConfig
+    and replace ``get_resource_prefix`` with an AWS-specific accessor so this
+    shared schema is free of AWS vocabulary.
+    """
 
     default: str = Field("", description="Default prefix for all resources")
     request: str = Field("req-", description="Prefix for acquire request IDs")
@@ -34,7 +45,17 @@ def set_default_prefix(self) -> "ResourceConfig":
 
 
 class PrefixConfig(BaseModel):
-    """Prefix configuration."""
+    """Naming prefix configuration used by the shared NamingConfig.
+
+    The generic keys (default, request, return_prefix, tag) are provider-agnostic.
+    The AWS-specific keys (launch_template, instance, fleet, asg) are kept for the
+    same reason as ResourcePrefixConfig: the hasattr-based dispatch in
+    ConfigurationAdapter.get_resource_prefix requires them as typed fields.
+    Their default values are empty strings and they are absent from the packaged
+    default_config.json.
+    TODO: remove launch_template/instance/fleet/asg once get_resource_prefix
+    gains an AWS-specific code path.
+    """
 
     default: str = Field("", description="Default prefix for all resources")
     request: str = Field("req-", description="Prefix for acquire request IDs")
@@ -110,39 +131,22 @@ class NamingConfig(BaseModel):
         },
         description="Table names for SQL databases",
     )
-    fleet_types: dict[str, str] = Field(
-        default_factory=lambda: {
-            "instant": "instant",
-            "request": "request",
-            "maintain": "maintain",
-        },
-        description="Fleet types for EC2 Fleet and Spot Fleet",
-    )
-    price_types: dict[str, str] = Field(
-        default_factory=lambda: {
-            "ondemand": "ondemand",
-            "spot": "spot",
-            "heterogeneous": "heterogeneous",
-        },
-        description="Price types for templates",
-    )
     statuses: StatusValuesConfig = Field(default_factory=lambda: StatusValuesConfig())
     patterns: dict[str, str] = Field(
         default_factory=lambda: {
-            "spot_fleet": r"^sfr-[a-f0-9]+$",
-            "ec2_fleet": r"^fleet-[a-f0-9]+$",
-            "asg": r"^[a-zA-Z0-9_-]+$",
             # No shared "region" pattern: region format varies by provider
             # (AWS: us-east-1, GCP: us-central1, Azure: eastus).
             # Providers that need region validation contribute their own pattern.
             "request_id": r"^(req|ret)-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$",
             "tag_key": r"^[\w\s+=.@-]+$",
             "cidr_block": r"^(\d{1,3}\.){3}\d{1,3}/\d{1,2}$",
+            # AWS-specific patterns (spot_fleet, ec2_fleet, asg, ec2_instance,
+            # instance_type) belong on AWSNamingConfig, not here.
         },
         description=(
             "Provider-agnostic validation patterns for shared resource identifiers. "
-            "AWS-specific patterns (ec2_instance, instance_type) belong on the AWS "
-            "provider's AWSNamingConfig / get_resource_id_pattern() classmethod, not here."
+            "AWS-specific patterns (spot_fleet, ec2_fleet, asg, ec2_instance, "
+            "instance_type) belong on the AWS provider's AWSNamingConfig, not here."
         ),
     )
     prefixes: PrefixConfig = Field(default_factory=lambda: PrefixConfig())  # type: ignore[call-arg]