From 1489723eaa5ac701dae63f06577105c2af93f044 Mon Sep 17 00:00:00 2001
From: awstools <awstools@amazon.com>
Date: Wed, 22 May 2024 18:15:36 +0000
Subject: [PATCH] feat(client-kms): This release includes feature to import
 customer's asymmetric (RSA, ECC and SM2) and HMAC keys into KMS in China.

---
 .../commands/GetParametersForImportCommand.ts |  6 ++---
 clients/client-kms/src/models/models_0.ts     | 24 +++++++++++++++----
 codegen/sdk-codegen/aws-models/kms.json       | 18 +++++++++++---
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/clients/client-kms/src/commands/GetParametersForImportCommand.ts b/clients/client-kms/src/commands/GetParametersForImportCommand.ts
index 99871ce4bb2b..02660039b902 100644
--- a/clients/client-kms/src/commands/GetParametersForImportCommand.ts
+++ b/clients/client-kms/src/commands/GetParametersForImportCommand.ts
@@ -52,7 +52,7 @@ export interface GetParametersForImportCommandOutput extends GetParametersForImp
  *       material.</p>
  *          <ul>
  *             <li>
- *                <p>The public key (or "wrapping key") of an RSA key pair that KMS generates.</p>
+ *                <p>The public key (or "wrapping key") of an asymmetric key pair that KMS generates.</p>
  *                <p>You will use this public key to encrypt ("wrap") your key material while it's in
  *           transit to KMS. </p>
  *             </li>
@@ -116,8 +116,8 @@ export interface GetParametersForImportCommandOutput extends GetParametersForImp
  * const client = new KMSClient(config);
  * const input = { // GetParametersForImportRequest
  *   KeyId: "STRING_VALUE", // required
- *   WrappingAlgorithm: "RSAES_PKCS1_V1_5" || "RSAES_OAEP_SHA_1" || "RSAES_OAEP_SHA_256" || "RSA_AES_KEY_WRAP_SHA_1" || "RSA_AES_KEY_WRAP_SHA_256", // required
- *   WrappingKeySpec: "RSA_2048" || "RSA_3072" || "RSA_4096", // required
+ *   WrappingAlgorithm: "RSAES_PKCS1_V1_5" || "RSAES_OAEP_SHA_1" || "RSAES_OAEP_SHA_256" || "RSA_AES_KEY_WRAP_SHA_1" || "RSA_AES_KEY_WRAP_SHA_256" || "SM2PKE", // required
+ *   WrappingKeySpec: "RSA_2048" || "RSA_3072" || "RSA_4096" || "SM2", // required
  * };
  * const command = new GetParametersForImportCommand(input);
  * const response = await client.send(command);
