Skip to content

Commit cffd79a

Browse files
Updates from spec version 157.0.0 (#2222)
1 parent 6952959 commit cffd79a

File tree

7 files changed

+268
-0
lines changed

7 files changed

+268
-0
lines changed

troposphere/autoscaling.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ class InstanceRequirements(AWSProperty):
218218
"InstanceGenerations": ([str], False),
219219
"LocalStorage": (str, False),
220220
"LocalStorageTypes": ([str], False),
221+
"MaxSpotPriceAsPercentageOfOptimalOnDemandPrice": (integer, False),
221222
"MemoryGiBPerVCpu": (MemoryGiBPerVCpuRequest, False),
222223
"MemoryMiB": (MemoryMiBRequest, True),
223224
"NetworkBandwidthGbps": (NetworkBandwidthGbpsRequest, False),

troposphere/ec2.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,6 +1327,7 @@ class InstanceRequirements(AWSProperty):
13271327
"InstanceGenerations": ([str], False),
13281328
"LocalStorage": (str, False),
13291329
"LocalStorageTypes": ([str], False),
1330+
"MaxSpotPriceAsPercentageOfOptimalOnDemandPrice": (integer, False),
13301331
"MemoryGiBPerVCpu": (MemoryGiBPerVCpu, False),
13311332
"MemoryMiB": (MemoryMiB, False),
13321333
"NetworkBandwidthGbps": (NetworkBandwidthGbps, False),

troposphere/glue.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,33 @@ class Table(AWSObject):
982982
}
983983

984984

985+
class TableOptimizerConfiguration(AWSProperty):
986+
"""
987+
`TableOptimizerConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-tableoptimizer-tableoptimizerconfiguration.html>`__
988+
"""
989+
990+
props: PropsDictType = {
991+
"Enabled": (boolean, False),
992+
"RoleArn": (str, False),
993+
}
994+
995+
996+
class TableOptimizer(AWSObject):
997+
"""
998+
`TableOptimizer <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-tableoptimizer.html>`__
999+
"""
1000+
1001+
resource_type = "AWS::Glue::TableOptimizer"
1002+
1003+
props: PropsDictType = {
1004+
"CatalogId": (str, True),
1005+
"DatabaseName": (str, True),
1006+
"TableName": (str, True),
1007+
"TableOptimizerConfiguration": (TableOptimizerConfiguration, True),
1008+
"Type": (str, True),
1009+
}
1010+
1011+
9851012
class Action(AWSProperty):
9861013
"""
9871014
`Action <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html>`__

troposphere/inspectorv2.py

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,89 @@
1010
from .validators import double, integer
1111

1212

13+
class CisTargets(AWSProperty):
14+
"""
15+
`CisTargets <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-cisscanconfiguration-cistargets.html>`__
16+
"""
17+
18+
props: PropsDictType = {
19+
"AccountIds": ([str], True),
20+
"TargetResourceTags": (dict, False),
21+
}
22+
23+
24+
class Time(AWSProperty):
25+
"""
26+
`Time <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-cisscanconfiguration-time.html>`__
27+
"""
28+
29+
props: PropsDictType = {
30+
"TimeOfDay": (str, True),
31+
"TimeZone": (str, True),
32+
}
33+
34+
35+
class DailySchedule(AWSProperty):
36+
"""
37+
`DailySchedule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-cisscanconfiguration-dailyschedule.html>`__
38+
"""
39+
40+
props: PropsDictType = {
41+
"StartTime": (Time, True),
42+
}
43+
44+
45+
class MonthlySchedule(AWSProperty):
46+
"""
47+
`MonthlySchedule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-cisscanconfiguration-monthlyschedule.html>`__
48+
"""
49+
50+
props: PropsDictType = {
51+
"Day": (str, True),
52+
"StartTime": (Time, True),
53+
}
54+
55+
56+
class WeeklySchedule(AWSProperty):
57+
"""
58+
`WeeklySchedule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-cisscanconfiguration-weeklyschedule.html>`__
59+
"""
60+
61+
props: PropsDictType = {
62+
"Days": ([str], True),
63+
"StartTime": (Time, True),
64+
}
65+
66+
67+
class Schedule(AWSProperty):
68+
"""
69+
`Schedule <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-cisscanconfiguration-schedule.html>`__
70+
"""
71+
72+
props: PropsDictType = {
73+
"Daily": (DailySchedule, False),
74+
"Monthly": (MonthlySchedule, False),
75+
"OneTime": (dict, False),
76+
"Weekly": (WeeklySchedule, False),
77+
}
78+
79+
80+
class CisScanConfiguration(AWSObject):
81+
"""
82+
`CisScanConfiguration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-cisscanconfiguration.html>`__
83+
"""
84+
85+
resource_type = "AWS::InspectorV2::CisScanConfiguration"
86+
87+
props: PropsDictType = {
88+
"ScanName": (str, False),
89+
"Schedule": (Schedule, False),
90+
"SecurityLevel": (str, False),
91+
"Tags": (dict, False),
92+
"Targets": (CisTargets, False),
93+
}
94+
95+
1396
class DateFilter(AWSProperty):
1497
"""
1598
`DateFilter <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-inspectorv2-filter-datefilter.html>`__

