Updates from spec version 109.0.0 (#2120)

cloudtools · Feb 3, 2023 · cdf4503 · cdf4503
1 parent 321b887
commit cdf4503
Show file tree

Hide file tree

Showing 14 changed files with 372 additions and 78 deletions.
diff --git a/troposphere/appconfig.py b/troposphere/appconfig.py
@@ -73,6 +73,7 @@ class Deployment(AWSObject):
         "DeploymentStrategyId": (str, True),
         "Description": (str, False),
         "EnvironmentId": (str, True),
+        "KmsKeyIdentifier": (str, False),
         "Tags": (Tags, False),
     }
 

diff --git a/troposphere/cloudtrail.py b/troposphere/cloudtrail.py
@@ -10,6 +10,32 @@
 from .validators import boolean, integer
 
 
+class Destination(AWSProperty):
+    """
+    `Destination <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-channel-destination.html>`__
+    """
+
+    props: PropsDictType = {
+        "Location": (str, True),
+        "Type": (str, True),
+    }
+
+
+class Channel(AWSObject):
+    """
+    `Channel <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-channel.html>`__
+    """
+
+    resource_type = "AWS::CloudTrail::Channel"
+
+    props: PropsDictType = {
+        "Destinations": ([Destination], False),
+        "Name": (str, False),
+        "Source": (str, False),
+        "Tags": (Tags, False),
+    }
+
+
 class AdvancedFieldSelector(AWSProperty):
     """
     `AdvancedFieldSelector <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-eventdatastore-advancedfieldselector.html>`__
@@ -56,6 +82,19 @@ class EventDataStore(AWSObject):
     }
 
 
+class ResourcePolicy(AWSObject):
+    """
+    `ResourcePolicy <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-resourcepolicy.html>`__
+    """
+
+    resource_type = "AWS::CloudTrail::ResourcePolicy"
+
+    props: PropsDictType = {
+        "ResourceArn": (str, True),
+        "ResourcePolicy": (dict, True),
+    }
+
+
 class DataResource(AWSProperty):
     """
     `DataResource <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html>`__

diff --git a/troposphere/connectcampaigns.py b/troposphere/connectcampaigns.py
@@ -7,7 +7,7 @@
 
 
 from . import AWSObject, AWSProperty, PropsDictType, Tags
-from .validators import double
+from .validators import boolean, double
 
 
 class PredictiveDialerConfig(AWSProperty):
@@ -41,12 +41,23 @@ class DialerConfig(AWSProperty):
     }
 
 