diff --git a/clients/client-kms/src/models/models_0.ts b/clients/client-kms/src/models/models_0.ts
index db0d57646cd4..517a457f6d43 100644
--- a/clients/client-kms/src/models/models_0.ts
+++ b/clients/client-kms/src/models/models_0.ts
@@ -13,6 +13,7 @@ export const AlgorithmSpec = {
   RSAES_PKCS1_V1_5: "RSAES_PKCS1_V1_5",
   RSA_AES_KEY_WRAP_SHA_1: "RSA_AES_KEY_WRAP_SHA_1",
   RSA_AES_KEY_WRAP_SHA_256: "RSA_AES_KEY_WRAP_SHA_256",
+  SM2PKE: "SM2PKE",
 } as const;
 
 /**
@@ -4211,6 +4212,7 @@ export const WrappingKeySpec = {
   RSA_2048: "RSA_2048",
   RSA_3072: "RSA_3072",
   RSA_4096: "RSA_4096",
+  SM2: "SM2",
 } as const;
 
 /**
@@ -4245,13 +4247,19 @@ export interface GetParametersForImportRequest {
   KeyId: string | undefined;
 
   /**
-   * <p>The algorithm you will use with the RSA public key (<code>PublicKey</code>) in the
+   * <p>The algorithm you will use with the asymmetric public key (<code>PublicKey</code>) in the
    *       response to protect your key material during import. For more information, see <a href="kms/latest/developerguide/importing-keys-get-public-key-and-token.html#select-wrapping-algorithm">Select a wrapping algorithm</a> in the <i>Key Management Service Developer Guide</i>.</p>
    *          <p>For RSA_AES wrapping algorithms, you encrypt your key material with an AES key that you
    *       generate, then encrypt your AES key with the RSA public key from KMS. For RSAES wrapping
-   *       algorithms, you encrypt your key material directly with the RSA public key from KMS.</p>
+   *       algorithms, you encrypt your key material directly with the RSA public key from KMS.
+   *       For SM2PKE wrapping algorithms, you encrypt your key material directly with the SM2 public key
+   *       from KMS.</p>
    *          <p>The wrapping algorithms that you can use depend on the type of key material that you are
-   *       importing. To import an RSA private key, you must use an RSA_AES wrapping algorithm.</p>
+   *       importing. To import an RSA private key, you must use an RSA_AES wrapping algorithm, except
+   *       in China Regions, where you must use the SM2PKE wrapping algorithm to import an RSA private key.</p>
+   *          <p>The SM2PKE wrapping algorithm is available only in China Regions. The
+   *       <code>RSA_AES_KEY_WRAP_SHA_256</code> and <code>RSA_AES_KEY_WRAP_SHA_1</code>
+   *       wrapping algorithms are not supported in China Regions.</p>
    *          <ul>
    *             <li>
    *                <p>
@@ -4282,17 +4290,23 @@ export interface GetParametersForImportRequest {
    *                   <b>RSAES_PKCS1_V1_5</b> (Deprecated) — As of October
    *           10, 2023, KMS does not support the RSAES_PKCS1_V1_5 wrapping algorithm.</p>
    *             </li>
+   *             <li>
+   *                <p>
+   *                   <b>SM2PKE</b> (China Regions only) — supported for
+   *           wrapping RSA, ECC, and SM2 key material.</p>
+   *             </li>
    *          </ul>
    * @public
    */
   WrappingAlgorithm: AlgorithmSpec | undefined;
 
   /**
-   * <p>The type of RSA public key to return in the response. You will use this wrapping key with
+   * <p>The type of public key to return in the response. You will use this wrapping key with
    *       the specified wrapping algorithm to protect your key material during import. </p>
-   *          <p>Use the longest RSA wrapping key that is practical. </p>
+   *          <p>Use the longest wrapping key that is practical. </p>
    *          <p>You cannot use an RSA_2048 public key to directly wrap an ECC_NIST_P521 private key.
    *       Instead, use an RSA_AES wrapping algorithm or choose a longer RSA public key.</p>
+   *          <p>The SM2 wrapping key spec is available only in China Regions.</p>
    * @public
    */
   WrappingKeySpec: WrappingKeySpec | undefined;
diff --git a/codegen/sdk-codegen/aws-models/kms.json b/codegen/sdk-codegen/aws-models/kms.json
index ec2e561e76e0..76409909d978 100644
--- a/codegen/sdk-codegen/aws-models/kms.json
+++ b/codegen/sdk-codegen/aws-models/kms.json
@@ -64,6 +64,12 @@
           "traits": {
             "smithy.api#enumValue": "RSA_AES_KEY_WRAP_SHA_256"
           }
+        },
+        "SM2PKE": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "SM2PKE"
+          }
         }
       }
     },
