Skip to content

Commit

Permalink
feat(aws-android-sdk-kms): update models to latest (#2948)
Browse files Browse the repository at this point in the history 
Co-authored-by: Erica Eaton <[email protected]>
  • Loading branch information
@awsmobilesdk @eeatonaws
awsmobilesdk and eeatonaws authored Aug 9, 2022
1 parent 7b25e68 commit f8c1f6f
Show file tree
Hide file tree
Showing 38 changed files with 1,209 additions and 710 deletions.
147 changes: 99 additions & 48 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java
View file

Large diffs are not rendered by default.

147 changes: 99 additions & 48 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion ...droid-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ConnectionErrorCodeType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public enum ConnectionErrorCodeType {
USER_LOCKED_OUT("USER_LOCKED_OUT"),
USER_NOT_FOUND("USER_NOT_FOUND"),
USER_LOGGED_IN("USER_LOGGED_IN"),
SUBNET_NOT_FOUND("SUBNET_NOT_FOUND");
SUBNET_NOT_FOUND("SUBNET_NOT_FOUND"),
INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET("INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET");

private String value;

Expand All @@ -56,6 +57,7 @@ public String toString() {
enumMap.put("USER_NOT_FOUND", USER_NOT_FOUND);
enumMap.put("USER_LOGGED_IN", USER_LOGGED_IN);
enumMap.put("SUBNET_NOT_FOUND", SUBNET_NOT_FOUND);
enumMap.put("INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET", INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...d-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateCustomKeyStoreRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* <p>
* This operation is part of the <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html"
* >Custom Key Store feature</a> feature in KMS, which combines the convenience
* >custom key store feature</a> feature in KMS, which combines the convenience
* and extensive integration of KMS with the isolation and control of a
* single-tenant key store.
* </p>
Expand Down
542 changes: 376 additions & 166 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateKeyRequest.java
View file

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions ...roid-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomKeyStoresListEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@ public class CustomKeyStoresListEntry implements Serializable {
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
*/
private String connectionErrorCode;

Expand Down Expand Up @@ -883,7 +884,8 @@ public CustomKeyStoresListEntry withConnectionState(ConnectionStateType connecti
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
*
* @return <p>
* Describes the connection error. This field appears in the
Expand Down Expand Up @@ -1095,7 +1097,8 @@ public String getConnectionErrorCode() {
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
*
* @param connectionErrorCode <p>
* Describes the connection error. This field appears in the
Expand Down Expand Up @@ -1311,7 +1314,8 @@ public void setConnectionErrorCode(String connectionErrorCode) {
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
*
* @param connectionErrorCode <p>
* Describes the connection error. This field appears in the
Expand Down Expand Up @@ -1527,7 +1531,8 @@ public CustomKeyStoresListEntry withConnectionErrorCode(String connectionErrorCo
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
*
* @param connectionErrorCode <p>
* Describes the connection error. This field appears in the
Expand Down Expand Up @@ -1743,7 +1748,8 @@ public void setConnectionErrorCode(ConnectionErrorCodeType connectionErrorCode)
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>INVALID_CREDENTIALS, CLUSTER_NOT_FOUND,
* NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS,
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND
* USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND,
* INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET
*
* @param connectionErrorCode <p>
* Describes the connection error. This field appears in the
Expand Down
4 changes: 3 additions & 1 deletion ...android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomerMasterKeySpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public enum CustomerMasterKeySpec {
HMAC_224("HMAC_224"),
HMAC_256("HMAC_256"),
HMAC_384("HMAC_384"),
HMAC_512("HMAC_512");
HMAC_512("HMAC_512"),
SM2("SM2");

private String value;

Expand Down Expand Up @@ -63,6 +64,7 @@ public String toString() {
enumMap.put("HMAC_256", HMAC_256);
enumMap.put("HMAC_384", HMAC_384);
enumMap.put("HMAC_512", HMAC_512);
enumMap.put("SM2", SM2);
}

/**
Expand Down
4 changes: 3 additions & 1 deletion aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DataKeyPairSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public enum DataKeyPairSpec {
ECC_NIST_P256("ECC_NIST_P256"),
ECC_NIST_P384("ECC_NIST_P384"),
ECC_NIST_P521("ECC_NIST_P521"),
ECC_SECG_P256K1("ECC_SECG_P256K1");
ECC_SECG_P256K1("ECC_SECG_P256K1"),
SM2("SM2");

private String value;

Expand All @@ -52,6 +53,7 @@ public String toString() {
enumMap.put("ECC_NIST_P384", ECC_NIST_P384);
enumMap.put("ECC_NIST_P521", ECC_NIST_P521);
enumMap.put("ECC_SECG_P256K1", ECC_SECG_P256K1);
enumMap.put("SM2", SM2);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public class DecryptRequest extends AmazonWebServiceRequest implements Serializa
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*/
private String encryptionAlgorithm;

Expand Down Expand Up @@ -1097,7 +1097,7 @@ public DecryptRequest withKeyId(String keyId) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @return <p>
* Specifies the encryption algorithm that will be used to decrypt
Expand Down Expand Up @@ -1133,7 +1133,7 @@ public String getEncryptionAlgorithm() {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that will be used to
Expand Down Expand Up @@ -1172,7 +1172,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that will be used to
Expand Down Expand Up @@ -1211,7 +1211,7 @@ public DecryptRequest withEncryptionAlgorithm(String encryptionAlgorithm) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that will be used to
Expand Down Expand Up @@ -1250,7 +1250,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm)
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that will be used to
Expand Down
12 changes: 6 additions & 6 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class DecryptResult implements Serializable {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*/
private String encryptionAlgorithm;

Expand Down Expand Up @@ -195,7 +195,7 @@ public DecryptResult withPlaintext(java.nio.ByteBuffer plaintext) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @return <p>
* The encryption algorithm that was used to decrypt the ciphertext.
Expand All @@ -213,7 +213,7 @@ public String getEncryptionAlgorithm() {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* The encryption algorithm that was used to decrypt the
Expand All @@ -235,7 +235,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* The encryption algorithm that was used to decrypt the
Expand All @@ -257,7 +257,7 @@ public DecryptResult withEncryptionAlgorithm(String encryptionAlgorithm) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* The encryption algorithm that was used to decrypt the
Expand All @@ -279,7 +279,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm)
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* The encryption algorithm that was used to decrypt the
Expand Down
4 changes: 2 additions & 2 deletions ...d-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DeleteCustomKeyStoreRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* the cluster.
* </p>
* <p>
* The custom key store that you delete cannot contain any KMS <a href=
* The custom key store that you delete cannot contain any <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#kms_keys"
* >KMS keys</a>. Before deleting the key store, verify that you will never need
* to use any of the KMS keys in the key store for any <a href=
Expand Down Expand Up @@ -59,7 +59,7 @@
* <p>
* This operation is part of the <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html"
* >Custom Key Store feature</a> feature in KMS, which combines the convenience
* >custom key store feature</a> feature in KMS, which combines the convenience
* and extensive integration of KMS with the isolation and control of a
* single-tenant key store.
* </p>
Expand Down
2 changes: 1 addition & 1 deletion ...dk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeCustomKeyStoresRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* <p>
* This operation is part of the <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html"
* >Custom Key Store feature</a> feature in KMS, which combines the convenience
* >custom key store feature</a> feature in KMS, which combines the convenience
* and extensive integration of KMS with the isolation and control of a
* single-tenant key store.
* </p>
Expand Down
4 changes: 2 additions & 2 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeKeyRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
* information, use <a>GetKeyRotationStatus</a>. Also, some key states prevent a
* KMS key from being automatically rotated. For details, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/rotate-keys.html#rotate-keys-how-it-works"
* >How Automatic Key Rotation Works</a> in <i>Key Management Service Developer
* Guide</i>.
* >How Automatic Key Rotation Works</a> in the <i>Key Management Service
* Developer Guide</i>.
* </p>
* </li>
* <li>
Expand Down
2 changes: 1 addition & 1 deletion ...k-kms/src/main/java/com/amazonaws/services/kms/model/DisconnectCustomKeyStoreRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
* <p>
* This operation is part of the <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html"
* >Custom Key Store feature</a> feature in KMS, which combines the convenience
* >custom key store feature</a> feature in KMS, which combines the convenience
* and extensive integration of KMS with the isolation and control of a
* single-tenant key store.
* </p>
Expand Down
19 changes: 12 additions & 7 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* </p>
* <p>
* If you specify an asymmetric KMS key, you must also specify the encryption
* algorithm. The algorithm must be compatible with the KMS key type.
* algorithm. The algorithm must be compatible with the KMS key spec.
* </p>
* <important>
* <p>
Expand Down Expand Up @@ -131,6 +131,11 @@
* </li>
* </ul>
* </li>
* <li>
* <p>
* <code>SM2PKE</code>: 1024 bytes (China Regions only)
* </p>
* </li>
* </ul>
* <p>
* The KMS key that you use for this operation must be in a compatible key
Expand Down Expand Up @@ -291,7 +296,7 @@ public class EncryptRequest extends AmazonWebServiceRequest implements Serializa
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*/
private String encryptionAlgorithm;

Expand Down Expand Up @@ -1049,7 +1054,7 @@ public EncryptRequest withGrantTokens(java.util.Collection<String> grantTokens)
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @return <p>
* Specifies the encryption algorithm that KMS will use to encrypt
Expand Down Expand Up @@ -1083,7 +1088,7 @@ public String getEncryptionAlgorithm() {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that KMS will use to
Expand Down Expand Up @@ -1120,7 +1125,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that KMS will use to
Expand Down Expand Up @@ -1157,7 +1162,7 @@ public EncryptRequest withEncryptionAlgorithm(String encryptionAlgorithm) {
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that KMS will use to
Expand Down Expand Up @@ -1194,7 +1199,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm)
* <p>
* <b>Constraints:</b><br/>
* <b>Allowed Values: </b>SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1,
* RSAES_OAEP_SHA_256
* RSAES_OAEP_SHA_256, SM2PKE
*
* @param encryptionAlgorithm <p>
* Specifies the encryption algorithm that KMS will use to
Expand Down
Loading

0 comments on commit f8c1f6f

Please sign in to comment.