Maintenance updates (#1175)

Author: xen0l

.github/workflows/python-package.yml

@@ -12,7 +12,6 @@ jobs:
       max-parallel: 5
       matrix:
         python-version:
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'

.pylintrc

@@ -148,7 +148,9 @@ disable=print-statement,
         bad-continuation,
         redefined-builtin,
         raise-missing-from,
-        duplicate-code
+        duplicate-code,
+        consider-using-with,
+        unspecified-encoding
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option

aws_gate/bootstrap.py

@@ -69,7 +69,7 @@ def install(self):
         os.chmod(plugin_dst_path, 0o755)
 
         version = _check_plugin_version(PLUGIN_INSTALL_PATH)
-        print("{} (version {}) installed successfully!".format(PLUGIN_NAME, version))
+        print(f"{PLUGIN_NAME} (version {version}) installed successfully!")
 
     def extract(self):
         raise NotImplementedError
@@ -81,9 +81,7 @@ class MacPlugin(Plugin):
     def extract(self):
         if not zipfile.is_zipfile(self.download_path):
             raise ValueError(
-                "Invalid macOS session-manager-plugin ZIP file found {}".format(
-                    self.download_path
-                )
+                f"Invalid macOS session-manager-plugin ZIP file found {self.download_path}"
             )
 
         with zipfile.ZipFile(self.download_path, "r") as zip_file:
@@ -114,7 +112,7 @@ def bootstrap(force=False):
         plugin = LinuxPlugin()
     else:
         raise UnsupportedPlatormError(
-            "Unable to bootstrap session-manager-plugin on {}".format(system)
+            f"Unable to bootstrap session-manager-plugin on {system}"
         )
 
     if plugin.is_installed or force:

aws_gate/cli.py

@@ -53,9 +53,7 @@ def get_argument_parser(*args, **kwargs):
         "-v", "--verbose", help="increase output verbosity", action="store_true"
     )
     parser.add_argument(
-        "--version",
-        action="version",
-        version="%(prog)s {version}".format(version=__version__),
+        "--version", action="version", version=f"%(prog)s {__version__}"
     )
     subparsers = parser.add_subparsers(title="subcommands", dest="subcommand")
 
@@ -241,7 +239,7 @@ def main(args=None, argument_parser=None):
     try:
         config = load_config_from_files()
     except (ValidationError, ScannerError) as e:
-        raise ValueError("Invalid configuration provided: {}".format(e))
+        raise ValueError(f"Invalid configuration provided: {e}")
 
     # We want to provide default values in cases they are not configured
     # in ~/.aws/config or availabe a environment variables

aws_gate/config.py

@@ -18,12 +18,12 @@ class EmptyConfigurationError(Exception):
 
 def validate_profile(profile):
     if not is_existing_profile(profile):
-        raise ValidationError("Invalid profile provided: {}".format(profile))
+        raise ValidationError(f"Invalid profile provided: {profile}")
 
 
 def validate_region(region):
     if not is_existing_region(region):
-        raise ValidationError("Invalid region name provided: {}".format(region))
+        raise ValidationError(f"Invalid region name provided: {region}")
 
 
 def validate_defaults(data):
@@ -45,9 +45,9 @@ class HostSchema(Schema):
 
 class GateConfigSchema(Schema):
     defaults = fields.Nested(
-        DefaultsSchema, required=False, missing=dict(), validate=validate_defaults
+        DefaultsSchema, required=False, missing={}, validate=validate_defaults
     )
-    hosts = fields.List(fields.Nested(HostSchema), required=False, missing=list())
+    hosts = fields.List(fields.Nested(HostSchema), required=False, missing=[])
 
     # pylint: disable=no-self-use,unused-argument
     @post_load
@@ -115,9 +115,7 @@ def _merge_data(src, dst):
                     dst[key] = src[key]
         else:
             raise TypeError(
-                "Cannot merge {} with dict, src={} dst={}".format(
-                    type(src).__name__, src, dst
-                )
+                f"Cannot merge {type(src).__name__} with dict, src={src} dst={dst}"
             )
 
     elif isinstance(dst, list):

aws_gate/decorators.py

