Skip to content

Commit 25772b9

Browse files
Merge branch 'release-1.40.44' into develop
* release-1.40.44: Bumping version to 1.40.44 Update changelog based on model updates Merge customizations for KMS
2 parents c33351d + 9c59091 commit 25772b9

22 files changed

Lines changed: 211 additions & 29 deletions

.changes/1.40.44.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[
2+
{
3+
"category": "``deadline``",
4+
"description": "Added fields to track cumulative task retry attempts for steps and jobs",
5+
"type": "api-change"
6+
},
7+
{
8+
"category": "``ec2``",
9+
"description": "This release adds support for OdbNetworkArn as a target in VPC Route Tables",
10+
"type": "api-change"
11+
},
12+
{
13+
"category": "``iot-managed-integrations``",
14+
"description": "Adding managed integrations APIs for IoT Device Management to onboard and control devices across different manufacturers, connectivity protocols and third party vendor clouds. APIs include managed thing operations, provisioning profile management, and cloud connector operations.",
15+
"type": "api-change"
16+
},
17+
{
18+
"category": "``keyspaces``",
19+
"description": "This release provides change data capture (CDC) streams support through updates to the Amazon Keyspaces API.",
20+
"type": "api-change"
21+
},
22+
{
23+
"category": "``keyspacesstreams``",
24+
"description": "This release adds change data capture (CDC) streams support through the new Amazon Keyspaces Streams API.",
25+
"type": "api-change"
26+
},
27+
{
28+
"category": "``kms``",
29+
"description": "This release updates AWS CLI examples for KMS APIs.",
30+
"type": "api-change"
31+
},
32+
{
33+
"category": "``qbusiness``",
34+
"description": "Added support for App level authentication for QBusiness DataAccessor using AWS IAM Identity center Trusted Token issuer",
35+
"type": "api-change"
36+
},
37+
{
38+
"category": "``workspaces``",
39+
"description": "Updated modifyStreamingProperties to support PrivateLink VPC endpoints for directories",
40+
"type": "api-change"
41+
}
42+
]

CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
CHANGELOG
33
=========
44

5+
1.40.44
6+
=======
7+
8+
* api-change:``deadline``: Added fields to track cumulative task retry attempts for steps and jobs
9+
* api-change:``ec2``: This release adds support for OdbNetworkArn as a target in VPC Route Tables
10+
* api-change:``iot-managed-integrations``: Adding managed integrations APIs for IoT Device Management to onboard and control devices across different manufacturers, connectivity protocols and third party vendor clouds. APIs include managed thing operations, provisioning profile management, and cloud connector operations.
11+
* api-change:``keyspaces``: This release provides change data capture (CDC) streams support through updates to the Amazon Keyspaces API.
12+
* api-change:``keyspacesstreams``: This release adds change data capture (CDC) streams support through the new Amazon Keyspaces Streams API.
13+
* api-change:``kms``: This release updates AWS CLI examples for KMS APIs.
14+
* api-change:``qbusiness``: Added support for App level authentication for QBusiness DataAccessor using AWS IAM Identity center Trusted Token issuer
15+
* api-change:``workspaces``: Updated modifyStreamingProperties to support PrivateLink VPC endpoints for directories
16+
17+
518
1.40.43
619
=======
720

awscli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import os
2020

21-
__version__ = '1.40.43'
21+
__version__ = '1.40.44'
2222

2323
#
2424
# Get our data path to be added to botocore's search path

awscli/examples/kms/create-key.rst

Lines changed: 42 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Output::
1717
"AWSAccountId": "111122223333",
1818
"Arn": "arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab",
1919
"CreationDate": "2017-07-05T14:04:55-07:00",
20+
"CurrentKeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6",
2021
"CustomerMasterKeySpec": "SYMMETRIC_DEFAULT",
2122
"Description": "",
2223
"Enabled": true,
@@ -40,7 +41,7 @@ For more information, see `Creating keys <https://docs.aws.amazon.com/kms/latest
4041

4142
**Example 2: To create an asymmetric RSA KMS key for encryption and decryption**
4243

43-
The following ``create-key`` example creates a KMS key that contains an asymmetric RSA key pair for encryption and decryption. ::
44+
The following ``create-key`` example creates a KMS key that contains an asymmetric RSA key pair for encryption and decryption. The key spec and key usage can't be changed after the key is created.::
4445

4546
aws kms create-key \
4647
--key-spec RSA_4096 \
@@ -75,7 +76,7 @@ For more information, see `Asymmetric keys in AWS KMS <https://docs.aws.amazon.c
7576

7677
**Example 3: To create an asymmetric elliptic curve KMS key for signing and verification**
7778

