lint: fix flake8 and pylint violations

Basic CI has never run against this repository, so the tree has drifted
out of line with .flake8 and .pylintrc. Fix the violations so the lint
job can pass:

  F541  f-string without placeholders (cli.py)
  E501  line too long (cli.py)
  W391  blank line at end of file (artifacts.py)
  F401  unused imports (pull_labs_poller.py, test_pull_labs_translate.py)
  E306  missing blank line before nested definition (test_kcidb_submit.py)
  W0714 overlapping excepts, JSONDecodeError derives from ValueError
        (setup_validate.py)
  W0613 unused argument (test_kcidb_submit.py)
  W0212 protected access in tests (test_role_manager.py)

These changes are extracted unmodified from PR kernelci#26 by Norbert Manthey,
which fixes them alongside its feature work.

Signed-off-by: Ben Copeland <ben.copeland@linaro.org>

Author: bhcopeland

src/kernel_ci_cloud_labs/cli.py

@@ -292,8 +292,11 @@ def main():
     val_parser.add_argument("--bucket", help="S3 bucket to verify (and create with --fix)")
     val_parser.add_argument("--role", help="IAM role name used by VM instance profiles")
     val_parser.add_argument("--region", default="us-west-2", help="AWS region (default: us-west-2)")
-    val_parser.add_argument("--api-url", help=f"KernelCI API base URI (overrides $KERNELCI_API_BASE_URI)")
-    val_parser.add_argument("--fix", action="store_true", help="Create missing resources (S3 bucket) instead of just reporting them")
+    val_parser.add_argument("--api-url", help="KernelCI API base URI (overrides $KERNELCI_API_BASE_URI)")
+    val_parser.add_argument(
+        "--fix", action="store_true",
+        help="Create missing resources (S3 bucket) instead of just reporting them",
+    )
     val_parser.set_defaults(func=cmd_setup_validate)
 
     args = parser.parse_args()

src/kernel_ci_cloud_labs/core/artifacts.py

@@ -262,5 +262,3 @@ def collect_run_artifacts(
         manifest_path,
     )
     return manifest
-
-

src/kernel_ci_cloud_labs/pull_labs_poller.py

@@ -45,7 +45,6 @@
 
 from kernel_ci_cloud_labs.kcidb_submit import (
     build_test_row,
-    submit_tests,
     to_kcidb_status,
 )
 from kernel_ci_cloud_labs.pull_labs_translate import translate_job
@@ -314,7 +313,7 @@ def _validate_default_executor_deps() -> None:
 
     problems: List[str] = []
     try:
-        import boto3  # noqa: F401,PLC0415
+        import boto3  # noqa: F401,PLC0415  # pylint: disable=unused-import
     except ImportError as e:
         problems.append(
             f"boto3 import failed ({e}) — run: python3.11 -m pip install -e ."

src/kernel_ci_cloud_labs/setup_validate.py

@@ -200,7 +200,7 @@ def _check_bucket_policy_statement(s3, bucket_name: str, fix: bool) -> bool:
             print(f"✗ Could not read bucket policy ({code}): {e}")
             return False
         existing = None
-    except (ValueError, json.JSONDecodeError) as e:
+    except ValueError as e:
         print(f"✗ Bucket policy is not valid JSON: {e}")
         return False
 
@@ -365,7 +365,7 @@ def check_kcidb_jwt() -> bool:
         # JWT payload is base64url; pad to a multiple of 4 before decoding.
         payload_b64 = parts[1] + "=" * (-len(parts[1]) % 4)
         payload = json.loads(base64.urlsafe_b64decode(payload_b64))
-    except (ValueError, json.JSONDecodeError) as e:
+    except ValueError as e:
         print(f"✗ JWT payload not decodable: {e}")
         return False
 

tests/test_kcidb_submit.py

@@ -187,8 +187,10 @@ def test_submit_revision_posts_with_bearer_auth(self):
         class FakeResp:
             def __enter__(self):
                 return self
+
             def __exit__(self, *a):
                 return False
+
             def read(self):
                 return b'{"status":"ok","id":"sub-1"}'
 
@@ -237,7 +239,7 @@ def __enter__(self): return self
             def __exit__(self, *a): return False
             def read(self): return b'{}'
 
-        def fake_urlopen(req, timeout=None):
+        def fake_urlopen(req, timeout=None):  # pylint: disable=unused-argument
             captured["body"] = json.loads(req.data.decode("utf-8"))
             return FakeResp()
 
@@ -264,7 +266,7 @@ def __enter__(self): return self
             def __exit__(self, *a): return False
             def read(self): return b'{}'
 
-        def fake_urlopen(req, timeout=None):
+        def fake_urlopen(req, timeout=None):  # pylint: disable=unused-argument
             captured["body"] = json.loads(req.data.decode("utf-8"))
             return FakeResp()
 

tests/test_pull_labs_translate.py

@@ -9,7 +9,6 @@
 
 from kernel_ci_cloud_labs.pull_labs_translate import (
     DEFAULT_PLATFORM_MAP,
-    DEFAULT_TEST_TYPE_MAP,
     translate_job,
 )
 

tests/test_role_manager.py

@@ -1,4 +1,5 @@
 """Unit tests for AWS Role Manager"""
+# pylint: disable=protected-access
 
 __authors__ = ["Max Hubmann <mxhbm@amazon.de>", "Norbert Manthey <nmanthey@amazon.de>"]
 __copyright__ = "Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved."