awscli 1.42.33__py3-none-any.whl → 1.44.6__py3-none-any.whl

awscli/customizations/s3/syncstrategy/caseconflict.py

@@ -0,0 +1,92 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+import logging
+import os
+import sys
+
+from awscli.customizations.s3.syncstrategy.base import BaseSync
+from awscli.customizations.utils import uni_print
+
+LOG = logging.getLogger(__name__)
+
+
+class CaseConflictException(Exception):
+    pass
+
+
+class CaseConflictSync(BaseSync):
+    DOC_URI = (
+        "https://docs.aws.amazon.com/cli/v1/topic/"
+        "s3-case-insensitivity.html"
+    )
+
+    def __init__(
+            self,
+            sync_type='file_not_at_dest',
+            on_case_conflict='warn',
+            submitted=None,
+    ):
+        super().__init__(sync_type)
+        self._on_case_conflict = on_case_conflict
+        if submitted is None:
+            submitted = set()
+        self._submitted = submitted
+
+    @property
+    def submitted(self):
+        return self._submitted
+
+    def determine_should_sync(self, src_file, dest_file):
+        # `src_file.compare_key` and `dest_file.compare_key` are not equal.
+        # This could mean that they're completely different or differ
+        # only by case. eg, `/tmp/a` and `/tmp/b` versus `/tmp/a` and `/tmp/A`.
+        # If the source file's destination already exists, that means it
+        # differs only by case and the conflict needs to be handled.
+        should_sync = True
+        # Normalize compare key for case sensitivity.
+        lower_compare_key = src_file.compare_key.lower()
+        if lower_compare_key in self._submitted or os.path.exists(
+                src_file.dest
+        ):
+            handler = getattr(self, f"_handle_{self._on_case_conflict}")
+            should_sync = handler(src_file)
+        if should_sync:
+            LOG.debug(f"syncing: {src_file.src} -> {src_file.dest}")
+            self._submitted.add(lower_compare_key)
+            # Set properties so that a subscriber can be created
+            # that removes the key from the set after download finishes.
+            src_file.case_conflict_submitted = self._submitted
+            src_file.case_conflict_key = lower_compare_key
+        return should_sync
+
+    @staticmethod
+    def _handle_skip(src_file):
+        msg = (
+            f"warning: Skipping {src_file.src} -> {src_file.dest} "
+            "because a file whose name differs only by case either exists "
+            "or is being downloaded.\n"
+        )
+        uni_print(msg, sys.stderr)
+        return False
+
+    @staticmethod
+    def _handle_warn(src_file):
+        msg = (
+            f"warning: Downloading {src_file.src} -> {src_file.dest} "
+            "despite a file whose name differs only by case either existing "
+            "or being downloaded. This behavior is not defined on "
+            "case-insensitive filesystems and may result in overwriting "
+            "existing files or race conditions between concurrent downloads. "
+            f"For more information, see {CaseConflictSync.DOC_URI}.\n"
+        )
+        uni_print(msg, sys.stderr)
+        return True
+
+    @staticmethod
+    def _handle_error(src_file):
+        msg = (
+            f"Failed to download {src_file.src} -> {src_file.dest} "
+            "because a file whose name differs only by case either exists "
+            "or is being downloaded."
+        )
+        raise CaseConflictException(msg)

awscli/customizations/s3/utils.py

@@ -690,6 +690,20 @@ class OnDoneFilteredSubscriber(BaseSubscriber):
         pass
 
 
+class CaseConflictCleanupSubscriber(BaseSubscriber):
+    """
+    A subscriber which removes object compare key from case conflict set
+    when download finishes.
+    """
+
+    def __init__(self, submitted, case_conflict_key):
+        self._submitted = submitted
+        self._key = case_conflict_key
+
+    def on_done(self, future, **kwargs):
+        self._submitted.discard(self._key)
+
+
 class DeleteSourceSubscriber(OnDoneFilteredSubscriber):
     """A subscriber which deletes the source of the transfer."""
     def _on_success(self, future):

awscli/customizations/scalarparse.py