78-
To create an asymmetric KMS key that contains an asymmetric elliptic curve (ECC) key pair for signing and verification. The ``--key-usage`` parameter is required even though ``SIGN_VERIFY`` is the only valid value for ECC KMS keys. ::
79+
To create an asymmetric KMS key that contains an asymmetric elliptic curve (ECC) key pair for signing and verification. The ``--key-usage`` parameter is required even though ``SIGN_VERIFY`` is the only valid value for ECC KMS keys. The key spec and key usage can't be changed after the key is created.::
7980

8081
aws kms create-key \
8182
--key-spec ECC_NIST_P521 \
@@ -105,10 +106,43 @@ Output::
105106
}
106107

107108

108-
For more information, see `Asymmetric keys in AWS KMS <https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html>`__ in the *AWS Key Management Service Developer Guide*.
109+
For more information, see `Asymmetric keys in AWS KMS <https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html>`__ in the *AWS Key Management Service Developer Guide*.
110+
111+
**Example 4: To create an asymmetric ML-DSA KMS key for signing and verification**
112+
113+
This example creates a module-lattice digital signature algorithm (ML-DSA) key for signing and verification. The key-usage parameter is required even though ``SIGN_VERIFY`` is the only valid value for ML-DSA keys. ::
114+
115+
aws kms create-key \
116+
--key-spec ML_DSA_65 \
117+
--key-usage SIGN_VERIFY
118+
119+
Output::
120+
121+
{
122+
"KeyMetadata": {
123+
"Arn": "arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab",
124+
"AWSAccountId": "111122223333",
125+
"CreationDate": "2019-12-02T07:48:55-07:00",
126+
"Description": "",
127+
"Enabled": true,
128+
"KeyId": "1234abcd-12ab-34cd-56ef-1234567890ab",
129+
"KeyManager": "CUSTOMER",
130+
"KeySpec": "ML_DSA_65",
131+
"KeyState": "Enabled",
132+
"KeyUsage": "SIGN_VERIFY",
133+
"MultiRegion": false,
134+
"Origin": "AWS_KMS",
135+
"SigningAlgorithms": [
136+
"ML_DSA_SHAKE_256"
137+
]
138+
}
139+
}
140+
141+
142+
For more information, see `Asymmetric keys in AWS KMS <https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html>`__ in the *AWS Key Management Service Developer Guide*.
109143

110144

111-
**Example 4: To create an HMAC KMS key**
145+
**Example 5: To create an HMAC KMS key**
112146

113147
The following ``create-key`` example creates a 384-bit HMAC KMS key. The ``GENERATE_VERIFY_MAC`` value for the ``--key-usage`` parameter is required even though it's the only valid value for HMAC KMS keys. ::
114148

@@ -142,7 +176,7 @@ Output::
142176
For more information, see `HMAC keys in AWS KMS <https://docs.aws.amazon.com/kms/latest/developerguide/hmac.html>`__ in the *AWS Key Management Service Developer Guide*.
143177

144178

145-
**Example 4: To create a multi-Region primary KMS key**
179+
**Example 6: To create a multi-Region primary KMS key**
146180

147181
The following ``create-key`` example creates a multi-Region primary symmetric encryption key. Because the default values for all parameters create a symmetric encryption key, only the ``--multi-region`` parameter is required for this KMS key. In the AWS CLI, to indicate that a Boolean parameter is true, just specify the parameter name. ::
148182

@@ -156,6 +190,7 @@ Output::
156190
"Arn": "arn:aws:kms:us-west-2:111122223333:key/mrk-1234abcd12ab34cd56ef12345678990ab",
157191
"AWSAccountId": "111122223333",
158192
"CreationDate": "2021-09-02T016:15:21-09:00",
193+
"CurrentKeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6",
159194
"CustomerMasterKeySpec": "SYMMETRIC_DEFAULT",
160195
"Description": "",
161196
"Enabled": true,
@@ -183,7 +218,7 @@ Output::
183218
For more information, see `Asymmetric keys in AWS KMS <https://docs.aws.amazon.com/kms/latest/developerguide/symmetric-asymmetric.html>`__ in the *AWS Key Management Service Developer Guide*.
184219

185220

186-
**Example 5: To create a KMS key for imported key material**
221+
**Example 7: To create a KMS key for imported key material**
187222

188223
The following ``create-key`` example creates a creates a KMS key with no key material. When the operation is complete, you can import your own key material into the KMS key. To create this KMS key, set the ``--origin`` parameter to ``EXTERNAL``. ::
189224

@@ -253,7 +288,7 @@ Output::
253288
For more information, see `AWS CloudHSM key stores <https://docs.aws.amazon.com/kms/latest/developerguide/keystore-cloudhsm.html>`__ in the *AWS Key Management Service Developer Guide*.
254289

255290

256-
**Example 7: To create a KMS key in an external key store**
291+
**Example 8: To create a KMS key in an external key store**
257292

