Skip to content

Commit 5914526

Browse files
ewbankkitewbankkit
committed
04/06/2022 CloudFormation schemas in us-east-1; Refresh existing schemas.
1 parent f21700c commit 5914526

10 files changed

+188
-24
lines changed

‎internal/service/cloudformation/schemas/AWS_Batch_ComputeEnvironment.json‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
"ComputeResources" : {
1313
"$ref" : "#/definitions/ComputeResources"
1414
},
15+
"ReplaceComputeEnvironment" : {
16+
"type" : "boolean",
17+
"default" : true
18+
},
1519
"ServiceRole" : {
1620
"type" : "string"
1721
},
@@ -31,6 +35,9 @@
3135
"Type" : {
3236
"type" : "string"
3337
},
38+
"UpdatePolicy" : {
39+
"$ref" : "#/definitions/UpdatePolicy"
40+
},
3441
"UnmanagedvCpus" : {
3542
"type" : "integer"
3643
}
@@ -117,6 +124,10 @@
117124
},
118125
"Type" : {
119126
"type" : "string"
127+
},
128+
"UpdateToLatestImageVersion" : {
129+
"type" : "boolean",
130+
"default" : false
120131
}
121132
},
122133
"required" : [ "Subnets", "Type", "MaxvCpus" ]
@@ -148,6 +159,20 @@
148159
"type" : "string"
149160
}
150161
}
162+
},
163+
"UpdatePolicy": {
164+
"type" : "object",
165+
"additionalProperties" : false,
166+
"properties" : {
167+
"TerminateJobsOnUpdate" : {
168+
"type" : "boolean",
169+
"default": false
170+
},
171+
"JobExecutionTimeoutMinutes" : {
172+
"type" : "integer",
173+
"default" : 30
174+
}
175+
}
151176
}
152177
},
153178
"tagging": {
@@ -159,6 +184,12 @@
159184
},
160185
"required" : [ "Type" ],
161186
"createOnlyProperties" : [
187+
"/properties/ComputeResources/SpotIamFleetRole",
188+
"/properties/ComputeEnvironmentName",
189+
"/properties/Tags",
190+
"/properties/Type"
191+
],
192+
"conditionalCreateOnlyProperties": [
162193
"/properties/ComputeResources/AllocationStrategy",
163194
"/properties/ComputeResources/BidPercentage",
164195
"/properties/ComputeResources/Ec2Configuration",
@@ -168,12 +199,14 @@
168199
"/properties/ComputeResources/InstanceTypes",
169200
"/properties/ComputeResources/LaunchTemplate",
170201
"/properties/ComputeResources/PlacementGroup",
171-
"/properties/ComputeResources/SpotIamFleetRole",
202+
"/properties/ComputeResources/SecurityGroupIds",
203+
"/properties/ComputeResources/Subnets",
172204
"/properties/ComputeResources/Tags",
173-
"/properties/ComputeResources/Type",
174-
"/properties/ComputeEnvironmentName",
175-
"/properties/Tags",
176-
"/properties/Type"
205+
"/properties/ComputeResources/Type"
206+
],
207+
"writeOnlyProperties": [
208+
"/properties/ComputeResources/UpdateToLatestImageVersion",
209+
"/properties/ReplaceComputeEnvironment"
177210
],
178211
"primaryIdentifier" : [ "/properties/ComputeEnvironmentArn" ],
179212
"readOnlyProperties" : [ "/properties/ComputeEnvironmentArn" ],