@@ -32,7 +32,7 @@ def plugin_required(
         and not _plugin_exists_in_path()
         and not platform.system() == "Windows"
     ):
-        raise OSError("{} not found".format(PLUGIN_NAME))
+        raise OSError(f"{PLUGIN_NAME} not found")
 
     return wrapped_function(*args, **kwargs)
 
@@ -50,7 +50,7 @@ def wrapper(
         )
 
         if version and parse_version(version) < parse_version(required_version):
-            raise ValueError("Invalid plugin version: {}".format(version))
+            raise ValueError(f"Invalid plugin version: {version}")
 
         return wrapped_function(*args, **kwargs)
 
@@ -62,7 +62,7 @@ def valid_aws_profile(
     wrapped_function, instance, args, kwargs
 ):  # pylint: disable=unused-argument
     if not is_existing_profile(kwargs["profile_name"]):
-        raise ValueError("Invalid profile provided: {}".format(kwargs["profile_name"]))
+        raise ValueError(f"Invalid profile provided: {kwargs['profile_name']}")
 
     return wrapped_function(*args, **kwargs)
 
@@ -72,6 +72,6 @@ def valid_aws_region(
     wrapped_function, instance, args, kwargs
 ):  # pylint: disable=unused-argument
     if not is_existing_region(kwargs["region_name"]):
-        raise ValueError("Invalid region provided: {}".format(kwargs["region_name"]))
+        raise ValueError(f"Invalid region provided: {kwargs['region_name']}")
 
     return wrapped_function(*args, **kwargs)

aws_gate/exec.py

@@ -62,7 +62,7 @@ def exec(
 
     instance_id = query_instance(name=instance, ec2=ec2)
     if instance_id is None:
-        raise ValueError("No instance could be found for name: {}".format(instance))
+        raise ValueError(f"No instance could be found for name: {instance}")
 
     logger.info(
         'Executing command "%s"  on instance %s (%s) via profile %s',

aws_gate/list.py

@@ -72,10 +72,11 @@ def list_instances(
 ):
     invalid_fields = list(set(fields) - set(DEFAULT_LIST_OUTPUT_FIELDS))
     if invalid_fields:
+        invalid_fields_str = " ".join(invalid_fields)
+        default_fields_str = " ".join(DEFAULT_LIST_OUTPUT_FIELDS)
+
         raise ValueError(
-            'Invalid fields provided: "{}". Valid fields: "{}"'.format(
-                " ".join(invalid_fields), " ".join(DEFAULT_LIST_OUTPUT_FIELDS)
-            )
+            f'Invalid fields provided: "{invalid_fields_str}". Valid fields: "{default_fields_str}"'  # noqa: B950
         )
 
     ssm = get_aws_client("ssm", region_name=region_name, profile_name=profile_name)

aws_gate/query.py

@@ -67,17 +67,17 @@ def getinstanceidbytag(name, ec2=None):
     else:
         key, value = name.split(":", 1)
 
-    filters = [{"Name": "tag:{}".format(key), "Values": [value]}]
+    filters = [{"Name": f"tag:{key}", "Values": [value]}]
     return _query_aws_api(filters=filters, ec2=ec2)
 
 
 def getinstanceidbyinstancename(name, ec2=None):
-    return getinstanceidbytag("Name:{}".format(name), ec2=ec2)
+    return getinstanceidbytag(f"Name:{name}", ec2=ec2)
 
 
 def getinstanceidbyautoscalinggroup(name, ec2=None):
     _, asg_name = name.split(":")
-    return getinstanceidbytag("aws:autoscaling:groupName:{}".format(asg_name), ec2=ec2)
+    return getinstanceidbytag(f"aws:autoscaling:groupName:{asg_name}", ec2=ec2)
 
 
 def query_instance(name, ec2=None):

aws_gate/session.py

@@ -53,7 +53,7 @@ def session(
 
     instance_id = query_instance(name=instance, ec2=ec2)
     if instance_id is None:
-        raise ValueError("No instance could be found for name: {}".format(instance))
+        raise ValueError(f"No instance could be found for name: {instance}")
 
     logger.info(
         "Opening session on instance %s (%s) via profile %s",