Apply changes from patch for review updates.

Author: rlhagerm

python/example_code/iot/README.md

@@ -36,7 +36,7 @@ python -m pip install -r requirements.txt
 
 ### Get started
 
-- [Hello AWS IoT](iot_hello.py#L14) (`listThings`)
+- [Hello AWS IoT](iot_hello.py#L14) (`DescribeEndpoint`)
 
 
 ### Basics
@@ -50,19 +50,19 @@ Code examples that show you how to perform the essential operations within a ser
 
 Code excerpts that show you how to call individual service functions.
 
-- [AttachThingPrincipal](iot_wrapper.py#L102)
-- [CreateKeysAndCertificate](iot_wrapper.py#L80)
-- [CreateThing](iot_wrapper.py#L31)
-- [CreateTopicRule](iot_wrapper.py#L219)
-- [DeleteCertificate](iot_wrapper.py#L196)
-- [DeleteThing](iot_wrapper.py#L318)
-- [DeleteTopicRule](iot_wrapper.py#L338)
-- [DescribeEndpoint](iot_wrapper.py#L125)
-- [DetachThingPrincipal](iot_wrapper.py#L173)
-- [ListCertificates](iot_wrapper.py#L148)
-- [ListThings](iot_wrapper.py#L55)
-- [SearchIndex](iot_wrapper.py#L275)
-- [UpdateIndexingConfiguration](iot_wrapper.py#L298)
+- [AttachThingPrincipal](iot_wrapper.py#L118)
+- [CreateKeysAndCertificate](iot_wrapper.py#L93)
+- [CreateThing](iot_wrapper.py#L38)
+- [CreateTopicRule](iot_wrapper.py#L249)
+- [DeleteCertificate](iot_wrapper.py#L223)
+- [DeleteThing](iot_wrapper.py#L357)
+- [DeleteTopicRule](iot_wrapper.py#L380)
+- [DescribeEndpoint](iot_wrapper.py#L144)
+- [DetachThingPrincipal](iot_wrapper.py#L197)
+- [ListCertificates](iot_wrapper.py#L170)
+- [ListThings](iot_wrapper.py#L65)
+- [SearchIndex](iot_wrapper.py#L311)
+- [UpdateIndexingConfiguration](iot_wrapper.py#L337)
 
 
 <!--custom.examples.start-->

python/example_code/iot/iot_wrapper.py

@@ -9,6 +9,7 @@
 """
 
 import logging
+import boto3
 from botocore.exceptions import ClientError
 
 logger = logging.getLogger(__name__)
@@ -26,6 +27,12 @@ def __init__(self, iot_client, iot_data_client=None):
         self.iot_client = iot_client
         self.iot_data_client = iot_data_client
 
+    @classmethod
+    def from_client(cls):
+        iot_client = boto3.client("iot")
+        iot_data_client = boto3.client("iot-data")
+        return cls(iot_client, iot_data_client)
+
     # snippet-end:[python.example_code.iot.IoTWrapper]
 
     # snippet-start:[python.example_code.iot.CreateThing]
@@ -40,6 +47,9 @@ def create_thing(self, thing_name):
             response = self.iot_client.create_thing(thingName=thing_name)
             logger.info("Created thing %s.", thing_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceAlreadyExistsException":
+                logger.info("Thing %s already exists. Skipping creation.", thing_name)
+                return None
             logger.error(
                 "Couldn't create thing %s. Here's why: %s: %s",
                 thing_name,
@@ -65,15 +75,18 @@ def list_things(self):
             for page in paginator.paginate():
                 things.extend(page["things"])
             logger.info("Retrieved %s things.", len(things))
+            return things
         except ClientError as err:
-            logger.error(
-                "Couldn't list things. Here's why: %s: %s",
-                err.response["Error"]["Code"],
-                err.response["Error"]["Message"],
-            )
+            if err.response["Error"]["Code"] == "ThrottlingException":
+                logger.error("Request throttled. Please try again later.")
+            else:
+                logger.error(
+                    "Couldn't list things. Here's why: %s: %s",
+                    err.response["Error"]["Code"],
+                    err.response["Error"]["Message"],
+                )
             raise
-        else:
-            return things
+            
 
     # snippet-end:[python.example_code.iot.ListThings]
 
@@ -88,11 +101,14 @@ def create_keys_and_certificate(self):
             response = self.iot_client.create_keys_and_certificate(setAsActive=True)
             logger.info("Created certificate %s.", response["certificateId"])
         except ClientError as err:
-            logger.error(
-                "Couldn't create keys and certificate. Here's why: %s: %s",
-                err.response["Error"]["Code"],
-                err.response["Error"]["Message"],
-            )
+            if err.response["Error"]["Code"] == "ThrottlingException":
+                logger.error("Request throttled. Please try again later.")
+            else:
+                logger.error(
+                    "Couldn't create keys and certificate. Here's why: %s: %s",
+                    err.response["Error"]["Code"],
+                    err.response["Error"]["Message"],
+                )
             raise
         else:
             return response
@@ -113,6 +129,9 @@ def attach_thing_principal(self, thing_name, principal):
             )
             logger.info("Attached principal %s to thing %s.", principal, thing_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceNotFoundException":
+                logger.error("Cannot attach principal. Resource not found.")
+                return
             logger.error(
                 "Couldn't attach principal to thing. Here's why: %s: %s",
                 err.response["Error"]["Code"],
@@ -134,11 +153,14 @@ def describe_endpoint(self, endpoint_type="iot:Data-ATS"):
             response = self.iot_client.describe_endpoint(endpointType=endpoint_type)
             logger.info("Retrieved endpoint %s.", response["endpointAddress"])
         except ClientError as err:
-            logger.error(
-                "Couldn't describe endpoint. Here's why: %s: %s",
-                err.response["Error"]["Code"],
-                err.response["Error"]["Message"],
-            )
+            if err.response["Error"]["Code"] == "ThrottlingException":
+                logger.error("Request throttled. Please try again later.")
+            else:
+                logger.error(
+                    "Couldn't describe endpoint. Here's why: %s: %s",
+                    err.response["Error"]["Code"],
+                    err.response["Error"]["Message"],
+                )
             raise
         else:
             return response["endpointAddress"]
@@ -158,15 +180,17 @@ def list_certificates(self):
             for page in paginator.paginate():
                 certificates.extend(page["certificates"])
             logger.info("Retrieved %s certificates.", len(certificates))
+            return certificates
         except ClientError as err:
-            logger.error(
-                "Couldn't list certificates. Here's why: %s: %s",
-                err.response["Error"]["Code"],
-                err.response["Error"]["Message"],
-            )
+            if err.response["Error"]["Code"] == "ThrottlingException":
+                logger.error("Request throttled. Please try again later.")
+            else:
+                logger.error(
+                    "Couldn't list certificates. Here's why: %s: %s",
+                    err.response["Error"]["Code"],
+                    err.response["Error"]["Message"],
+                )
             raise
-        else:
-            return certificates
 
     # snippet-end:[python.example_code.iot.ListCertificates]
 
@@ -184,6 +208,9 @@ def detach_thing_principal(self, thing_name, principal):
             )
             logger.info("Detached principal %s from thing %s.", principal, thing_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceNotFoundException":
+                logger.error("Cannot detach principal. Resource not found.")
+                return
             logger.error(
                 "Couldn't detach principal from thing. Here's why: %s: %s",
                 err.response["Error"]["Code"],
@@ -207,6 +234,9 @@ def delete_certificate(self, certificate_id):
             self.iot_client.delete_certificate(certificateId=certificate_id)
             logger.info("Deleted certificate %s.", certificate_id)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceNotFoundException":
+                logger.error("Cannot delete certificate. Resource not found.")
+                return
             logger.error(
                 "Couldn't delete certificate. Here's why: %s: %s",
                 err.response["Error"]["Code"],
@@ -238,6 +268,9 @@ def create_topic_rule(self, rule_name, topic, sns_action_arn, role_arn):
             )
             logger.info("Created topic rule %s.", rule_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceAlreadyExistsException":
+                logger.info("Topic rule %s already exists. Skipping creation.", rule_name)
+                return
             logger.error(
                 "Couldn't create topic rule. Here's why: %s: %s",
                 err.response["Error"]["Code"],
@@ -260,15 +293,18 @@ def list_topic_rules(self):
             for page in paginator.paginate():
                 rules.extend(page["rules"])
             logger.info("Retrieved %s topic rules.", len(rules))
+            return rules
         except ClientError as err:
-            logger.error(
-                "Couldn't list topic rules. Here's why: %s: %s",
-                err.response["Error"]["Code"],
-                err.response["Error"]["Message"],
-            )
+            if err.response["Error"]["Code"] == "ThrottlingException":
+                logger.error("Request throttled. Please try again later.")
+            else:
+                logger.error(
+                    "Couldn't list topic rules. Here's why: %s: %s",
+                    err.response["Error"]["Code"],
+                    err.response["Error"]["Message"],
+                )
             raise
-        else:
-            return rules
+            
 
     # snippet-end:[python.example_code.iot.ListTopicRules]
 
@@ -284,11 +320,14 @@ def search_index(self, query):
             response = self.iot_client.search_index(queryString=query)
             logger.info("Found %s things.", len(response.get("things", [])))
         except ClientError as err:
-            logger.error(
-                "Couldn't search index. Here's why: %s: %s",
-                err.response["Error"]["Code"],
-                err.response["Error"]["Message"],
-            )
+            if err.response["Error"]["Code"] == "ThrottlingException":
+                logger.error("Request throttled. Please try again later.")
+            else:
+                logger.error(
+                    "Couldn't search index. Here's why: %s: %s",
+                    err.response["Error"]["Code"],
+                    err.response["Error"]["Message"],
+                )
             raise
         else:
             return response.get("things", [])
@@ -326,6 +365,9 @@ def delete_thing(self, thing_name):
             self.iot_client.delete_thing(thingName=thing_name)
             logger.info("Deleted thing %s.", thing_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceNotFoundException":
+                logger.error("Cannot delete thing. Resource not found.")
+                return
             logger.error(
                 "Couldn't delete thing. Here's why: %s: %s",
                 err.response["Error"]["Code"],
@@ -370,6 +412,9 @@ def update_thing_shadow(self, thing_name, shadow_state):
             )
             logger.info("Updated shadow for thing %s.", thing_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceNotFoundException":
+                logger.error("Cannot update thing shadow. Resource not found.")
+                return
             logger.error(
                 "Couldn't update thing shadow. Here's why: %s: %s",
                 err.response["Error"]["Code"],
@@ -393,6 +438,9 @@ def get_thing_shadow(self, thing_name):
             shadow = json.loads(response["payload"].read())
             logger.info("Retrieved shadow for thing %s.", thing_name)
         except ClientError as err:
+            if err.response["Error"]["Code"] == "ResourceNotFoundException":
+                logger.error("Cannot get thing shadow. Resource not found.")
+                return None
             logger.error(
                 "Couldn't get thing shadow. Here's why: %s: %s",
                 err.response["Error"]["Code"],