Skip to content

Commit

Permalink
Merge branch 'release-1.37.4'
Browse files Browse the repository at this point in the history
* release-1.37.4:
  Bumping version to 1.37.4
  Update changelog based on model updates
  Replaced /myBucket/ with amzn-s3-demo-bucket (#9221)
  Updated AWS CLI command to describe EKS cluster (#9144)
  Replaced /CodeDeployDemoBucket/ with amzn-s3-demo-bucket (#9227)
  CLI examples for cloudfront, ec2, ivs, rds, securitylake
  Replaced /mybucket2/ with amzn-s3-demo-bucket2
  Replaced /awsexamplebucket/ with amzn-s3-demo-bucket
  • Loading branch information
aws-sdk-python-automation committed Jan 22, 2025
2 parents a676750 + c71ba24 commit d40f9ea
Show file tree
Hide file tree
Showing 59 changed files with 1,090 additions and 1,007 deletions.
22 changes: 22 additions & 0 deletions .changes/1.37.4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"category": "``bedrock-agent-runtime``",
"description": "Adds multi-turn input support for an Agent node in an Amazon Bedrock Flow",
"type": "api-change"
},
{
"category": "``glue``",
"description": "Docs Update for timeout changes",
"type": "api-change"
},
{
"category": "``medialive``",
"description": "AWS Elemental MediaLive adds a new feature, ID3 segment tagging, in CMAF Ingest output groups. It allows customers to insert ID3 tags into every output segment, controlled by a newly added channel schedule action Id3SegmentTagging.",
"type": "api-change"
},
{
"category": "``workspaces-thin-client``",
"description": "Rename WorkSpaces Web to WorkSpaces Secure Browser",
"type": "api-change"
}
]
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
CHANGELOG
=========

1.37.4
======

* api-change:``bedrock-agent-runtime``: Adds multi-turn input support for an Agent node in an Amazon Bedrock Flow
* api-change:``glue``: Docs Update for timeout changes
* api-change:``medialive``: AWS Elemental MediaLive adds a new feature, ID3 segment tagging, in CMAF Ingest output groups. It allows customers to insert ID3 tags into every output segment, controlled by a newly added channel schedule action Id3SegmentTagging.
* api-change:``workspaces-thin-client``: Rename WorkSpaces Web to WorkSpaces Secure Browser


1.37.3
======

Expand Down
2 changes: 1 addition & 1 deletion awscli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import os

__version__ = '1.37.3'
__version__ = '1.37.4'

#
# Get our data path to be added to botocore's search path
Expand Down
22 changes: 9 additions & 13 deletions awscli/examples/cloudfront/create-distribution-with-tags.rst
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
**To create a CloudFront distribution with tags**

The following example creates a distribution with two tags by providing the
distribution configuration and tags in a JSON file named
``dist-config-with-tags.json``::
The following ``create-distribution-with-tags`` example creates a distribution with two tags by providing the distribution configuration and tags in a JSON file named ``dist-config-with-tags.json``. ::

aws cloudfront create-distribution-with-tags \
--distribution-config-with-tags file://dist-config-with-tags.json

The file ``dist-config-with-tags.json`` is a JSON document in the current
folder that contains the following. Note the ``Tags`` object at the top of
the file, which contains two tags:
The file ``dist-config-with-tags.json`` is a JSON document in the current folder. Note the ``Tags`` object at the top of the file, which contains two tags:

- ``Name = ExampleDistribution``
- ``Project = ExampleProject``

::
Contents of ``dist-config-with-tags.json``::

{
"Tags": {
Expand All @@ -39,8 +35,8 @@ the file, which contains two tags:
"Quantity": 1,
"Items": [
{
"Id": "awsexamplebucket.s3.amazonaws.com-cli-example",
"DomainName": "awsexamplebucket.s3.amazonaws.com",
"Id": "amzn-s3-demo-bucket.s3.amazonaws.com-cli-example",
"DomainName": "amzn-s3-demo-bucket.s3.amazonaws.com",
"OriginPath": "",
"CustomHeaders": {
"Quantity": 0
Expand All @@ -55,7 +51,7 @@ the file, which contains two tags:
"Quantity": 0
},
"DefaultCacheBehavior": {
"TargetOriginId": "awsexamplebucket.s3.amazonaws.com-cli-example",
"TargetOriginId": "amzn-s3-demo-bucket.s3.amazonaws.com-cli-example",
"ForwardedValues": {
"QueryString": false,
"Cookies": {
Expand Down Expand Up @@ -155,8 +151,8 @@ Output::
"Quantity": 1,
"Items": [
{
"Id": "awsexamplebucket.s3.amazonaws.com-cli-example",
"DomainName": "awsexamplebucket.s3.amazonaws.com",
"Id": "amzn-s3-demo-bucket.s3.amazonaws.com-cli-example",
"DomainName": "amzn-s3-demo-bucket.s3.amazonaws.com",
"OriginPath": "",
"CustomHeaders": {
"Quantity": 0
Expand All @@ -171,7 +167,7 @@ Output::
"Quantity": 0
},
"DefaultCacheBehavior": {
"TargetOriginId": "awsexamplebucket.s3.amazonaws.com-cli-example",
"TargetOriginId": "amzn-s3-demo-bucket.s3.amazonaws.com-cli-example",
"ForwardedValues": {
"QueryString": false,
"Cookies": {
Expand Down
16 changes: 6 additions & 10 deletions awscli/examples/cloudfront/get-distribution.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
**To get a CloudFront distribution**

The following example gets the CloudFront distribution with the ID
``EDFDVBD6EXAMPLE``, including its ``ETag``. The distribution ID is returned in
the `create-distribution <create-distribution.html>`_ and `list-distributions
<list-distributions.html>`_ commands.
The following ``get-distribution`` example gets the CloudFront distribution with the ID ``EDFDVBD6EXAMPLE``, including its ``ETag``. The distribution ID is returned in the `create-distribution <create-distribution.html>`__ and `list-distributions <list-distributions.html>`__ commands. ::

::

aws cloudfront get-distribution --id EDFDVBD6EXAMPLE
aws cloudfront get-distribution \
--id EDFDVBD6EXAMPLE

Output::

Expand All @@ -34,8 +30,8 @@ Output::
"Quantity": 1,
"Items": [
{
"Id": "awsexamplebucket.s3.amazonaws.com-cli-example",
"DomainName": "awsexamplebucket.s3.amazonaws.com",
"Id": "amzn-s3-demo-bucket.s3.amazonaws.com-cli-example",
"DomainName": "amzn-s3-demo-bucket.s3.amazonaws.com",
"OriginPath": "",
"CustomHeaders": {
"Quantity": 0
Expand All @@ -50,7 +46,7 @@ Output::
"Quantity": 0
},
"DefaultCacheBehavior": {
"TargetOriginId": "awsexamplebucket.s3.amazonaws.com-cli-example",
"TargetOriginId": "amzn-s3-demo-bucket.s3.amazonaws.com-cli-example",
"ForwardedValues": {
"QueryString": false,
"Cookies": {
Expand Down
4 changes: 2 additions & 2 deletions awscli/examples/cloudtrail/put-event-selectors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ The following example creates an event selector for a trail named ``TrailName``

aws cloudtrail put-event-selectors \
--trail-name TrailName \
--event-selectors '[{"ReadWriteType": "All","IncludeManagementEvents": true,"DataResources": [{"Type":"AWS::S3::Object", "Values": ["arn:aws:s3:::mybucket/prefix","arn:aws:s3:::mybucket2/prefix2"]},{"Type": "AWS::Lambda::Function","Values": ["arn:aws:lambda:us-west-2:999999999999:function:hello-world-python-function"]}]}]'
--event-selectors '[{"ReadWriteType": "All","IncludeManagementEvents": true,"DataResources": [{"Type":"AWS::S3::Object", "Values": ["arn:aws:s3:::mybucket/prefix","arn:aws:s3:::amzn-s3-demo-bucket2/prefix2"]},{"Type": "AWS::Lambda::Function","Values": ["arn:aws:lambda:us-west-2:999999999999:function:hello-world-python-function"]}]}]'

Output::

Expand All @@ -131,7 +131,7 @@ Output::
{
"Values": [
"arn:aws:s3:::mybucket/prefix",
"arn:aws:s3:::mybucket2/prefix2"
"arn:aws:s3:::amzn-s3-demo-bucket2/prefix2"
],
"Type": "AWS::S3::Object"
},
Expand Down
4 changes: 2 additions & 2 deletions awscli/examples/deploy/batch-get-deployments.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Output::
"s3Location": {
"bundleType": "zip",
"version": "uTecLusEXAMPLEFXtfUcyfV8bEXAMPLE",
"bucket": "CodeDeployDemoBucket",
"bucket": "amzn-s3-demo-bucket",
"key": "WordPressApp.zip"
}
},
Expand Down Expand Up @@ -56,7 +56,7 @@ Output::
"s3Location": {
"bundleType": "zip",
"eTag": "\"dd56cfdEXAMPLE8e768f9d77fEXAMPLE\"",
"bucket": "CodeDeployDemoBucket",
"bucket": "amzn-s3-demo-bucket",
"key": "MyOtherApp.zip"
}
},
Expand Down
2 changes: 1 addition & 1 deletion awscli/examples/deploy/create-deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The following ``create-deployment`` example creates a deployment and associates
--deployment-config-name CodeDeployDefault.OneAtATime \
--deployment-group-name WordPress_DG \
--description "My demo deployment" \
--s3-location bucket=CodeDeployDemoBucket,bundleType=zip,eTag=dd56cfdEXAMPLE8e768f9d77fEXAMPLE,key=WordPressApp.zip
--s3-location bucket=amzn-s3-demo-bucket,bundleType=zip,eTag=dd56cfdEXAMPLE8e768f9d77fEXAMPLE,key=WordPressApp.zip

Output::

Expand Down
4 changes: 2 additions & 2 deletions awscli/examples/deploy/get-application-revision.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The following ``get-application-revision`` example displays information about an

aws deploy get-application-revision \
--application-name WordPress_App \
--s3-location bucket=CodeDeployDemoBucket,bundleType=zip,eTag=dd56cfdEXAMPLE8e768f9d77fEXAMPLE,key=WordPressApp.zip
--s3-location bucket=amzn-s3-demo-bucket,bundleType=zip,eTag=dd56cfdEXAMPLE8e768f9d77fEXAMPLE,key=WordPressApp.zip

Output::

Expand All @@ -22,7 +22,7 @@ Output::
"s3Location": {
"bundleType": "zip",
"eTag": "dd56cfdEXAMPLE8e768f9d77fEXAMPLE",
"bucket": "CodeDeployDemoBucket",
"bucket": "amzn-s3-demo-bucket",
"key": "WordPressApp.zip"
}
}
Expand Down
2 changes: 1 addition & 1 deletion awscli/examples/deploy/get-deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Output::
"s3Location": {
"bundleType": "zip",
"eTag": "\"dd56cfdEXAMPLE8e768f9d77fEXAMPLE\"",
"bucket": "CodeDeployDemoBucket",
"bucket": "amzn-s3-demo-bucket",
"key": "WordPressApp.zip"
}
},
Expand Down
6 changes: 3 additions & 3 deletions awscli/examples/deploy/list-application-revisions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The following ``list-application-revisions`` example displays information about

aws deploy list-application-revisions \
--application-name WordPress_App \
--s-3-bucket CodeDeployDemoBucket \
--s-3-bucket amzn-s3-demo-bucket \
--deployed exclude \
--s-3-key-prefix WordPress_ \
--sort-by lastUsedTime \
Expand All @@ -18,7 +18,7 @@ Output::
"revisionType": "S3",
"s3Location": {
"version": "uTecLusvCB_JqHFXtfUcyfV8bEXAMPLE",
"bucket": "CodeDeployDemoBucket",
"bucket": "amzn-s3-demo-bucket",
"key": "WordPress_App.zip",
"bundleType": "zip"
}
Expand All @@ -27,7 +27,7 @@ Output::
"revisionType": "S3",
"s3Location": {
"version": "tMk.UxgDpMEVb7V187ZM6wVAWEXAMPLE",
"bucket": "CodeDeployDemoBucket",
"bucket": "amzn-s3-demo-bucket",
"key": "WordPress_App_2-0.zip",
"bundleType": "zip"
}
Expand Down
4 changes: 2 additions & 2 deletions awscli/examples/deploy/push.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ The following ``push`` example bundles and deploys an application revision to Am
--application-name WordPress_App \
--description "This is my deployment" \
--ignore-hidden-files \
--s3-location s3://CodeDeployDemoBucket/WordPressApp.zip \
--s3-location s3://amzn-s3-demo-bucket/WordPressApp.zip \
--source /tmp/MyLocalDeploymentFolder/

The output describes how to use the ``create-deployment`` command to create a deployment that uses the uploaded application revision. ::

To deploy with this revision, run:
aws deploy create-deployment --application-name WordPress_App --deployment-config-name <deployment-config-name> --deployment-group-name <deployment-group-name> --s3-location bucket=CodeDeployDemoBucket,key=WordPressApp.zip,bundleType=zip,eTag="cecc9b8EXAMPLE50a6e71fdb88EXAMPLE",version=LFsJAUdEXAMPLEfvKtvi79L8EXAMPLE
aws deploy create-deployment --application-name WordPress_App --deployment-config-name <deployment-config-name> --deployment-group-name <deployment-group-name> --s3-location bucket=amzn-s3-demo-bucket,key=WordPressApp.zip,bundleType=zip,eTag="cecc9b8EXAMPLE50a6e71fdb88EXAMPLE",version=LFsJAUdEXAMPLEfvKtvi79L8EXAMPLE
2 changes: 1 addition & 1 deletion awscli/examples/deploy/register-application-revision.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ The following ``register-application-revision`` example registers information ab
aws deploy register-application-revision \
--application-name WordPress_App \
--description "Revised WordPress application" \
--s3-location bucket=CodeDeployDemoBucket,key=RevisedWordPressApp.zip,bundleType=zip,eTag=cecc9b8a08eac650a6e71fdb88EXAMPLE
--s3-location bucket=amzn-s3-demo-bucket,key=RevisedWordPressApp.zip,bundleType=zip,eTag=cecc9b8a08eac650a6e71fdb88EXAMPLE

This command produces no output.
2 changes: 1 addition & 1 deletion awscli/examples/ec2/accept-address-transfer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Output::
}
}

For more information, see `Transfer Elastic IP addresses <https://docs.aws.amazon.com/vpc/latest/userguide/vpc-eips.html#transfer-EIPs-intro>`__ in the *Amazon VPC User Guide*.
For more information, see `Transfer Elastic IP addresses <https://docs.aws.amazon.com/vpc/latest/userguide/WorkWithEIPs.html#transfer-EIPs-intro>`__ in the *Amazon VPC User Guide*.
110 changes: 55 additions & 55 deletions awscli/examples/ec2/allocate-hosts.rst
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
**Example 1: To allocate a Dedicated Host**

The following ``allocate-hosts`` example allocates a single Dedicated Host in the ``eu-west-1a`` Availability Zone, onto which you can launch ``m5.large`` instances. By default, the Dedicated Host accepts only target instance launches, and does not support host recovery. ::

aws ec2 allocate-hosts \
--instance-type m5.large \
--availability-zone eu-west-1a \
--quantity 1

Output::

{
"HostIds": [
"h-07879acf49EXAMPLE"
]
}

**Example 2: To allocate a Dedicated Host with auto-placement and host recovery enabled**

The following ``allocate-hosts`` example allocates a single Dedicated Host in the ``eu-west-1a`` Availability Zone with auto-placement and host recovery enabled. ::

aws ec2 allocate-hosts \
--instance-type m5.large \
--availability-zone eu-west-1a \
--auto-placement on \
--host-recovery on \
--quantity 1

Output::

{
"HostIds": [
"h-07879acf49EXAMPLE"
]
}

**Example 3: To allocate a Dedicated Host with tags**

The following ``allocate-hosts`` example allocates a single Dedicated Host and applies a tag with a key named ``purpose`` and a value of ``production``. ::

aws ec2 allocate-hosts \
--instance-type m5.large \
--availability-zone eu-west-1a \
--quantity 1 \
--tag-specifications 'ResourceType=dedicated-host,Tags={Key=purpose,Value=production}'

Output::

{
"HostIds": [
"h-07879acf49EXAMPLE"
]
}

For more information, see `Allocating Dedicated Hosts <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/how-dedicated-hosts-work.html#dedicated-hosts-allocating>`__ in the *Amazon Elastic Compute Cloud User Guide for Linux Instances*.
**Example 1: To allocate a Dedicated Host**

The following ``allocate-hosts`` example allocates a single Dedicated Host in the ``eu-west-1a`` Availability Zone, onto which you can launch ``m5.large`` instances. By default, the Dedicated Host accepts only target instance launches, and does not support host recovery. ::

aws ec2 allocate-hosts \
--instance-type m5.large \
--availability-zone eu-west-1a \
--quantity 1

Output::

{
"HostIds": [
"h-07879acf49EXAMPLE"
]
}

**Example 2: To allocate a Dedicated Host with auto-placement and host recovery enabled**

The following ``allocate-hosts`` example allocates a single Dedicated Host in the ``eu-west-1a`` Availability Zone with auto-placement and host recovery enabled. ::

aws ec2 allocate-hosts \
--instance-type m5.large \
--availability-zone eu-west-1a \
--auto-placement on \
--host-recovery on \
--quantity 1

Output::

{
"HostIds": [
"h-07879acf49EXAMPLE"
]
}

**Example 3: To allocate a Dedicated Host with tags**

The following ``allocate-hosts`` example allocates a single Dedicated Host and applies a tag with a key named ``purpose`` and a value of ``production``. ::

aws ec2 allocate-hosts \
--instance-type m5.large \
--availability-zone eu-west-1a \
--quantity 1 \
--tag-specifications 'ResourceType=dedicated-host,Tags={Key=purpose,Value=production}'

Output::

{
"HostIds": [
"h-07879acf49EXAMPLE"
]
}

For more information, see `Allocate a Dedicated Host <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-allocating.html>`__ in the *Amazon EC2 User Guide*.
Loading

0 comments on commit d40f9ea

Please sign in to comment.