Skip to content

Commit bcef7bf

Browse files
Adds support for Customer Managed Key encryption for Amazon Verified Access resources
1 parent ce37de4 commit bcef7bf

30 files changed

+746
-32
lines changed

generator/ServiceModels/ec2/ec2-2016-11-15.api.json

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11994,7 +11994,8 @@
1199411994
"shape":"String",
1199511995
"idempotencyToken":true
1199611996
},
11997-
"DryRun":{"shape":"Boolean"}
11997+
"DryRun":{"shape":"Boolean"},
11998+
"SseSpecification":{"shape":"VerifiedAccessSseSpecificationRequest"}
1199811999
}
1199912000
},
1200012001
"CreateVerifiedAccessEndpointResult":{
@@ -12028,7 +12029,8 @@
1202812029
"shape":"String",
1202912030
"idempotencyToken":true
1203012031
},
12031-
"DryRun":{"shape":"Boolean"}
12032+
"DryRun":{"shape":"Boolean"},
12033+
"SseSpecification":{"shape":"VerifiedAccessSseSpecificationRequest"}
1203212034
}
1203312035
},
1203412036
"CreateVerifiedAccessGroupResult":{
@@ -12105,7 +12107,8 @@
1210512107
"shape":"String",
1210612108
"idempotencyToken":true
1210712109
},
12108-
"DryRun":{"shape":"Boolean"}
12110+
"DryRun":{"shape":"Boolean"},
12111+
"SseSpecification":{"shape":"VerifiedAccessSseSpecificationRequest"}
1210912112
}
1211012113
},
1211112114
"CreateVerifiedAccessTrustProviderResult":{
@@ -29095,6 +29098,7 @@
2909529098
"ed25519"
2909629099
]
2909729100
},
29101+
"KmsKeyArn":{"type":"string"},
2909829102
"KmsKeyId":{"type":"string"},
2909929103
"LastError":{
2910029104
"type":"structure",
@@ -31998,10 +32002,7 @@
3199832002
},
3199932003
"ModifyVerifiedAccessEndpointPolicyRequest":{
3200032004
"type":"structure",
32001-
"required":[
32002-
"VerifiedAccessEndpointId",
32003-
"PolicyEnabled"
32004-
],
32005+
"required":["VerifiedAccessEndpointId"],
3200532006
"members":{
3200632007
"VerifiedAccessEndpointId":{"shape":"VerifiedAccessEndpointId"},
3200732008
"PolicyEnabled":{"shape":"Boolean"},
@@ -32010,7 +32011,8 @@
3201032011
"shape":"String",
3201132012
"idempotencyToken":true
3201232013
},
32013-
"DryRun":{"shape":"Boolean"}
32014+
"DryRun":{"shape":"Boolean"},
32015+
"SseSpecification":{"shape":"VerifiedAccessSseSpecificationRequest"}
3201432016
}
3201532017
},
3201632018
"ModifyVerifiedAccessEndpointPolicyResult":{
@@ -32023,6 +32025,10 @@
3202332025
"PolicyDocument":{
3202432026
"shape":"String",
3202532027
"locationName":"policyDocument"
32028+
},
32029+
"SseSpecification":{
32030+
"shape":"VerifiedAccessSseSpecificationResponse",
32031+
"locationName":"sseSpecification"
3202632032
}
3202732033
}
3202832034
},
@@ -32060,10 +32066,7 @@
3206032066
},
3206132067
"ModifyVerifiedAccessGroupPolicyRequest":{
3206232068
"type":"structure",
32063-
"required":[
32064-
"VerifiedAccessGroupId",
32065-
"PolicyEnabled"
32066-
],
32069+
"required":["VerifiedAccessGroupId"],
3206732070
"members":{
3206832071
"VerifiedAccessGroupId":{"shape":"VerifiedAccessGroupId"},
3206932072
"PolicyEnabled":{"shape":"Boolean"},
@@ -32072,7 +32075,8 @@
3207232075
"shape":"String",
3207332076
"idempotencyToken":true
3207432077
},
32075-
"DryRun":{"shape":"Boolean"}
32078+
"DryRun":{"shape":"Boolean"},
32079+
"SseSpecification":{"shape":"VerifiedAccessSseSpecificationRequest"}
3207632080
}
3207732081
},
3207832082
"ModifyVerifiedAccessGroupPolicyResult":{
@@ -32085,6 +32089,10 @@
3208532089
"PolicyDocument":{
3208632090
"shape":"String",
3208732091
"locationName":"policyDocument"
32092+
},
32093+
"SseSpecification":{
32094+
"shape":"VerifiedAccessSseSpecificationResponse",
32095+
"locationName":"sseSpecification"
3208832096
}
3208932097
}
3209032098
},
@@ -32181,7 +32189,8 @@
3218132189
"ClientToken":{
3218232190
"shape":"String",
3218332191
"idempotencyToken":true
32184-
}
32192+
},
32193+
"SseSpecification":{"shape":"VerifiedAccessSseSpecificationRequest"}
3218532194
}
3218632195
},
3218732196
"ModifyVerifiedAccessTrustProviderResult":{
@@ -43488,6 +43497,10 @@
4348843497
"Tags":{
4348943498
"shape":"TagList",
4349043499
"locationName":"tagSet"
43500+
},
43501+
"SseSpecification":{
43502+
"shape":"VerifiedAccessSseSpecificationResponse",
43503+
"locationName":"sseSpecification"
4349143504
}
4349243505
}
4349343506
},
@@ -43635,6 +43648,10 @@
4363543648
"Tags":{
4363643649
"shape":"TagList",
4363743650
"locationName":"tagSet"
43651+
},
43652+
"SseSpecification":{
43653+
"shape":"VerifiedAccessSseSpecificationResponse",
43654+
"locationName":"sseSpecification"
4363843655
}
4363943656
}
4364043657
},
@@ -43861,6 +43878,26 @@
4386143878
}
4386243879
}
4386343880
},
43881+
"VerifiedAccessSseSpecificationRequest":{
43882+
"type":"structure",
43883+
"members":{
43884+
"CustomerManagedKeyEnabled":{"shape":"Boolean"},
43885+
"KmsKeyArn":{"shape":"KmsKeyArn"}
43886+
}
43887+
},
43888+
"VerifiedAccessSseSpecificationResponse":{
43889+
"type":"structure",
43890+
"members":{
43891+
"CustomerManagedKeyEnabled":{
43892+
"shape":"Boolean",
43893+
"locationName":"customerManagedKeyEnabled"
43894+
},
43895+
"KmsKeyArn":{
43896+
"shape":"KmsKeyArn",
43897+
"locationName":"kmsKeyArn"
43898+
}
43899+
}
43900+
},
4386443901
"VerifiedAccessTrustProvider":{
4386543902
"type":"structure",
4386643903
"members":{
@@ -43907,6 +43944,10 @@
4390743944
"Tags":{
4390843945
"shape":"TagList",
4390943946
"locationName":"tagSet"
43947+
},
43948+
"SseSpecification":{
43949+
"shape":"VerifiedAccessSseSpecificationResponse",
43950+
"locationName":"sseSpecification"
4391043951
}
4391143952
}
4391243953
},

