Skip to content

Commit a25e30e

Browse files
authored
feat(aws-android-sdk-kms): update models to latest (#3210)
1 parent 080718b commit a25e30e

File tree

322 files changed

+2466
-1247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+2466
-1247
lines changed

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.
@@ -71,15 +71,15 @@
7171
* <b>Signing Requests</b>
7272
* </p>
7373
* <p>
74-
* Requests must be signed by using an access key ID and a secret access key. We
75-
* strongly recommend that you <i>do not</i> use your Amazon Web Services
76-
* account (root) access key ID and secret access key for everyday work with
77-
* KMS. Instead, use the access key ID and secret access key for an IAM user.
78-
* You can also use the Amazon Web Services Security Token Service to generate
79-
* temporary security credentials that you can use to sign requests.
74+
* Requests must be signed using an access key ID and a secret access key. We
75+
* strongly recommend that you do not use your Amazon Web Services account root
76+
* access key ID and secret access key for everyday work. You can use the access
77+
* key ID and secret access key for an IAM user or you can use the Security
78+
* Token Service (STS) to generate temporary security credentials and use those
79+
* to sign requests.
8080
* </p>
8181
* <p>
82-
* All KMS operations require <a href=
82+
* All KMS requests must be signed with <a href=
8383
* "https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html"
8484
* >Signature Version 4</a>.
8585
* </p>
@@ -1229,11 +1229,11 @@ CreateKeyResult createKey(CreateKeyRequest createKeyRequest) throws AmazonClient
12291229
* <p>
12301230
* Whenever possible, use key policies to give users permission to call the
12311231
* <code>Decrypt</code> operation on a particular KMS key, instead of using
1232-
* IAM policies. Otherwise, you might create an IAM user policy that gives
1233-
* the user <code>Decrypt</code> permission on all KMS keys. This user could
1234-
* decrypt ciphertext that was encrypted by KMS keys in other accounts if
1235-
* the key policy for the cross-account KMS key permits it. If you must use
1236-
* an IAM policy for <code>Decrypt</code> permissions, limit the user to
1232+
* &amp;IAM; policies. Otherwise, you might create an &amp;IAM; policy that
1233+
* gives the user <code>Decrypt</code> permission on all KMS keys. This user
1234+
* could decrypt ciphertext that was encrypted by KMS keys in other accounts
1235+
* if the key policy for the cross-account KMS key permits it. If you must
1236+
* use an IAM policy for <code>Decrypt</code> permissions, limit the user to
12371237
* particular KMS keys or particular trusted accounts. For details, see <a
12381238
* href=
12391239
* "https://docs.aws.amazon.com/kms/latest/developerguide/iam-policies.html#iam-policies-best-practices"
@@ -1258,9 +1258,9 @@ CreateKeyResult createKey(CreateKeyRequest createKeyRequest) throws AmazonClient
12581258
* Guide</i>.
12591259
* </p>
12601260
* <p>
1261-
* <b>Cross-account use</b>: Yes. To perform this operation with a KMS key
1262-
* in a different Amazon Web Services account, specify the key ARN or alias
1263-
* ARN in the value of the <code>KeyId</code> parameter.
1261+
* <b>Cross-account use</b>: Yes. If you use the <code>KeyId</code>
1262+
* parameter to identify a KMS key in a different Amazon Web Services
1263+
* account, specify the key ARN or the alias ARN of the KMS key.
12641264
* </p>
12651265
* <p>
12661266
* <b>Required permissions</b>: <a href=
@@ -2433,9 +2433,9 @@ EncryptResult encrypt(EncryptRequest encryptRequest) throws AmazonClientExceptio
24332433
* parameter.
24342434
* </p>
24352435
* <p>
2436-
* To generate an SM4 data key (China Regions only), specify a
2437-
* <code>KeySpec</code> value of <code>AES_128</code> or
2438-
* <code>NumberOfBytes</code> value of <code>128</code>. The symmetric
2436+
* To generate a 128-bit SM4 data key (China Regions only), specify a
2437+
* <code>KeySpec</code> value of <code>AES_128</code> or a
2438+
* <code>NumberOfBytes</code> value of <code>16</code>. The symmetric
24392439
* encryption key used in China Regions to encrypt your data key is an SM4
24402440
* encryption key.
24412441
* </p>
@@ -5514,9 +5514,12 @@ void updatePrimaryRegion(UpdatePrimaryRegionRequest updatePrimaryRegionRequest)
55145514
* Guide</i>.
55155515
* </p>
55165516
* <p>
5517-
* To verify a digital signature, you can use the <code>Verify</code>
5518-
* operation. Specify the same asymmetric KMS key, message, and signing
5519-
* algorithm that were used to produce the signature.
5517+
* To use the <code>Verify</code> operation, specify the same asymmetric KMS
5518+
* key, message, and signing algorithm that were used to produce the
5519+
* signature. The message type does not need to be the same as the one used
5520+
* for signing, but it must indicate whether the value of the
5521+
* <code>Message</code> parameter should be hashed as part of the
5522+
* verification process.
55205523
* </p>
55215524
* <p>
55225525
* You can also verify the digital signature by using the public key of the

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.
@@ -85,15 +85,15 @@
8585
* <b>Signing Requests</b>
8686
* </p>
8787
* <p>
88-
* Requests must be signed by using an access key ID and a secret access key. We
89-
* strongly recommend that you <i>do not</i> use your Amazon Web Services
90-
* account (root) access key ID and secret access key for everyday work with
91-
* KMS. Instead, use the access key ID and secret access key for an IAM user.
92-
* You can also use the Amazon Web Services Security Token Service to generate
93-
* temporary security credentials that you can use to sign requests.
88+
* Requests must be signed using an access key ID and a secret access key. We
89+
* strongly recommend that you do not use your Amazon Web Services account root
90+
* access key ID and secret access key for everyday work. You can use the access
91+
* key ID and secret access key for an IAM user or you can use the Security
92+
* Token Service (STS) to generate temporary security credentials and use those
93+
* to sign requests.
9494
* </p>
9595
* <p>
96-
* All KMS operations require <a href=
96+
* All KMS requests must be signed with <a href=
9797
* "https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html"
9898
* >Signature Version 4</a>.
9999
* </p>
@@ -1690,11 +1690,11 @@ public CreateKeyResult createKey(CreateKeyRequest createKeyRequest)
16901690
* <p>
16911691
* Whenever possible, use key policies to give users permission to call the
16921692
* <code>Decrypt</code> operation on a particular KMS key, instead of using
1693-
* IAM policies. Otherwise, you might create an IAM user policy that gives
1694-
* the user <code>Decrypt</code> permission on all KMS keys. This user could
1695-
* decrypt ciphertext that was encrypted by KMS keys in other accounts if
1696-
* the key policy for the cross-account KMS key permits it. If you must use
1697-
* an IAM policy for <code>Decrypt</code> permissions, limit the user to
1693+
* &amp;IAM; policies. Otherwise, you might create an &amp;IAM; policy that
1694+
* gives the user <code>Decrypt</code> permission on all KMS keys. This user
1695+
* could decrypt ciphertext that was encrypted by KMS keys in other accounts
1696+
* if the key policy for the cross-account KMS key permits it. If you must
1697+
* use an IAM policy for <code>Decrypt</code> permissions, limit the user to
16981698
* particular KMS keys or particular trusted accounts. For details, see <a
16991699
* href=
17001700
* "https://docs.aws.amazon.com/kms/latest/developerguide/iam-policies.html#iam-policies-best-practices"
@@ -1719,9 +1719,9 @@ public CreateKeyResult createKey(CreateKeyRequest createKeyRequest)
17191719
* Guide</i>.
17201720
* </p>
17211721
* <p>
1722-
* <b>Cross-account use</b>: Yes. To perform this operation with a KMS key
1723-
* in a different Amazon Web Services account, specify the key ARN or alias
1724-
* ARN in the value of the <code>KeyId</code> parameter.
1722+
* <b>Cross-account use</b>: Yes. If you use the <code>KeyId</code>
1723+
* parameter to identify a KMS key in a different Amazon Web Services
1724+
* account, specify the key ARN or the alias ARN of the KMS key.
17251725
* </p>
17261726
* <p>
17271727
* <b>Required permissions</b>: <a href=
@@ -3183,9 +3183,9 @@ public EncryptResult encrypt(EncryptRequest encryptRequest)
31833183
* parameter.
31843184
* </p>
31853185
* <p>
3186-
* To generate an SM4 data key (China Regions only), specify a
3187-
* <code>KeySpec</code> value of <code>AES_128</code> or
3188-
* <code>NumberOfBytes</code> value of <code>128</code>. The symmetric
3186+
* To generate a 128-bit SM4 data key (China Regions only), specify a
3187+
* <code>KeySpec</code> value of <code>AES_128</code> or a
3188+
* <code>NumberOfBytes</code> value of <code>16</code>. The symmetric
31893189
* encryption key used in China Regions to encrypt your data key is an SM4
31903190
* encryption key.
31913191
* </p>
@@ -7017,9 +7017,12 @@ public void updatePrimaryRegion(UpdatePrimaryRegionRequest updatePrimaryRegionRe
70177017
* Guide</i>.
70187018
* </p>
70197019
* <p>
7020-
* To verify a digital signature, you can use the <code>Verify</code>
7021-
* operation. Specify the same asymmetric KMS key, message, and signing
7022-
* algorithm that were used to produce the signature.
7020+
* To use the <code>Verify</code> operation, specify the same asymmetric KMS
7021+
* key, message, and signing algorithm that were used to produce the
7022+
* signature. The message type does not need to be the same as the one used
7023+
* for signing, but it must indicate whether the value of the
7024+
* <code>Message</code> parameter should be hashed as part of the
7025+
* verification process.
70237026
* </p>
70247027
* <p>
70257028
* You can also verify the digital signature by using the public key of the

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/AlgorithmSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/AliasListEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/AlreadyExistsException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CancelKeyDeletionRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CancelKeyDeletionResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CloudHsmClusterInUseException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CloudHsmClusterInvalidConfigurationException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CloudHsmClusterNotActiveException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License").
55
* You may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)