Skip to content

Commit

Permalink
feat(aws-android-sdk-kms): update models to latest (#3595)
Browse files Browse the repository at this point in the history
  • Loading branch information
awsmobilesdk authored Jun 14, 2024
1 parent cbbcc78 commit e2f1159
Show file tree
Hide file tree
Showing 346 changed files with 9,049 additions and 938 deletions.
911 changes: 845 additions & 66 deletions aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -27,7 +27,8 @@ public enum AlgorithmSpec {
RSAES_OAEP_SHA_1("RSAES_OAEP_SHA_1"),
RSAES_OAEP_SHA_256("RSAES_OAEP_SHA_256"),
RSA_AES_KEY_WRAP_SHA_1("RSA_AES_KEY_WRAP_SHA_1"),
RSA_AES_KEY_WRAP_SHA_256("RSA_AES_KEY_WRAP_SHA_256");
RSA_AES_KEY_WRAP_SHA_256("RSA_AES_KEY_WRAP_SHA_256"),
SM2PKE("SM2PKE");

private String value;

Expand All @@ -48,6 +49,7 @@ public String toString() {
enumMap.put("RSAES_OAEP_SHA_256", RSAES_OAEP_SHA_256);
enumMap.put("RSA_AES_KEY_WRAP_SHA_1", RSA_AES_KEY_WRAP_SHA_1);
enumMap.put("RSA_AES_KEY_WRAP_SHA_256", RSA_AES_KEY_WRAP_SHA_256);
enumMap.put("SM2PKE", SM2PKE);
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -50,6 +50,12 @@
* <p>
* <b>Related operations</b>: <a>ScheduleKeyDeletion</a>
* </p>
* <p>
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
* model. For more information, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
* >KMS eventual consistency</a>.
* </p>
*/
public class CancelKeyDeletionRequest extends AmazonWebServiceRequest implements Serializable {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/

package com.amazonaws.services.kms.model;

import com.amazonaws.AmazonServiceException;

/**
* <p>
* The request was rejected because an automatic rotation of this key is
* currently in progress or scheduled to begin within the next 20 minutes.
* </p>
*/
public class ConflictException extends AmazonServiceException {
private static final long serialVersionUID = 1L;

/**
* Constructs a new ConflictException with the specified error message.
*
* @param message Describes the error encountered.
*/
public ConflictException(String message) {
super(message);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -158,6 +158,12 @@
* </p>
* </li>
* </ul>
* <p>
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
* model. For more information, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
* >KMS eventual consistency</a>.
* </p>
*/
public class ConnectCustomKeyStoreRequest extends AmazonWebServiceRequest implements Serializable {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -113,6 +113,12 @@
* </p>
* </li>
* </ul>
* <p>
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
* model. For more information, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
* >KMS eventual consistency</a>.
* </p>
*/
public class CreateAliasRequest extends AmazonWebServiceRequest implements Serializable {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -157,6 +157,12 @@
* </p>
* </li>
* </ul>
* <p>
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
* model. For more information, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
* >KMS eventual consistency</a>.
* </p>
*/
public class CreateCustomKeyStoreRequest extends AmazonWebServiceRequest implements Serializable {
/**
Expand Down Expand Up @@ -306,7 +312,7 @@ public class CreateCustomKeyStoreRequest extends AmazonWebServiceRequest impleme
* <p>
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
* Amazon Web Services Region.
* </p>
* </li>
Expand Down Expand Up @@ -1169,7 +1175,7 @@ public CreateCustomKeyStoreRequest withCustomKeyStoreType(CustomKeyStoreType cus
* <p>
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
* Amazon Web Services Region.
* </p>
* </li>
Expand Down Expand Up @@ -1236,8 +1242,8 @@ public CreateCustomKeyStoreRequest withCustomKeyStoreType(CustomKeyStoreType cus
* An external key store with <code>PUBLIC_ENDPOINT</code>
* connectivity cannot use the same <code>XksProxyUriEndpoint</code>
* value as an external key store with
* <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same Amazon
* Web Services Region.
* <code>VPC_ENDPOINT_SERVICE</code> connectivity in this Amazon Web
* Services Region.
* </p>
* </li>
* <li>
Expand Down Expand Up @@ -1301,7 +1307,7 @@ public String getXksProxyUriEndpoint() {
* <p>
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
* Amazon Web Services Region.
* </p>
* </li>
Expand Down Expand Up @@ -1371,7 +1377,7 @@ public String getXksProxyUriEndpoint() {
* connectivity cannot use the same
* <code>XksProxyUriEndpoint</code> value as an external key
* store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in
* the same Amazon Web Services Region.
* this Amazon Web Services Region.
* </p>
* </li>
* <li>
Expand Down Expand Up @@ -1435,7 +1441,7 @@ public void setXksProxyUriEndpoint(String xksProxyUriEndpoint) {
* <p>
* An external key store with <code>PUBLIC_ENDPOINT</code> connectivity
* cannot use the same <code>XksProxyUriEndpoint</code> value as an external
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in the same
* key store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in this
* Amazon Web Services Region.
* </p>
* </li>
Expand Down Expand Up @@ -1508,7 +1514,7 @@ public void setXksProxyUriEndpoint(String xksProxyUriEndpoint) {
* connectivity cannot use the same
* <code>XksProxyUriEndpoint</code> value as an external key
* store with <code>VPC_ENDPOINT_SERVICE</code> connectivity in
* the same Amazon Web Services Region.
* this Amazon Web Services Region.
* </p>
* </li>
* <li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down Expand Up @@ -116,6 +116,12 @@
* </p>
* </li>
* </ul>
* <p>
* <b>Eventual consistency</b>: The KMS API follows an eventual consistency
* model. For more information, see <a href=
* "https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html"
* >KMS eventual consistency</a>.
* </p>
*/
public class CreateGrantRequest extends AmazonWebServiceRequest implements Serializable {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
* Copyright 2010-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit e2f1159

Please sign in to comment.