generator/ServiceModels/ec2/ec2-2016-11-15.docs.json

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2059,7 +2059,7 @@
20592059
"CreateVerifiedAccessEndpointRequest$DryRun": "<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
20602060
"CreateVerifiedAccessGroupRequest$DryRun": "<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
20612061
"CreateVerifiedAccessInstanceRequest$DryRun": "<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
2062-
"CreateVerifiedAccessInstanceRequest$FIPSEnabled": "<p> Choose to enable or disable support for Federal Information Processing Standards (FIPS) on the instance. </p>",
2062+
"CreateVerifiedAccessInstanceRequest$FIPSEnabled": "<p>Enable or disable support for Federal Information Processing Standards (FIPS) on the instance.</p>",
20632063
"CreateVerifiedAccessTrustProviderRequest$DryRun": "<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
20642064
"CreateVolumeRequest$Encrypted": "<p>Indicates whether the volume should be encrypted. The effect of setting the encryption state to <code>true</code> depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-by-default\">Encryption by default</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p> <p>Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#EBSEncryption_supported_instances\">Supported instance types</a>.</p>",
20652065
"CreateVolumeRequest$DryRun": "<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
@@ -2776,7 +2776,7 @@
27762776
"UpdateSecurityGroupRuleDescriptionsEgressResult$Return": "<p>Returns <code>true</code> if the request succeeds; otherwise, returns an error.</p>",
27772777
"UpdateSecurityGroupRuleDescriptionsIngressRequest$DryRun": "<p>Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is <code>UnauthorizedOperation</code>.</p>",
27782778
"UpdateSecurityGroupRuleDescriptionsIngressResult$Return": "<p>Returns <code>true</code> if the request succeeds; otherwise, returns an error.</p>",
2779-
"VerifiedAccessInstance$FipsEnabled": "<p> Describes if support for Federal Information Processing Standards (FIPS) is enabled on the instance. </p>",
2779+
"VerifiedAccessInstance$FipsEnabled": "<p>Describes whether support for Federal Information Processing Standards (FIPS) is enabled on the instance.</p>",
27802780
"VerifiedAccessLogCloudWatchLogsDestination$Enabled": "<p>Indicates whether logging is enabled.</p>",
27812781
"VerifiedAccessLogCloudWatchLogsDestinationOptions$Enabled": "<p>Indicates whether logging is enabled.</p>",
27822782
"VerifiedAccessLogKinesisDataFirehoseDestination$Enabled": "<p>Indicates whether logging is enabled.</p>",
@@ -2785,6 +2785,8 @@
27852785
"VerifiedAccessLogS3Destination$Enabled": "<p>Indicates whether logging is enabled.</p>",
27862786
"VerifiedAccessLogS3DestinationOptions$Enabled": "<p>Indicates whether logging is enabled.</p>",
27872787
"VerifiedAccessLogs$IncludeTrustContext": "<p> Describes current setting for including trust data into the logs. </p>",
2788+
"VerifiedAccessSseSpecificationRequest$CustomerManagedKeyEnabled": "<p> Enable or disable the use of customer managed KMS keys for server side encryption. </p> <p>Valid values: <code>True</code> | <code>False</code> </p>",
2789+
"VerifiedAccessSseSpecificationResponse$CustomerManagedKeyEnabled": "<p> Describes the use of customer managed KMS keys for server side encryption. </p> <p>Valid values: <code>True</code> | <code>False</code> </p>",
27882790
"Volume$Encrypted": "<p>Indicates whether the volume is encrypted.</p>",
27892791
"Volume$FastRestored": "<p>Indicates whether the volume was created using fast snapshot restore.</p>",
27902792
"Volume$MultiAttachEnabled": "<p>Indicates whether Amazon EBS Multi-Attach is enabled.</p>",
@@ -12820,6 +12822,13 @@
1282012822
"KeyPairInfo$KeyType": "<p>The type of key pair.</p>"
1282112823
}
1282212824
},
12825+
"KmsKeyArn": {
12826+
"base": null,
12827+
"refs": {
12828+
"VerifiedAccessSseSpecificationRequest$KmsKeyArn": "<p> The ARN of the KMS key. </p>",
12829+
"VerifiedAccessSseSpecificationResponse$KmsKeyArn": "<p> Describes the ARN of the KMS key. </p>"
12830+
}
12831+
},
1282312832
"KmsKeyId": {
1282412833
"base": null,
1282512834
"refs": {
@@ -22667,6 +22676,27 @@
2266722676
"VerifiedAccessInstanceLoggingConfiguration$AccessLogs": "<p>Details about the logging options.</p>"
2266822677
}
2266922678
},
22679+
"VerifiedAccessSseSpecificationRequest": {
22680+
"base": "<p> Verified Access provides server side encryption by default to data at rest using Amazon Web Services-owned KMS keys. You also have the option of using customer managed KMS keys, which can be specified using the options below. </p>",
22681+
"refs": {
22682+
"CreateVerifiedAccessEndpointRequest$SseSpecification": "<p> Options for server side encryption. </p>",
22683+
"CreateVerifiedAccessGroupRequest$SseSpecification": "<p> Options for server side encryption. </p>",
22684+
"CreateVerifiedAccessTrustProviderRequest$SseSpecification": "<p> Options for server side encryption. </p>",
22685+
"ModifyVerifiedAccessEndpointPolicyRequest$SseSpecification": "<p> Options for server side encryption. </p>",
22686+
"ModifyVerifiedAccessGroupPolicyRequest$SseSpecification": "<p> Options for server side encryption. </p>",
22687+
"ModifyVerifiedAccessTrustProviderRequest$SseSpecification": "<p> Options for server side encryption. </p>"
22688+
}
22689+
},
22690+
"VerifiedAccessSseSpecificationResponse": {
22691+
"base": "<p> Describes the options in use for server side encryption. </p>",
22692+
"refs": {
22693+
"ModifyVerifiedAccessEndpointPolicyResult$SseSpecification": "<p> Describes the options in use for server side encryption. </p>",
22694+
"ModifyVerifiedAccessGroupPolicyResult$SseSpecification": "<p> Describes the options in use for server side encryption. </p>",
22695+
"VerifiedAccessEndpoint$SseSpecification": "<p> Describes the options in use for server side encryption. </p>",
22696+
"VerifiedAccessGroup$SseSpecification": "<p> Describes the options in use for server side encryption. </p>",
22697+
"VerifiedAccessTrustProvider$SseSpecification": "<p> Describes the options in use for server side encryption. </p>"
22698+
}
22699+
},
2267022700
"VerifiedAccessTrustProvider": {
2267122701
"base": "<p>Describes a Verified Access trust provider.</p>",
2267222702
"refs": {

0 commit comments

Comments
 (0)