Merge branch 'release-1.36.29'

* release-1.36.29: Bumping version to 1.36.29 Update changelog based on model updates CLI examples iam, ivs, sts
aws · Dec 26, 2024 · c38cd95 · c38cd95
2 parents 31b2a4f + b49b68d
commit c38cd95
Show file tree

Hide file tree

Showing 17 changed files with 407 additions and 46 deletions.
diff --git a/.changes/1.36.29.json b/.changes/1.36.29.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``bcm-pricing-calculator``",
+    "description": "Added ConflictException to DeleteBillEstimate.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecr``",
+    "description": "Add support for Dualstack Endpoints",
+    "type": "api-change"
+  },
+  {
+    "category": "``network-firewall``",
+    "description": "Dual-stack endpoints are now supported.",
+    "type": "api-change"
+  },
+  {
+    "category": "``securityhub``",
+    "description": "Documentation updates for AWS Security Hub",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.36.29
+=======
+
+* api-change:``bcm-pricing-calculator``: Added ConflictException to DeleteBillEstimate.
+* api-change:``ecr``: Add support for Dualstack Endpoints
+* api-change:``network-firewall``: Dual-stack endpoints are now supported.
+* api-change:``securityhub``: Documentation updates for AWS Security Hub
+
+
 1.36.28
 =======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -18,7 +18,7 @@
 
 import os
 
-__version__ = '1.36.28'
+__version__ = '1.36.29'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/examples/iam/disable-organizations-root-credentials-management.rst b/awscli/examples/iam/disable-organizations-root-credentials-management.rst
@@ -0,0 +1,16 @@
+**To disable the RootCredentialsManagement feature in your organization**
+
+The following ``disable-organizations-root-credentials-management`` command disables the management of privileged root user credentials across member accounts in your organization. ::
+
+    aws iam disable-organizations-root-credentials-management
+
+Output::
+
+    {
+        "EnabledFeatures": [
+            "RootSessions"
+        ]
+        "OrganizationId": "o-aa111bb222"
+    }
+
+For more information, see `Centralize root access for member accounts <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html>`__ in the *AWS IAM User Guide*.g
diff --git a/awscli/examples/iam/disable-organizations-root-sessions.rst b/awscli/examples/iam/disable-organizations-root-sessions.rst
@@ -0,0 +1,16 @@
+**To disable the RootSessions feature in your organization**
+
+The following ``disable-organizations-root-sessions`` command disables root user sessions for privileged tasks across member accounts in your organization. ::
+
+    aws iam disable-organizations-root-sessions
+
+Output::
+
+    {
+        "EnabledFeatures": [
+            "RootCredentialsManagement"
+        ]
+        "OrganizationId": "o-aa111bb222"
+    }
+
+For more information, see `Centralize root access for member accounts <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html>`__ in the *AWS IAM User Guide*.
diff --git a/awscli/examples/iam/enable-organizations-root-credentials-management.rst b/awscli/examples/iam/enable-organizations-root-credentials-management.rst
@@ -0,0 +1,16 @@
+**To enable the RootCredentialsManagement feature in your organization**
+
+The following ``enable-organizations-root-credentials-management`` command enables the management of privileged root user credentials across member accounts in your organization. ::
+
+    aws iam enable-organizations-root-credentials-management
+
+Output::
+
+    {
+        "EnabledFeatures": [
+            "RootCredentialsManagement"
+        ]
+        "OrganizationId": "o-aa111bb222"
+    }
+
+For more information, see `Centralize root access for member accounts <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html>`__ in the *AWS IAM User Guide*.
diff --git a/awscli/examples/iam/enable-organizations-root-sessions.rst b/awscli/examples/iam/enable-organizations-root-sessions.rst
@@ -0,0 +1,16 @@
+**To enable the RootSessions feature in your organization**
+
+The following ``enable-organizations-root-sessions`` command allows the management account or delegated administrator to perform privileged tasks on member accounts in your organization. ::
+
+    aws iam enable-organizations-root-sessions
+
+Output::
+
+    {
+        "EnabledFeatures": [
+            "RootSessions"
+        ]
+        "OrganizationId": "o-aa111bb222"
+    }
+
+For more information, see `Centralize root access for member accounts <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-enable-root-access.html>`__ in the *AWS IAM User Guide*.
diff --git a/awscli/examples/iam/list-organizations-features.rst b/awscli/examples/iam/list-organizations-features.rst
@@ -0,0 +1,17 @@
+**To list the centralized root access features enabled for your organization**
+
+The following ``list-organizations-features`` command lists the centralized root access features enabled for your organization. ::
+
+    aws iam list-organizations-features
+
+Output::
+
+    {
+        "EnabledFeatures": [
+            "RootCredentialsManagement",
+            "RootSessions"
+        ]
+        "OrganizationId": "o-aa111bb222"
+    }
+
+For more information, see `Centrally manage root access for member accounts <https://docs.aws.amazon.com/IAM/latest/UserGuide/id_root-user.html#id_root-user-access-management>`__ in the *AWS IAM User Guide*.
diff --git a/awscli/examples/ivs/batch-get-channel.rst b/awscli/examples/ivs/batch-get-channel.rst
@@ -13,9 +13,15 @@ Output::
             {
                 "arn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
                 "authorized": false,
+                "containerFormat": "TS",
                 "ingestEndpoint": "a1b2c3d4e5f6.global-contribute.live-video.net",
                 "insecureIngest": false,
                 "latencyMode": "LOW",
+                "multitrackInputConfiguration": {
+                    "enabled": false,
+                    "maximumResolution": "FULL_HD",
+                    "policy": "ALLOW"
+                },
                 "name": "channel-1",
                 "playbackUrl": "https://a1b2c3d4e5f6.us-west-2.playback.live-video.net/api/video/v1/us-west-2.123456789012.channel-1.abcdEFGH.m3u8",
                 "preset": "",
@@ -31,9 +37,15 @@ Output::
             {
                 "arn": "arn:aws:ivs:us-west-2:123456789012:channel/efghEFGHijkl",
                 "authorized": false,
+                "containerFormat": "FRAGMENTED_MP4",
                 "ingestEndpoint": "a1b2c3d4e5f6.global-contribute.live-video.net",
-                "insecureIngest": true,
+                "insecureIngest": false,
                 "latencyMode": "LOW",
+                "multitrackInputConfiguration": {
+                    "enabled": true,
+                    "maximumResolution": "FULL_HD",
+                    "policy": "ALLOW"
+                },
                 "name": "channel-2",
                 "playbackUrl": "https://a1b2c3d4e5f6.us-west-2.playback.live-video.net/api/video/v1/us-west-2.123456789012.channel-2.abcdEFGH.m3u8",
                 "preset": "",
@@ -49,4 +61,4 @@ Output::
         ]
     }
 
-For more information, see `Create a Channel <https://docs.aws.amazon.com/ivs/latest/LowLatencyUserGuide/getting-started-create-channel.html>`__ in the *IVS Low-Latency User Guide*.
+For more information, see `Create a Channel <https://docs.aws.amazon.com/ivs/latest/LowLatencyUserGuide/getting-started-create-channel.html>`__ in the *IVS Low-Latency User Guide*.
diff --git a/awscli/examples/ivs/create-channel.rst b/awscli/examples/ivs/create-channel.rst
@@ -3,7 +3,7 @@
 The following ``create-channel`` example creates a new channel and an associated stream key to start streaming. ::
 
     aws ivs create-channel \
-        --name "test-channel" \
+        --name 'test-channel' \
         --no-insecure-ingest
 
 Output::
@@ -12,8 +12,14 @@ Output::
         "channel": {
             "arn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
             "authorized": false,
+            "containerFormat": "TS",
             "name": "test-channel",
             "latencyMode": "LOW",
+            "multitrackInputConfiguration": {
+                "enabled": false,
+                "maximumResolution": "FULL_HD",
+                "policy": "ALLOW"
+            },
             "playbackRestrictionPolicyArn": "",
             "recordingConfigurationArn": "",
             "srt": {
@@ -39,20 +45,26 @@ For more information, see `Create a Channel <https://docs.aws.amazon.com/ivs/lat
 
 **Example 2: To create a channel with recording enabled, using the RecordingConfiguration resource specified by its ARN**
 
-The following ``create-channel`` example creates a new channel and an associated stream key to start streaming, and sets up recording for the channel. ::
+The following ``create-channel`` example creates a new channel and an associated stream key to start streaming, and sets up recording for the channel::
 
     aws ivs create-channel \
         --name test-channel-with-recording \
         --insecure-ingest \
-        --recording-configuration-arn "arn:aws:ivs:us-west-2:123456789012:recording-configuration/ABCD12cdEFgh"
+        --recording-configuration-arn 'arn:aws:ivs:us-west-2:123456789012:recording-configuration/ABCD12cdEFgh'
 
 Output::
 
     {
         "channel": {
             "arn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
+            "containerFormat": "TS",
             "name": "test-channel-with-recording",
             "latencyMode": "LOW",
+            "multitrackInputConfiguration": {
+                "enabled": false,
+                "maximumResolution": "FULL_HD",
+                "policy": "ALLOW"
+            },
             "type": "STANDARD",
             "playbackRestrictionPolicyArn": "",
             "recordingConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:recording-configuration/ABCD12cdEFgh",
@@ -80,20 +92,26 @@ For more information, see `Record to Amazon S3 <https://docs.aws.amazon.com/ivs/
 
 **Example 3: To create a channel with a playback restriction policy specified by its ARN**
 
-The following ``create-channel`` example creates a new channel and an associated stream key to start streaming, and sets up a playback restriction policy for the channel. ::
+The following ``create-channel`` example creates a new channel and an associated stream key to start streaming, and sets up a playback restriction policy for the channel::
 
     aws ivs create-channel \
-        --name test-channel-with-playback-restriction-policy \
+        --name test-channel-with-playback-restriction-policy\
         --insecure-ingest \
-        --playback-restriction-policy-arn "arn:aws:ivs:us-west-2:123456789012:playback-restriction-policy/ABcdef34ghIJ"
+        --playback-restriction-policy-arn 'arn:aws:ivs:us-west-2:123456789012:playback-restriction-policy/ABcdef34ghIJ'
 
 Output::
 
     {
         "channel": {
             "arn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
+            "containerFormat": "TS",
             "name": "test-channel-with-playback-restriction-policy",
             "latencyMode": "LOW",
+            "multitrackInputConfiguration": {
+                "enabled": false,
+                "maximumResolution": "FULL_HD",
+                "policy": "ALLOW"
+            },
             "type": "STANDARD",
             "playbackRestrictionPolicyArn": "arn:aws:ivs:us-west-2:123456789012:playback-restriction-policy/ABcdef34ghIJ",
             "recordingConfigurationArn": "",
@@ -117,4 +135,51 @@ Output::
         }
     }
 
-For more information, see `Undesired Content and Viewers <https://docs.aws.amazon.com/ivs/latest/LowLatencyUserGuide/undesired-content.html>`__ in the *IVS Low-Latency User Guide*.
+For more information, see `Undesired Content and Viewers <https://docs.aws.amazon.com/ivs/latest/LowLatencyUserGuide/undesired-content.html>`__ in the *IVS Low-Latency User Guide*.
+
+**Example 4: To create a channel with multitrack enabled**
+
+The following ``create-channel`` example creates a new channel and an associated stream key to start streaming, and enables multitrack. ::
+
+    aws ivs create-channel \
+        --name 'test-channel' \
+        --no-insecure-ingest \
+        --container-format 'FRAGMENTED_MP4' \
+        --multitrack-input-configuration '{"enabled": true,"maximumResolution": "FULL_HD","policy": "ALLOW"}'
+
+Output::
+
+    {
+        "channel": {
+            "arn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
+            "authorized": false,
+            "containerFormat": "FRAGMENTED_MP4",
+            "name": "test-channel",
+            "latencyMode": "LOW",
+            "multitrackInputConfiguration": { 
+                "enabled": true,
+                "maximumResolution": "FULL_HD",
+                "policy": "ALLOW"
+            },
+            "playbackRestrictionPolicyArn": "",
+            "recordingConfigurationArn": "",
+            "srt": {
+                "endpoint": "a1b2c3d4e5f6.srt.live-video.net",
+                "passphrase": "AB1C2defGHijkLMNo3PqQRstUvwxyzaBCDEfghh4ijklMN5opqrStuVWxyzAbCDEfghIJ"
+            },
+            "ingestEndpoint": "a1b2c3d4e5f6.global-contribute.live-video.net",
+            "insecureIngest": false,
+            "playbackUrl": "https://a1b2c3d4e5f6.us-west-2.playback.live-video.net/api/video/v1/us-west-2.123456789012.channel.abcdEFGH.m3u8",
+            "preset": "",
+            "tags": {},
+            "type": "STANDARD"
+        },
+        "streamKey": {
+            "arn": "arn:aws:ivs:us-west-2:123456789012:stream-key/g1H2I3j4k5L6",
+            "value": "sk_us-west-2_abcdABCDefgh_567890abcdef",
+            "channelArn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
+            "tags": {}
+        }
+    }
+
+For more information, see `Create a Channel <https://docs.aws.amazon.com/ivs/latest/LowLatencyUserGuide/multitrack-video.html>`__ in the *IVS Low-Latency User Guide*.
diff --git a/awscli/examples/ivs/get-channel.rst b/awscli/examples/ivs/get-channel.rst
@@ -3,27 +3,34 @@
 The following ``get-channel`` example gets the channel configuration for a specified channel ARN (Amazon Resource Name). ::
 
     aws ivs get-channel \
-        --arn arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh
+        --arn 'arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh'
 
 Output::
 
     {
         "channel": {
             "arn": "arn:aws:ivs:us-west-2:123456789012:channel/abcdABCDefgh",
-            "name": "channel-1",
+            "authorized": false,
+            "containerFormat": "TS",
+            "ingestEndpoint": "a1b2c3d4e5f6.global-contribute.live-video.net",
+            "insecureIngest": false,
             "latencyMode": "LOW",
-            "type": "STANDARD",
+            "multitrackInputConfiguration": {
+                "enabled": false,
+                "maximumResolution": "FULL_HD",
+                "policy": "ALLOW"
+            },
+            "name": "channel-1",
             "playbackRestrictionPolicyArn": "",
+            "playbackUrl": "https://a1b2c3d4e5f6.us-west-2.playback.live-video.net/api/video/v1/us-west-2.123456789012.channel.abcdEFGH.m3u8",
             "preset": "",
-            "recordingConfigurationArn": "arn:aws:ivs:us-west-2:123456789012:recording-configuration/ABCD12cdEFgh",
+            "recordingConfigurationArn": "",
             "srt": {
                 "endpoint": "a1b2c3d4e5f6.srt.live-video.net",
                 "passphrase": "AB1C2defGHijkLMNo3PqQRstUvwxyzaBCDEfghh4ijklMN5opqrStuVWxyzAbCDEfghIJ"
             },
-            "ingestEndpoint": "a1b2c3d4e5f6.global-contribute.live-video.net",
-            "insecureIngest": false,
-            "playbackUrl": "https://a1b2c3d4e5f6.us-west-2.playback.live-video.net/api/video/v1/us-west-2.123456789012.channel.abcdEFGH.m3u8",
             "tags": {}
+            "type": "STANDARD",
         }
     }