[pre-commit.ci] pre-commit autoupdate (#451)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.15.1 → v0.15.2](astral-sh/ruff-pre-commit@v0.15.1...v0.15.2)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: resolve ruff v0.15.2 linting errors

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Meni Yakove <myakove@gmail.com>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
       - id: detect-secrets
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.1
+    rev: v0.15.2
     hooks:
       - id: ruff
       - id: ruff-format

rosa/cli.py

@@ -11,7 +11,6 @@
 from ocm_python_wrapper.ocm_client import OCMPythonClient
 from simple_logger.logger import get_logger
 
-
 LOGGER = get_logger(name=__name__)
 TIMEOUT_5MIN = 5 * 60
 
@@ -52,15 +51,14 @@ def rosa_login(env, token, aws_region, allowed_commands=None):
 
     try:
         is_logged_in(allowed_commands=_allowed_commands, aws_region=aws_region, env=env)
-        LOGGER.info(f"Already logged in to {env} [region: {aws_region}].")
-        return
-
     except NotLoggedInOrWrongEnvError:
         build_execute_command(
             command=f"login --env={env} --token={token}",
             allowed_commands=_allowed_commands,
         )
         is_logged_in(allowed_commands=_allowed_commands, aws_region=aws_region, env=env)
+    else:
+        LOGGER.info(f"Already logged in to {env} [region: {aws_region}].")
 
 
 def rosa_logout(allowed_commands=None):
@@ -102,7 +100,7 @@ def execute_command(command, wait_timeout=TIMEOUT_5MIN):
     log = f"Executing command: {' '.join(command)}, waiting for {wait_timeout} seconds."
     hashed_log = hash_log_keys(log=log)
     LOGGER.info(hashed_log)
-    res = subprocess.run(command, capture_output=True, text=True, timeout=wait_timeout)
+    res = subprocess.run(command, capture_output=True, text=True, timeout=wait_timeout, check=False)
     if res.returncode != 0:
         raise CommandExecuteError(f"Failed to execute '{hashed_log}': {res.stderr}")
 

rosa/rosa_versions.py

@@ -1,15 +1,15 @@
 import re
-from typing import Dict, List
 from functools import lru_cache
 
-import rosa.cli
 from ocm_python_wrapper.ocm_client import OCMPythonClient
 
+import rosa.cli
+
 
 @lru_cache
 def get_rosa_versions(
     ocm_client: OCMPythonClient, aws_region: str, channel_group: str = "stable", hosted_cp: bool = False
-) -> Dict[str, Dict[str, List[str]]]:
+) -> dict[str, dict[str, list[str]]]:
     """
     Get all rosa versions for specified channel group.
 
@@ -29,13 +29,13 @@ def get_rosa_versions(
                        '4.15': ['4.15.32', '4.15.31', '4.15.30', '4.15.29', '4.15.28', '4.15.27']}}
 
     """
-    rosa_base_available_versions_dict: Dict = {}
+    rosa_base_available_versions_dict: dict = {}
     base_available_versions = rosa.cli.execute(
         command=(f"list versions --channel-group={channel_group} {'--hosted-cp' if hosted_cp else ''}"),
         aws_region=aws_region,
         ocm_client=ocm_client,
     )["out"]
-    _all_versions: List = [ver["raw_id"] for ver in base_available_versions]
+    _all_versions: list = [ver["raw_id"] for ver in base_available_versions]
     rosa_base_available_versions_dict[channel_group] = {}
     for _version in _all_versions:
         _version_key = re.findall(r"^\d+.\d+", _version)[0]

rosa/tests/conftest.py

@@ -8,7 +8,7 @@ def path_from_dict(_dict=None, _path=""):
     for key, val in _dict.items():
         # If dict == end_values we need to test it
         if isinstance(val, dict):
-            if all([_key in end_values for _key in val.keys()]):
+            if all(_key in end_values for _key in val):
                 yield {
                     "command": f"{_path}{key}",
                     AWS_REGION_STR: AWS_REGION_STR if val["region"] else None,

rosa/tests/test_parse_command.py

@@ -5,7 +5,6 @@
 from rosa.cli import build_command, parse_help
 from rosa.tests.const import AWS_REGION_STR
 
-
 LOGGER = get_logger(name=__name__)
 
 

rosa/tests/test_rosa_login.py

@@ -1,6 +1,6 @@
 import pytest
-from rosa.cli import is_logged_in, NotLoggedInOrWrongEnvError
 
+from rosa.cli import NotLoggedInOrWrongEnvError, is_logged_in
 
 ROSA_ENV = "rosa_env"
 AWS_REGION_STR = "us-east-1"