Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates from spec version 78.0.0 #2059

Merged
merged 1 commit into from
Jun 24, 2022
Merged

Updates from spec version 78.0.0 #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 126 additions & 7 deletions troposphere/appflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,36 @@ class AmplitudeConnectorProfileCredentials(AWSProperty):
}


class DatadogConnectorProfileCredentials(AWSProperty):
class ApiKeyCredentials(AWSProperty):
"""
`DatadogConnectorProfileCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofilecredentials.html>`__
`ApiKeyCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-apikeycredentials.html>`__
"""

props: PropsDictType = {
"ApiKey": (str, True),
"ApplicationKey": (str, True),
"ApiSecretKey": (str, False),
}


class DynatraceConnectorProfileCredentials(AWSProperty):
class BasicAuthCredentials(AWSProperty):
"""
`DynatraceConnectorProfileCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-dynatraceconnectorprofilecredentials.html>`__
`BasicAuthCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-basicauthcredentials.html>`__
"""

props: PropsDictType = {
"ApiToken": (str, True),
"Password": (str, True),
"Username": (str, True),
}


class CustomAuthCredentials(AWSProperty):
"""
`CustomAuthCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-customauthcredentials.html>`__
"""

props: PropsDictType = {
"CredentialsMap": (dict, False),
"CustomAuthenticationType": (str, True),
}


Expand All @@ -53,6 +65,55 @@ class ConnectorOAuthRequest(AWSProperty):
}


class OAuth2Credentials(AWSProperty):
"""
`OAuth2Credentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-oauth2credentials.html>`__
"""

props: PropsDictType = {
"AccessToken": (str, False),
"ClientId": (str, False),
"ClientSecret": (str, False),
"OAuthRequest": (ConnectorOAuthRequest, False),
"RefreshToken": (str, False),
}


class CustomConnectorProfileCredentials(AWSProperty):
"""
`CustomConnectorProfileCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-customconnectorprofilecredentials.html>`__
"""

props: PropsDictType = {
"ApiKey": (ApiKeyCredentials, False),
"AuthenticationType": (str, True),
"Basic": (BasicAuthCredentials, False),
"Custom": (CustomAuthCredentials, False),
"Oauth2": (OAuth2Credentials, False),
}


class DatadogConnectorProfileCredentials(AWSProperty):
"""
`DatadogConnectorProfileCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofilecredentials.html>`__
"""

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


class DynatraceConnectorProfileCredentials(AWSProperty):
"""
`DynatraceConnectorProfileCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-dynatraceconnectorprofilecredentials.html>`__
"""

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


class GoogleAnalyticsConnectorProfileCredentials(AWSProperty):
"""
`GoogleAnalyticsConnectorProfileCredentials <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html>`__
Expand Down Expand Up @@ -110,7 +171,7 @@ class SAPODataConnectorProfileCredentials(AWSProperty):
"""

props: PropsDictType = {
"BasicAuthCredentials": (dict, False),
"BasicAuthCredentials": (BasicAuthCredentials, False),
"OAuthCredentials": (dict, False),
}

Expand Down Expand Up @@ -214,6 +275,7 @@ class ConnectorProfileCredentials(AWSProperty):

props: PropsDictType = {
"Amplitude": (AmplitudeConnectorProfileCredentials, False),
"CustomConnector": (CustomConnectorProfileCredentials, False),
"Datadog": (DatadogConnectorProfileCredentials, False),
"Dynatrace": (DynatraceConnectorProfileCredentials, False),
"GoogleAnalytics": (GoogleAnalyticsConnectorProfileCredentials, False),
Expand All @@ -232,6 +294,29 @@ class ConnectorProfileCredentials(AWSProperty):
}


class OAuth2Properties(AWSProperty):
"""
`OAuth2Properties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-oauth2properties.html>`__
"""

props: PropsDictType = {
"OAuth2GrantType": (str, False),
"TokenUrl": (str, False),
"TokenUrlCustomProperties": (dict, False),
}


class CustomConnectorProfileProperties(AWSProperty):
"""
`CustomConnectorProfileProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-customconnectorprofileproperties.html>`__
"""

props: PropsDictType = {
"OAuth2Properties": (OAuth2Properties, False),
"ProfileProperties": (dict, False),
}


class DatadogConnectorProfileProperties(AWSProperty):
"""
`DatadogConnectorProfileProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofileproperties.html>`__
Expand Down Expand Up @@ -386,6 +471,7 @@ class ConnectorProfileProperties(AWSProperty):
"""

