Skip to content

Commit

Permalink
Updates from spec version 167.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@markpeek
markpeek committed Mar 30, 2024
1 parent 0acf17f commit 71f6f46
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 180 deletions.
1 change: 1 addition & 0 deletions troposphere/cloudwatch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ class SingleMetricAnomalyDetector(AWSProperty):
"""

props: PropsDictType = {
"AccountId": (str, False),
"Dimensions": ([MetricDimension], False),
"MetricName": (str, False),
"Namespace": (str, False),
Expand Down
3 changes: 3 additions & 0 deletions troposphere/docdbelastic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ class Cluster(AWSObject):
"AdminUserName": (str, True),
"AdminUserPassword": (str, False),
"AuthType": (str, True),
"BackupRetentionPeriod": (integer, False),
"ClusterName": (str, True),
"KmsKeyId": (str, False),
"PreferredBackupWindow": (str, False),
"PreferredMaintenanceWindow": (str, False),
"ShardCapacity": (integer, True),
"ShardCount": (integer, True),
"ShardInstanceCount": (integer, False),
"SubnetIds": ([str], False),
"Tags": (Tags, False),
"VpcSecurityGroupIds": ([str], False),
Expand Down
5 changes: 3 additions & 2 deletions troposphere/entityresolution.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ class IdMappingWorkflowInputSource(AWSProperty):

props: PropsDictType = {
"InputSourceARN": (str, True),
"SchemaArn": (str, True),
"SchemaArn": (str, False),
"Type": (str, False),
}


Expand All @@ -76,7 +77,7 @@ class IdMappingWorkflow(AWSObject):
"Description": (str, False),
"IdMappingTechniques": (IdMappingTechniques, True),
"InputSourceConfig": ([IdMappingWorkflowInputSource], True),
"OutputSourceConfig": ([IdMappingWorkflowOutputSource], True),
"OutputSourceConfig": ([IdMappingWorkflowOutputSource], False),
"RoleArn": (str, True),
"Tags": (Tags, False),
"WorkflowName": (str, True),
Expand Down
76 changes: 70 additions & 6 deletions troposphere/kafkaconnect.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ class LogDelivery(AWSProperty):
}


class CustomPlugin(AWSProperty):
class CustomPluginProperty(AWSProperty):
"""
`CustomPlugin <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-connector-customplugin.html>`__
`CustomPluginProperty <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-connector-customplugin.html>`__
"""

props: PropsDictType = {
Expand All @@ -191,13 +191,13 @@ class Plugin(AWSProperty):
"""

props: PropsDictType = {
"CustomPlugin": (CustomPlugin, True),
"CustomPlugin": (CustomPluginProperty, True),
}


class WorkerConfiguration(AWSProperty):
class WorkerConfigurationProperty(AWSProperty):
"""
`WorkerConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-connector-workerconfiguration.html>`__
`WorkerConfigurationProperty <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-connector-workerconfiguration.html>`__
"""

props: PropsDictType = {
Expand Down Expand Up @@ -226,5 +226,69 @@ class Connector(AWSObject):
"Plugins": ([Plugin], True),
"ServiceExecutionRoleArn": (str, True),
"Tags": (Tags, False),
"WorkerConfiguration": (WorkerConfiguration, False),
"WorkerConfiguration": (WorkerConfigurationProperty, False),
}


class S3Location(AWSProperty):
"""
`S3Location <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-s3location.html>`__
"""

props: PropsDictType = {
"BucketArn": (str, True),
"FileKey": (str, True),
"ObjectVersion": (str, False),
}


class CustomPluginLocation(AWSProperty):
"""
`CustomPluginLocation <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginlocation.html>`__
"""

props: PropsDictType = {
"S3Location": (S3Location, True),
}


class CustomPlugin(AWSObject):
"""
`CustomPlugin <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-customplugin.html>`__
"""

resource_type = "AWS::KafkaConnect::CustomPlugin"

props: PropsDictType = {
"ContentType": (str, True),
"Description": (str, False),
"Location": (CustomPluginLocation, True),
"Name": (str, True),
"Tags": (Tags, False),
}


class WorkerConfiguration(AWSObject):
"""
`WorkerConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kafkaconnect-workerconfiguration.html>`__
"""

resource_type = "AWS::KafkaConnect::WorkerConfiguration"

props: PropsDictType = {
"Description": (str, False),
"Name": (str, True),
"PropertiesFileContent": (str, True),
"Tags": (Tags, False),
}


class CustomPluginFileDescription(AWSProperty):
"""
`CustomPluginFileDescription <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kafkaconnect-customplugin-custompluginfiledescription.html>`__
"""

