Skip to content

Commit f8c1f6f

Browse files
awsmobilesdkeeatonaws
awsmobilesdk
and
eeatonaws
authored
feat(aws-android-sdk-kms): update models to latest (#2948)
Co-authored-by: Erica Eaton <[email protected]>
1 parent 7b25e68 commit f8c1f6f

38 files changed

+1209
-710
lines changed

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

Lines changed: 99 additions & 48 deletions
Large diffs are not rendered by default.

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

Lines changed: 99 additions & 48 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public enum ConnectionErrorCodeType {
3131
USER_LOCKED_OUT("USER_LOCKED_OUT"),
3232
USER_NOT_FOUND("USER_NOT_FOUND"),
3333
USER_LOGGED_IN("USER_LOGGED_IN"),
34-
SUBNET_NOT_FOUND("SUBNET_NOT_FOUND");
34+
SUBNET_NOT_FOUND("SUBNET_NOT_FOUND"),
35+
INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET("INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET");
3536

3637
private String value;
3738

@@ -56,6 +57,7 @@ public String toString() {
5657
enumMap.put("USER_NOT_FOUND", USER_NOT_FOUND);
5758
enumMap.put("USER_LOGGED_IN", USER_LOGGED_IN);
5859
enumMap.put("SUBNET_NOT_FOUND", SUBNET_NOT_FOUND);
60+
enumMap.put("INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET", INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET);
5961
}
6062

6163
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <p>
3131
* This operation is part of the <a href=
3232
* "https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html"
33-
* >Custom Key Store feature</a> feature in KMS, which combines the convenience
33+
* >custom key store feature</a> feature in KMS, which combines the convenience
3434
* and extensive integration of KMS with the isolation and control of a
3535
* single-tenant key store.
3636
* </p>

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

Lines changed: 376 additions & 166 deletions
Large diffs are not rendered by default.

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ public class CustomKeyStoresListEntry implements Serializable {
203203
* <b>Constraints:</b><br/>
204204
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
205205
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
206-
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
206+
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
207+
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
207208
*/
208209
private String connectionErrorCode;
209210

@@ -883,7 +884,8 @@ public CustomKeyStoresListEntry withConnectionState(ConnectionStateType connecti
883884
* <b>Constraints:</b><br/>
884885
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
885886
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
886-
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
887+
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
888+
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
887889
*
888890
* @return <p>
889891
* Describes the connection error. This field appears in the
@@ -1095,7 +1097,8 @@ public String getConnectionErrorCode() {
10951097
* <b>Constraints:</b><br/>
10961098
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
10971099
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
1098-
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
1100+
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
1101+
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
10991102
*
11001103
* @param connectionErrorCode <p>
11011104
* Describes the connection error. This field appears in the
@@ -1311,7 +1314,8 @@ public void setConnectionErrorCode(String connectionErrorCode) {
13111314
* <b>Constraints:</b><br/>
13121315
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
13131316
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
1314-
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
1317+
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
1318+
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
13151319
*
13161320
* @param connectionErrorCode <p>
13171321
* Describes the connection error. This field appears in the
@@ -1527,7 +1531,8 @@ public CustomKeyStoresListEntry withConnectionErrorCode(String connectionErrorCo
15271531
* <b>Constraints:</b><br/>
15281532
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
15291533
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
1530-
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
1534+
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
1535+
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
15311536
*
15321537
* @param connectionErrorCode <p>
15331538
* Describes the connection error. This field appears in the
@@ -1743,7 +1748,8 @@ public void setConnectionErrorCode(ConnectionErrorCodeType connectionErrorCode)
17431748
* <b>Constraints:</b><br/>
17441749
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
17451750
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
1746-
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
1751+
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
1752+
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
17471753
*
17481754
* @param connectionErrorCode <p>
17491755
* Describes the connection error. This field appears in the

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public enum CustomerMasterKeySpec {
3535
HMAC_224("HMAC_224"),
3636
HMAC_256("HMAC_256"),
3737
HMAC_384("HMAC_384"),
38-
HMAC_512("HMAC_512");
38+
HMAC_512("HMAC_512"),
39+
SM2("SM2");
3940

4041
private String value;
4142

@@ -63,6 +64,7 @@ public String toString() {
6364
enumMap.put("HMAC_256", HMAC_256);
6465
enumMap.put("HMAC_384", HMAC_384);
6566
enumMap.put("HMAC_512", HMAC_512);
67+
enumMap.put("SM2", SM2);
6668
}
6769

6870
/**

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public enum DataKeyPairSpec {
2929
ECC_NIST_P256("ECC_NIST_P256"),
3030
ECC_NIST_P384("ECC_NIST_P384"),
3131
ECC_NIST_P521("ECC_NIST_P521"),
32-
ECC_SECG_P256K1("ECC_SECG_P256K1");
32+
ECC_SECG_P256K1("ECC_SECG_P256K1"),
33+
SM2("SM2");
3334

3435
private String value;
3536

@@ -52,6 +53,7 @@ public String toString() {
5253
enumMap.put("ECC_NIST_P384", ECC_NIST_P384);
5354
enumMap.put("ECC_NIST_P521", ECC_NIST_P521);
5455
enumMap.put("ECC_SECG_P256K1", ECC_SECG_P256K1);
56+
enumMap.put("SM2", SM2);
5557
}
5658

5759
/**

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public class DecryptRequest extends AmazonWebServiceRequest implements Serializa
280280
* <p>
281281
* <b>Constraints:</b><br/>
282282
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
283-
* RSAES_OAEP_SHA_256
283+
* RSAES_OAEP_SHA_256, SM2PKE
284284
*/
285285
private String encryptionAlgorithm;
286286

@@ -1097,7 +1097,7 @@ public DecryptRequest withKeyId(String keyId) {
10971097
* <p>
10981098
* <b>Constraints:</b><br/>
10991099
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
1100-
* RSAES_OAEP_SHA_256
1100+
* RSAES_OAEP_SHA_256, SM2PKE
11011101
*
11021102
* @return <p>
11031103
* Specifies the encryption algorithm that will be used to decrypt
@@ -1133,7 +1133,7 @@ public String getEncryptionAlgorithm() {
11331133
* <p>
11341134
* <b>Constraints:</b><br/>
11351135
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
1136-
* RSAES_OAEP_SHA_256
1136+
* RSAES_OAEP_SHA_256, SM2PKE
11371137
*
11381138
* @param encryptionAlgorithm <p>
11391139
* Specifies the encryption algorithm that will be used to
@@ -1172,7 +1172,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) {
11721172
* <p>
11731173
* <b>Constraints:</b><br/>
11741174
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
1175-
* RSAES_OAEP_SHA_256
1175+
* RSAES_OAEP_SHA_256, SM2PKE
11761176
*
11771177
* @param encryptionAlgorithm <p>
11781178
* Specifies the encryption algorithm that will be used to
@@ -1211,7 +1211,7 @@ public DecryptRequest withEncryptionAlgorithm(String encryptionAlgorithm) {
12111211
* <p>
12121212
* <b>Constraints:</b><br/>
12131213
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
1214-
* RSAES_OAEP_SHA_256
1214+
* RSAES_OAEP_SHA_256, SM2PKE
12151215
*
12161216
* @param encryptionAlgorithm <p>
12171217
* Specifies the encryption algorithm that will be used to
@@ -1250,7 +1250,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm)
12501250
* <p>
12511251
* <b>Constraints:</b><br/>
12521252
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
1253-
* RSAES_OAEP_SHA_256
1253+
* RSAES_OAEP_SHA_256, SM2PKE
12541254
*
12551255
* @param encryptionAlgorithm <p>
12561256
* Specifies the encryption algorithm that will be used to

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class DecryptResult implements Serializable {
4949
* <p>
5050
* <b>Constraints:</b><br/>
5151
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
52-
* RSAES_OAEP_SHA_256
52+
* RSAES_OAEP_SHA_256, SM2PKE
5353
*/
5454
private String encryptionAlgorithm;
5555

@@ -195,7 +195,7 @@ public DecryptResult withPlaintext(java.nio.ByteBuffer plaintext) {
195195
* <p>
196196
* <b>Constraints:</b><br/>
197197
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
198-
* RSAES_OAEP_SHA_256
198+
* RSAES_OAEP_SHA_256, SM2PKE
199199
*
200200
* @return <p>
201201
* The encryption algorithm that was used to decrypt the ciphertext.
@@ -213,7 +213,7 @@ public String getEncryptionAlgorithm() {
213213
* <p>
214214
* <b>Constraints:</b><br/>
215215
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
216-
* RSAES_OAEP_SHA_256
216+
* RSAES_OAEP_SHA_256, SM2PKE
217217
*
218218
* @param encryptionAlgorithm <p>
219219
* The encryption algorithm that was used to decrypt the
@@ -235,7 +235,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) {
235235
* <p>
236236
* <b>Constraints:</b><br/>
237237
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
238-
* RSAES_OAEP_SHA_256
238+
* RSAES_OAEP_SHA_256, SM2PKE
239239
*
240240
* @param encryptionAlgorithm <p>
241241
* The encryption algorithm that was used to decrypt the
@@ -257,7 +257,7 @@ public DecryptResult withEncryptionAlgorithm(String encryptionAlgorithm) {
257257
* <p>
258258
* <b>Constraints:</b><br/>
259259
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
260-
* RSAES_OAEP_SHA_256
260+
* RSAES_OAEP_SHA_256, SM2PKE
261261
*
262262
* @param encryptionAlgorithm <p>
263263
* The encryption algorithm that was used to decrypt the
@@ -279,7 +279,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm)
279279
* <p>
280280
* <b>Constraints:</b><br/>
281281
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
282-
* RSAES_OAEP_SHA_256
282+
* RSAES_OAEP_SHA_256, SM2PKE
283283
*
284284
* @param encryptionAlgorithm <p>
285285
* The encryption algorithm that was used to decrypt the

0 commit comments

Comments
 (0)