Replace ResolvableGeneric with properly typed nested models

Applied the new ResolvableModel type to existing models that were
using ResolvableGeneric for nested structures. This provides proper
typing and IDE support for nested CloudFormation resource properties.

Changes:

Auto-generated resources (regenerated with nested types):
- AWS::S3::Bucket - 50+ nested model types (CorsConfiguration,
  ReplicationConfiguration, LifecycleConfiguration, etc.)

Manually written resources (added typed nested models):
- AWS::OpenSearchService::Domain - ClusterConfig, EBSOptions,
  VPCOptions, AdvancedSecurityOptions, etc.
- AWS::Elasticsearch::Domain - Same nested types as OpenSearch
- AWS::EC2::VPCEndpoint - DnsOptions, Tags
- AWS::IAM::User - Tags (using existing Tag type)

Field type improvements:
- TopicARN: ResolvableStr (was ResolvableGeneric)
- KMSMasterKeyId: ResolvableStr (was ResolvableGeneric)
- UserPoolClientId: ResolvableStr (was ResolvableGeneric)
- CertificateArn: ResolvableStr (was ResolvableGeneric)
- Various JSON policies: Resolvable[dict] (was ResolvableGeneric)

Only PolicyDocument fields remain as ResolvableGeneric since they
are intentionally arbitrary JSON (IAM policy documents).

Updated tests to work with the new typed access patterns:
- LogPublishingOptions and AdvancedOptions now use dict access
  instead of attribute access

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: jsoucheiron

pycfmodel/model/resources/autoscaling_auto_scaling_group.py

@@ -7,13 +7,8 @@
 from typing import List, Literal, Optional
 
 from pycfmodel.model.base import CustomModel
-from pycfmodel.model.generic import ResolvableGeneric
 from pycfmodel.model.resources.resource import Resource
-from pycfmodel.model.types import Resolvable
-from pycfmodel.model.types import ResolvableBool
-from pycfmodel.model.types import ResolvableInt
-from pycfmodel.model.types import ResolvableModel
-from pycfmodel.model.types import ResolvableStr
+from pycfmodel.model.types import Resolvable, ResolvableBool, ResolvableInt, ResolvableModel, ResolvableStr
 
 
 class AcceleratorCountRequest(CustomModel):
