feat(aws-android-sdk-kms): update models to latest (#2302)

Author: awsmobilesdk

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

@@ -47,14 +47,31 @@ public class AliasListEntry implements Serializable {
 
     /**
      * <p>
-     * String that contains the key identifier referred to by the alias.
+     * String that contains the key identifier of the CMK associated with the
+     * alias.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 2048<br/>
      */
     private String targetKeyId;
 
+    /**
+     * <p>
+     * Date and time that the alias was most recently created in the account and
+     * Region. Formatted as Unix time.
+     * </p>
+     */
+    private java.util.Date creationDate;
+
+    /**
+     * <p>
+     * Date and time that the alias was most recently associated with a CMK in
+     * the account and Region. Formatted as Unix time.
+     * </p>
+     */
+    private java.util.Date lastUpdatedDate;
+
     /**
      * <p>
      * String that contains the alias. This value begins with
@@ -174,14 +191,16 @@ public AliasListEntry withAliasArn(String aliasArn) {
 
     /**
      * <p>
-     * String that contains the key identifier referred to by the alias.
+     * String that contains the key identifier of the CMK associated with the
+     * alias.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 2048<br/>
      *
      * @return <p>
-     *         String that contains the key identifier referred to by the alias.
+     *         String that contains the key identifier of the CMK associated
+     *         with the alias.
      *         </p>
      */
     public String getTargetKeyId() {
@@ -190,15 +209,16 @@ public String getTargetKeyId() {
 
     /**
      * <p>
-     * String that contains the key identifier referred to by the alias.
+     * String that contains the key identifier of the CMK associated with the
+     * alias.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 2048<br/>
      *
      * @param targetKeyId <p>
-     *            String that contains the key identifier referred to by the
-     *            alias.
+     *            String that contains the key identifier of the CMK associated
+     *            with the alias.
      *            </p>
      */
     public void setTargetKeyId(String targetKeyId) {
@@ -207,7 +227,8 @@ public void setTargetKeyId(String targetKeyId) {
 
     /**
      * <p>
-     * String that contains the key identifier referred to by the alias.
+     * String that contains the key identifier of the CMK associated with the
+     * alias.
      * </p>
      * <p>
      * Returns a reference to this object so that method calls can be chained
@@ -217,8 +238,8 @@ public void setTargetKeyId(String targetKeyId) {
      * <b>Length: </b>1 - 2048<br/>
      *
      * @param targetKeyId <p>
-     *            String that contains the key identifier referred to by the
-     *            alias.
+     *            String that contains the key identifier of the CMK associated
+     *            with the alias.
      *            </p>
      * @return A reference to this updated object so that method calls can be
      *         chained together.
@@ -228,6 +249,108 @@ public AliasListEntry withTargetKeyId(String targetKeyId) {
         return this;
     }
 
+    /**
+     * <p>
+     * Date and time that the alias was most recently created in the account and
+     * Region. Formatted as Unix time.
+     * </p>
+     *
+     * @return <p>
+     *         Date and time that the alias was most recently created in the
+     *         account and Region. Formatted as Unix time.
+     *         </p>
+     */
+    public java.util.Date getCreationDate() {
+        return creationDate;
+    }
+
+    /**
+     * <p>
+     * Date and time that the alias was most recently created in the account and
+     * Region. Formatted as Unix time.
+     * </p>
+     *
+     * @param creationDate <p>
+     *            Date and time that the alias was most recently created in the
+     *            account and Region. Formatted as Unix time.
+     *            </p>
+     */
+    public void setCreationDate(java.util.Date creationDate) {
+        this.creationDate = creationDate;
+    }
+
+    /**
+     * <p>
+     * Date and time that the alias was most recently created in the account and
+     * Region. Formatted as Unix time.
+     * </p>
+     * <p>
+     * Returns a reference to this object so that method calls can be chained
+     * together.
+     *
+     * @param creationDate <p>
+     *            Date and time that the alias was most recently created in the
+     *            account and Region. Formatted as Unix time.
+     *            </p>
+     * @return A reference to this updated object so that method calls can be
+     *         chained together.
+     */
+    public AliasListEntry withCreationDate(java.util.Date creationDate) {
+        this.creationDate = creationDate;
+        return this;
+    }
+
+    /**
+     * <p>
+     * Date and time that the alias was most recently associated with a CMK in
+     * the account and Region. Formatted as Unix time.
+     * </p>
+     *
+     * @return <p>
+     *         Date and time that the alias was most recently associated with a
+     *         CMK in the account and Region. Formatted as Unix time.
+     *         </p>
+     */
+    public java.util.Date getLastUpdatedDate() {
+        return lastUpdatedDate;
+    }
+
+    /**
+     * <p>
+     * Date and time that the alias was most recently associated with a CMK in
+     * the account and Region. Formatted as Unix time.
+     * </p>
+     *
+     * @param lastUpdatedDate <p>
+     *            Date and time that the alias was most recently associated with
+     *            a CMK in the account and Region. Formatted as Unix time.
+     *            </p>
+     */
+    public void setLastUpdatedDate(java.util.Date lastUpdatedDate) {
+        this.lastUpdatedDate = lastUpdatedDate;
+    }
+
+    /**
+     * <p>
+     * Date and time that the alias was most recently associated with a CMK in
+     * the account and Region. Formatted as Unix time.
+     * </p>
+     * <p>
+     * Returns a reference to this object so that method calls can be chained
+     * together.
+     *
+     * @param lastUpdatedDate <p>
+     *            Date and time that the alias was most recently associated with
+     *            a CMK in the account and Region. Formatted as Unix time.
+     *            </p>
+     * @return A reference to this updated object so that method calls can be
+     *         chained together.
+     */
+    public AliasListEntry withLastUpdatedDate(java.util.Date lastUpdatedDate) {
+        this.lastUpdatedDate = lastUpdatedDate;
+        return this;
+    }
+
     /**
      * Returns a string representation of this object; useful for testing and
      * debugging.
@@ -244,7 +367,11 @@ public String toString() {
         if (getAliasArn() != null)
             sb.append("AliasArn: " + getAliasArn() + ",");
         if (getTargetKeyId() != null)
-            sb.append("TargetKeyId: " + getTargetKeyId());
+            sb.append("TargetKeyId: " + getTargetKeyId() + ",");
+        if (getCreationDate() != null)
+            sb.append("CreationDate: " + getCreationDate() + ",");
+        if (getLastUpdatedDate() != null)
+            sb.append("LastUpdatedDate: " + getLastUpdatedDate());
         sb.append("}");
         return sb.toString();
     }
@@ -258,6 +385,10 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getAliasArn() == null) ? 0 : getAliasArn().hashCode());
         hashCode = prime * hashCode
                 + ((getTargetKeyId() == null) ? 0 : getTargetKeyId().hashCode());
+        hashCode = prime * hashCode
+                + ((getCreationDate() == null) ? 0 : getCreationDate().hashCode());
+        hashCode = prime * hashCode
+                + ((getLastUpdatedDate() == null) ? 0 : getLastUpdatedDate().hashCode());
         return hashCode;
     }
 
@@ -286,6 +417,16 @@ public boolean equals(Object obj) {
         if (other.getTargetKeyId() != null
                 && other.getTargetKeyId().equals(this.getTargetKeyId()) == false)
             return false;
+        if (other.getCreationDate() == null ^ this.getCreationDate() == null)
+            return false;
+        if (other.getCreationDate() != null
+                && other.getCreationDate().equals(this.getCreationDate()) == false)
+            return false;
+        if (other.getLastUpdatedDate() == null ^ this.getLastUpdatedDate() == null)
+            return false;
+        if (other.getLastUpdatedDate() != null
+                && other.getLastUpdatedDate().equals(this.getLastUpdatedDate()) == false)
+            return false;
         return true;
     }
 }

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

@@ -23,8 +23,7 @@
  * <p>
  * Cancels the deletion of a customer master key (CMK). When this operation
  * succeeds, the key state of the CMK is <code>Disabled</code>. To enable the
- * CMK, use <a>EnableKey</a>. You cannot perform this operation on a CMK in a
- * different AWS account.
+ * CMK, use <a>EnableKey</a>.
  * </p>
  * <p>
  * For more information about scheduling and canceling deletion of a CMK, see <a
@@ -40,6 +39,18 @@
  * >How Key State Affects Use of a Customer Master Key</a> in the <i>AWS Key
  * Management Service Developer Guide</i>.
  * </p>
+ * <p>
+ * <b>Cross-account use</b>: No. You cannot perform this operation on a CMK in a
+ * different AWS account.
+ * </p>
+ * <p>
+ * <b>Required permissions</b>: <a href=
+ * "https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html"
+ * >kms:CancelKeyDeletion</a> (key policy)
+ * </p>
+ * <p>
+ * <b>Related operations</b>: <a>ScheduleKeyDeletion</a>
+ * </p>
  */
 public class CancelKeyDeletionRequest extends AmazonWebServiceRequest implements Serializable {
     /**

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

@@ -20,7 +20,9 @@
 public class CancelKeyDeletionResult implements Serializable {
     /**
      * <p>
-     * The unique identifier of the master key for which deletion is canceled.
+     * The Amazon Resource Name (<a href=
+     * "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     * >key ARN</a>) of the CMK whose deletion is canceled.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
@@ -30,15 +32,18 @@ public class CancelKeyDeletionResult implements Serializable {
 
     /**
      * <p>
-     * The unique identifier of the master key for which deletion is canceled.
+     * The Amazon Resource Name (<a href=
+     * "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     * >key ARN</a>) of the CMK whose deletion is canceled.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 2048<br/>
      *
      * @return <p>
-     *         The unique identifier of the master key for which deletion is
-     *         canceled.
+     *         The Amazon Resource Name (<a href=
+     *         "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     *         >key ARN</a>) of the CMK whose deletion is canceled.
      *         </p>
      */
     public String getKeyId() {
@@ -47,15 +52,18 @@ public String getKeyId() {
 
     /**
      * <p>
-     * The unique identifier of the master key for which deletion is canceled.
+     * The Amazon Resource Name (<a href=
+     * "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     * >key ARN</a>) of the CMK whose deletion is canceled.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 2048<br/>
      *
      * @param keyId <p>
-     *            The unique identifier of the master key for which deletion is
-     *            canceled.
+     *            The Amazon Resource Name (<a href=
+     *            "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     *            >key ARN</a>) of the CMK whose deletion is canceled.
      *            </p>
      */
     public void setKeyId(String keyId) {
@@ -64,7 +72,9 @@ public void setKeyId(String keyId) {
 
     /**
      * <p>
-     * The unique identifier of the master key for which deletion is canceled.
+     * The Amazon Resource Name (<a href=
+     * "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     * >key ARN</a>) of the CMK whose deletion is canceled.
      * </p>
      * <p>
      * Returns a reference to this object so that method calls can be chained
@@ -74,8 +84,9 @@ public void setKeyId(String keyId) {
      * <b>Length: </b>1 - 2048<br/>
      *
      * @param keyId <p>
-     *            The unique identifier of the master key for which deletion is
-     *            canceled.
+     *            The Amazon Resource Name (<a href=
+     *            "https://docs.aws.amazon.com/kms/latest/developerguide/concepts.html#key-id-key-ARN"
+     *            >key ARN</a>) of the CMK whose deletion is canceled.
      *            </p>
      * @return A reference to this updated object so that method calls can be
      *         chained together.

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

@@ -77,6 +77,45 @@
  * >Troubleshooting a Custom Key Store</a> in the <i>AWS Key Management Service
  * Developer Guide</i>.
  * </p>
+ * <p>
+ * <b>Cross-account use</b>: No. You cannot perform this operation on a custom
+ * key store in a different AWS account.
+ * </p>
+ * <p>
+ * <b>Required permissions</b>: <a href=
+ * "https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html"
+ * >kms:ConnectCustomKeyStore</a> (IAM policy)
+ * </p>
+ * <p>
+ * <b>Related operations</b>
+ * </p>
+ * <ul>
+ * <li>
+ * <p>
+ * <a>CreateCustomKeyStore</a>
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>DeleteCustomKeyStore</a>
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>DescribeCustomKeyStores</a>
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>DisconnectCustomKeyStore</a>
+ * </p>
+ * </li>
+ * <li>
+ * <p>
+ * <a>UpdateCustomKeyStore</a>
+ * </p>
+ * </li>
+ * </ul>
  */
 public class ConnectCustomKeyStoreRequest extends AmazonWebServiceRequest implements Serializable {
     /**