@@ -3570,7 +3576,7 @@
         }
       ],
       "traits": {
-        "smithy.api#documentation": "<p>Returns the public key and an import token you need to import or reimport key material for\n      a KMS key. </p>\n         <p>By default, KMS keys are created with key material that KMS generates. This operation\n      supports <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing key\n        material</a>, an advanced feature that lets you generate and import the cryptographic\n      key material for a KMS key. For more information about importing key material into KMS, see\n        <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing key\n        material</a> in the <i>Key Management Service Developer Guide</i>.</p>\n         <p>Before calling <code>GetParametersForImport</code>, use the <a>CreateKey</a>\n      operation with an <code>Origin</code> value of <code>EXTERNAL</code> to create a KMS key with\n      no key material. You can import key material for a symmetric encryption KMS key, HMAC KMS key,\n      asymmetric encryption KMS key, or asymmetric signing KMS key. You can also import key material\n      into a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html\">multi-Region key</a> of any supported type. However, you can't import key material into\n      a KMS key in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>. You can also use <code>GetParametersForImport</code> to get a\n      public key and import token to <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html#reimport-key-material\">reimport the original key\n        material</a> into a KMS key whose key material expired or was deleted.</p>\n         <p>\n            <code>GetParametersForImport</code> returns the items that you need to import your key\n      material.</p>\n         <ul>\n            <li>\n               <p>The public key (or \"wrapping key\") of an RSA key pair that KMS generates.</p>\n               <p>You will use this public key to encrypt (\"wrap\") your key material while it's in\n          transit to KMS. </p>\n            </li>\n            <li>\n               <p>A import token that ensures that KMS can decrypt your key material and associate it\n          with the correct KMS key.</p>\n            </li>\n         </ul>\n         <p>The public key and its import token are permanently linked and must be used together. Each\n      public key and import token set is valid for 24 hours. The expiration date and time appear in\n      the <code>ParametersValidTo</code> field in the <code>GetParametersForImport</code> response.\n      You cannot use an expired public key or import token in an <a>ImportKeyMaterial</a>\n      request. If your key and token expire, send another <code>GetParametersForImport</code>\n      request.</p>\n         <p>\n            <code>GetParametersForImport</code> requires the following information:</p>\n         <ul>\n            <li>\n               <p>The key ID of the KMS key for which you are importing the key material.</p>\n            </li>\n            <li>\n               <p>The key spec of the public key (\"wrapping key\") that you will use to encrypt your key\n          material during import.</p>\n            </li>\n            <li>\n               <p>The wrapping algorithm that you will use with the public key to encrypt your key\n          material.</p>\n            </li>\n         </ul>\n         <p>You can use the same or a different public key spec and wrapping algorithm each time you\n      import or reimport the same key material. </p>\n         <p>The KMS key that you use for this operation must be in a compatible key state. For\ndetails, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p>\n         <p>\n            <b>Cross-account use</b>: No. You cannot perform this operation on a KMS key in a different Amazon Web Services account.</p>\n         <p>\n            <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GetParametersForImport</a> (key policy)</p>\n         <p>\n            <b>Related operations:</b>\n         </p>\n         <ul>\n            <li>\n               <p>\n                  <a>ImportKeyMaterial</a>\n               </p>\n            </li>\n            <li>\n               <p>\n                  <a>DeleteImportedKeyMaterial</a>\n               </p>\n            </li>\n         </ul>\n         <p>\n            <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. \n  For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html\">KMS eventual consistency</a>.</p>"
+        "smithy.api#documentation": "<p>Returns the public key and an import token you need to import or reimport key material for\n      a KMS key. </p>\n         <p>By default, KMS keys are created with key material that KMS generates. This operation\n      supports <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing key\n        material</a>, an advanced feature that lets you generate and import the cryptographic\n      key material for a KMS key. For more information about importing key material into KMS, see\n        <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html\">Importing key\n        material</a> in the <i>Key Management Service Developer Guide</i>.</p>\n         <p>Before calling <code>GetParametersForImport</code>, use the <a>CreateKey</a>\n      operation with an <code>Origin</code> value of <code>EXTERNAL</code> to create a KMS key with\n      no key material. You can import key material for a symmetric encryption KMS key, HMAC KMS key,\n      asymmetric encryption KMS key, or asymmetric signing KMS key. You can also import key material\n      into a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html\">multi-Region key</a> of any supported type. However, you can't import key material into\n      a KMS key in a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">custom key store</a>. You can also use <code>GetParametersForImport</code> to get a\n      public key and import token to <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys.html#reimport-key-material\">reimport the original key\n        material</a> into a KMS key whose key material expired or was deleted.</p>\n         <p>\n            <code>GetParametersForImport</code> returns the items that you need to import your key\n      material.</p>\n         <ul>\n            <li>\n               <p>The public key (or \"wrapping key\") of an asymmetric key pair that KMS generates.</p>\n               <p>You will use this public key to encrypt (\"wrap\") your key material while it's in\n          transit to KMS. </p>\n            </li>\n            <li>\n               <p>A import token that ensures that KMS can decrypt your key material and associate it\n          with the correct KMS key.</p>\n            </li>\n         </ul>\n         <p>The public key and its import token are permanently linked and must be used together. Each\n      public key and import token set is valid for 24 hours. The expiration date and time appear in\n      the <code>ParametersValidTo</code> field in the <code>GetParametersForImport</code> response.\n      You cannot use an expired public key or import token in an <a>ImportKeyMaterial</a>\n      request. If your key and token expire, send another <code>GetParametersForImport</code>\n      request.</p>\n         <p>\n            <code>GetParametersForImport</code> requires the following information:</p>\n         <ul>\n            <li>\n               <p>The key ID of the KMS key for which you are importing the key material.</p>\n            </li>\n            <li>\n               <p>The key spec of the public key (\"wrapping key\") that you will use to encrypt your key\n          material during import.</p>\n            </li>\n            <li>\n               <p>The wrapping algorithm that you will use with the public key to encrypt your key\n          material.</p>\n            </li>\n         </ul>\n         <p>You can use the same or a different public key spec and wrapping algorithm each time you\n      import or reimport the same key material. </p>\n         <p>The KMS key that you use for this operation must be in a compatible key state. For\ndetails, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-state.html\">Key states of KMS keys</a> in the <i>Key Management Service Developer Guide</i>.</p>\n         <p>\n            <b>Cross-account use</b>: No. You cannot perform this operation on a KMS key in a different Amazon Web Services account.</p>\n         <p>\n            <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:GetParametersForImport</a> (key policy)</p>\n         <p>\n            <b>Related operations:</b>\n         </p>\n         <ul>\n            <li>\n               <p>\n                  <a>ImportKeyMaterial</a>\n               </p>\n            </li>\n            <li>\n               <p>\n                  <a>DeleteImportedKeyMaterial</a>\n               </p>\n            </li>\n         </ul>\n         <p>\n            <b>Eventual consistency</b>: The KMS API follows an eventual consistency model. \n  For more information, see <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/programming-eventual-consistency.html\">KMS eventual consistency</a>.</p>"
       }
     },
     "com.amazonaws.kms#GetParametersForImportRequest": {
@@ -3586,14 +3592,14 @@
         "WrappingAlgorithm": {
           "target": "com.amazonaws.kms#AlgorithmSpec",
           "traits": {
-            "smithy.api#documentation": "<p>The algorithm you will use with the RSA public key (<code>PublicKey</code>) in the\n      response to protect your key material during import. For more information, see <a href=\"kms/latest/developerguide/importing-keys-get-public-key-and-token.html#select-wrapping-algorithm\">Select a wrapping algorithm</a> in the <i>Key Management Service Developer Guide</i>.</p>\n         <p>For RSA_AES wrapping algorithms, you encrypt your key material with an AES key that you\n      generate, then encrypt your AES key with the RSA public key from KMS. For RSAES wrapping\n      algorithms, you encrypt your key material directly with the RSA public key from KMS.</p>\n         <p>The wrapping algorithms that you can use depend on the type of key material that you are\n      importing. To import an RSA private key, you must use an RSA_AES wrapping algorithm.</p>\n         <ul>\n            <li>\n               <p>\n                  <b>RSA_AES_KEY_WRAP_SHA_256</b> — Supported for\n          wrapping RSA and ECC key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSA_AES_KEY_WRAP_SHA_1</b> — Supported for\n          wrapping RSA and ECC key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSAES_OAEP_SHA_256</b> — Supported for all types\n          of key material, except RSA key material (private key).</p>\n               <p>You cannot use the RSAES_OAEP_SHA_256 wrapping algorithm with the RSA_2048 wrapping\n          key spec to wrap ECC_NIST_P521 key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSAES_OAEP_SHA_1</b> — Supported for all types of\n          key material, except RSA key material (private key).</p>\n               <p>You cannot use the RSAES_OAEP_SHA_1 wrapping algorithm with the RSA_2048 wrapping key\n          spec to wrap ECC_NIST_P521 key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSAES_PKCS1_V1_5</b> (Deprecated) — As of October\n          10, 2023, KMS does not support the RSAES_PKCS1_V1_5 wrapping algorithm.</p>\n            </li>\n         </ul>",
+            "smithy.api#documentation": "<p>The algorithm you will use with the asymmetric public key (<code>PublicKey</code>) in the\n      response to protect your key material during import. For more information, see <a href=\"kms/latest/developerguide/importing-keys-get-public-key-and-token.html#select-wrapping-algorithm\">Select a wrapping algorithm</a> in the <i>Key Management Service Developer Guide</i>.</p>\n         <p>For RSA_AES wrapping algorithms, you encrypt your key material with an AES key that you\n      generate, then encrypt your AES key with the RSA public key from KMS. For RSAES wrapping\n      algorithms, you encrypt your key material directly with the RSA public key from KMS. \n      For SM2PKE wrapping algorithms, you encrypt your key material directly with the SM2 public key \n      from KMS.</p>\n         <p>The wrapping algorithms that you can use depend on the type of key material that you are\n      importing. To import an RSA private key, you must use an RSA_AES wrapping algorithm, except \n      in China Regions, where you must use the SM2PKE wrapping algorithm to import an RSA private key.</p>\n         <p>The SM2PKE wrapping algorithm is available only in China Regions. The \n      <code>RSA_AES_KEY_WRAP_SHA_256</code> and <code>RSA_AES_KEY_WRAP_SHA_1</code> \n      wrapping algorithms are not supported in China Regions.</p>\n         <ul>\n            <li>\n               <p>\n                  <b>RSA_AES_KEY_WRAP_SHA_256</b> — Supported for\n          wrapping RSA and ECC key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSA_AES_KEY_WRAP_SHA_1</b> — Supported for\n          wrapping RSA and ECC key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSAES_OAEP_SHA_256</b> — Supported for all types\n          of key material, except RSA key material (private key).</p>\n               <p>You cannot use the RSAES_OAEP_SHA_256 wrapping algorithm with the RSA_2048 wrapping\n          key spec to wrap ECC_NIST_P521 key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSAES_OAEP_SHA_1</b> — Supported for all types of\n          key material, except RSA key material (private key).</p>\n               <p>You cannot use the RSAES_OAEP_SHA_1 wrapping algorithm with the RSA_2048 wrapping key\n          spec to wrap ECC_NIST_P521 key material.</p>\n            </li>\n            <li>\n               <p>\n                  <b>RSAES_PKCS1_V1_5</b> (Deprecated) — As of October\n          10, 2023, KMS does not support the RSAES_PKCS1_V1_5 wrapping algorithm.</p>\n            </li>\n            <li>\n               <p>\n                  <b>SM2PKE</b> (China Regions only) — supported for \n          wrapping RSA, ECC, and SM2 key material.</p>\n            </li>\n         </ul>",
             "smithy.api#required": {}
           }
         },
         "WrappingKeySpec": {
           "target": "com.amazonaws.kms#WrappingKeySpec",
           "traits": {
-            "smithy.api#documentation": "<p>The type of RSA public key to return in the response. You will use this wrapping key with\n      the specified wrapping algorithm to protect your key material during import. </p>\n         <p>Use the longest RSA wrapping key that is practical. </p>\n         <p>You cannot use an RSA_2048 public key to directly wrap an ECC_NIST_P521 private key.\n      Instead, use an RSA_AES wrapping algorithm or choose a longer RSA public key.</p>",
+            "smithy.api#documentation": "<p>The type of public key to return in the response. You will use this wrapping key with\n      the specified wrapping algorithm to protect your key material during import. </p>\n         <p>Use the longest wrapping key that is practical. </p>\n         <p>You cannot use an RSA_2048 public key to directly wrap an ECC_NIST_P521 private key.\n      Instead, use an RSA_AES wrapping algorithm or choose a longer RSA public key.</p>\n         <p>The SM2 wrapping key spec is available only in China Regions.</p>",
             "smithy.api#required": {}
           }
         }
@@ -9145,6 +9151,12 @@
           "traits": {
             "smithy.api#enumValue": "RSA_4096"
           }
+        },
+        "SM2": {
+          "target": "smithy.api#Unit",
+          "traits": {
+            "smithy.api#enumValue": "SM2"
+          }
         }
       }
     },