@@ -222,7 +217,7 @@ class NotificationConfiguration(CustomModel):
     A structure that specifies an Amazon SNS notification configuration for the ``NotificationConfigurations`` property of the [AWS::AutoScaling::AutoScalingGroup](https://docs.
     """
 
-    TopicARN: ResolvableGeneric
+    TopicARN: ResolvableStr
     NotificationTypes: Optional[Resolvable[List[ResolvableStr]]] = None
 
 
@@ -370,8 +365,8 @@ class InstanceRequirements(CustomModel):
 
 class LaunchTemplateOverrides(CustomModel):
     """
-    Use this structure to let Amazon EC2 Auto Scaling do the following when the Auto Scaling group has a mixed instances policy:
-  +  Override the instance type that is specified in the launch template.
+      Use this structure to let Amazon EC2 Auto Scaling do the following when the Auto Scaling group has a mixed instances policy:
+    +  Override the instance type that is specified in the launch template.
     """
 
     ImageId: Optional[ResolvableStr] = None
@@ -410,53 +405,53 @@ class MixedInstancesPolicy(CustomModel):
 
 class AutoScalingAutoScalingGroupProperties(CustomModel):
     """
-    Properties for AWS::AutoScaling::AutoScalingGroup.
-
-    Properties:
-
-    - AutoScalingGroupName: The name of the Auto Scaling group. This name must be unique per Region per acco...
-    - AvailabilityZoneDistribution: The EC2 instance capacity distribution across Availability Zones for the Auto Sc...
-    - AvailabilityZoneImpairmentPolicy: The Availability Zone impairment policy for the Auto Scaling group.
-    - AvailabilityZones: A list of Availability Zones where instances in the Auto Scaling group can be cr...
-    - CapacityRebalance: Indicates whether Capacity Rebalancing is enabled. Otherwise, Capacity Rebalanci...
-    - CapacityReservationSpecification: The capacity reservation specification for the Auto Scaling group.
-    - Context: Reserved.
-    - Cooldown: *Only needed if you use simple scaling policies.* 
- The amount of time, in secon...
-    - DefaultInstanceWarmup: The amount of time, in seconds, until a new instance is considered to have finis...
-    - DesiredCapacity: The desired capacity is the initial capacity of the Auto Scaling group at the ti...
-    - DesiredCapacityType: The unit of measurement for the value specified for desired capacity. Amazon EC2...
-    - HealthCheckGracePeriod: The amount of time, in seconds, that Amazon EC2 Auto Scaling waits before checki...
-    - HealthCheckType: A comma-separated value string of one or more health check types.
- The valid val...
-    - InstanceId: The ID of the instance used to base the launch configuration on. For more inform...
-    - InstanceLifecyclePolicy: The instance lifecycle policy for the Auto Scaling group.
-    - InstanceMaintenancePolicy: An instance maintenance policy. For more information, see [Set instance maintena...
-    - LaunchConfigurationName: The name of the launch configuration to use to launch instances.
- Required only ...
-    - LaunchTemplate: Information used to specify the launch template and version to use to launch ins...
-    - LifecycleHookSpecificationList: One or more lifecycle hooks to add to the Auto Scaling group before instances ar...
-    - LoadBalancerNames: A list of Classic Load Balancers associated with this Auto Scaling group. For Ap...
-    - MaxInstanceLifetime: The maximum amount of time, in seconds, that an instance can be in service. The ...
-    - MaxSize: The maximum size of the group.
-  With a mixed instances policy that uses instanc...
-    - MetricsCollection: Enables the monitoring of group metrics of an Auto Scaling group. By default, th...
-    - MinSize: The minimum size of the group.
-    - MixedInstancesPolicy: An embedded object that specifies a mixed instances policy.
- The policy includes...
-    - NewInstancesProtectedFromScaleIn: Indicates whether newly launched instances are protected from termination by Ama...
-    - NotificationConfiguration: 
-    - NotificationConfigurations: Configures an Auto Scaling group to send notifications when specified events tak...
-    - PlacementGroup: The name of the placement group into which to launch your instances. For more in...
-    - ServiceLinkedRoleARN: The Amazon Resource Name (ARN) of the service-linked role that the Auto Scaling ...
-    - SkipZonalShiftValidation: 
-    - Tags: One or more tags. You can tag your Auto Scaling group and propagate the tags to ...
-    - TargetGroupARNs: The Amazon Resource Names (ARN) of the Elastic Load Balancing target groups to a...
-    - TerminationPolicies: A policy or a list of policies that are used to select the instance to terminate...
-    - TrafficSources: The traffic sources associated with this Auto Scaling group.
-    - VPCZoneIdentifier: A list of subnet IDs for a virtual private cloud (VPC) where instances in the Au...
-
-    More info at [AWS Docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-autoscalinggroup.html)
+       Properties for AWS::AutoScaling::AutoScalingGroup.
+
+       Properties:
+
+       - AutoScalingGroupName: The name of the Auto Scaling group. This name must be unique per Region per acco...
+       - AvailabilityZoneDistribution: The EC2 instance capacity distribution across Availability Zones for the Auto Sc...
+       - AvailabilityZoneImpairmentPolicy: The Availability Zone impairment policy for the Auto Scaling group.
+       - AvailabilityZones: A list of Availability Zones where instances in the Auto Scaling group can be cr...
+       - CapacityRebalance: Indicates whether Capacity Rebalancing is enabled. Otherwise, Capacity Rebalanci...
+       - CapacityReservationSpecification: The capacity reservation specification for the Auto Scaling group.
+       - Context: Reserved.
+       - Cooldown: *Only needed if you use simple scaling policies.*
+    The amount of time, in secon...
+       - DefaultInstanceWarmup: The amount of time, in seconds, until a new instance is considered to have finis...
+       - DesiredCapacity: The desired capacity is the initial capacity of the Auto Scaling group at the ti...
+       - DesiredCapacityType: The unit of measurement for the value specified for desired capacity. Amazon EC2...
+       - HealthCheckGracePeriod: The amount of time, in seconds, that Amazon EC2 Auto Scaling waits before checki...
+       - HealthCheckType: A comma-separated value string of one or more health check types.
+    The valid val...
+       - InstanceId: The ID of the instance used to base the launch configuration on. For more inform...
+       - InstanceLifecyclePolicy: The instance lifecycle policy for the Auto Scaling group.
+       - InstanceMaintenancePolicy: An instance maintenance policy. For more information, see [Set instance maintena...
+       - LaunchConfigurationName: The name of the launch configuration to use to launch instances.
+    Required only ...
+       - LaunchTemplate: Information used to specify the launch template and version to use to launch ins...
+       - LifecycleHookSpecificationList: One or more lifecycle hooks to add to the Auto Scaling group before instances ar...
+       - LoadBalancerNames: A list of Classic Load Balancers associated with this Auto Scaling group. For Ap...
+       - MaxInstanceLifetime: The maximum amount of time, in seconds, that an instance can be in service. The ...
+       - MaxSize: The maximum size of the group.
+     With a mixed instances policy that uses instanc...
+       - MetricsCollection: Enables the monitoring of group metrics of an Auto Scaling group. By default, th...
+       - MinSize: The minimum size of the group.
+       - MixedInstancesPolicy: An embedded object that specifies a mixed instances policy.
+    The policy includes...
+       - NewInstancesProtectedFromScaleIn: Indicates whether newly launched instances are protected from termination by Ama...
+       - NotificationConfiguration:
+       - NotificationConfigurations: Configures an Auto Scaling group to send notifications when specified events tak...
+       - PlacementGroup: The name of the placement group into which to launch your instances. For more in...
+       - ServiceLinkedRoleARN: The Amazon Resource Name (ARN) of the service-linked role that the Auto Scaling ...
+       - SkipZonalShiftValidation:
+       - Tags: One or more tags. You can tag your Auto Scaling group and propagate the tags to ...
+       - TargetGroupARNs: The Amazon Resource Names (ARN) of the Elastic Load Balancing target groups to a...
+       - TerminationPolicies: A policy or a list of policies that are used to select the instance to terminate...
+       - TrafficSources: The traffic sources associated with this Auto Scaling group.
+       - VPCZoneIdentifier: A list of subnet IDs for a virtual private cloud (VPC) where instances in the Au...
+
+       More info at [AWS Docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-autoscalinggroup.html)
     """
 
     MaxSize: ResolvableStr

pycfmodel/model/resources/cloudwatch_alarm.py

@@ -8,11 +8,7 @@
 
 from pycfmodel.model.base import CustomModel
 from pycfmodel.model.resources.resource import Resource
-from pycfmodel.model.types import Resolvable
-from pycfmodel.model.types import ResolvableBool
-from pycfmodel.model.types import ResolvableInt
-from pycfmodel.model.types import ResolvableModel
-from pycfmodel.model.types import ResolvableStr
+from pycfmodel.model.types import Resolvable, ResolvableBool, ResolvableInt, ResolvableModel, ResolvableStr
 
 
 class Dimension(CustomModel):

pycfmodel/model/resources/dynamodb_table.py

@@ -9,11 +9,7 @@
 from pycfmodel.model.base import CustomModel
 from pycfmodel.model.generic import ResolvableGeneric
 from pycfmodel.model.resources.resource import Resource
-from pycfmodel.model.types import Resolvable
-from pycfmodel.model.types import ResolvableBool
-from pycfmodel.model.types import ResolvableInt
-from pycfmodel.model.types import ResolvableModel
-from pycfmodel.model.types import ResolvableStr
+from pycfmodel.model.types import Resolvable, ResolvableBool, ResolvableInt, ResolvableModel, ResolvableStr
 
 
 class AttributeDefinition(CustomModel):
@@ -192,7 +188,7 @@ class SSESpecification(CustomModel):
     """
 
     SSEEnabled: ResolvableBool
-    KMSMasterKeyId: Optional[ResolvableGeneric] = None
+    KMSMasterKeyId: Optional[ResolvableStr] = None
     SSEType: Optional[ResolvableStr] = None
 
 
@@ -266,35 +262,35 @@ class GlobalSecondaryIndex(CustomModel):
 
 class DynamoDBTableProperties(CustomModel):
     """
-    Properties for AWS::DynamoDB::Table.
-
-    Properties:
-
-    - AttributeDefinitions: A list of attributes that describe the key schema for the table and indexes.
- Th...
-    - BillingMode: Specify how you are charged for read and write throughput and how you manage cap...
-    - ContributorInsightsSpecification: The settings used to specify whether to enable CloudWatch Contributor Insights f...
-    - DeletionProtectionEnabled: Determines if a table is protected from deletion. When enabled, the table cannot...
-    - GlobalSecondaryIndexes: Global secondary indexes to be created on the table. You can create up to 20 glo...
-    - ImportSourceSpecification: Specifies the properties of data being imported from the S3 bucket source to the...
-    - KeySchema: Specifies the attributes that make up the primary key for the table. The attribu...
-    - KinesisStreamSpecification: The Kinesis Data Streams configuration for the specified table.
-    - LocalSecondaryIndexes: Local secondary indexes to be created on the table. You can create up to 5 local...
-    - OnDemandThroughput: Sets the maximum number of read and write units for the specified on-demand tabl...
-    - PointInTimeRecoverySpecification: The settings used to enable point in time recovery.
-    - ProvisionedThroughput: Throughput for the specified table, which consists of values for ``ReadCapacityU...
-    - ResourcePolicy: An AWS resource-based policy document in JSON format that will be attached to th...
-    - SSESpecification: Specifies the settings to enable server-side encryption.
-    - StreamSpecification: The settings for the DDB table stream, which captures changes to items stored in...
-    - TableClass: The table class of the new table. Valid values are ``STANDARD`` and ``STANDARD_I...
-    - TableName: A name for the table. If you don't specify a name, CFNlong generates a unique ph...
-    - Tags: An array of key-value pairs to apply to this resource.
- For more information, se...
-    - TimeToLiveSpecification: Specifies the Time to Live (TTL) settings for the table.
-  For detailed informat...
-    - WarmThroughput: Represents the warm throughput (in read units per second and write units per sec...
-
-    More info at [AWS Docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html)
+       Properties for AWS::DynamoDB::Table.
+
+       Properties:
+
+       - AttributeDefinitions: A list of attributes that describe the key schema for the table and indexes.
+    Th...
+       - BillingMode: Specify how you are charged for read and write throughput and how you manage cap...
+       - ContributorInsightsSpecification: The settings used to specify whether to enable CloudWatch Contributor Insights f...
+       - DeletionProtectionEnabled: Determines if a table is protected from deletion. When enabled, the table cannot...
+       - GlobalSecondaryIndexes: Global secondary indexes to be created on the table. You can create up to 20 glo...
+       - ImportSourceSpecification: Specifies the properties of data being imported from the S3 bucket source to the...
+       - KeySchema: Specifies the attributes that make up the primary key for the table. The attribu...
+       - KinesisStreamSpecification: The Kinesis Data Streams configuration for the specified table.
+       - LocalSecondaryIndexes: Local secondary indexes to be created on the table. You can create up to 5 local...
+       - OnDemandThroughput: Sets the maximum number of read and write units for the specified on-demand tabl...
+       - PointInTimeRecoverySpecification: The settings used to enable point in time recovery.
+       - ProvisionedThroughput: Throughput for the specified table, which consists of values for ``ReadCapacityU...
+       - ResourcePolicy: An AWS resource-based policy document in JSON format that will be attached to th...
+       - SSESpecification: Specifies the settings to enable server-side encryption.
+       - StreamSpecification: The settings for the DDB table stream, which captures changes to items stored in...
+       - TableClass: The table class of the new table. Valid values are ``STANDARD`` and ``STANDARD_I...
+       - TableName: A name for the table. If you don't specify a name, CFNlong generates a unique ph...
+       - Tags: An array of key-value pairs to apply to this resource.
+    For more information, se...
+       - TimeToLiveSpecification: Specifies the Time to Live (TTL) settings for the table.
+     For detailed informat...
+       - WarmThroughput: Represents the warm throughput (in read units per second and write units per sec...
+
+       More info at [AWS Docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html)
     """
 
     KeySchema: Resolvable[List[KeySchema]]

pycfmodel/model/resources/ec2_vpc_endpoint_policy.py

@@ -1,13 +1,23 @@
 from typing import List, Literal, Optional
 
 from pycfmodel.model.base import CustomModel
-from pycfmodel.model.generic import ResolvableGeneric
 from pycfmodel.model.resources.properties.policy_document import PolicyDocument as resource_policy_document
+from pycfmodel.model.resources.properties.tag import Tag
 from pycfmodel.model.resources.resource import Resource
-from pycfmodel.model.types import Resolvable, ResolvableBool, ResolvableStr
+from pycfmodel.model.types import Resolvable, ResolvableBool, ResolvableModel, ResolvableStr
 from pycfmodel.model.utils import OptionallyNamedPolicyDocument
 
 
+class DnsOptions(CustomModel):
+    """DNS options for VPC endpoint."""
+
+    DnsRecordIpType: Optional[ResolvableStr] = None
+    PrivateDnsOnlyForInboundResolverEndpoint: Optional[ResolvableBool] = None
+
+
+ResolvableDnsOptions = ResolvableModel(DnsOptions)
+
+
 class EC2VpcEndpointPolicyProperties(CustomModel):
     """
     Properties:
@@ -30,7 +40,7 @@ class EC2VpcEndpointPolicyProperties(CustomModel):
     More info at [AWS Docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html)
     """
 
-    DnsOptions: Optional[ResolvableGeneric] = None
+    DnsOptions: Optional[ResolvableDnsOptions] = None
     IpAddressType: Optional[ResolvableStr] = None
     PolicyDocument: Optional[Resolvable[resource_policy_document]] = None
     PrivateDnsEnabled: Optional[ResolvableBool] = None
@@ -41,7 +51,7 @@ class EC2VpcEndpointPolicyProperties(CustomModel):
     ServiceNetworkArn: Optional[ResolvableStr] = None
     ServiceRegion: Optional[ResolvableStr] = None
     SubnetIds: Optional[Resolvable[List[ResolvableStr]]] = None
-    Tags: Optional[Resolvable[List[ResolvableGeneric]]] = None
+    Tags: Optional[Resolvable[List[Tag]]] = None
     VpcEndpointType: Optional[ResolvableStr] = None
     VpcId: ResolvableStr
 

pycfmodel/model/resources/elbv2_listener.py

@@ -7,13 +7,8 @@
 from typing import List, Literal, Optional
 
 from pycfmodel.model.base import CustomModel
-from pycfmodel.model.generic import ResolvableGeneric
 from pycfmodel.model.resources.resource import Resource
-from pycfmodel.model.types import Resolvable
-from pycfmodel.model.types import ResolvableBool
-from pycfmodel.model.types import ResolvableInt
-from pycfmodel.model.types import ResolvableModel
-from pycfmodel.model.types import ResolvableStr
+from pycfmodel.model.types import Resolvable, ResolvableBool, ResolvableInt, ResolvableModel, ResolvableStr
 
 
 class AuthenticateCognitoConfig(CustomModel):
@@ -22,9 +17,9 @@ class AuthenticateCognitoConfig(CustomModel):
     """
 
     UserPoolArn: ResolvableStr
-    UserPoolClientId: ResolvableGeneric
+    UserPoolClientId: ResolvableStr
     UserPoolDomain: ResolvableStr
-    AuthenticationRequestExtraParams: Optional[ResolvableGeneric] = None
+    AuthenticationRequestExtraParams: Optional[Resolvable[dict]] = None
     OnUnauthenticatedRequest: Optional[ResolvableStr] = None
     Scope: Optional[ResolvableStr] = None
     SessionCookieName: Optional[ResolvableStr] = None
@@ -44,7 +39,7 @@ class AuthenticateOidcConfig(CustomModel):
     Issuer: ResolvableStr
     TokenEndpoint: ResolvableStr
     UserInfoEndpoint: ResolvableStr
-    AuthenticationRequestExtraParams: Optional[ResolvableGeneric] = None
+    AuthenticationRequestExtraParams: Optional[Resolvable[dict]] = None
     ClientSecret: Optional[ResolvableStr] = None
     OnUnauthenticatedRequest: Optional[ResolvableStr] = None
     Scope: Optional[ResolvableStr] = None
@@ -61,7 +56,7 @@ class Certificate(CustomModel):
     Specifies an SSL server certificate to use as the default certificate for a secure listener.
     """
 
-    CertificateArn: Optional[ResolvableGeneric] = None
+    CertificateArn: Optional[ResolvableStr] = None
 
 
 ResolvableCertificate = ResolvableModel(Certificate)
@@ -94,9 +89,7 @@ class JwtValidationActionAdditionalClaim(CustomModel):
 
 
 class JwtValidationConfig(CustomModel):
-    """
-    
-    """
+    """ """
 
     Issuer: ResolvableStr
     JwksEndpoint: ResolvableStr