improve rds error catching

diodonfrost · Oct 17, 2019 · aa144e0 · aa144e0
1 parent b95fe81
commit aa144e0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/package/rds_handler.py b/package/rds_handler.py
@@ -43,7 +43,10 @@ def stop(self, tag_key, tag_value):
                 self.rds.stop_db_instance(DBInstanceIdentifier=instance_id)
                 print("Stop rds instance {0}".format(instance_id))
             except ClientError as e:
-                if e.response["Error"]["Code"] == "InvalidDBInstanceState":
+                error_code = e.response["Error"]["Code"]
+                if error_code == "InvalidDBInstanceState":
+                    logging.info("%s", e)
+                elif error_code == "InvalidParameterCombination":
                     logging.info("%s", e)
                 else:
                     logging.error("Unexpected error: %s", e)
@@ -74,7 +77,10 @@ def start(self, tag_key, tag_value):
                 self.rds.start_db_instance(DBInstanceIdentifier=instance_id)
                 print("Start rds instance {0}".format(instance_id))
             except ClientError as e:
-                if e.response["Error"]["Code"] == "InvalidDBInstanceState":
+                error_code = e.response["Error"]["Code"]
+                if error_code == "InvalidDBInstanceState":
+                    logging.info("%s", e)
+                elif error_code == "InvalidParameterCombination":
                     logging.info("%s", e)
                 else:
                     logging.error("Unexpected error: %s", e)