props: PropsDictType = {
"FileMd5": (str, False),
"FileSize": (integer, False),
}
177 changes: 5 additions & 172 deletions troposphere/securityhub.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class AutomationRulesAction(AWSProperty):

class DateRange(AWSProperty):
"""
`DateRange <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-daterange.html>`__
`DateRange <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-automationrule-daterange.html>`__
"""

props: PropsDictType = {
Expand All @@ -96,7 +96,7 @@ class DateRange(AWSProperty):

class DateFilter(AWSProperty):
"""
`DateFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-datefilter.html>`__
`DateFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-automationrule-datefilter.html>`__
"""

props: PropsDictType = {
Expand All @@ -108,7 +108,7 @@ class DateFilter(AWSProperty):

class MapFilter(AWSProperty):
"""
`MapFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-mapfilter.html>`__
`MapFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-automationrule-mapfilter.html>`__
"""

props: PropsDictType = {
Expand All @@ -120,7 +120,7 @@ class MapFilter(AWSProperty):

class NumberFilter(AWSProperty):
"""
`NumberFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-numberfilter.html>`__
`NumberFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-automationrule-numberfilter.html>`__
"""

props: PropsDictType = {
Expand All @@ -132,7 +132,7 @@ class NumberFilter(AWSProperty):

class StringFilter(AWSProperty):
"""
`StringFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-stringfilter.html>`__
`StringFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-automationrule-stringfilter.html>`__
"""

props: PropsDictType = {
Expand Down Expand Up @@ -204,18 +204,6 @@ class AutomationRule(AWSObject):
}


class DelegatedAdmin(AWSObject):
"""
`DelegatedAdmin <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-delegatedadmin.html>`__
"""

resource_type = "AWS::SecurityHub::DelegatedAdmin"

props: PropsDictType = {
"AdminAccountId": (str, True),
}


class Hub(AWSObject):
"""
`Hub <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-hub.html>`__
Expand All @@ -231,161 +219,6 @@ class Hub(AWSObject):
}


class BooleanFilter(AWSProperty):
"""
`BooleanFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-booleanfilter.html>`__
"""

props: PropsDictType = {
"Value": (boolean, True),
}


class IpFilter(AWSProperty):
"""
`IpFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-ipfilter.html>`__
"""

props: PropsDictType = {
"Cidr": (str, False),
}


class AwsSecurityFindingFilters(AWSProperty):
"""
`AwsSecurityFindingFilters <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-insight-awssecurityfindingfilters.html>`__
"""

props: PropsDictType = {
"AwsAccountId": ([StringFilter], False),
"AwsAccountName": ([StringFilter], False),
"CompanyName": ([StringFilter], False),
"ComplianceAssociatedStandardsId": ([StringFilter], False),
"ComplianceSecurityControlId": ([StringFilter], False),
"ComplianceSecurityControlParametersName": ([StringFilter], False),
"ComplianceSecurityControlParametersValue": ([StringFilter], False),
"ComplianceStatus": ([StringFilter], False),
"Confidence": ([NumberFilter], False),
"CreatedAt": ([DateFilter], False),
"Criticality": ([NumberFilter], False),
"Description": ([StringFilter], False),
"FindingProviderFieldsConfidence": ([NumberFilter], False),
"FindingProviderFieldsCriticality": ([NumberFilter], False),
"FindingProviderFieldsRelatedFindingsId": ([StringFilter], False),
"FindingProviderFieldsRelatedFindingsProductArn": ([StringFilter], False),
"FindingProviderFieldsSeverityLabel": ([StringFilter], False),
"FindingProviderFieldsSeverityOriginal": ([StringFilter], False),
"FindingProviderFieldsTypes": ([StringFilter], False),
"FirstObservedAt": ([DateFilter], False),
"GeneratorId": ([StringFilter], False),
"Id": ([StringFilter], False),
"LastObservedAt": ([DateFilter], False),
"MalwareName": ([StringFilter], False),
"MalwarePath": ([StringFilter], False),
"MalwareState": ([StringFilter], False),
"MalwareType": ([StringFilter], False),
"NetworkDestinationDomain": ([StringFilter], False),
"NetworkDestinationIpV4": ([IpFilter], False),
"NetworkDestinationIpV6": ([IpFilter], False),
"NetworkDestinationPort": ([NumberFilter], False),
"NetworkDirection": ([StringFilter], False),
"NetworkProtocol": ([StringFilter], False),
"NetworkSourceDomain": ([StringFilter], False),
"NetworkSourceIpV4": ([IpFilter], False),
"NetworkSourceIpV6": ([IpFilter], False),
"NetworkSourceMac": ([StringFilter], False),
"NetworkSourcePort": ([NumberFilter], False),
"NoteText": ([StringFilter], False),
"NoteUpdatedAt": ([DateFilter], False),
"NoteUpdatedBy": ([StringFilter], False),
"ProcessLaunchedAt": ([DateFilter], False),
"ProcessName": ([StringFilter], False),
"ProcessParentPid": ([NumberFilter], False),
"ProcessPath": ([StringFilter], False),
"ProcessPid": ([NumberFilter], False),
"ProcessTerminatedAt": ([DateFilter], False),
"ProductArn": ([StringFilter], False),
"ProductFields": ([MapFilter], False),
"ProductName": ([StringFilter], False),
"RecommendationText": ([StringFilter], False),
"RecordState": ([StringFilter], False),
"Region": ([StringFilter], False),
"RelatedFindingsId": ([StringFilter], False),
"RelatedFindingsProductArn": ([StringFilter], False),
"ResourceApplicationArn": ([StringFilter], False),
"ResourceApplicationName": ([StringFilter], False),
"ResourceAwsEc2InstanceIamInstanceProfileArn": ([StringFilter], False),
"ResourceAwsEc2InstanceImageId": ([StringFilter], False),
"ResourceAwsEc2InstanceIpV4Addresses": ([IpFilter], False),
"ResourceAwsEc2InstanceIpV6Addresses": ([IpFilter], False),
"ResourceAwsEc2InstanceKeyName": ([StringFilter], False),
"ResourceAwsEc2InstanceLaunchedAt": ([DateFilter], False),
"ResourceAwsEc2InstanceSubnetId": ([StringFilter], False),
"ResourceAwsEc2InstanceType": ([StringFilter], False),
"ResourceAwsEc2InstanceVpcId": ([StringFilter], False),
"ResourceAwsIamAccessKeyCreatedAt": ([DateFilter], False),
"ResourceAwsIamAccessKeyPrincipalName": ([StringFilter], False),
"ResourceAwsIamAccessKeyStatus": ([StringFilter], False),
"ResourceAwsIamUserUserName": ([StringFilter], False),
"ResourceAwsS3BucketOwnerId": ([StringFilter], False),
"ResourceAwsS3BucketOwnerName": ([StringFilter], False),
"ResourceContainerImageId": ([StringFilter], False),
"ResourceContainerImageName": ([StringFilter], False),
"ResourceContainerLaunchedAt": ([DateFilter], False),
"ResourceContainerName": ([StringFilter], False),
"ResourceDetailsOther": ([MapFilter], False),
"ResourceId": ([StringFilter], False),
"ResourcePartition": ([StringFilter], False),
"ResourceRegion": ([StringFilter], False),
"ResourceTags": ([MapFilter], False),
"ResourceType": ([StringFilter], False),
"Sample": ([BooleanFilter], False),
"SeverityLabel": ([StringFilter], False),
"SourceUrl": ([StringFilter], False),
"ThreatIntelIndicatorCategory": ([StringFilter], False),
"ThreatIntelIndicatorLastObservedAt": ([DateFilter], False),
"ThreatIntelIndicatorSource": ([StringFilter], False),
"ThreatIntelIndicatorSourceUrl": ([StringFilter], False),
"ThreatIntelIndicatorType": ([StringFilter], False),
"ThreatIntelIndicatorValue": ([StringFilter], False),
"Title": ([StringFilter], False),
"Type": ([StringFilter], False),
"UpdatedAt": ([DateFilter], False),
"UserDefinedFields": ([MapFilter], False),
"VerificationState": ([StringFilter], False),
"VulnerabilitiesExploitAvailable": ([StringFilter], False),
"VulnerabilitiesFixAvailable": ([StringFilter], False),
"WorkflowState": ([StringFilter], False),
"WorkflowStatus": ([StringFilter], False),
}


class Insight(AWSObject):
"""
`Insight <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-insight.html>`__
"""

resource_type = "AWS::SecurityHub::Insight"

props: PropsDictType = {
"Filters": (AwsSecurityFindingFilters, True),
"GroupByAttribute": (str, True),
"Name": (str, True),
}


class ProductSubscription(AWSObject):
"""
`ProductSubscription <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-productsubscription.html>`__
"""

resource_type = "AWS::SecurityHub::ProductSubscription"

props: PropsDictType = {
"ProductArn": (str, True),
}


class StandardsControl(AWSProperty):
"""
`StandardsControl <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-standard-standardscontrol.html>`__
Expand Down

0 comments on commit 71f6f46

Please sign in to comment.