@@ -27,9 +27,14 @@ There's nothing currently done for timestamps, but this will change
 in the future.
 
 """
+import sys
+
 from botocore.utils import parse_timestamp
 from botocore.exceptions import ProfileNotFound
 
+from awscli.customizations.utils import uni_print
+from awscli.utils import resolve_v2_debug_mode
+
 
 def register_scalar_parser(event_handlers):
     event_handlers.register_first(
@@ -44,12 +49,20 @@ def iso_format(value):
     return parse_timestamp(value).isoformat()
 
 
-def add_timestamp_parser(session):
+def add_timestamp_parser(session, v2_debug=False):
     factory = session.get_component('response_parser_factory')
+    print_v2_debug_warnings = v2_debug
     try:
         timestamp_format = session.get_scoped_config().get(
             'cli_timestamp_format',
-            'none')
+            None)
+        if timestamp_format is not None:
+            # We do not want to print v2 debug warnings if the user explicitly
+            # configured the cli_timestamp_format, they would not be
+            # broken in that case.
+            print_v2_debug_warnings = False
+        else:
+            timestamp_format = 'wire'
     except ProfileNotFound:
         # If a --profile is provided that does not exist, loading
         # a value from get_scoped_config will crash the CLI.
@@ -57,23 +70,49 @@ def add_timestamp_parser(session):
         # the session-initialized event, which happens before a
         # profile can be created, even if the command would have
         # successfully created a profile. Instead of crashing here
-        # on a ProfileNotFound the CLI should just use 'none'.
-        timestamp_format = 'none'
-    if timestamp_format == 'none':
+        # on a ProfileNotFound the CLI should just use 'wire'.
+        timestamp_format = 'wire'
+    # We also support 'none' for backwards compatibility reasons, though we
+    # document 'wire' instead.
+    if timestamp_format == 'wire' or timestamp_format == 'none':
         # For backwards compatibility reasons, we replace botocore's timestamp
         # parser (which parses to a datetime.datetime object) with the
         # identity function which prints the date exactly the same as it comes
         # across the wire.
-        timestamp_parser = identity
+        encountered_timestamp = False
+        def identity_with_warning(x):
+            # To prevent printing the same warning for each timestamp in the
+            # response, we utilize a reference to a nonlocal variable to track
+            # if we have already printed the warning.
+            nonlocal encountered_timestamp
+            if not encountered_timestamp:
+                encountered_timestamp = True
+                uni_print(
+                    '\nAWS CLI v2 UPGRADE WARNING: In AWS CLI v2, all '
+                    'timestamp response values are returned in the ISO 8601 '
+                    'format. This is different from v1 behavior, where the '
+                    'timestamps are returned as they appear in the service '
+                    'API response. To retain AWS CLI v1 behavior in AWS CLI '
+                    'v2, set the configuration variable '
+                    '`cli_timestamp_format` to `wire`. See '
+                    'https://docs.aws.amazon.com/cli/latest/userguide/'
+                    'cliv2-migration-changes.html'
+                    '#cliv2-migration-timestamp.\n',
+                    out_file=sys.stderr
+                )
+            return identity(x)
+
+        timestamp_parser = identity_with_warning \
+            if print_v2_debug_warnings else identity
     elif timestamp_format == 'iso8601':
         timestamp_parser = iso_format
     else:
         raise ValueError('Unknown cli_timestamp_format value: %s, valid values'
-                         ' are "none" or "iso8601"' % timestamp_format)
+                         ' are "none", "wire" or "iso8601"' % timestamp_format)
     factory.set_parser_defaults(timestamp_parser=timestamp_parser)
 
 
-def add_scalar_parsers(session, **kwargs):
+def add_scalar_parsers(session, parsed_args=None, **kwargs):
     factory = session.get_component('response_parser_factory')
     factory.set_parser_defaults(blob_parser=identity)
-    add_timestamp_parser(session)
+    add_timestamp_parser(session, resolve_v2_debug_mode(parsed_args))

awscli/data/cli.json

@@ -64,6 +64,11 @@
             "dest": "connect_timeout",
             "type": "int",
             "help": "<p>The maximum socket connect time in seconds. If the value is set to 0, the socket connect will be blocking and not timeout. The default value is 60 seconds.</p>"
+        },
+        "v2-debug": {
+            "action": "store_true",
+            "dest": "v2_debug",
+            "help": "<p>Enable AWS CLI v2 migration assistance. Prints warnings if the command would face a breaking change after swapping AWS CLI v1 for AWS CLI v2 in the current environment. Prints one warning for each breaking change detected.</p>"
         }
     }
 }

awscli/examples/cloudformation/create-generated-template.rst

@@ -0,0 +1,50 @@
+**To create a generated template from scanned resources**
+
+The following ``create-generated-template`` example creates a generated template named ``MyTemplate`` from scanned resources. ::
+
+    aws cloudformation create-generated-template \
+        --generated-template-name MyTemplate \
+        --resources file://resources.json
+
+Contents of ``resources.json``::
+
+    [
+        {
+            "ResourceType": "AWS::EKS::Cluster",
+            "LogicalResourceId":"MyCluster",
+            "ResourceIdentifier": {
+                "ClusterName": "MyAppClusterName"
+            }
+        },
+        {
+            "ResourceType": "AWS::AutoScaling::AutoScalingGroup",
+            "LogicalResourceId":"MyASG",
+            "ResourceIdentifier": {
+                "AutoScalingGroupName": "MyAppASGName"
+            }
+        },
+        {
+            "ResourceType": "AWS::EKS::Nodegroup",
+            "LogicalResourceId":"MyNodegroup",
+            "ResourceIdentifier": {
+                "NodegroupName": "MyAppNodegroupName"
+            }
+        },
+        {
+            "ResourceType": "AWS::IAM::Role",
+            "LogicalResourceId":"MyRole",
+            "ResourceIdentifier": {
+                "RoleId": "arn:aws::iam::123456789012:role/MyAppIAMRole"
+            }
+        }
+    ]
+
+Output::
+
+    {
+      "Arn":
+        "arn:aws:cloudformation:us-east-1:123456789012:generatedtemplate/7fc8512c-d8cb-4e02-b266-d39c48344e48",
+      "Name": "MyTemplate"
+    }
+
+For more information, see `Create a CloudFormation template from resources scanned with IaC generator <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/iac-generator-create-template-from-scanned-resources.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/create-stack-refactor.rst

@@ -0,0 +1,16 @@
+**To create the stack definition for a stack refactor operation**
+
+The following ``create-stack-refactor`` example creates the stack definition for stack refactoring. ::
+
+    aws cloudformation create-stack-refactor \
+        --stack-definitions \
+          StackName=Stack1,TemplateBody@=file://template1-updated.yaml \
+          StackName=Stack2,TemplateBody@=file://template2-updated.yaml
+
+Output::
+
+    {
+        "StackRefactorId": "9c384f70-4e07-4ed7-a65d-fee5eb430841"
+    }
+
+For more information, see `Stack refactoring <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stack-refactoring.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/delete-generated-template.rst

@@ -0,0 +1,10 @@
+**To delete a generated template**
+
+The following ``delete-generated-template`` example deletes the specified template. ::
+
+    aws cloudformation delete-generated-template \
+        --generated-template-name MyTemplate
+
+This command produces no output.
+
+For more information, see `Generating templates from existing resources <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/generate-IaC.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/describe-generated-template.rst

@@ -0,0 +1,62 @@
+**To describe a generated template**
+
+The following ``describe-generated-template`` example describes the specified template. ::
+
+    aws cloudformation describe-generated-template \
+        --generated-template-name MyTemplate
+
+Output::
+
+    {
+        "GeneratedTemplateId": "arn:aws:cloudformation:us-east-1:123456789012:generatedTemplate/7d881acf-f307-4ded-910e-f8fb49b96894",
+        "GeneratedTemplateName": "MyTemplate",
+        "Resources": [
+            {
+                "ResourceType": "AWS::EC2::SecurityGroup",
+                "LogicalResourceId": "EC2SecurityGroup",
+                "ResourceIdentifier": {
+                    "Id": "sg-1234567890abcdef0"
+                },
+                "ResourceStatus": "COMPLETE",
+                "ResourceStatusReason": "Resource Template complete",
+                "Warnings": []
+            },
+            {
+                "ResourceType": "AWS::EC2::Instance",
+                "LogicalResourceId": "EC2Instance",
+                "ResourceIdentifier": {
+                    "InstanceId": "i-1234567890abcdef0"
+                },
+                "ResourceStatus": "COMPLETE",
+                "ResourceStatusReason": "Resource Template complete",
+                "Warnings": []
+            },
+            {
+                "ResourceType": "AWS::EC2::KeyPair",
+                "LogicalResourceId": "EC2KeyPairSshkeypair",
+                "ResourceIdentifier": {
+                    "KeyName": "sshkeypair"
+                },
+                "ResourceStatus": "COMPLETE",
+                "ResourceStatusReason": "Resource Template complete",
+                "Warnings": []
+            }
+        ],
+        "Status": "COMPLETE",
+        "StatusReason": "All resources complete",
+        "CreationTime": "2025-09-23T19:38:06.435000+00:00",
+        "LastUpdatedTime": "2025-09-23T19:38:10.798000+00:00",
+        "Progress": {
+            "ResourcesSucceeded": 3,
+            "ResourcesFailed": 0,
+            "ResourcesProcessing": 0,
+            "ResourcesPending": 0
+        },
+        "TemplateConfiguration": {
+            "DeletionPolicy": "RETAIN",
+            "UpdateReplacePolicy": "RETAIN"
+        },
+        "TotalWarnings": 0
+    }
+
+For more information, see `Generating templates from existing resources <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/generate-IaC.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/describe-resource-scan.rst

@@ -0,0 +1,38 @@
+**To describe a resource scan**
+
+The following ``describe-resource-scan`` example describes the resource scan with the specified scan ID. ::
+
+    aws cloudformation describe-resource-scan --region \
+        --resource-scan-id arn:aws:cloudformation:us-east-1:123456789012:resourceScan/0a699f15-489c-43ca-a3ef-3e6ecfa5da60
+
+Output::
+
+    {
+        "ResourceScanId": "arn:aws:cloudformation:us-east-1:123456789012:resourceScan/0a699f15-489c-43ca-a3ef-3e6ecfa5da60",
+        "Status": "COMPLETE",
+        "StartTime": "2025-08-21T03:10:38.485000+00:00",
+        "EndTime": "2025-08-21T03:20:28.485000+00:00",
+        "PercentageCompleted": 100.0,
+        "ResourceTypes": [
+            "AWS::CloudFront::CachePolicy",
+            "AWS::CloudFront::OriginRequestPolicy",
+            "AWS::EC2::DHCPOptions",
+            "AWS::EC2::InternetGateway",
+            "AWS::EC2::KeyPair",
+            "AWS::EC2::NetworkAcl",
+            "AWS::EC2::NetworkInsightsPath",
+            "AWS::EC2::NetworkInterface",
+            "AWS::EC2::PlacementGroup",
+            "AWS::EC2::Route",
+            "AWS::EC2::RouteTable",
+            "AWS::EC2::SecurityGroup",
+            "AWS::EC2::Subnet",
+            "AWS::EC2::SubnetCidrBlock",
+            "AWS::EC2::SubnetNetworkAclAssociation",
+            "AWS::EC2::SubnetRouteTableAssociation",
+            ...
+        ],
+        "ResourcesRead": 676
+    }
+
+For more information, see `Generating templates from existing resources <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/generate-IaC.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/describe-stack-refactor.rst

@@ -0,0 +1,20 @@
+**To describe a stack refactor operation**
+
+The following ``describe-stack-refactor`` example describes the stack refactor operation with the specified stack refactor ID. ::
+
+    aws cloudformation describe-stack-refactor \
+        --stack-refactor-id 9c384f70-4e07-4ed7-a65d-fee5eb430841
+
+Output::
+
+    {
+        "StackRefactorId": "9c384f70-4e07-4ed7-a65d-fee5eb430841",
+        "StackIds": [
+            "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack1/3e6a1ff0-94b1-11f0-aa6f-0a88d2e03acf",
+            "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack2/5da91650-94b1-11f0-81cf-0a23500e151b"
+        ],
+        "ExecutionStatus": "AVAILABLE",
+        "Status": "CREATE_COMPLETE"
+    }
+
+For more information, see `Stack refactoring <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stack-refactoring.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/execute-stack-refactor.rst

@@ -0,0 +1,10 @@
+**To complete a stack refactor operation**
+
+The following ``execute-stack-refactor`` example completes the stack refactor operation with the specified stack refactor ID. ::
+
+    aws cloudformation execute-stack-refactor \
+        --stack-refactor-id 9c384f70-4e07-4ed7-a65d-fee5eb430841
+
+This command produces no output.
+
+For more information, see `Stack refactoring <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stack-refactoring.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/list-generated-templates.rst

@@ -0,0 +1,41 @@
+**To list generated templates**
+
+The following ``list-generated-templates`` example lists all generated templates. ::
+
+    aws cloudformation list-generated-templates
+
+Output::
+
+    {
+        "Summaries": [
+            {
+                "GeneratedTemplateId": "arn:aws:cloudformation:us-east-1:123456789012:generatedtemplate/7fc8512c-d8cb-4e02-b266-d39c48344e48",
+                "GeneratedTemplateName": "MyTemplate",
+                "Status": "COMPLETE",
+                "StatusReason": "All resources complete",
+                "CreationTime": "2025-09-23T20:13:24.283000+00:00",
+                "LastUpdatedTime": "2025-09-23T20:13:28.610000+00:00",
+                "NumberOfResources": 4
+            },
+            {
+                "GeneratedTemplateId": "arn:aws:cloudformation:us-east-1:123456789012:generatedTemplate/f10dd1c4-edc6-4823-8153-ab6112b8d051",
+                "GeneratedTemplateName": "MyEC2InstanceTemplate",
+                "Status": "COMPLETE",
+                "StatusReason": "All resources complete",
+                "CreationTime": "2024-08-08T19:35:49.790000+00:00",
+                "LastUpdatedTime": "2024-08-08T19:35:52.207000+00:00",
+                "NumberOfResources": 3
+            },
+            {
+                "GeneratedTemplateId": "arn:aws:cloudformation:us-east-1:123456789012:generatedTemplate/e5a1c89f-7ce2-41bd-9bdf-75b7c852e3ca",
+                "GeneratedTemplateName": "MyEKSNodeGroupTemplate",
+                "Status": "COMPLETE",
+                "StatusReason": "All resources complete",
+                "CreationTime": "2024-07-16T20:39:27.883000+00:00",
+                "LastUpdatedTime": "2024-07-16T20:39:35.766000+00:00",
+                "NumberOfResources": 4
+            }
+        ]
+    }
+
+For more information, see `Generating templates from existing resources <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/generate-IaC.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/list-resource-scan-related-resources.rst

@@ -0,0 +1,47 @@
+**To list related resources from a resource scan**
+
+The following ``list-resource-scan-related-resources`` example lists resources from the specified resource scan that are related to resources in ``resources.json``. ::
+
+    aws cloudformation list-resource-scan-related-resources \
+        --resource-scan-id arn:aws:cloudformation:us-east-1:123456789012:resourceScan/0a699f15-489c-43ca-a3ef-3e6ecfa5da60 \
+        --resources file://resources.json
+
+Contents of ``resources.json``::
+
+    [
+        {
+            "ResourceType": "AWS::EKS::Cluster",
+            "ResourceIdentifier": {
+                "ClusterName": "MyAppClusterName"
+            }
+        },
+        {
+            "ResourceType": "AWS::AutoScaling::AutoScalingGroup",
+            "ResourceIdentifier": {
+                "AutoScalingGroupName": "MyAppASGName"
+            }
+        }
+    ]
+
+Output::
+
+    {
+        "RelatedResources": [
+            {
+                "ResourceType": "AWS::EKS::Nodegroup",
+                "ResourceIdentifier": {
+                    "NodegroupName": "MyAppNodegroupName"
+                },
+                "ManagedByStack": false
+            },
+            {
+                "ResourceType": "AWS::IAM::Role",
+                "ResourceIdentifier": {
+                    "RoleId": "arn:aws::iam::123456789012:role/MyAppIAMRole"
+                },
+                "ManagedByStack": false
+            }
+        ]
+    }
+
+For more information, see `Create a CloudFormation template from resources scanned with IaC generator <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/iac-generator-create-template-from-scanned-resources.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/list-resource-scan-resources.rst

@@ -0,0 +1,30 @@
+**To list resources from a resource scan**
+
+The following ``list-resource-scan-resources`` example lists resources from the specified resource scan, filtered by resource identifier. ::
+
+    aws cloudformation list-resource-scan-resources \
+        --resource-scan-id arn:aws:cloudformation:us-east-1:123456789012:resourceScan/0a699f15-489c-43ca-a3ef-3e6ecfa5da60 \
+        --resource-identifier MyApp
+
+Output::
+
+    {
+        "Resources": [
+            {
+                "ResourceType": "AWS::EKS::Cluster",
+                "ResourceIdentifier": {
+                    "ClusterName": "MyAppClusterName"
+                },
+                "ManagedByStack": false
+            },
+            {
+                "ResourceType": "AWS::AutoScaling::AutoScalingGroup",
+                "ResourceIdentifier": {
+                    "AutoScalingGroupName": "MyAppASGName"
+                },
+                "ManagedByStack": false
+            }
+        ]
+    }
+
+For more information, see `Create a CloudFormation template from resources scanned with IaC generator <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/iac-generator-create-template-from-scanned-resources.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/list-stack-refactor-actions.rst

@@ -0,0 +1,71 @@
+**To list actions for a stack refactor operation**
+
+The following ``list-stack-refactor-actions`` example lists actions for the stack refactor operation with the specified stack refactor ID. ::
+
+    aws cloudformation list-stack-refactor-actions \
+        --stack-refactor-id 9c384f70-4e07-4ed7-a65d-fee5eb430841
+
+Output::
+
+    {
+        "StackRefactorActions": [
+            {
+                "Action": "MOVE",
+                "Entity": "RESOURCE",
+                "PhysicalResourceId": "MyTestLambdaRole",
+                "Description": "No configuration changes detected.",
+                "Detection": "AUTO",
+                "TagResources": [],
+                "UntagResources": [],
+                "ResourceMapping": {
+                    "Source": {
+                        "StackName": "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack1/3e6a1ff0-94b1-11f0-aa6f-0a88d2e03acf",
+                        "LogicalResourceId": "MyLambdaRole"
+                    },
+                    "Destination": {
+                        "StackName": "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack2/5da91650-94b1-11f0-81cf-0a23500e151b",
+                        "LogicalResourceId": "MyLambdaRole"
+                    }
+                }
+            },
+            {
+                "Action": "MOVE",
+                "Entity": "RESOURCE",
+                "PhysicalResourceId": "MyTestFunction",
+                "Description": "Resource configuration changes will be validated during refactor execution.",
+                "Detection": "AUTO",
+                "TagResources": [
+                    {
+                        "Key": "aws:cloudformation:stack-name",
+                        "Value": "Stack2"
+                    },
+                    {
+                        "Key": "aws:cloudformation:logical-id",
+                        "Value": "MyFunction"
+                    },
+                    {
+                        "Key": "aws:cloudformation:stack-id",
+                        "Value": "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack2/5da91650-94b1-11f0-81cf-0a23500e151b"
+                    }
+                ],
+                "UntagResources": [
+                    "aws:cloudformation:stack-name",
+                    "aws:cloudformation:logical-id",
+                    "aws:cloudformation:stack-id"
+                ],
+                "ResourceMapping": {
+                    "Source": {
+                        "StackName": "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack1/3e6a1ff0-94b1-11f0-aa6f-0a88d2e03acf",
+                        "LogicalResourceId": "MyFunction"
+                    },
+                    "Destination": {
+                        "StackName": "arn:aws:cloudformation:us-east-1:123456789012:stack/Stack2/5da91650-94b1-11f0-81cf-0a23500e151b",
+                        "LogicalResourceId": "MyFunction"
+                    }
+                }
+            }
+        ]
+    }
+
+
+For more information, see `Stack refactoring <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stack-refactoring.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/cloudformation/start-resource-scan.rst

@@ -0,0 +1,14 @@
+**To start a resource scan**
+
+The following ``start-resource-scan`` example starts a resource scan that scans all existing resources in the current account and Region. ::
+
+    aws cloudformation start-resource-scan
+
+Output::
+
+    {
+        "ResourceScanId":
+          "arn:aws:cloudformation:us-east-1:123456789012:resourceScan/0a699f15-489c-43ca-a3ef-3e6ecfa5da60"
+    }
+
+For more information, see `Start a resource scan with CloudFormation IaC generator <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/iac-generator-start-resource-scan.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/global_options.rst

@@ -70,3 +70,7 @@
   
   The maximum socket connect time in seconds. If the value is set to 0, the socket connect will be blocking and not timeout. The default value is 60 seconds.
   
+``--v2-debug`` (boolean)
+  
+  Enable AWS CLI v2 migration assistance. Prints warnings if the command would face a breaking change after swapping AWS CLI v1 for AWS CLI v2 in the current environment. Prints one warning for each breaking change detected.
+  

awscli/examples/global_synopsis.rst

@@ -12,3 +12,4 @@
 [--ca-bundle <value>]
 [--cli-read-timeout <value>]
 [--cli-connect-timeout <value>]
+[--v2-debug]