Run pyupgrade --py36-plus (#119)

Signed-off-by: Ciaran Evans <[email protected]>

Author: ciaransweet

CHANGELOG.md

@@ -18,11 +18,13 @@
 ### Removed
 - Removed TravisCI related files
 - All `# -*- coding: utf-8 -*-` statements
+- Python 3.5 support
 
 ### Changed
 - update return value of asg action detach_random_instances to include instance IDs
 - switch from `pycodestyle` to `black`, `flake8`, and `isort` for linting/formatting
 - applied `black`, `flake8`, and `isort` across the codebase
+- applied `pyupgrade --py36-plus`
 
 ### Fixed
 - `chaosaws.route53.probes` now correctly exposes the `__all__` attribute

README.md

@@ -12,7 +12,7 @@ extension to the [Chaos Toolkit][chaostoolkit].
 
 ## Install
 
-This package requires Python 3.5+
+This package requires Python 3.6+
 
 To be used from your experiment, this package must be installed in the Python
 environment where [chaostoolkit][] already lives.

chaosaws/__init__.py

@@ -72,7 +72,7 @@ def aws_client(
             raise InterruptExecution("AWS requires a region to be set!")
 
     if region:
-        logger.debug("Using AWS region '{}'".format(region))
+        logger.debug(f"Using AWS region '{region}'")
         params["region_name"] = region
 
     if boto3.DEFAULT_SESSION is None:
@@ -175,11 +175,11 @@ def signed_api_call(
     region = configuration.get("aws_region", "us-east-1") or ""
     host = configuration.get("aws_host", "amazonaws.com")
     scheme = configuration.get("aws_endpoint_scheme", "https")
-    host = "{s}.{r}.{h}".format(s=service, r=region, h=host)
-    endpoint = configuration.get(
-        "aws_endpoint", "{scheme}://{h}".format(scheme=scheme, h=host)
-    ).replace("..", ".")
-    endpoint = "{e}{p}".format(e=endpoint, p=path)
+    host = f"{service}.{region}.{host}"
+    endpoint = configuration.get("aws_endpoint", f"{scheme}://{host}").replace(
+        "..", "."
+    )
+    endpoint = f"{endpoint}{path}"
     creds = get_credentials(secrets)
 
     # when creds weren't provided via secrets, we let boto search for them

chaosaws/asg/actions.py

@@ -78,9 +78,7 @@ def terminate_random_instances(
             instances = [e for e in instances if e["AvailabilityZone"] == az]
 
             if not instances:
-                raise FailedActivity(
-                    "No instances found in Availability Zone: {}".format(az)
-                )
+                raise FailedActivity(f"No instances found in Availability Zone: {az}")
         else:
             if instance_percent:
                 instance_count = int(
@@ -100,7 +98,7 @@ def terminate_random_instances(
         client = aws_client("ec2", configuration, secrets)
         try:
             response = client.terminate_instances(
-                InstanceIds=sorted([e["InstanceId"] for e in instances])
+                InstanceIds=sorted(e["InstanceId"] for e in instances)
             )
             results.append(
                 {
@@ -172,9 +170,7 @@ def stop_random_instances(
             instances = [e for e in instances if e["AvailabilityZone"] == az]
 
             if not instances:
-                raise FailedActivity(
-                    "No instances found in Availability Zone: {}".format(az)
-                )
+                raise FailedActivity(f"No instances found in Availability Zone: {az}")
         else:
             if instance_percent:
                 instance_count = int(
@@ -193,7 +189,7 @@ def stop_random_instances(
         client = aws_client("ec2", configuration, secrets)
         try:
             response = client.stop_instances(
-                InstanceIds=sorted([e["InstanceId"] for e in instances]), Force=force
+                InstanceIds=sorted(e["InstanceId"] for e in instances), Force=force
             )
             results.append(
                 {
@@ -561,17 +557,17 @@ def validate_asgs(asg_names: List[str] = None, tags: List[Dict[str, str]] = None
 
 
 def get_asg_by_name(asg_names: List[str], client: boto3.client) -> AWSResponse:
-    logger.debug("Searching for ASG(s): {}.".format(asg_names))
+    logger.debug(f"Searching for ASG(s): {asg_names}.")
 
     asgs = client.describe_auto_scaling_groups(AutoScalingGroupNames=asg_names)
 
     if not asgs.get("AutoScalingGroups", []):
-        raise FailedActivity("Unable to locate ASG(s): {}".format(asg_names))
+        raise FailedActivity(f"Unable to locate ASG(s): {asg_names}")
 
     found_asgs = [a["AutoScalingGroupName"] for a in asgs["AutoScalingGroups"]]
     invalid_asgs = [a for a in asg_names if a not in found_asgs]
     if invalid_asgs:
-        raise FailedActivity("No ASG(s) found with name(s): {}".format(invalid_asgs))
+        raise FailedActivity(f"No ASG(s) found with name(s): {invalid_asgs}")
     return asgs
 
 
@@ -593,7 +589,7 @@ def get_asg_by_tags(tags: List[Dict[str, str]], client: boto3.client) -> AWSResp
             results.add(a["ResourceId"])
 
     if not results:
-        raise FailedActivity("No ASG(s) found with matching tag(s): {}.".format(tags))
+        raise FailedActivity(f"No ASG(s) found with matching tag(s): {tags}.")
     return get_asg_by_name(list(results), client)
 
 
@@ -704,7 +700,7 @@ def attach_instance_volume(
         response = client.attach_volume(
             Device=mount_point, InstanceId=instance_id, VolumeId=volume_id
         )
-        logger.debug("Attached volume %s to instance %s" % (volume_id, instance_id))
+        logger.debug(f"Attached volume {volume_id} to instance {instance_id}")
     except ClientError as e:
         raise FailedActivity(
             "Unable to attach volume %s to instance %s: %s"

chaosaws/asg/probes.py

@@ -139,7 +139,7 @@ def wait_desired_equals_healthy(
 
         if result:
             waiting_time = int(time.time() - start)
-            logger.debug("Waiting time was: {}".format(waiting_time))
+            logger.debug(f"Waiting time was: {waiting_time}")
             return waiting_time
         time.sleep(0.1)
 
@@ -185,7 +185,7 @@ def wait_desired_not_equals_healthy_tags(
 
         if not result:
             waiting_time = int(time.time() - start)
-            logger.debug("Waiting time was: {}".format(waiting_time))
+            logger.debug(f"Waiting time was: {waiting_time}")
 
             return waiting_time
         time.sleep(0.1)
@@ -232,7 +232,7 @@ def wait_desired_equals_healthy_tags(
 
         if result:
             waiting_time = int(time.time() - start)
-            logger.debug("Waiting time was: {}".format(waiting_time))
+            logger.debug(f"Waiting time was: {waiting_time}")
 
             return waiting_time
 
@@ -263,10 +263,10 @@ def is_scaling_in_progress(
                 or instance["HealthStatus"] != "Healthy"
             ):
 
-                logger.debug("Scaling activities in progress: {}".format(True))
+                logger.debug(f"Scaling activities in progress: {True}")
                 return True
 
-    logger.debug("Scaling activities in progress: {}".format(False))
+    logger.debug(f"Scaling activities in progress: {False}")
     return False
 
 
@@ -422,7 +422,7 @@ def get_asg_by_name(asg_names: List[str], client: boto3.client) -> AWSResponse:
     invalid_asgs = [a for a in asg_names if a not in valid_asgs]
 
     if invalid_asgs:
-        raise FailedActivity("No ASG(s) found matching: {}".format(invalid_asgs))
+        raise FailedActivity(f"No ASG(s) found matching: {invalid_asgs}")
     return results
 
 
@@ -457,7 +457,7 @@ def get_asg_by_tags(
 
     filtered_groups = [g["Name"] for g in group_sets if filter_set.issubset(g["Tags"])]
 
-    logger.debug("filtered groups: {}".format(filtered_groups))
+    logger.debug(f"filtered groups: {filtered_groups}")
 
     if filtered_groups:
         groups_descr = client.describe_auto_scaling_groups(

chaosaws/awslambda/actions.py

@@ -54,9 +54,7 @@ def invoke_function(
     try:
         response = client.invoke(**request_kwargs)
     except Exception as x:
-        raise FailedActivity(
-            "failed invoking function '{}': '{}'".format(function_name, str(x))
-        )
+        raise FailedActivity(f"failed invoking function '{function_name}': '{str(x)}'")
     if "Payload" in response:
         # The payload is of type StreamingBody and
         # cannot be directly serialized into JSON
@@ -88,7 +86,7 @@ def put_function_concurrency(
         )
     except Exception as x:
         raise FailedActivity(
-            "failed throttling lambda function '{}': '{}'".format(function_name, str(x))
+            f"failed throttling lambda function '{function_name}': '{str(x)}'"
         )
 
 

chaosaws/cloudwatch/probes.py

@@ -22,7 +22,7 @@ def get_alarm_state_value(
     client = aws_client("cloudwatch", configuration, secrets)
     response = client.describe_alarms(AlarmNames=[alarm_name])
     if len(response["MetricAlarms"]) == 0:
-        raise FailedActivity("CloudWatch alarm name {} not found".format(alarm_name))
+        raise FailedActivity(f"CloudWatch alarm name {alarm_name} not found")
     return response["MetricAlarms"][0]["StateValue"]
 
 
@@ -76,24 +76,22 @@ def get_metric_statistics(
     if unit is not None:
         request_kwargs["Unit"] = unit
 
-    logger.debug("Request arguments: {}".format(request_kwargs))
+    logger.debug(f"Request arguments: {request_kwargs}")
     response = client.get_metric_statistics(**request_kwargs)
 
     datapoints = response["Datapoints"]
     if not datapoints:
         return 0
 
     datapoint = datapoints[0]
-    logger.debug("Response: {}".format(response))
+    logger.debug(f"Response: {response}")
     try:
         if statistic is not None:
             return datapoint[statistic]
         elif extended_statistic is not None:
             return datapoint["ExtendedStatistics"][extended_statistic]
     except Exception as x:
-        raise FailedActivity(
-            "Unable to parse response '{}': '{}'".format(response, str(x))
-        )
+        raise FailedActivity(f"Unable to parse response '{response}': '{str(x)}'")
 
 
 def get_metric_data(

chaosaws/ec2/actions.py

@@ -63,13 +63,11 @@ def stop_instance(
         instance_types = pick_random_instance(filters, client)
 
         if not instance_types:
-            raise FailedActivity("No instances in availability zone: {}".format(az))
+            raise FailedActivity(f"No instances in availability zone: {az}")
     else:
         instance_types = get_instance_type_by_id([instance_id], client)
 
-    logger.debug(
-        "Picked EC2 instance '{}' from AZ '{}' to be stopped".format(instance_types, az)
-    )
+    logger.debug(f"Picked EC2 instance '{instance_types}' from AZ '{az}' to be stopped")
 
     return stop_instances_any_type(
         instance_types=instance_types, force=force, client=client
@@ -113,7 +111,7 @@ def stop_instances(
         instance_types = list_instances_by_type(filters, client)
 
         if not instance_types:
-            raise FailedActivity("No instances in availability zone: {}".format(az))
+            raise FailedActivity(f"No instances in availability zone: {az}")
     else:
         instance_types = get_instance_type_by_id(instance_ids, client)
 
@@ -228,7 +226,7 @@ def terminate_instances(
                 "No instances found matching filters: %s" % str(filters)
             )
 
-        logger.debug("Instances in AZ %s selected: %s}." % (az, str(instance_types)))
+        logger.debug(f"Instances in AZ {az} selected: {str(instance_types)}}}.")
     else:
         instance_types = get_instance_type_by_id(instance_ids, client)
 
@@ -281,7 +279,7 @@ def start_instances(
                 "No instances found matching filters: %s" % str(filters)
             )
 
-        logger.debug("Instances in AZ %s selected: %s}." % (az, str(instance_types)))
+        logger.debug(f"Instances in AZ {az} selected: {str(instance_types)}}}.")
     else:
         instance_types = get_instance_type_by_id(instance_ids, client)
     return start_instances_any_type(instance_types, client)
@@ -333,7 +331,7 @@ def restart_instances(
                 "No instances found matching filters: %s" % str(filters)
             )
 
-        logger.debug("Instances in AZ %s selected: %s}." % (az, str(instance_types)))
+        logger.debug(f"Instances in AZ {az} selected: {str(instance_types)}}}.")
     else:
         instance_types = get_instance_type_by_id(instance_ids, client)
     return restart_instances_any_type(instance_types, client)
@@ -435,9 +433,9 @@ def list_instances_by_type(
     Return all instance ids matching the given filters by type
     (InstanceLifecycle) ie spot, on demand, etc.
     """
-    logger.debug("EC2 instances query: {}".format(str(filters)))
+    logger.debug(f"EC2 instances query: {str(filters)}")
     res = client.describe_instances(Filters=filters)
-    logger.debug("Instances matching the filter query: {}".format(str(res)))
+    logger.debug(f"Instances matching the filter query: {str(res)}")
 
     return get_instance_type_from_response(res)
 
@@ -601,7 +599,7 @@ def stop_instances_any_type(
             client.describe_instances(InstanceIds=instance_types["spot"])
         )
 
-        logger.debug("Canceling spot requests: {}".format(spot_request_ids))
+        logger.debug(f"Canceling spot requests: {spot_request_ids}")
         client.cancel_spot_instance_requests(SpotInstanceRequestIds=spot_request_ids)
         logger.debug("Terminating spot instances: {}".format(instance_types["spot"]))
 
@@ -623,7 +621,7 @@ def terminate_instances_any_type(
     response = []
 
     for k, v in instance_types.items():
-        logger.debug("Terminating %s instance(s): %s" % (k, instance_types[k]))
+        logger.debug(f"Terminating {k} instance(s): {instance_types[k]}")
         if k == "spot":
             instances = get_spot_request_ids_from_response(
                 client.describe_instances(InstanceIds=v)
@@ -644,7 +642,7 @@ def start_instances_any_type(
     """
     results = []
     for k, v in instance_types.items():
-        logger.debug("Starting %s instance(s): %s" % (k, v))
+        logger.debug(f"Starting {k} instance(s): {v}")
         response = client.start_instances(InstanceIds=v)
         results.extend(response.get("StartingInstances", []))
     return results
@@ -656,7 +654,7 @@ def restart_instances_any_type(instance_types: dict, client: boto3.client):
     """
     results = []
     for k, v in instance_types.items():
-        logger.debug("Restarting %s instance(s): %s" % (k, v))
+        logger.debug(f"Restarting {k} instance(s): {v}")
         client.reboot_instances(InstanceIds=v)
     return results
 
@@ -712,7 +710,7 @@ def attach_instance_volume(
         response = client.attach_volume(
             Device=mount_point, InstanceId=instance_id, VolumeId=volume_id
         )
-        logger.debug("Attached volume %s to instance %s" % (volume_id, instance_id))
+        logger.debug(f"Attached volume {volume_id} to instance {instance_id}")
     except ClientError as e:
         raise FailedActivity(
             "Unable to attach volume %s to instance %s: %s"