Skip to content

Commit e2f1159

Browse files
awsmobilesdkawsmobilesdk
authored
feat(aws-android-sdk-kms): update models to latest (#3595)
1 parent cbbcc78 commit e2f1159

File tree

346 files changed

+9049
-938
lines changed

Some content is hidden

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

346 files changed

+9049
-938
lines changed

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

Lines changed: 845 additions & 66 deletions
Large diffs are not rendered by default.

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

Lines changed: 928 additions & 66 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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.
@@ -27,7 +27,8 @@ public enum AlgorithmSpec {
2727
RSAES_OAEP_SHA_1("RSAES_OAEP_SHA_1"),
2828
RSAES_OAEP_SHA_256("RSAES_OAEP_SHA_256"),
2929
RSA_AES_KEY_WRAP_SHA_1("RSA_AES_KEY_WRAP_SHA_1"),
30-
RSA_AES_KEY_WRAP_SHA_256("RSA_AES_KEY_WRAP_SHA_256");
30+
RSA_AES_KEY_WRAP_SHA_256("RSA_AES_KEY_WRAP_SHA_256"),
31+
SM2PKE("SM2PKE");
3132

3233
private String value;
3334

@@ -48,6 +49,7 @@ public String toString() {
4849
enumMap.put("RSAES_OAEP_SHA_256", RSAES_OAEP_SHA_256);
4950
enumMap.put("RSA_AES_KEY_WRAP_SHA_1", RSA_AES_KEY_WRAP_SHA_1);
5051
enumMap.put("RSA_AES_KEY_WRAP_SHA_256", RSA_AES_KEY_WRAP_SHA_256);
52+
enumMap.put("SM2PKE", SM2PKE);
5153
}
5254

5355
/**

‎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-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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.
@@ -50,6 +50,12 @@
5050
* <p>
5151
* <b>Related operations</b>: <a>ScheduleKeyDeletion</a>
5252
* </p>
53+
* <p>
54+
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
55+
* model. For more information, see <a href=
56+
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
57+
* >KMS eventual consistency</a>.
58+
* </p>
5359
*/
5460
public class CancelKeyDeletionRequest extends AmazonWebServiceRequest implements Serializable {
5561
/**

‎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-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/CloudHsmClusterNotFoundException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/CloudHsmClusterNotRelatedException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/ConflictException.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*
2+
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* A copy of the License is located at
7+
*
8+
* http://aws.amazon.com/apache2.0
9+
*
10+
* or in the "license" file accompanying this file. This file is distributed
11+
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
12+
* express or implied. See the License for the specific language governing
13+
* permissions and limitations under the License.
14+
*/
15+
16+
package com.amazonaws.services.kms.model;
17+
18+
import com.amazonaws.AmazonServiceException;
19+
20+
/**
21+
* <p>
22+
* The request was rejected because an automatic rotation of this key is
23+
* currently in progress or scheduled to begin within the next 20 minutes.
24+
* </p>
25+
*/
26+
public class ConflictException extends AmazonServiceException {
27+
private static final long serialVersionUID = 1L;
28+
29+
/**
30+
* Constructs a new ConflictException with the specified error message.
31+
*
32+
* @param message Describes the error encountered.
33+
*/
34+
public ConflictException(String message) {
35+
super(message);
36+
}
37+
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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.
@@ -158,6 +158,12 @@
158158
* </p>
159159
* </li>
160160
* </ul>
161+
* <p>
162+
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
163+
* model. For more information, see <a href=
164+
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
165+
* >KMS eventual consistency</a>.
166+
* </p>
161167
*/
162168
public class ConnectCustomKeyStoreRequest extends AmazonWebServiceRequest implements Serializable {
163169
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/ConnectionErrorCodeType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/ConnectionStateType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/CreateAliasRequest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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.
@@ -113,6 +113,12 @@
113113
* </p>
114114
* </li>
115115
* </ul>
116+
* <p>
117+
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
118+
* model. For more information, see <a href=
119+
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
120+
* >KMS eventual consistency</a>.
121+
* </p>
116122
*/
117123
public class CreateAliasRequest extends AmazonWebServiceRequest implements Serializable {
118124
/**

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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.
@@ -157,6 +157,12 @@
157157
* </p>
158158
* </li>
159159
* </ul>
160+
* <p>
161+
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
162+
* model. For more information, see <a href=
163+
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
164+
* >KMS eventual consistency</a>.
165+
* </p>
160166
*/
161167
public class CreateCustomKeyStoreRequest extends AmazonWebServiceRequest implements Serializable {
162168
/**
@@ -306,7 +312,7 @@ public class CreateCustomKeyStoreRequest extends AmazonWebServiceRequest impleme
306312
* <p>
307313
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
308314
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
309-
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
315+
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
310316
* Amazon Web Services Region.
311317
* </p>
312318
* </li>
@@ -1169,7 +1175,7 @@ public CreateCustomKeyStoreRequest withCustomKeyStoreType(CustomKeyStoreType cus
11691175
* <p>
11701176
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
11711177
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
1172-
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
1178+
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
11731179
* Amazon Web Services Region.
11741180
* </p>
11751181
* </li>
@@ -1236,8 +1242,8 @@ public CreateCustomKeyStoreRequest withCustomKeyStoreType(CustomKeyStoreType cus
12361242
* An external key store with <code>PUBLIC_ENDPOINT</code>
12371243
* connectivity cannot use the same <code>XksProxyUriEndpoint</code>
12381244
* value as an external key store with
1239-
* <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same Amazon
1240-
* Web Services Region.
1245+
* <code>VPC_ENDPOINT_SERVICE</code> connectivity in this Amazon Web
1246+
* Services Region.
12411247
* </p>
12421248
* </li>
12431249
* <li>
@@ -1301,7 +1307,7 @@ public String getXksProxyUriEndpoint() {
13011307
* <p>
13021308
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
13031309
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
1304-
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
1310+
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
13051311
* Amazon Web Services Region.
13061312
* </p>
13071313
* </li>
@@ -1371,7 +1377,7 @@ public String getXksProxyUriEndpoint() {
13711377
* connectivity cannot use the same
13721378
* <code>XksProxyUriEndpoint</code> value as an external key
13731379
* store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in
1374-
* the same Amazon Web Services Region.
1380+
* this Amazon Web Services Region.
13751381
* </p>
13761382
* </li>
13771383
* <li>
@@ -1435,7 +1441,7 @@ public void setXksProxyUriEndpoint(String xksProxyUriEndpoint) {
14351441
* <p>
14361442
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
14371443
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
1438-
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
1444+
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
14391445
* Amazon Web Services Region.
14401446
* </p>
14411447
* </li>
@@ -1508,7 +1514,7 @@ public void setXksProxyUriEndpoint(String xksProxyUriEndpoint) {
15081514
* connectivity cannot use the same
15091515
* <code>XksProxyUriEndpoint</code> value as an external key
15101516
* store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in
1511-
* the same Amazon Web Services Region.
1517+
* this Amazon Web Services Region.
15121518
* </p>
15131519
* </li>
15141520
* <li>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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/CreateGrantRequest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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.
@@ -116,6 +116,12 @@
116116
* </p>
117117
* </li>
118118
* </ul>
119+
* <p>
120+
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
121+
* model. For more information, see <a href=
122+
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
123+
* >KMS eventual consistency</a>.
124+
* </p>
119125
*/
120126
public class CreateGrantRequest extends AmazonWebServiceRequest implements Serializable {
121127
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
* Copyright 2010-2024 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)