+class AnswerMachineDetectionConfig(AWSProperty):
+    """
+    `AnswerMachineDetectionConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connectcampaigns-campaign-answermachinedetectionconfig.html>`__
+    """
+
+    props: PropsDictType = {
+        "EnableAnswerMachineDetection": (boolean, True),
+    }
+
+
 class OutboundCallConfig(AWSProperty):
     """
     `OutboundCallConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connectcampaigns-campaign-outboundcallconfig.html>`__
     """
 
     props: PropsDictType = {
+        "AnswerMachineDetectionConfig": (AnswerMachineDetectionConfig, False),
         "ConnectContactFlowArn": (str, True),
         "ConnectQueueArn": (str, True),
         "ConnectSourcePhoneNumber": (str, False),

diff --git a/troposphere/ec2.py b/troposphere/ec2.py
@@ -715,7 +715,7 @@ class Host(AWSObject):
 
 class IpamOperatingRegion(AWSProperty):
     """
-    `IpamOperatingRegion <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipam-ipamoperatingregion.html>`__
+    `IpamOperatingRegion <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipamresourcediscovery-ipamoperatingregion.html>`__
     """
 
     props: PropsDictType = {
@@ -731,8 +731,11 @@ class IPAM(AWSObject):
     resource_type = "AWS::EC2::IPAM"
 
     props: PropsDictType = {
+        "DefaultResourceDiscoveryAssociationId": (str, False),
+        "DefaultResourceDiscoveryId": (str, False),
         "Description": (str, False),
         "OperatingRegions": ([IpamOperatingRegion], False),
+        "ResourceDiscoveryAssociationCount": (integer, False),
         "Tags": (Tags, False),
     }
 
@@ -781,12 +784,55 @@ class IPAMPool(AWSObject):
         "IpamScopeId": (str, True),
         "Locale": (str, False),
         "ProvisionedCidrs": ([ProvisionedCidr], False),
+        "PublicIpSource": (str, False),
         "PubliclyAdvertisable": (boolean, False),
         "SourceIpamPoolId": (str, False),
         "Tags": (Tags, False),
     }
 
 
+class IPAMPoolCidr(AWSObject):
+    """
+    `IPAMPoolCidr <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampoolcidr.html>`__
+    """
+
+    resource_type = "AWS::EC2::IPAMPoolCidr"
+
+    props: PropsDictType = {
+        "Cidr": (str, False),
+        "IpamPoolId": (str, True),
+        "NetmaskLength": (integer, False),
+    }
+
+
+class IPAMResourceDiscovery(AWSObject):
+    """
+    `IPAMResourceDiscovery <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscovery.html>`__
+    """
+
+    resource_type = "AWS::EC2::IPAMResourceDiscovery"
+
+    props: PropsDictType = {
+        "Description": (str, False),
+        "OperatingRegions": ([IpamOperatingRegion], False),
+        "Tags": (Tags, False),
+    }
+
+
+class IPAMResourceDiscoveryAssociation(AWSObject):
+    """
+    `IPAMResourceDiscoveryAssociation <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamresourcediscoveryassociation.html>`__
+    """
+
+    resource_type = "AWS::EC2::IPAMResourceDiscoveryAssociation"
+
+    props: PropsDictType = {
+        "IpamId": (str, True),
+        "IpamResourceDiscoveryId": (str, True),
+        "Tags": (Tags, False),
+    }
+
+
 class IPAMScope(AWSObject):
     """
     `IPAMScope <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html>`__

diff --git a/troposphere/iot.py b/troposphere/iot.py
@@ -756,6 +756,7 @@ class CloudwatchLogsAction(AWSProperty):
     """
 
     props: PropsDictType = {
+        "BatchMode": (boolean, False),
         "LogGroupName": (str, True),
         "RoleArn": (str, True),
     }

diff --git a/troposphere/networkfirewall.py b/troposphere/networkfirewall.py
@@ -17,6 +17,7 @@ class SubnetMapping(AWSProperty):
     """
 
     props: PropsDictType = {
+        "IPAddressType": (str, False),
         "SubnetId": (str, True),
     }
 

diff --git a/troposphere/networkmanager.py b/troposphere/networkmanager.py
@@ -55,10 +55,10 @@ class ConnectPeer(AWSObject):
 
     props: PropsDictType = {
         "BgpOptions": (BgpOptions, False),
-        "ConnectAttachmentId": (str, False),
+        "ConnectAttachmentId": (str, True),
         "CoreNetworkAddress": (str, False),
-        "InsideCidrBlocks": ([str], False),
-        "PeerAddress": (str, False),
+        "InsideCidrBlocks": ([str], True),
+        "PeerAddress": (str, True),
         "Tags": (Tags, False),
     }
 
@@ -204,9 +204,9 @@ class SiteToSiteVpnAttachment(AWSObject):
     resource_type = "AWS::NetworkManager::SiteToSiteVpnAttachment"
 
     props: PropsDictType = {
-        "CoreNetworkId": (str, False),
+        "CoreNetworkId": (str, True),
         "Tags": (Tags, False),
-        "VpnConnectionArn": (str, False),
+        "VpnConnectionArn": (str, True),
     }
 
 

diff --git a/troposphere/nimblestudio.py b/troposphere/nimblestudio.py
@@ -10,6 +10,17 @@
 from .validators import double
 
 
+class StreamConfigurationSessionBackup(AWSProperty):
+    """
+    `StreamConfigurationSessionBackup <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfigurationsessionbackup.html>`__
+    """
+
+    props: PropsDictType = {
+        "MaxBackupsToRetain": (double, False),
+        "Mode": (str, False),
+    }
+
+
 class StreamingSessionStorageRoot(AWSProperty):
     """
     `StreamingSessionStorageRoot <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamingsessionstorageroot.html>`__
@@ -55,6 +66,7 @@ class StreamConfiguration(AWSProperty):
         "Ec2InstanceTypes": ([str], True),
         "MaxSessionLengthInMinutes": (double, False),
         "MaxStoppedSessionLengthInMinutes": (double, False),
+        "SessionBackup": (StreamConfigurationSessionBackup, False),
         "SessionPersistenceMode": (str, False),
         "SessionStorage": (StreamConfigurationSessionStorage, False),
         "StreamingImageIds": ([str], True),

diff --git a/troposphere/opsworkscm.py b/troposphere/opsworkscm.py
@@ -47,7 +47,6 @@ class Server(AWSObject):
         "PreferredBackupWindow": (str, False),
         "PreferredMaintenanceWindow": (str, False),
         "SecurityGroupIds": ([str], False),
-        "ServerName": (str, False),
         "ServiceRoleArn": (str, True),
         "SubnetIds": ([str], False),
         "Tags": (validate_tags_or_list, False),

diff --git a/troposphere/rds.py b/troposphere/rds.py
@@ -304,7 +304,6 @@ class AuthFormat(AWSProperty):
         "Description": (str, False),
         "IAMAuth": (str, False),
         "SecretArn": (str, False),
-        "UserName": (str, False),
     }
 
 
@@ -340,7 +339,6 @@ class DBProxyEndpoint(AWSObject):
         "DBProxyEndpointName": (str, True),
         "DBProxyName": (str, True),
         "Tags": (Tags, False),
-        "TargetRole": (str, False),
         "VpcSecurityGroupIds": ([str], False),
         "VpcSubnetIds": ([str], True),
     }

diff --git a/troposphere/rolesanywhere.py b/troposphere/rolesanywhere.py
@@ -18,9 +18,9 @@ class CRL(AWSObject):
     resource_type = "AWS::RolesAnywhere::CRL"
 
     props: PropsDictType = {
-        "CrlData": (str, False),
+        "CrlData": (str, True),
         "Enabled": (boolean, False),
-        "Name": (str, False),
+        "Name": (str, True),
         "Tags": (Tags, False),
         "TrustAnchorArn": (str, False),
     }
@@ -37,9 +37,9 @@ class Profile(AWSObject):
         "DurationSeconds": (double, False),
         "Enabled": (boolean, False),
         "ManagedPolicyArns": ([str], False),
-        "Name": (str, False),
+        "Name": (str, True),
         "RequireInstanceProperties": (boolean, False),
-        "RoleArns": ([str], False),
+        "RoleArns": ([str], True),
         "SessionPolicy": (str, False),
         "Tags": (Tags, False),
     }
@@ -76,7 +76,7 @@ class TrustAnchor(AWSObject):
 
     props: PropsDictType = {
         "Enabled": (boolean, False),
-        "Name": (str, False),
-        "Source": (Source, False),
+        "Name": (str, True),
+        "Source": (Source, True),
         "Tags": (Tags, False),
     }