‎internal/service/cloudformation/schemas/AWS_CloudFormation_StackSet.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"cloudformation:DescribeStackSetOperation",
347347
"cloudformation:TagResource"
348348
],
349-
"timeoutInMinutes": 720
349+
"timeoutInMinutes": 2160
350350
},
351351
"read": {
352352
"permissions": [
@@ -366,7 +366,7 @@
366366
"cloudformation:TagResource",
367367
"cloudformation:UntagResource"
368368
],
369-
"timeoutInMinutes": 720
369+
"timeoutInMinutes": 2160
370370
},
371371
"delete": {
372372
"permissions": [
@@ -375,7 +375,7 @@
375375
"cloudformation:DescribeStackSetOperation",
376376
"cloudformation:UntagResource"
377377
],
378-
"timeoutInMinutes": 720
378+
"timeoutInMinutes": 2160
379379
},
380380
"list": {
381381
"permissions": [

‎internal/service/cloudformation/schemas/AWS_DataBrew_Dataset.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"Format": {
1414
"description": "Dataset format",
15-
"enum": ["CSV", "JSON", "PARQUET", "EXCEL"],
15+
"enum": ["CSV", "JSON", "PARQUET", "EXCEL", "ORC"],
1616
"type": "string"
1717
},
1818
"FormatOptions": {

‎internal/service/cloudformation/schemas/AWS_EC2_TransitGatewayPeeringAttachment.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"sourceUrl":"https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-myservice","handlers":{"read":{"permissions":["ec2:DescribeTransitGatewayPeeringAttachments"]},"create":{"permissions":["ec2:CreateTransitGatewayPeeringAttachment","ec2:DescribeTransitGatewayPeeringAttachments"]},"update":{"permissions":["ec2:DescribeTransitGatewayPeeringAttachments"]},"list":{"permissions":["ec2:DescribeTransitGatewayPeeringAttachments"]},"delete":{"permissions":["ec2:DeleteTransitGatewayPeeringAttachment","ec2:DescribeTransitGatewayPeeringAttachments"]}},"typeName":"AWS::EC2::TransitGatewayPeeringAttachment","readOnlyProperties":["/properties/TransitGatewayAttachmentId","/properties/Status","/properties/State","/properties/CreationTime"],"description":"The AWS::EC2::TransitGatewayPeeringAttachment type","createOnlyProperties":["/properties/TransitGatewayId","/properties/PeerTransitGatewayId","/properties/PeerRegion","/properties/PeerAccountId"],"additionalProperties":false,"primaryIdentifier":["/properties/TransitGatewayAttachmentId"],"definitions":{"Tag":{"additionalProperties":false,"type":"object","properties":{"Value":{"description":"The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters.","type":"string"},"Key":{"description":"The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:.","type":"string"}}},"PeeringAttachmentStatus":{"additionalProperties":false,"type":"object","properties":{"Message":{"description":"The status message, if applicable.","type":"string"},"Code":{"description":"The status code.","type":"string"}}}},"required":["TransitGatewayId","PeerTransitGatewayId","PeerAccountId","PeerRegion"],"properties":{"Status":{"description":"The status of the transit gateway peering attachment.","$ref":"#/definitions/PeeringAttachmentStatus"},"TransitGatewayId":{"description":"The ID of the transit gateway.","type":"string"},"PeerTransitGatewayId":{"description":"The ID of the peer transit gateway.","type":"string"},"PeerAccountId":{"description":"The ID of the peer account","type":"string"},"State":{"description":"The state of the transit gateway peering attachment. Note that the initiating state has been deprecated.","type":"string"},"CreationTime":{"format":"date-time","description":"The time the transit gateway peering attachment was created.","type":"string"},"PeerRegion":{"description":"Peer Region","type":"string"},"Tags":{"description":"The tags for the transit gateway peering attachment.","type":"array","items":{"$ref":"#/definitions/Tag"}},"TransitGatewayAttachmentId":{"description":"The ID of the transit gateway peering attachment.","type":"string"}}}
1+
{"sourceUrl":"https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-myservice","handlers":{"read":{"permissions":["ec2:DescribeTransitGatewayPeeringAttachments"]},"create":{"permissions":["ec2:CreateTransitGatewayPeeringAttachment","ec2:DescribeTransitGatewayPeeringAttachments"]},"update":{"permissions":["ec2:DescribeTransitGatewayPeeringAttachments"]},"list":{"permissions":["ec2:DescribeTransitGatewayPeeringAttachments"]},"delete":{"permissions":["ec2:DeleteTransitGatewayPeeringAttachment","ec2:DescribeTransitGatewayPeeringAttachments"]}},"typeName":"AWS::EC2::TransitGatewayPeeringAttachment","readOnlyProperties":["/properties/TransitGatewayAttachmentId","/properties/Status","/properties/State","/properties/CreationTime"],"description":"The AWS::EC2::TransitGatewayPeeringAttachment type","writeOnlyProperties":["/properties/Options"],"createOnlyProperties":["/properties/TransitGatewayId","/properties/PeerTransitGatewayId","/properties/PeerRegion","/properties/PeerAccountId"],"additionalProperties":false,"primaryIdentifier":["/properties/TransitGatewayAttachmentId"],"definitions":{"Tag":{"additionalProperties":false,"type":"object","properties":{"Value":{"description":"The value of the tag. Constraints: Tag values are case-sensitive and accept a maximum of 255 Unicode characters.","type":"string"},"Key":{"description":"The key of the tag. Constraints: Tag keys are case-sensitive and accept a maximum of 127 Unicode characters. May not begin with aws:.","type":"string"}}},"PeeringAttachmentStatus":{"additionalProperties":false,"type":"object","properties":{"Message":{"description":"The status message, if applicable.","type":"string"},"Code":{"description":"The status code.","type":"string"}}}},"required":["TransitGatewayId","PeerTransitGatewayId","PeerAccountId","PeerRegion"],"properties":{"Status":{"description":"The status of the transit gateway peering attachment.","$ref":"#/definitions/PeeringAttachmentStatus"},"TransitGatewayId":{"description":"The ID of the transit gateway.","type":"string"},"PeerTransitGatewayId":{"description":"The ID of the peer transit gateway.","type":"string"},"PeerAccountId":{"description":"The ID of the peer account","type":"string"},"State":{"description":"The state of the transit gateway peering attachment. Note that the initiating state has been deprecated.","type":"string"},"CreationTime":{"format":"date-time","description":"The time the transit gateway peering attachment was created.","type":"string"},"PeerRegion":{"description":"Peer Region","type":"string"},"Tags":{"description":"The tags for the transit gateway peering attachment.","type":"array","items":{"$ref":"#/definitions/Tag"}},"TransitGatewayAttachmentId":{"description":"The ID of the transit gateway peering attachment.","type":"string"}}}

‎internal/service/cloudformation/schemas/AWS_ECS_Service.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,6 @@
338338
"/properties/Cluster",
339339
"/properties/DeploymentController",
340340
"/properties/LaunchType",
341-
"/properties/PlacementConstraints",
342-
"/properties/PlacementStrategies",
343341
"/properties/Role",
344342
"/properties/SchedulingStrategy",
345343
"/properties/ServiceName"

‎internal/service/cloudformation/schemas/AWS_EKS_Cluster.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@
2626
],
2727
"additionalProperties": false
2828
},
29-
"KeyArn": {
30-
"type": "string"
29+
"Provider": {
30+
"type": "object",
31+
"additionalProperties": false,
32+
"properties": {
33+
"KeyArn": {
34+
"description": "Amazon Resource Name (ARN) or alias of the KMS key. The KMS key must be symmetric, created in the same region as the cluster, and if the KMS key was created in a different account, the user must have access to the KMS key.",
35+
"type": "string"
36+
}
37+
}
3138
},
3239
"EncryptionConfig": {
3340
"description": "The encryption configuration for the cluster",
3441
"type": "object",
3542
"properties": {
3643
"Provider": {
3744
"description": "The encryption provider for the cluster.",
38-
"type": "object",
39-
"additionalProperties": false,
40-
"properties": {
41-
"KeyArn": {
42-
"description": "Amazon Resource Name (ARN) or alias of the KMS key. The KMS key must be symmetric, created in the same region as the cluster, and if the KMS key was created in a different account, the user must have access to the KMS key.",
43-
"$ref": "#/definitions/KeyArn"
44-
}
45-
}
45+
"$ref": "#/definitions/Provider"
4646
},
4747
"Resources": {
4848
"description": "Specifies the resources to be encrypted. The only supported value is \"secrets\".",

‎internal/service/cloudformation/schemas/AWS_Logs_LogGroup.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,7 @@
127127
"/properties/LogGroupName"
128128
],
129129
"additionalProperties": false,
130-
"taggable": true
130+
"tagging": {
131+
"taggable": true
132+
}
131133
}

‎internal/service/cloudformation/schemas/AWS_SageMaker_App.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
"description": "The type of app.",
2323
"enum": [
2424
"JupyterServer",
25-
"KernelGateway"
25+
"KernelGateway",
26+
"RStudioServerPro",
27+
"RSessionGateway",
28+
"Canvas"
2629
]
2730
},
2831
"DomainId": {

‎internal/service/cloudformation/schemas/AWS_SageMaker_Domain.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,23 @@
8989
"type" : "string",
9090
"description" : "The SSO managed application instance ID.",
9191
"maxLength" : 256
92+
},
93+
"DomainSettings": {
94+
"$ref": "#/definitions/DomainSettings"
95+
},
96+
"AppSecurityGroupManagement": {
97+
"type": "string",
98+
"description": "The entity that creates and manages the required security groups for inter-app communication in VPCOnly mode. Required when CreateDomain.AppNetworkAccessType is VPCOnly and DomainSettings.RStudioServerProDomainSettings.DomainExecutionRoleArn is provided.",
99+
"enum": [
100+
"Service",
101+
"Customer"
102+
]
103+
},
104+
"SecurityGroupIdForDomainBoundary": {
105+
"type": "string",
106+
"description": "The ID of the security group that authorizes traffic between the RSessionGateway apps and the RStudioServerPro app.",
107+
"maxLength": 32,
108+
"pattern": "[-0-9a-zA-Z]+"
92109
}
93110
},
94111
"definitions": {
@@ -112,6 +129,9 @@
112129
"$ref": "#/definitions/KernelGatewayAppSettings",
113130
"description": "The kernel gateway app settings."
114131
},
132+
"RStudioServerProAppSettings": {
133+
"$ref": "#/definitions/RStudioServerProAppSettings"
134+
},
115135
"SecurityGroups": {
116136
"type": "array",
117137
"description": "The security groups for the Amazon Virtual Private Cloud (VPC) that Studio uses for communication.",
@@ -291,6 +311,79 @@
291311
"Key",
292312
"Value"
293313
]
314+
},
315+
"DomainSettings": {
316+
"type": "object",
317+
"description":"A collection of Domain settings.",
318+
"additionalProperties": false,
319+
"properties": {
320+
"SecurityGroupIds": {
321+
"type": "array",
322+
"description": "The security groups for the Amazon Virtual Private Cloud that the Domain uses for communication between Domain-level apps and user apps.",
323+
"uniqueItems": false,
324+
"minItems": 1,
325+
"maxItems": 3,
326+
"items": {
327+
"type": "string",
328+
"maxLength": 32,
329+
"pattern": "[-0-9a-zA-Z]+"
330+
}
331+
},
332+
"RStudioServerProDomainSettings": {
333+
"$ref": "#/definitions/RStudioServerProDomainSettings"
334+
}
335+
}
336+
},
337+
"RStudioServerProDomainSettings": {
338+
"type": "object",
339+
"description": "A collection of settings that update the current configuration for the RStudioServerPro Domain-level app.",
340+
"additionalProperties": false,
341+
"properties": {
342+
"DomainExecutionRoleArn": {
343+
"type": "string",
344+
"description": "The ARN of the execution role for the RStudioServerPro Domain-level app.",
345+
"minLength": 20,
346+
"maxLength": 2048,
347+
"pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$"
348+
},
349+
"RStudioConnectUrl": {
350+
"type": "string",
351+
"description": "A URL pointing to an RStudio Connect server.",
352+
"pattern": "^(https:|http:|www\\.)\\S*"
353+
},
354+
"RStudioPackageManagerUrl": {
355+
"type": "string",
356+
"description": "A URL pointing to an RStudio Package Manager server.",
357+
"pattern": "^(https:|http:|www\\.)\\S*"
358+
},
359+
"DefaultResourceSpec": {
360+
"$ref": "#/definitions/ResourceSpec"
361+
}
362+
},
363+
"required":["DomainExecutionRoleArn"]
364+
},
365+
"RStudioServerProAppSettings": {
366+
"type": "object",
367+
"description": "A collection of settings that configure user interaction with the RStudioServerPro app.",
368+
"additionalProperties": false,
369+
"properties": {
370+
"AccessStatus": {
371+
"type": "string",
372+
"description": "Indicates whether the current user has access to the RStudioServerPro app.",
373+
"enum": [
374+
"ENABLED",
375+
"DISABLED"
376+
]
377+
},
378+
"UserGroup": {
379+
"type": "string",
380+
"description": "The level of permissions that the user has within the RStudioServerPro app. This value defaults to User. The Admin value allows the user access to the RStudio Administrative Dashboard.",
381+
"enum": [
382+
"R_STUDIO_ADMIN",
383+
"R_STUDIO_USER"
384+
]
385+
}
386+
}
294387
}
295388
},
296389
"required": [
@@ -302,8 +395,12 @@
302395
],
303396
"createOnlyProperties": [
304397
"/properties/AppNetworkAccessType",
398+
"/properties/AppSecurityGroupManagement",
305399
"/properties/AuthMode",
306400
"/properties/DomainName",
401+
"/properties/DomainSettings/SecurityGroupIds",
402+
"/properties/DomainSettings/RStudioServerProDomainSettings/DomainExecutionRoleArn",
403+
"/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
307404
"/properties/KmsKeyId",
308405
"/properties/SubnetIds",
309406
"/properties/VpcId",
@@ -320,11 +417,13 @@
320417
"/properties/Url",
321418
"/properties/DomainId",
322419
"/properties/HomeEfsFileSystemId",
420+
"/properties/SecurityGroupIdForDomainBoundary",
323421
"/properties/SingleSignOnManagedApplicationInstanceId"
324422
],
325423
"handlers": {
326424
"create": {
327425
"permissions": [
426+
"sagemaker:CreateApp",
328427
"sagemaker:CreateDomain",
329428
"sagemaker:DescribeDomain",
330429
"sagemaker:DescribeImage",
@@ -354,6 +453,7 @@
354453
},
355454
"delete": {
356455
"permissions": [
456+
"sagemaker:DeleteApp",
357457
"sagemaker:DeleteDomain",
358458
"sagemaker:DescribeDomain"
359459
]

‎internal/service/cloudformation/schemas/AWS_SageMaker_UserProfile.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
"$ref": "#/definitions/KernelGatewayAppSettings",
7272
"description": "The kernel gateway app settings."
7373
},
74+
"RStudioServerProAppSettings": {
75+
"$ref": "#/definitions/RStudioServerProAppSettings"
76+
},
7477
"SecurityGroups": {
7578
"type": "array",
7679
"description": "The security groups for the Amazon Virtual Private Cloud (VPC) that Studio uses for communication.",
@@ -250,6 +253,29 @@
250253
"Key",
251254
"Value"
252255
]
256+
},
257+
"RStudioServerProAppSettings": {
258+
"type": "object",
259+
"description": "A collection of settings that configure user interaction with the RStudioServerPro app.",
260+
"additionalProperties": false,
261+
"properties": {
262+
"AccessStatus": {
263+
"type": "string",
264+
"description": "Indicates whether the current user has access to the RStudioServerPro app.",
265+
"enum": [
266+
"ENABLED",
267+
"DISABLED"
268+
]
269+
},
270+
"UserGroup": {
271+
"type": "string",
272+
"description": "The level of permissions that the user has within the RStudioServerPro app. This value defaults to User. The Admin value allows the user access to the RStudio Administrative Dashboard.",
273+
"enum": [
274+
"R_STUDIO_ADMIN",
275+
"R_STUDIO_USER"
276+
]
277+
}
278+
}
253279
}
254280
},
255281
"required": [
@@ -261,6 +287,8 @@
261287
"/properties/UserProfileName",
262288
"/properties/SingleSignOnUserIdentifier",
263289
"/properties/SingleSignOnUserValue",
290+
"/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
291+
"/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
264292
"/properties/Tags"
265293
],
266294
"writeOnlyProperties": [

0 commit comments

Comments
 (0)