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

awscli/__init__.py

@@ -18,7 +18,7 @@ A Universal Command Line Environment for Amazon Web Services.
 
 import os
 
-__version__ = '1.42.33'
+__version__ = '1.42.69'
 
 #
 # Get our data path to be added to botocore's search path

awscli/arguments.py

@@ -449,7 +449,7 @@ class CLIArgument(BaseCLIArgument):
         cli_name = self.cli_name
         parser.add_argument(
             cli_name,
-            help=self.documentation,
+            help=self.documentation.replace('%', '%%'),
             type=self.cli_type,
             required=self.required,
         )

awscli/customizations/eks/update_kubeconfig.py

@@ -77,6 +77,12 @@ class UpdateKubeconfigCommand(BasicCommand):
                           "connect to the cluster the first time."),
             'required': False
         },
+        {
+            'name': 'proxy-url',
+            'help_text': ("Optionally specify a proxy url to route "
+                          "traffic via when connecting to a cluster."),
+            'required': False
+        },
         {
             'name': 'dry-run',
             'action': 'store_true',
@@ -305,7 +311,7 @@ class EKSClient(object):
         endpoint = self.cluster_description.get("endpoint")
         arn = self.cluster_description.get("arn")
 
-        return OrderedDict([
+        generated_cluster = OrderedDict([
             ("cluster", OrderedDict([
                 ("certificate-authority-data", cert_data),
                 ("server", endpoint)
@@ -313,6 +319,11 @@ class EKSClient(object):
             ("name", arn)
         ])
 
+        if self._parsed_args.proxy_url is not None:
+            generated_cluster["cluster"]["proxy-url"] = self._parsed_args.proxy_url
+
+        return generated_cluster
+
     def get_user_entry(self, user_alias=None):
         """
         Return a user entry generated using

awscli/customizations/scalarparse.py

@@ -49,7 +49,7 @@ def add_timestamp_parser(session):
     try:
         timestamp_format = session.get_scoped_config().get(
             'cli_timestamp_format',
-            'none')
+            'wire')
     except ProfileNotFound:
         # If a --profile is provided that does not exist, loading
         # a value from get_scoped_config will crash the CLI.
@@ -57,9 +57,11 @@ 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
@@ -69,7 +71,7 @@ def add_timestamp_parser(session):
         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)
 
 

awscli/examples/ivs-realtime/get-composition.rst

@@ -51,9 +51,10 @@ Output::
             ],
             "layout": {
                 "grid": {
-                    "featuredParticipantAttribute": ""
+                    "featuredParticipantAttribute": "",
                     "gridGap": 2,
                     "omitStoppedVideo": false,
+                    "participantOrderAttribute": "",
                     "videoAspectRatio": "VIDEO",
                     "videoFillMode": ""
                 }
@@ -65,7 +66,7 @@ Output::
         }
     }
 
-For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon IVS Real-Time Streaming User Guide*.
+For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.
 
 **Example 2: To get a composition with PiP layout**
 
@@ -123,6 +124,7 @@ Output::
                     "featuredParticipantAttribute": "abcdefg",
                     "gridGap": 0,
                     "omitStoppedVideo": false,
+                    "participantOrderAttribute": "",
                     "pipBehavior": "STATIC",
                     "pipOffset": 0,
                     "pipParticipantAttribute": "",
@@ -137,7 +139,7 @@ Output::
         }
     }
 
-For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon IVS Real-Time Streaming User Guide*.
+For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.
 
 **Example 3: To get a composition with thumbnail recording enabled**
 
@@ -203,6 +205,7 @@ Output::
                     "featuredParticipantAttribute": ""
                     "gridGap": 2,
                     "omitStoppedVideo": false,
+                    "participantOrderAttribute": "",
                     "videoAspectRatio": "VIDEO",
                     "videoFillMode": ""                }
             },
@@ -213,4 +216,4 @@ Output::
         }
     }
 
-For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon IVS Real-Time Streaming User Guide*.
+For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.

awscli/examples/ivs-realtime/start-composition.rst

@@ -57,6 +57,7 @@ Output::
                     "featuredParticipantAttribute": ""
                     "gridGap": 2,
                     "omitStoppedVideo": false,
+                    "participantOrderAttribute": "",
                     "videoAspectRatio": "VIDEO",
                     "videoFillMode": ""
                 }
@@ -68,7 +69,7 @@ Output::
         }
     }
 
-For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon IVS Real-Time Streaming User Guide*.
+For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.
 
 **Example 2: To start a composition with PiP layout**
 
@@ -129,6 +130,7 @@ Output::
                     "featuredParticipantAttribute": "abcdefg",
                     "gridGap": 0,
                     "omitStoppedVideo": false,
+                    "participantOrderAttribute": "",
                     "pipBehavior": "STATIC",
                     "pipOffset": 0,
                     "pipParticipantAttribute": "",
@@ -143,7 +145,7 @@ Output::
         }
     }
 
-For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon IVS Real-Time Streaming User Guide*.
+For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.
 
 **Example 3: To start a composition with thumbnail recording enabled**
 
@@ -212,6 +214,7 @@ Output::
                     "featuredParticipantAttribute": ""
                     "gridGap": 2,
                     "omitStoppedVideo": false,
+                    "participantOrderAttribute": "",
                     "videoAspectRatio": "VIDEO",
                     "videoFillMode": ""
                 }
@@ -223,4 +226,86 @@ Output::
         }
     }
 
-For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon IVS Real-Time Streaming User Guide*.
+For more information, see `Composite Recording (Real-Time Streaming) <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.
+
+**Example 4: To start a composition using grid layout with custom participant ordering**
+
+The following ``start-composition`` example starts a composition for the specified stage to be streamed to the specified locations using grid layout with custom participant ordering. ::
+
+    aws ivs-realtime start-composition \
+        --stage-arn arn:aws:ivs:ap-northeast-1:123456789012:stage/defgABCDabcd \
+        --destinations '[{"channel": {"channelArn": "arn:aws:ivs:ap-northeast-1:123456789012:channel/abcABCdefDEg", \
+            "encoderConfigurationArn": "arn:aws:ivs:ap-northeast-1:123456789012:encoder-configuration/ABabCDcdEFef"}}, \
+            {"s3": {"encoderConfigurationArns": ["arn:aws:ivs:ap-northeast-1:123456789012:encoder-configuration/ABabCDcdEFef"], \ 
+            "storageConfigurationArn": "arn:aws:ivs:ap-northeast-1:123456789012:storage-configuration/FefABabCDcdE", \
+            "thumbnailConfigurations": [{"storage": ["SEQUENTIAL"],"targetIntervalSeconds": 60}]}}]' \
+        --layout grid='{participantOrderAttribute="abcdefg"}'
+
+Output::
+
+    {
+        "composition": {
+            "arn": "arn:aws:ivs:ap-northeast-1:123456789012:composition/abcdABCDefgh",
+            "destinations": [
+                {
+                    "configuration": {
+                        "channel": {
+                            "channelArn": "arn:aws:ivs:ap-northeast-1:123456789012:channel/abcABCdefDEg",
+                            "encoderConfigurationArn": "arn:aws:ivs:ap-northeast-1:123456789012:encoder-configuration/ABabCDcdEFef"
+                        },
+                        "name": ""
+                    },
+                    "id": "AabBCcdDEefF",
+                    "state": "STARTING"
+                },
+                {
+                    "configuration": {
+                        "name": "",
+                        "s3": {
+                            "encoderConfigurationArns": [
+                                "arn:aws:ivs:arn:aws:ivs:ap-northeast-1:123456789012:encoder-configuration/ABabCDcdEFef"
+                            ],
+                            "recordingConfiguration": {
+                                "format": "HLS",
+                                "hlsConfiguration": {
+                                    "targetSegmentDurationSeconds": 2
+                                }
+                            },
+                            "storageConfigurationArn": "arn:arn:aws:ivs:ap-northeast-1:123456789012:storage-configuration/FefABabCDcdE",
+                            "thumbnailConfigurations": [
+                               {
+                                  "targetIntervalSeconds": 60,
+                                  "storage": [
+                                      "SEQUENTIAL"
+                                  ]
+                               }
+                            ]
+                        }
+                    },
+                    "detail": {
+                        "s3": {
+                            "recordingPrefix": "aBcDeFgHhGfE/AbCdEfGhHgFe/GHFabcgefABC/composite"
+                        }
+                    },
+                    "id": "GHFabcgefABC",
+                    "state": "STARTING"
+                }
+            ],
+            "layout": {
+                "grid": {
+                    "featuredParticipantAttribute": ""
+                    "gridGap": 2,
+                    "omitStoppedVideo": false,
+                    "participantOrderAttribute": "abcdefg",
+                    "videoAspectRatio": "VIDEO",
+                    "videoFillMode": ""
+                }
+            },
+            "stageArn": "arn:aws:ivs:ap-northeast-1:123456789012:stage/defgABCDabcd",
+            "startTime": "2023-10-16T23:24:00+00:00",
+            "state": "STARTING",
+            "tags": {}
+        }
+    }
+
+For more information, see `IVS Composite Recording | Real-Time Streaming <https://docs.aws.amazon.com/ivs/latest/RealTimeUserGuide/rt-composite-recording.html>`__ in the *Amazon Interactive Video Service User Guide*.

awscli/examples/lambda/create-function.rst

@@ -4,7 +4,7 @@ The following ``create-function`` example creates a Lambda function named ``my-f
 
     aws lambda create-function \
         --function-name my-function \
-        --runtime nodejs18.x \
+        --runtime nodejs22.x \
         --zip-file fileb://my-function.zip \
         --handler my-function.handler \
         --role arn:aws:iam::123456789012:role/service-role/MyTestFunction-role-tges6bf4
@@ -28,10 +28,10 @@ Output::
         "Version": "$LATEST",
         "Role": "arn:aws:iam::123456789012:role/service-role/MyTestFunction-role-zgur6bf4",
         "Timeout": 3,
-        "LastModified": "2023-10-14T22:26:11.234+0000",
+        "LastModified": "2025-10-14T22:26:11.234+0000",
         "Handler": "my-function.handler",
-        "Runtime": "nodejs18.x",
+        "Runtime": "nodejs22.x",
         "Description": ""
     }
 
-For more information, see `AWS Lambda Function Configuration <https://docs.aws.amazon.com/lambda/latest/dg/resource-model.html>`__ in the *AWS Lambda Developer Guide*.
+For more information, see `Configure Lambda function memory <https://docs.aws.amazon.com/lambda/latest/dg/configuration-memory.html>`__ in the *AWS Lambda Developer Guide*.

awscli/examples/lambda/get-function.rst

@@ -34,10 +34,10 @@ Output::
             "Handler": "index.handler",
             "Role": "arn:aws:iam::123456789012:role/service-role/helloWorldPython-role-uy3l9qyq",
             "Timeout": 3,
-            "LastModified": "2019-09-24T18:20:35.054+0000",
-            "Runtime": "nodejs10.x",
+            "LastModified": "2025-09-24T18:20:35.054+0000",
+            "Runtime": "nodejs22.x",
             "Description": ""
         }
     }
 
-For more information, see `AWS Lambda Function Configuration <https://docs.aws.amazon.com/lambda/latest/dg/resource-model.html>`__ in the *AWS Lambda Developer Guide*.
+For more information, see `Configure Lambda function memory <https://docs.aws.amazon.com/lambda/latest/dg/configuration-memory.html>`__ in the *AWS Lambda Developer Guide*.

awscli/examples/lambda/list-functions.rst

@@ -22,8 +22,8 @@ Output::
                 "Handler": "helloworld.handler",
                 "Role": "arn:aws:iam::123456789012:role/service-role/MyTestFunction-role-zgur6bf4",
                 "Timeout": 3,
-                "LastModified": "2023-09-23T18:32:33.857+0000",
-                "Runtime": "nodejs18.x",
+                "LastModified": "2025-09-23T18:32:33.857+0000",
+                "Runtime": "nodejs22.x",
                 "Description": ""
             },
             {
@@ -45,8 +45,8 @@ Output::
                 "Handler": "index.handler",
                 "Role": "arn:aws:iam::123456789012:role/service-role/helloWorldPython-role-uy3l9qyq",
                 "Timeout": 3,
-                "LastModified": "2023-10-01T16:47:28.490+0000",
-                "Runtime": "nodejs18.x",
+                "LastModified": "2025-10-01T16:47:28.490+0000",
+                "Runtime": "nodejs22.x",
                 "Description": ""
             },
             {
@@ -78,11 +78,11 @@ Output::
                 "Handler": "lambda_function.lambda_handler",
                 "Role": "arn:aws:iam::123456789012:role/service-role/my-python-function-role-z5g7dr6n",
                 "Timeout": 3,
-                "LastModified": "2023-10-01T19:40:41.643+0000",
+                "LastModified": "2025-10-01T19:40:41.643+0000",
                 "Runtime": "python3.11",
                 "Description": ""
             }
         ]
     }
 
-For more information, see `AWS Lambda Function Configuration <https://docs.aws.amazon.com/lambda/latest/dg/resource-model.html>`__ in the *AWS Lambda Developer Guide*.
+For more information, see `Configure Lambda function memory <https://docs.aws.amazon.com/lambda/latest/dg/configuration-memory.html>`__ in the *AWS Lambda Developer Guide*.

awscli/examples/securityhub/describe-hub.rst

@@ -1,15 +1,17 @@
 **To get information about a hub resource**
 
-The following ``describe-hub`` example returns the subscription date for the specified hub resource. The hub resource is identified by its ARN. ::
+The following ``describe-hub`` example returns the subscription date and other configuration settings for the specified hub resource. The hub resource is identified by its ARN. ::
 
-    aws securityhub describe-hub \
+    aws securityhub describe-hub \
         --hub-arn "arn:aws:securityhub:us-west-1:123456789012:hub/default"
 
 Output::
 
     {
         "HubArn": "arn:aws:securityhub:us-west-1:123456789012:hub/default",
-        "SubscribedAt": "2019-11-19T23:15:10.046Z"
+        "SubscribedAt": "2019-11-19T23:15:10.046Z",
+        "AutoEnableControls": true,
+        "ControlFindingGenerator": "SECURITY_CONTROL"
     }
 
-For more information, see `AWS::SecurityHub::Hub <https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-hub.html>`__ in the *AWS CloudFormation User Guide*.
+For more information, see `AWS::SecurityHub::Hub <https://docs.aws.amazon.com/AWSCloudFormation/latest/TemplateReference/aws-resource-securityhub-hub.html>`__ in the *AWS CloudFormation User Guide*.

awscli/examples/servicediscovery/create-service.rst

@@ -1,22 +1,23 @@
-**To create a service**
+**Example 1: To create a service using namespace ID**
 
 The following ``create-service`` example creates a service. ::
 
     aws servicediscovery create-service \
         --name myservice \
         --namespace-id  ns-ylexjili4cdxy3xm \
-        --dns-config "NamespaceId=ns-ylexjili4cdxy3xm,RoutingPolicy=MULTIVALUE,DnsRecords=[{Type=A,TTL=60}]"
+        --dns-config "RoutingPolicy=MULTIVALUE,DnsRecords=[{Type=A,TTL=60}]"
 
 Output::
 
     {
-            "Service": {
-            "Id": "srv-p5zdwlg5uvvzjita",
-            "Arn": "arn:aws:servicediscovery:us-west-2:803642222207:service/srv-p5zdwlg5uvvzjita",
+        "Service": {
+            "Id": "srv-abcd1234xmpl5678",
+            "Arn": "arn:aws:servicediscovery:us-west-2:123456789012:service/srv-abcd1234xmpl5678",
+            "ResourceOwner": "123456789012",
             "Name": "myservice",
-            "NamespaceId": "ns-ylexjili4cdxy3xm",
+            "NamespaceId": "ns-abcd1234xmpl5678",
             "DnsConfig": {
-                "NamespaceId": "ns-ylexjili4cdxy3xm",
+                "NamespaceId": "ns-abcd1234xmpl5678",
                 "RoutingPolicy": "MULTIVALUE",
                 "DnsRecords": [
                     {
@@ -25,10 +26,49 @@ Output::
                     }
                 ]
             },
-            "CreateDate": 1587081768.334,
-            "CreatorRequestId": "567c1193-6b00-4308-bd57-ad38a8822d25"
+            "Type": "DNS_HTTP",
+            "CreateDate": "2025-08-18T13:45:31.023000-05:00",
+            "CreatorRequestId": "abcd1234-5678-90ab-cdef-xmpl12345678",
+            "CreatedByAccount": "123456789012"
         }
     }
 
-For more information, see `Creating services <https://docs.aws.amazon.com/cloud-map/latest/dg/creating-services.html>`__ in the *AWS Cloud Map Developer Guide*.
+For more information, see `Creating an AWS Cloud Map service for an application component <https://docs.aws.amazon.com/cloud-map/latest/dg/creating-services.html>`__ in the *AWS Cloud Map Developer Guide*.
+
+**Example 2: To create a service using namespace ARN**
+
+The following ``create-service`` example creates a service using a namespace ARN instead of namespace ID. Specifying a namespace ARN is necessary when creating a service in a shared namespace. ::
+
+    aws servicediscovery create-service \
+        --name myservice-arn \
+        --namespace-id arn:aws:servicediscovery:us-west-2:123456789012:namespace/ns-abcd1234xmpl5678 \
+        --dns-config "RoutingPolicy=MULTIVALUE,DnsRecords=[{Type=A,TTL=60}]"
+
+Output::
+
+    {
+        "Service": {
+            "Id": "srv-abcd1234xmpl5678",
+            "Arn": "arn:aws:servicediscovery:us-west-2:123456789012:service/srv-abcd1234xmpl5678",
+            "ResourceOwner": "123456789012",
+            "Name": "myservice-arn",
+            "NamespaceId": "ns-abcd1234xmpl5678",
+            "DnsConfig": {
+                "NamespaceId": "ns-abcd1234xmpl5678",
+                "RoutingPolicy": "MULTIVALUE",
+                "DnsRecords": [
+                    {
+                        "Type": "A",
+                        "TTL": 60
+                    }
+                ]
+            },
+            "Type": "DNS_HTTP",
+            "CreateDate": "2025-08-18T13:45:31.023000-05:00",
+            "CreatorRequestId": "abcd1234-5678-90ab-cdef-xmpl12345678",
+            "CreatedByAccount": "123456789012"
+        }
+    }
+
+For more information, see `Shared AWS Cloud Map namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/sharing-namespaces.html>`__ in the *AWS Cloud Map Developer Guide*.
 

awscli/examples/servicediscovery/delete-namespace.rst

@@ -1,17 +1,31 @@
-**To delete a namespace**
+**Example 1: To delete a namespace**
 
 The following ``delete-namespace`` example deletes a namespace. ::
 
     aws servicediscovery delete-namespace \
-        --id ns-ylexjili4cdxy3xm
+        --id ns-abcd1234xmpl5678
 
 Output::
 
     {
-        "OperationId": "gv4g5meo7ndmeh4fqskygvk23d2fijwa-k98y6drk"
+        "OperationId": "abcd1234-5678-90ab-cdef-xmpl12345678"
     }
 
 To confirm that the operation succeeded, you can run ``get-operation``. For more information, see `get-operation <https://docs.aws.amazon.com/cli/latest/reference/servicediscovery/get-operation.html>`__ .
 
-For more information, see `Deleting namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-namespaces.html>`__ in the *AWS Cloud Map Developer Guide*.
+For more information, see `Deleting an AWS Cloud Map namespace <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-namespaces.html>`__ in the *AWS Cloud Map Developer Guide*.
 
+**Example 2: To delete a namespace using namespace ARN**
+
+The following ``delete-namespace`` example deletes a namespace using its ARN. ::
+
+    aws servicediscovery delete-namespace \
+        --id arn:aws:servicediscovery:us-west-2:123456789012:namespace/ns-abcd1234xmpl5678
+
+Output::
+
+    {
+        "OperationId": "abcd1234-5678-90ab-cdef-xmpl12345678"
+    }
+
+For more information, see `Deleting an AWS Cloud Map namespace <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-namespaces.html>`__ in the *AWS Cloud Map Developer Guide*.

awscli/examples/servicediscovery/delete-service-attributes.rst

@@ -1,11 +1,23 @@
-**To delete a service attribute**
+**Example 1: To delete a service attribute**
 
 The following ``delete-service-attributes`` example deletes a service attribute with the key ``Port`` that is associated with the specified service. ::
 
     aws servicediscovery delete-service-attributes \
-        --service-id srv-e4anhexample0004 \
+        --service-id srv-abcd1234xmpl5678 \
         --attributes Port
 
 This command produces no output.
 
-For more information, see `Deleting namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-namespaces.html>`__ in the *AWS Cloud Map Developer Guide*.
+For more information, see `AWS Cloud Map services <https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-services.html>`__ in the *AWS Cloud Map Developer Guide*.
+
+**Example 2: To delete a service attribute using ARN**
+
+The following ``delete-service-attributes`` example deletes a service attribute using the service ARN. Specifying the ARN is necessary for deleting attributes associated with services created in namespaces shared with your account. ::
+
+    aws servicediscovery delete-service-attributes \
+        --service-id arn:aws:servicediscovery:us-west-2:123456789012:service/srv-abcd1234xmpl5678 \
+        --attributes Port
+
+This command produces no output.
+
+For more information, see `AWS Cloud Map services <https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-services.html>`__ and `Shared AWS Cloud Map namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/sharing-namespaces.html>`__ in the *AWS Cloud Map Developer Guide*.

awscli/examples/servicediscovery/delete-service.rst

@@ -1,11 +1,21 @@
-**To delete a service**
+**Example 1: To delete a service**
 
 The following ``delete-service`` example deletes a service. ::
 
     aws servicediscovery delete-service \
-        --id srv-p5zdwlg5uvvzjita
+        --id srv-abcd1234xmpl5678
 
 This command produces no output.
 
-For more information, see `Deleting services <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-services.html>`__ in the *AWS Cloud Map Developer Guide*.
+For more information, see `Deleting an AWS Cloud Map service <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-services.html>`__ in the *AWS Cloud Map Developer Guide*.
 
+**Example 2: To delete a service using ARN**
+
+The following ``delete-service`` example deletes a service using its ARN. ::
+
+    aws servicediscovery delete-service \
+        --id arn:aws:servicediscovery:us-west-2:123456789012:service/srv-abcd1234xmpl5678
+
+This command produces no output.
+
+For more information, see `Deleting an AWS Cloud Map service <https://docs.aws.amazon.com/cloud-map/latest/dg/deleting-services.html>`__ in the *AWS Cloud Map Developer Guide*.

awscli/examples/servicediscovery/deregister-instance.rst

@@ -1,4 +1,4 @@
-**To deregister a service instance**
+**Example 1: To deregister a service instance**
 
 The following ``deregister-instance`` example deregisters a service instance. ::
 
@@ -12,7 +12,23 @@ Output::
         "OperationId": "4yejorelbukcjzpnr6tlmrghsjwpngf4-k98rnaiq"
     }
 
-To confirm that the operation succeeded, you can run ``get-operation``. For more information, see `get-operation <https://docs.aws.amazon.com/cli/latest/reference/servicediscovery/get-operation.html>`__ .
+To confirm that the operation succeeded, you can run ``get-operation``. For more information, see `get-operation <https://docs.aws.amazon.com/cli/latest/reference/servicediscovery/get-operation.html>`__.
 
 For more information, see `Deregistering service instances <https://docs.aws.amazon.com/cloud-map/latest/dg/deregistering-instances.html>`__ in the *AWS Cloud Map Developer Guide*.
 
+**Example 2: To deregister a service instance using service ARN for shared namespaces**
+
+The following ``deregister-instance`` example deregisters a service instance using a service ARN instead of service ID. Specifying an ARN is required when deregistering instances from services created in namespaces that are shared with your account. ::
+
+    aws servicediscovery deregister-instance \
+        --service-id arn:aws:servicediscovery:us-west-2:123456789012:service/srv-p5zdwlg5uvvzjita \
+        --instance-id web-server-01
+
+Output::
+
+    {
+        "OperationId": "gv4g5meo7ndmkqjrhpn39wk42xmpl"
+    }
+
+For more information, see `Shared AWS Cloud Map namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/sharing-namespaces.html>`__ and `Deregistering an AWS Cloud Map service instance <https://docs.aws.amazon.com/cloud-map/latest/dg/deregistering-instances.html>`__ in the *AWS Cloud Map Developer Guide*.
+

awscli/examples/servicediscovery/discover-instances-revision.rst

@@ -1,4 +1,4 @@
-**To discover the revision of an instance**
+**Example 1: To discover the revision of an instance**
 
 The following ``discover-instances-revision`` example discovers the increasing revision of an instance. ::
 
@@ -13,3 +13,20 @@ Output::
     }
 
 For more information, see `AWS Cloud Map service instances <https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-instances.html>`__ in the *AWS Cloud Map Developer Guide*.
+
+**Example 2: To discover the revision of instances from a specific owner account**
+
+The following ``discover-instances-revision`` example discovers the revision of instances from a specific owner account. The owner-account parameter is necessary for instances in namespaces that are shared with your account. ::
+
+    aws servicediscovery discover-instances-revision \
+        --namespace-name shared-namespace \
+        --service-name shared-service \
+        --owner-account 123456789111
+
+Output::
+
+    {
+        "InstancesRevision": 1234567890
+    }
+
+For more information, see `Shared AWS Cloud Map namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/sharing-namespaces.html>`__ and `AWS Cloud Map service instances <https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-instances.html>`__ in the *AWS Cloud Map Developer Guide*.

awscli/examples/servicediscovery/discover-instances.rst

@@ -1,4 +1,4 @@
-**To discover registered instances**
+**Example 1: To discover registered instances**
 
 The following ``discover-instances`` example discovers registered instances. ::
 
@@ -22,7 +22,37 @@ Output::
                     "AWS_INSTANCE_PORT": "808"
                 }
             }
-        ]
+        ],
+        "InstancesRevision": 85648075627387284
     }
 
 For more information, see `AWS Cloud Map service instances <https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-instances.html>`__ in the *AWS Cloud Map Developer Guide*.
+
+**Example 2: To discover instances from a specific owner account**
+
+The following ``discover-instances`` example discovers registered instances from a specific owner account. This parameter is necessary to discover instances in namespaces that are shared with your account. ::
+
+    aws servicediscovery discover-instances \
+        --namespace-name shared-namespace \
+        --service-name shared-service \
+        --owner-account 123456789111
+
+Output::
+
+    {
+        "Instances": [
+            {
+                "InstanceId": "shared-instance-1234",
+                "NamespaceName": "shared-namespace",
+                "ServiceName": "shared-service",
+                "HealthStatus": "HEALTHY",
+                "Attributes": {
+                    "AWS_INSTANCE_IPV4": "203.0.113.75",
+                    "AWS_INSTANCE_PORT": "80"
+                }
+            }
+        ],
+        "InstancesRevision": 1234567890
+    }
+
+For more information, see `Shared AWS Cloud Map namespaces <https://docs.aws.amazon.com/cloud-map/latest/dg/sharing-namespaces.html>`__ and `AWS Cloud Map service instances <https://docs.aws.amazon.com/cloud-map/latest/dg/working-with-instances.html>`__ in the *AWS Cloud Map Developer Guide*.