props: PropsDictType = {
"CustomConnector": (CustomConnectorProfileProperties, False),
"Datadog": (DatadogConnectorProfileProperties, False),
"Dynatrace": (DynatraceConnectorProfileProperties, False),
"InforNexus": (InforNexusConnectorProfileProperties, False),
Expand Down Expand Up @@ -421,6 +507,7 @@ class ConnectorProfile(AWSObject):

props: PropsDictType = {
"ConnectionMode": (str, True),
"ConnectorLabel": (str, False),
"ConnectorProfileConfig": (ConnectorProfileConfig, False),
"ConnectorProfileName": (str, True),
"ConnectorType": (str, True),
Expand All @@ -440,6 +527,20 @@ class ErrorHandlingConfig(AWSProperty):
}


class CustomConnectorDestinationProperties(AWSProperty):
"""
`CustomConnectorDestinationProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-customconnectordestinationproperties.html>`__
"""

props: PropsDictType = {
"CustomProperties": (dict, False),
"EntityName": (str, True),
"ErrorHandlingConfig": (ErrorHandlingConfig, False),
"IdFieldNames": ([str], False),
"WriteOperationType": (str, False),
}


class EventBridgeDestinationProperties(AWSProperty):
"""
`EventBridgeDestinationProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-eventbridgedestinationproperties.html>`__
Expand Down Expand Up @@ -515,6 +616,7 @@ class S3OutputFormatConfig(AWSProperty):
"AggregationConfig": (AggregationConfig, False),
"FileType": (str, False),
"PrefixConfig": (PrefixConfig, False),
"PreserveSourceDataTyping": (boolean, False),
}


Expand Down Expand Up @@ -624,6 +726,7 @@ class DestinationConnectorProperties(AWSProperty):
"""

props: PropsDictType = {
"CustomConnector": (CustomConnectorDestinationProperties, False),
"EventBridge": (EventBridgeDestinationProperties, False),
"LookoutMetrics": (LookoutMetricsDestinationProperties, False),
"Marketo": (MarketoDestinationProperties, False),
Expand All @@ -643,6 +746,7 @@ class DestinationFlowConfig(AWSProperty):
"""

props: PropsDictType = {
"ApiVersion": (str, False),
"ConnectorProfileName": (str, False),
"ConnectorType": (str, True),
"DestinationConnectorProperties": (DestinationConnectorProperties, True),
Expand All @@ -669,6 +773,17 @@ class AmplitudeSourceProperties(AWSProperty):
}


class CustomConnectorSourceProperties(AWSProperty):
"""
`CustomConnectorSourceProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-customconnectorsourceproperties.html>`__
"""

props: PropsDictType = {
"CustomProperties": (dict, False),
"EntityName": (str, True),
}


class DatadogSourceProperties(AWSProperty):
"""
`DatadogSourceProperties <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-datadogsourceproperties.html>`__
Expand Down Expand Up @@ -834,6 +949,7 @@ class SourceConnectorProperties(AWSProperty):

props: PropsDictType = {
"Amplitude": (AmplitudeSourceProperties, False),
"CustomConnector": (CustomConnectorSourceProperties, False),
"Datadog": (DatadogSourceProperties, False),
"Dynatrace": (DynatraceSourceProperties, False),
"GoogleAnalytics": (GoogleAnalyticsSourceProperties, False),
Expand All @@ -857,6 +973,7 @@ class SourceFlowConfig(AWSProperty):
"""

props: PropsDictType = {
"ApiVersion": (str, False),
"ConnectorProfileName": (str, False),
"ConnectorType": (str, True),
"IncrementalPullConfig": (IncrementalPullConfig, False),
Expand All @@ -871,6 +988,7 @@ class ConnectorOperator(AWSProperty):

props: PropsDictType = {
"Amplitude": (str, False),
"CustomConnector": (str, False),
"Datadog": (str, False),
"Dynatrace": (str, False),
"GoogleAnalytics": (str, False),
Expand Down Expand Up @@ -920,6 +1038,7 @@ class ScheduledTriggerProperties(AWSProperty):

props: PropsDictType = {
"DataPullMode": (str, False),
"FlowErrorDeactivationThreshold": (integer, False),
"ScheduleEndTime": (double, False),
"ScheduleExpression": (str, True),
"ScheduleOffset": (double, False),
Expand Down
1 change: 1 addition & 0 deletions troposphere/applicationinsights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ class Application(AWSObject):
"CWEMonitorEnabled": (boolean, False),
"ComponentMonitoringSettings": ([ComponentMonitoringSetting], False),
"CustomComponents": ([CustomComponent], False),
"GroupingType": (str, False),
"LogPatternSets": ([LogPatternSet], False),
"OpsCenterEnabled": (boolean, False),
"OpsItemSNSTopicArn": (str, False),
Expand Down
47 changes: 46 additions & 1 deletion troposphere/cloudtrail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,52 @@


from . import AWSObject, AWSProperty, PropsDictType, Tags
from .validators import boolean
from .validators import boolean, integer


class AdvancedFieldSelector(AWSProperty):
"""
`AdvancedFieldSelector <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-eventdatastore-advancedfieldselector.html>`__
"""

props: PropsDictType = {
"EndsWith": ([str], False),
"Equals": ([str], False),
"Field": (str, True),
"NotEndsWith": ([str], False),
"NotEquals": ([str], False),
"NotStartsWith": ([str], False),
"StartsWith": ([str], False),
}


class AdvancedEventSelector(AWSProperty):
"""
`AdvancedEventSelector <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-eventdatastore-advancedeventselector.html>`__
"""

props: PropsDictType = {
"FieldSelectors": ([AdvancedFieldSelector], True),
"Name": (str, False),
}


class EventDataStore(AWSObject):
"""
`EventDataStore <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-eventdatastore.html>`__
"""

resource_type = "AWS::CloudTrail::EventDataStore"

props: PropsDictType = {
"AdvancedEventSelectors": ([AdvancedEventSelector], False),
"MultiRegionEnabled": (boolean, False),
"Name": (str, False),
"OrganizationEnabled": (boolean, False),
"RetentionPeriod": (integer, False),
"Tags": (Tags, False),
"TerminationProtectionEnabled": (boolean, False),
}


class DataResource(AWSProperty):
Expand Down
4 changes: 2 additions & 2 deletions troposphere/ec2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class ClientVpnTargetNetworkAssociation(AWSObject):

class CustomerGateway(AWSObject):
"""
`CustomerGateway <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html>`__
`CustomerGateway <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customergateway.html>`__
"""

resource_type = "AWS::EC2::CustomerGateway"
Expand Down Expand Up @@ -1392,7 +1392,7 @@ class LaunchTemplate(AWSObject):
resource_type = "AWS::EC2::LaunchTemplate"

props: PropsDictType = {
"LaunchTemplateData": (LaunchTemplateData, False),
"LaunchTemplateData": (LaunchTemplateData, True),
"LaunchTemplateName": (str, False),
"TagSpecifications": ([TagSpecifications], False),
}
Expand Down
5 changes: 3 additions & 2 deletions troposphere/elasticloadbalancingv2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ class AuthenticateOidcConfig(AWSProperty):
"AuthenticationRequestExtraParams": (dict, False),
"AuthorizationEndpoint": (str, True),
"ClientId": (str, True),
"ClientSecret": (str, True),
"ClientSecret": (str, False),
"Issuer": (str, True),
"OnUnauthenticatedRequest": (str, False),
"Scope": (str, False),
"SessionCookieName": (str, False),
"SessionTimeout": (str, False),
"TokenEndpoint": (str, True),
"UseExistingClientSecret": (boolean, False),
"UserInfoEndpoint": (str, True),
}

Expand Down Expand Up @@ -288,7 +289,7 @@ class ListenerRuleAuthenticateOidcConfig(AWSProperty):
"AuthenticationRequestExtraParams": (dict, False),
"AuthorizationEndpoint": (str, True),
"ClientId": (str, True),
"ClientSecret": (str, True),
"ClientSecret": (str, False),
"Issuer": (str, True),
"OnUnauthenticatedRequest": (str, False),
"Scope": (str, False),
Expand Down
17 changes: 17 additions & 0 deletions troposphere/iot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,23 @@ class Authorizer(AWSObject):
}


class CACertificate(AWSObject):
"""
`CACertificate <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-cacertificate.html>`__
"""

resource_type = "AWS::IoT::CACertificate"

props: PropsDictType = {
"AutoRegistrationStatus": (str, False),
"CACertificatePem": (str, False),
"RegistrationConfig": (dict, False),
"Status": (str, True),
"Tags": (Tags, False),
"VerificationCertificatePem": (str, False),
}


class Certificate(AWSObject):
"""
`Certificate <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html>`__
Expand Down
Loading