258293
The following ``create-key`` example creates a creates a KMS key in the specified external key store. The ``--custom-key-store-id``, ``--origin``, and ``--xks-key-id`` parameters are required in this command.
259294

awscli/examples/kms/delete-imported-key-material.rst

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ The following ``delete-imported-key-material`` example deletes key material that
55
aws kms delete-imported-key-material \
66
--key-id 1234abcd-12ab-34cd-56ef-1234567890ab
77

8-
This command produces no output. To verify that the key material is deleted, use the ``describe-key`` command to look for a key state of ``PendingImport`` or ``PendingDeletion``.
98

10-
For more information, see `Deleting imported key material<https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys-delete-key-material.html>`__ in the *AWS Key Management Service Developer Guide*.
9+
Output::
10+
11+
{
12+
"KeyId": "1234abcd-12ab-34cd-56ef-1234567890ab",
13+
"KeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6"
14+
}
15+
16+
For more information, see `Deleting imported key material <https://docs.aws.amazon.com/kms/latest/developerguide/importing-keys-delete-key-material.html>`__ in the *AWS Key Management Service Developer Guide*.

awscli/examples/kms/describe-key.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Output::
1414
"AWSAccountId": "846764612917",
1515
"KeyId": "b8a9477d-836c-491f-857e-07937918959b",
1616
"Arn": "arn:aws:kms:us-west-2:846764612917:key/b8a9477d-836c-491f-857e-07937918959b",
17+
"CurrentKeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6",
1718
"CreationDate": 2017-06-30T21:44:32.140000+00:00,
1819
"Enabled": true,
1920
"Description": "Default KMS key that protects my S3 objects when no other key is defined",
@@ -80,6 +81,7 @@ Output::
8081
"AWSAccountId": "111122223333",
8182
"Arn": "arn:aws:kms:ap-northeast-1:111122223333:key/mrk-1234abcd12ab34cd56ef1234567890ab",
8283
"CreationDate": "2021-06-28T21:09:16.114000+00:00",
84+
"CurrentKeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6",
8385
"Description": "",
8486
"Enabled": true,
8587
"KeyId": "mrk-1234abcd12ab34cd56ef1234567890ab",

awscli/examples/kms/disable-key.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**To temporarily disable a KMS key**
22

3-
The following example uses the ``disable-key`` command to disable a customer managed KMS key. To re-enable the KMS key, use the ``enable-key`` command. ::
3+
The following ``disable-key`` command disables a customer managed KMS key. To re-enable the KMS key, use the ``enable-key`` command. ::
44

55
aws kms disable-key \
66
--key-id 1234abcd-12ab-34cd-56ef-1234567890ab

awscli/examples/kms/generate-data-key-pair-without-plaintext.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Output::
2020
"PrivateKeyCiphertextBlob": "AQIDAHi6LtupRpdKl2aJTzkK6FbhOtQkMlQJJH3PdtHvS/y+hAFFxmiD134doUDzMGmfCEtcAAAHaTCCB2UGCSqGSIb3DQEHBqCCB1...",
2121
"PublicKey": "MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3A3eGMyPrvSn7+LdlJE1oUoQV5HpEuHAVbdOyND+NmYDH/mL1OSIEuLrcdZ5hrMH4pk83r40l...",
2222
"KeyId": "arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab",
23+
"KeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6",
2324
"KeyPairSpec": "ECC_NIST_P384"
2425
}
2526

awscli/examples/kms/generate-data-key-pair.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Output::
1919
"PrivateKeyPlaintext": "MIIG/QIBADANBgkqhkiG9w0BAQEFAASCBucwggbjAgEAAoIBgQDcDd4YzI+u9Kfv4t2UkTWhShBXkekS4cBVt07I0P42ZgMf+YvU5IgS4ut...",
2020
"PublicKey": "MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3A3eGMyPrvSn7+LdlJE1oUoQV5HpEuHAVbdOyND+NmYDH/mL1OSIEuLrcdZ5hrMH4pk83r40l...",
2121
"KeyId": "arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab",
22+
"KeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6"
2223
"KeyPairSpec": "RSA_2048"
2324
}
2425

awscli/examples/kms/generate-data-key-without-plaintext.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Output::
1414

1515
{
1616
"CiphertextBlob": "AQEDAHjRYf5WytIc0C857tFSnBaPn2F8DgfmThbJlGfR8P3WlwAAAH4wfAYJKoZIhvcNAQcGoG8wbQIBADBoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDEFogL",
17-
"KeyId": "arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab"
17+
"KeyId": "arn:aws:kms:us-east-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab",
18+
"KeyMaterialId": "0b7fd7ddbac6eef27907413567cad8c810e2883dc8a7534067a82ee1142fc1e6"
1819
}
1920

2021
The ``CiphertextBlob`` (encrypted data key) is returned in base64-encoded format.

0 commit comments

Comments
 (0)