troposphere/location.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class MapConfiguration(AWSProperty):
6262
"""
6363

6464
props: PropsDictType = {
65+
"CustomLayers": ([str], False),
6566
"PoliticalView": (str, False),
6667
"Style": (str, True),
6768
}

troposphere/rds.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,23 @@ class GlobalCluster(AWSObject):
503503
}
504504

505505

506+
class Integration(AWSObject):
507+
"""
508+
`Integration <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-integration.html>`__
509+
"""
510+
511+
resource_type = "AWS::RDS::Integration"
512+
513+
props: PropsDictType = {
514+
"AdditionalEncryptionContext": (dict, False),
515+
"IntegrationName": (str, False),
516+
"KMSKeyId": (str, False),
517+
"SourceArn": (str, True),
518+
"Tags": (Tags, False),
519+
"TargetArn": (str, True),
520+
}
521+
522+
506523
class OptionSetting(AWSProperty):
507524
"""
508525
`OptionSetting <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionsetting.html>`__

troposphere/sagemaker.py

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,42 @@ class App(AWSObject):
3939
}
4040

4141

42+
class CustomImageContainerEnvironmentVariable(AWSProperty):
43+
"""
44+
`CustomImageContainerEnvironmentVariable <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-customimagecontainerenvironmentvariable.html>`__
45+
"""
46+
47+
props: PropsDictType = {
48+
"Key": (str, True),
49+
"Value": (str, True),
50+
}
51+
52+
53+
class ContainerConfig(AWSProperty):
54+
"""
55+
`ContainerConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-containerconfig.html>`__
56+
"""
57+
58+
props: PropsDictType = {
59+
"ContainerArguments": ([str], False),
60+
"ContainerEntrypoint": ([str], False),
61+
"ContainerEnvironmentVariables": (
62+
[CustomImageContainerEnvironmentVariable],
63+
False,
64+
),
65+
}
66+
67+
68+
class JupyterLabAppImageConfig(AWSProperty):
69+
"""
70+
`JupyterLabAppImageConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-jupyterlabappimageconfig.html>`__
71+
"""
72+
73+
props: PropsDictType = {
74+
"ContainerConfig": (ContainerConfig, False),
75+
}
76+
77+
4278
class FileSystemConfig(AWSProperty):
4379
"""
4480
`FileSystemConfig <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-filesystemconfig.html>`__
@@ -82,6 +118,7 @@ class AppImageConfig(AWSObject):
82118

83119
props: PropsDictType = {
84120
"AppImageConfigName": (str, True),
121+
"JupyterLabAppImageConfig": (JupyterLabAppImageConfig, False),
85122
"KernelGatewayImageConfig": (KernelGatewayImageConfig, False),
86123
"Tags": (Tags, False),
87124
}
@@ -442,6 +479,17 @@ class DefaultSpaceSettings(AWSProperty):
442479
}
443480

444481

482+
class DockerSettings(AWSProperty):
483+
"""
484+
`DockerSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-dockersettings.html>`__
485+
"""
486+
487+
props: PropsDictType = {
488+
"EnableDockerAccess": (str, False),
489+
"VpcOnlyTrustedAccounts": ([str], False),
490+
}
491+
492+
445493
class RStudioServerProDomainSettings(AWSProperty):
446494
"""
447495
`RStudioServerProDomainSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-rstudioserverprodomainsettings.html>`__
@@ -461,6 +509,7 @@ class DomainSettings(AWSProperty):
461509
"""
462510

463511
props: PropsDictType = {
512+
"DockerSettings": (DockerSettings, False),
464513
"RStudioServerProDomainSettings": (RStudioServerProDomainSettings, False),
465514
"SecurityGroupIds": ([str], False),
466515
}
@@ -2605,14 +2654,100 @@ class Project(AWSObject):
26052654
}
26062655

26072656

2657+
class OwnershipSettings(AWSProperty):
2658+
"""
2659+
`OwnershipSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-ownershipsettings.html>`__
2660+
"""
2661+
2662+
props: PropsDictType = {
2663+
"OwnerUserProfileName": (str, True),
2664+
}
2665+
2666+
2667+
class EFSFileSystem(AWSProperty):
2668+
"""
2669+
`EFSFileSystem <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-efsfilesystem.html>`__
2670+
"""
2671+
2672+
props: PropsDictType = {
2673+
"FileSystemId": (str, True),
2674+
}
2675+
2676+
2677+
class CustomFileSystem(AWSProperty):
2678+
"""
2679+
`CustomFileSystem <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-customfilesystem.html>`__
2680+
"""
2681+
2682+
props: PropsDictType = {
2683+
"EFSFileSystem": (EFSFileSystem, False),
2684+
}
2685+
2686+
2687+
class SpaceCodeEditorAppSettings(AWSProperty):
2688+
"""
2689+
`SpaceCodeEditorAppSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacecodeeditorappsettings.html>`__
2690+
"""
2691+
2692+
props: PropsDictType = {
2693+
"DefaultResourceSpec": (ResourceSpec, False),
2694+
}
2695+
2696+
2697+
class SpaceJupyterLabAppSettings(AWSProperty):
2698+
"""
2699+
`SpaceJupyterLabAppSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacejupyterlabappsettings.html>`__
2700+
"""
2701+
2702+
props: PropsDictType = {
2703+
"CodeRepositories": ([CodeRepositoryProperty], False),
2704+
"DefaultResourceSpec": (ResourceSpec, False),
2705+
}
2706+
2707+
2708+
class EbsStorageSettings(AWSProperty):
2709+
"""
2710+
`EbsStorageSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-ebsstoragesettings.html>`__
2711+
"""
2712+
2713+
props: PropsDictType = {
2714+
"EbsVolumeSizeInGb": (integer, True),
2715+
}
2716+
2717+
2718+
class SpaceStorageSettings(AWSProperty):
2719+
"""
2720+
`SpaceStorageSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacestoragesettings.html>`__
2721+
"""
2722+
2723+
props: PropsDictType = {
2724+
"EbsStorageSettings": (EbsStorageSettings, False),
2725+
}
2726+
2727+
26082728
class SpaceSettings(AWSProperty):
26092729
"""
26102730
`SpaceSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacesettings.html>`__
26112731
"""
26122732

26132733
props: PropsDictType = {
2734+
"AppType": (str, False),
2735+
"CodeEditorAppSettings": (SpaceCodeEditorAppSettings, False),
2736+
"CustomFileSystems": ([CustomFileSystem], False),
2737+
"JupyterLabAppSettings": (SpaceJupyterLabAppSettings, False),
26142738
"JupyterServerAppSettings": (JupyterServerAppSettings, False),
26152739
"KernelGatewayAppSettings": (KernelGatewayAppSettings, False),
2740+
"SpaceStorageSettings": (SpaceStorageSettings, False),
2741+
}
2742+
2743+
2744+
class SpaceSharingSettings(AWSProperty):
2745+
"""
2746+
`SpaceSharingSettings <http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacesharingsettings.html>`__
2747+
"""
2748+
2749+
props: PropsDictType = {
2750+
"SharingType": (str, True),
26162751
}
26172752

26182753

@@ -2625,8 +2760,11 @@ class Space(AWSObject):
26252760

26262761
props: PropsDictType = {
26272762
"DomainId": (str, True),
2763+
"OwnershipSettings": (OwnershipSettings, False),
2764+
"SpaceDisplayName": (str, False),
26282765
"SpaceName": (str, True),
26292766
"SpaceSettings": (SpaceSettings, False),
2767+
"SpaceSharingSettings": (SpaceSharingSettings, False),
26302768
"Tags": (Tags, False),
26312769
}
26322770

0 commit comments

Comments
 (0)