qontract-reconcile 0.10.1rc460__py3-none-any.whl → 0.10.1rc462__py3-none-any.whl

reconcile/test/fixtures.py

@@ -14,7 +14,7 @@ class Fixtures:
         )
 
     def get(self, fixture):
-        with open(self.path(fixture), "r") as f:
+        with open(self.path(fixture), "r", encoding="locale") as f:
             return f.read().strip()
 
     def get_anymarkup(self, fixture):

reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/conftest.py

@@ -30,10 +30,10 @@ def file_contents() -> Callable[[str], tuple[str, str]]:
             "files",
         )
 
-        with open(f"{path}/{case}.yml", "r") as f:
+        with open(f"{path}/{case}.yml", "r", encoding="locale") as f:
             a = f.read().strip()
 
-        with open(f"{path}/{case}.result.yml", "r") as f:
+        with open(f"{path}/{case}.result.yml", "r", encoding="locale") as f:
             b = f.read().strip()
 
         return (a, b)

reconcile/test/test_jump_host.py

@@ -55,7 +55,7 @@ def test_base_jumphost(fs: Any, parameters: JumphostParameters, expected_port: i
     jumphost = JumpHostBase(parameters=parameters)
     assert os.path.exists(jumphost._identity_file)
 
-    with open(jumphost._identity_file, "r") as f:
+    with open(jumphost._identity_file, "r", encoding="locale") as f:
         assert f.read() == parameters.key
 
     assert jumphost._port == expected_port
@@ -113,5 +113,5 @@ def test_ssh_jumphost(
     if local_port:
         assert jumphost._local_port == local_port
 
-    with open(known_hosts_file, "r") as f:
+    with open(known_hosts_file, "r", encoding="locale") as f:
         assert f.read() == EXPECTED_KNOWN_HOSTS_CONTENT

reconcile/test/test_quay_mirror.py

@@ -51,7 +51,9 @@ class TestIsCompareTags:
         self.tmp_dir = (
             tempfile.TemporaryDirectory()  # pylint: disable=consider-using-with
         )
-        with open(os.path.join(self.tmp_dir.name, CONTROL_FILE_NAME), "w") as fh:
+        with open(
+            os.path.join(self.tmp_dir.name, CONTROL_FILE_NAME), "w", encoding="locale"
+        ) as fh:
             fh.write(str(NOW - 100.0))
 
     def teardown_method(self):

reconcile/test/test_quay_mirror_org.py

@@ -33,7 +33,9 @@ class TestIsCompareTags:
         self.tmp_dir = (
             tempfile.TemporaryDirectory()  # pylint: disable=consider-using-with
         )
-        with open(os.path.join(self.tmp_dir.name, CONTROL_FILE_NAME), "w") as fh:
+        with open(
+            os.path.join(self.tmp_dir.name, CONTROL_FILE_NAME), "w", encoding="locale"
+        ) as fh:
             fh.write(str(NOW - 100.0))
 
     def teardown_method(self):

reconcile/test/test_terraform_repo.py

@@ -339,7 +339,7 @@ def test_output_correct_statefile(
     assert diff
     integration.print_output(diff, True)
 
-    with open(f"{tmp_path}/tf-repo.yaml", "r") as output:
+    with open(f"{tmp_path}/tf-repo.yaml", "r", encoding="locale") as output:
         yaml_rep = yaml.safe_load(output)
 
         assert expected_output == yaml_rep
@@ -366,7 +366,7 @@ def test_output_correct_no_statefile(
     assert diff
     integration.print_output(diff, True)
 
-    with open(f"{tmp_path}/tf-repo.yaml", "r") as output:
+    with open(f"{tmp_path}/tf-repo.yaml", "r", encoding="locale") as output:
         yaml_rep = yaml.safe_load(output)
 
         assert expected_output == yaml_rep

reconcile/typed_queries/saas_files.py

@@ -95,9 +95,9 @@ class SaasResourceTemplate(ConfiguredBaseModel):
     provider: Optional[str] = Field(..., alias="provider")
     hash_length: Optional[int] = Field(..., alias="hash_length")
     parameters: Optional[Json] = Field(..., alias="parameters")
-    secret_parameters: Optional[
-        list[SaasResourceTemplateV2_SaasSecretParametersV1]
-    ] = Field(..., alias="secretParameters")
+    secret_parameters: Optional[list[SaasResourceTemplateV2_SaasSecretParametersV1]] = (
+        Field(..., alias="secretParameters")
+    )
     targets: list[SaasResourceTemplateTarget] = Field(..., alias="targets")
 
 
@@ -279,7 +279,7 @@ class SaasFileList:
         if name is None and env_name is None and app_name is None:
             return self.saas_files
 
-        if name == "" or env_name == "" or app_name == "":
+        if name == "" or env_name == "" or app_name == "":  # noqa: PLC1901
             return []
 
         filtered: list[SaasFile] = []
@@ -308,7 +308,7 @@ class SaasFileList:
 def convert_parameters_to_json_string(root: dict[str, Any]) -> dict[str, Any]:
     """Find all parameter occurrences and convert them to a json string."""
     for key, value in root.items():
-        if key in ["parameters", "labels"]:
+        if key in {"parameters", "labels"}:
             root[key] = json.dumps(value) if value is not None else None
         elif isinstance(value, dict):
             root[key] = convert_parameters_to_json_string(value)

reconcile/utils/amtool.py

@@ -25,7 +25,7 @@ class AmtoolResult:
 def check_config(yaml_config: str) -> AmtoolResult:
     """Run amtool check rules on the given yaml string"""
 
-    with tempfile.NamedTemporaryFile(mode="w+") as fp:
+    with tempfile.NamedTemporaryFile(mode="w+", encoding="locale") as fp:
         fp.write(yaml_config)
         fp.flush()
         cmd = ["amtool", "check-config", fp.name]
@@ -36,7 +36,7 @@ def check_config(yaml_config: str) -> AmtoolResult:
 
 def config_routes_test(yaml_config: str, labels: Mapping[str, str]) -> AmtoolResult:
     labels_lst = [f"{key}={value}" for key, value in labels.items()]
-    with tempfile.NamedTemporaryFile(mode="w+") as fp:
+    with tempfile.NamedTemporaryFile(mode="w+", encoding="locale") as fp:
         fp.write(yaml_config)
         fp.flush()
         cmd = ["amtool", "config", "routes", "test", "--config.file", fp.name]

reconcile/utils/aws_api.py

@@ -58,37 +58,13 @@ if TYPE_CHECKING:
         ResourceRecordTypeDef,
     )
 else:
-    EC2Client = (
-        EC2ServiceResource
-    ) = (
-        RouteTableTypeDef
-    ) = (
-        SubnetTypeDef
-    ) = (
+    EC2Client = EC2ServiceResource = RouteTableTypeDef = SubnetTypeDef = (
         TransitGatewayTypeDef
-    ) = (
-        TransitGatewayVpcAttachmentTypeDef
-    ) = (
-        VpcTypeDef
-    ) = (
-        IAMClient
-    ) = (
+    ) = TransitGatewayVpcAttachmentTypeDef = VpcTypeDef = IAMClient = (
         AccessKeyMetadataTypeDef
-    ) = (
-        ImageTypeDef
-    ) = (
-        TagTypeDef
-    ) = (
-        LaunchPermissionModificationsTypeDef
-    ) = (
+    ) = ImageTypeDef = TagTypeDef = LaunchPermissionModificationsTypeDef = (
         FilterTypeDef
-    ) = (
-        Route53Client
-    ) = (
-        ResourceRecordSetTypeDef
-    ) = (
-        ResourceRecordTypeDef
-    ) = (
+    ) = Route53Client = ResourceRecordSetTypeDef = ResourceRecordTypeDef = (
         HostedZoneTypeDef
     ) = RDSClient = DBInstanceMessageTypeDef = UpgradeTargetTypeDef = object
 
@@ -866,7 +842,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         self, account_name: str, assume_role: str, assume_region: str, client_type="ec2"
     ) -> EC2Client:
         session = self.get_session(account_name)
-        if assume_role == "":
+        if not assume_role:
             return self.get_session_client(
                 session, client_type, region_name=assume_region
             )

reconcile/utils/config.py

@@ -12,12 +12,11 @@ class SecretNotFound(Exception):
 
 
 def get_config():
-    global _config
     return _config
 
 
 def init(config):
-    global _config
+    global _config  # noqa: PLW0603
     _config = config
     return _config
 

reconcile/utils/environ.py

@@ -11,7 +11,7 @@ def environ(variables=None):
         @wraps(f)
         def f_environ(*args, **kwargs):
             for e in variables:
-                if e not in os.environ or os.environ[e] == "":
+                if not os.environ.get(e):
                     raise KeyError("Could not find environment variable: {}".format(e))
             f(*args, **kwargs)
 

reconcile/utils/git.py

@@ -9,7 +9,9 @@ class GitError(Exception):
 def clone(repo_url, wd):
     # pylint: disable=subprocess-run-check
     cmd = ["git", "clone", repo_url, wd]
-    result = subprocess.run(cmd, cwd=wd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    result = subprocess.run(
+        cmd, cwd=wd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False
+    )
     if result.returncode != 0:
         raise GitError(f"git clone failed: {repo_url}")
 
@@ -17,7 +19,9 @@ def clone(repo_url, wd):
 def checkout(commit, wd):
     # pylint: disable=subprocess-run-check
     cmd = ["git", "checkout", commit]
-    result = subprocess.run(cmd, cwd=wd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    result = subprocess.run(
+        cmd, cwd=wd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False
+    )
     if result.returncode != 0:
         raise GitError(f"git checkout failed: {commit}")
 
@@ -28,7 +32,7 @@ def is_file_in_git_repo(file_path):
     # pylint: disable=subprocess-run-check
     cmd = ["git", "rev-parse", "--is-inside-work-tree"]
     result = subprocess.run(
-        cmd, cwd=dir_path, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        cmd, cwd=dir_path, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=False
     )
     return result.returncode == 0
 

reconcile/utils/git_secrets.py

@@ -38,7 +38,7 @@ def scan_history(repo_url, existing_keys):
 def get_suspected_files(error):
     suspects = []
     for e in error.split("\n"):
-        if e == "":
+        if not e:
             break
         if e.startswith("warning"):
             continue
@@ -55,7 +55,7 @@ def get_leaked_keys(repo_wd, suspected_files, existing_keys):
         commit, file_relative_path = s[0], s[1]
         git.checkout(commit, repo_wd)
         file_path = os.path.join(repo_wd, file_relative_path)
-        with open(file_path, "r") as f:
+        with open(file_path, "r", encoding="locale") as f:
             content = f.read()
         leaked_keys = [key for key in existing_keys if key in content]
         all_leaked_keys.extend(leaked_keys)

reconcile/utils/helm.py

@@ -25,7 +25,7 @@ class JSONEncoder(json.JSONEncoder):
 
 def template(values: Mapping[str, Any]) -> Mapping[str, Any]:
     try:
-        with tempfile.NamedTemporaryFile(mode="w+") as values_file:
+        with tempfile.NamedTemporaryFile(mode="w+", encoding="locale") as values_file:
             values_file.write(json.dumps(values, cls=JSONEncoder))
             values_file.flush()
             cmd = [

reconcile/utils/jjb_client.py

@@ -64,7 +64,7 @@ class JJB:  # pylint: disable=too-many-public-methods
                 ini = ini.replace('"', "")
                 ini = ini.replace("false", "False")
             ini_file_path = "{}/{}.ini".format(wd, name)
-            with open(ini_file_path, "w") as f:
+            with open(ini_file_path, "w", encoding="locale") as f:
                 f.write(ini)
                 f.write("\n")
             working_dirs[name] = wd
@@ -81,12 +81,12 @@ class JJB:  # pylint: disable=too-many-public-methods
                 if c["type"] == "jobs":
                     for item in content:
                         item["project"]["app_name"] = c["app"]["name"]
-                with open(config_file_path, "a") as f:
+                with open(config_file_path, "a", encoding="locale") as f:
                     yaml.dump(content, f)
                     f.write("\n")
             else:
                 config = c["config_path"]["content"]
-                with open(config_file_path, "a") as f:
+                with open(config_file_path, "a", encoding="locale") as f:
                     f.write(config)
                     f.write("\n")
 
@@ -100,7 +100,7 @@ class JJB:  # pylint: disable=too-many-public-methods
         the supplied configs"""
         for name, wd in self.working_dirs.items():
             config_path = "{}/config.yaml".format(wd)
-            with open(config_path, "w") as f:
+            with open(config_path, "w", encoding="locale") as f:
                 f.write(configs[name])
 
     def sort(self, configs):
@@ -136,7 +136,7 @@ class JJB:  # pylint: disable=too-many-public-methods
         configs = {}
         for name, wd in self.working_dirs.items():
             config_path = "{}/config.yaml".format(wd)
-            with open(config_path, "r") as f:
+            with open(config_path, "r", encoding="locale") as f:
                 configs[name] = f.read()
 
         return configs
@@ -196,7 +196,7 @@ class JJB:  # pylint: disable=too-many-public-methods
             logging.info([action, item_type, instance, item])
 
             if action == "update":
-                with open(ft) as c, open(f) as d:
+                with open(ft, encoding="locale") as c, open(f, encoding="locale") as d:
                     clines = c.readlines()
                     dlines = d.readlines()
 
@@ -247,7 +247,7 @@ class JJB:  # pylint: disable=too-many-public-methods
 
     @staticmethod
     def get_jjb(args):
-        from jenkins_jobs.cli.entry import JenkinsJobs
+        from jenkins_jobs.cli.entry import JenkinsJobs  # noqa: PLC0415
 
         return JenkinsJobs(args)
 

reconcile/utils/jump_host.py

@@ -45,7 +45,7 @@ class JumpHostBase:
         self._identity_dir = tempfile.mkdtemp()
 
         identity_file = self._identity_dir + "/id"
-        with open(identity_file, "w") as f:
+        with open(identity_file, "w", encoding="locale") as f:
             f.write(self._identity)
         os.chmod(identity_file, 0o600)
         self._identity_file = identity_file
@@ -96,7 +96,7 @@ class JumpHostSSH(JumpHostBase):
 
     def _init_known_hosts_file(self) -> None:
         known_hosts_file = self._identity_dir + "/known_hosts"
-        with open(known_hosts_file, "w") as f:
+        with open(known_hosts_file, "w", encoding="locale") as f:
             f.write(self._known_hosts)
         os.chmod(known_hosts_file, 0o600)
         self.known_hosts_file = known_hosts_file

reconcile/utils/metrics.py

@@ -187,9 +187,9 @@ class MetricsContainer:
         self._gauges: dict[Type[GaugeMetric], dict[Sequence[str], float]] = defaultdict(
             dict
         )
-        self._counters: dict[
-            Type[CounterMetric], dict[Sequence[str], float]
-        ] = defaultdict(dict)
+        self._counters: dict[Type[CounterMetric], dict[Sequence[str], float]] = (
+            defaultdict(dict)
+        )
 
         self._scopes: dict[Hashable, MetricsContainer] = {}
 

reconcile/utils/models.py

@@ -29,56 +29,52 @@ def data_default_none(
             # Settings defaults
             if field.allow_none:
                 data[field.alias] = None
-            else:
-                if isinstance(field.type_, type) and issubclass(field.type_, str):
-                    data[field.alias] = DEFAULT_STRING
-                elif isinstance(field.type_, type) and issubclass(field.type_, bool):
-                    data[field.alias] = False
-                elif isinstance(field.type_, type) and issubclass(field.type_, int):
-                    data[field.alias] = DEFAULT_INT
-        else:
-            if isinstance(field.type_, type) and issubclass(field.type_, BaseModel):
-                if isinstance(data[field.alias], dict):
-                    data[field.alias] = data_default_none(
-                        field.type_, data[field.alias]
-                    )
-                if isinstance(data[field.alias], list):
-                    data[field.alias] = [
-                        data_default_none(field.type_, item)
-                        for item in data[field.alias]
-                        if isinstance(item, dict)
-                    ]
-            elif field.sub_fields:
-                if all(
-                    isinstance(sub_field.type_, type)
-                    and issubclass(sub_field.type_, BaseModel)
-                    for sub_field in field.sub_fields
-                ):
-                    # Union[ClassA, ClassB] field
-                    for sub_field in field.sub_fields:
-                        if isinstance(data[field.alias], dict):
-                            try:
-                                d = dict(data[field.alias])
-                                d.update(data_default_none(sub_field.type_, d))
-                                # Lets confirm we found a matching union class
-                                sub_field.type_(**d)
-                                data[field.alias] = d
-                                break
-                            except ValidationError:
-                                continue
-                elif isinstance(data[field.alias], list) and len(field.sub_fields) == 1:
-                    # list[Union[ClassA, ClassB]] field
-                    for sub_data in data[field.alias]:
-                        for sub_field in field.sub_fields[0].sub_fields or []:
-                            try:
-                                d = dict(sub_data)
-                                d.update(data_default_none(sub_field.type_, d))
-                                # Lets confirm we found a matching union class
-                                sub_field.type_(**d)
-                                sub_data.update(d)
-                                break
-                            except ValidationError:
-                                continue
+            elif isinstance(field.type_, type) and issubclass(field.type_, str):
+                data[field.alias] = DEFAULT_STRING
+            elif isinstance(field.type_, type) and issubclass(field.type_, bool):
+                data[field.alias] = False
+            elif isinstance(field.type_, type) and issubclass(field.type_, int):
+                data[field.alias] = DEFAULT_INT
+        elif isinstance(field.type_, type) and issubclass(field.type_, BaseModel):
+            if isinstance(data[field.alias], dict):
+                data[field.alias] = data_default_none(field.type_, data[field.alias])
+            if isinstance(data[field.alias], list):
+                data[field.alias] = [
+                    data_default_none(field.type_, item)
+                    for item in data[field.alias]
+                    if isinstance(item, dict)
+                ]
+        elif field.sub_fields:
+            if all(
+                isinstance(sub_field.type_, type)
+                and issubclass(sub_field.type_, BaseModel)
+                for sub_field in field.sub_fields
+            ):
+                # Union[ClassA, ClassB] field
+                for sub_field in field.sub_fields:
+                    if isinstance(data[field.alias], dict):
+                        try:
+                            d = dict(data[field.alias])
+                            d.update(data_default_none(sub_field.type_, d))
+                            # Lets confirm we found a matching union class
+                            sub_field.type_(**d)
+                            data[field.alias] = d
+                            break
+                        except ValidationError:
+                            continue
+            elif isinstance(data[field.alias], list) and len(field.sub_fields) == 1:
+                # list[Union[ClassA, ClassB]] field
+                for sub_data in data[field.alias]:
+                    for sub_field in field.sub_fields[0].sub_fields or []:
+                        try:
+                            d = dict(sub_data)
+                            d.update(data_default_none(sub_field.type_, d))
+                            # Lets confirm we found a matching union class
+                            sub_field.type_(**d)
+                            sub_data.update(d)
+                            break
+                        except ValidationError:
+                            continue
 
     return data
 
@@ -90,7 +86,7 @@ class CSV(list[str]):
     """
 
     @classmethod
-    def __get_validators__(cls) -> Generator[Callable, None, None]:
+    def __get_validators__(cls) -> Generator[Callable, None, None]:  # noqa: PLW3201
         yield cls.validate
         yield cls.length_validator
 

reconcile/utils/mr/aws_access.py

@@ -57,7 +57,7 @@ class CreateDeleteAwsAccessKey(MergeRequestBase):
         )
 
         # add a new email to be picked up by email-sender
-        with open(BODY_TEMPLATE) as file_obj:
+        with open(BODY_TEMPLATE, encoding="locale") as file_obj:
             body_template = Template(
                 file_obj.read(), keep_trailing_newline=True, trim_blocks=True
             )

reconcile/utils/mr/base.py

@@ -232,7 +232,7 @@ def app_interface_email(
     apps: Optional[list[str]] = None,
 ) -> str:
     """Render app-interface-email template."""
-    with open(EMAIL_TEMPLATE) as file_obj:
+    with open(EMAIL_TEMPLATE, encoding="locale") as file_obj:
         email_template = Template(
             file_obj.read(), keep_trailing_newline=True, trim_blocks=True
         )

reconcile/utils/mr/user_maintenance.py

@@ -36,7 +36,7 @@ class CreateDeleteUserAppInterface(MergeRequestBase):
         for path_spec in self.paths:
             path_type = path_spec["type"]
             path = path_spec["path"]
-            if path_type in [PathTypes.USER, PathTypes.REQUEST, PathTypes.QUERY]:
+            if path_type in {PathTypes.USER, PathTypes.REQUEST, PathTypes.QUERY}:
                 gitlab_cli.delete_file(
                     branch_name=self.branch, file_path=path, commit_message=self.title
                 )

reconcile/utils/oc.py

@@ -382,7 +382,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
 
         self.is_log_slow_oc_reconcile = os.environ.get(
             "LOG_SLOW_OC_RECONCILE", ""
-        ).lower() in ["true", "yes"]
+        ).lower() in {"true", "yes"}
 
     def _init(
         self,
@@ -454,7 +454,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
 
         self.is_log_slow_oc_reconcile = os.environ.get(
             "LOG_SLOW_OC_RECONCILE", ""
-        ).lower() in ["true", "yes"]
+        ).lower() in {"true", "yes"}
 
     def whoami(self):
         return self._run(["whoami"])
@@ -719,7 +719,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
         ready_pods = [
             pod
             for pod in pods
-            if pod["status"].get("phase") in ("Running", "Succeeded")
+            if pod["status"].get("phase") in {"Running", "Succeeded"}
         ]
 
         if not ready_pods:
@@ -731,7 +731,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
         if follow:
             cmd.append("-f")
         # pylint: disable=consider-using-with
-        output_file = open(os.path.join(output, name), "w")
+        output_file = open(os.path.join(output, name), "w", encoding="locale")
         # collect logs to file async
         Popen(self.oc_base_cmd + cmd, stdout=output_file)
 
@@ -983,7 +983,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
         kind: str,
         include_optional: bool = True,
     ) -> dict[str, set[str]]:
-        if kind not in ("Secret", "ConfigMap"):
+        if kind not in {"Secret", "ConfigMap"}:
             raise KeyError(f"unsupported resource kind: {kind}")
         optional = "optional"
         if kind == "Secret":
@@ -1117,7 +1117,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
             find = False
             for gv in self.api_resources[kind]:
                 if apigroup_override == gv.group:
-                    if gv.group == "":
+                    if not gv.group:
                         group_version = gv.api_version
                     else:
                         group_version = f"{gv.group}/{gv.api_version}"
@@ -1389,7 +1389,7 @@ class OC:
         use_native_env = os.environ.get("USE_NATIVE_CLIENT", "")
         use_native = True
         if len(use_native_env) > 0:
-            use_native = use_native_env.lower() in ["true", "yes"]
+            use_native = use_native_env.lower() in {"true", "yes"}
         else:
             enable_toggle = "openshift-resources-native-client"
             use_native = get_feature_toggle_state(
@@ -1756,7 +1756,7 @@ def validate_labels(labels: dict[str, str]) -> Iterable[str]:
                     f"Label key prefix is invalid, it needs to match "
                     f"'{k_prefix_pattern}'': {prefix}"
                 )
-            if prefix in ("kubernetes.io", "k8s.io"):
+            if prefix in {"kubernetes.io", "k8s.io"}:
                 err.append(f"Label key prefix is reserved: {prefix}")
 
     return err

reconcile/utils/oc_connection_parameters.py

@@ -153,20 +153,19 @@ class OCConnectionParameters:
                 logging.debug(
                     f"No admin automation token set for cluster '{cluster.name}', but privileged access requested."
                 )
+        elif cluster.automation_token:
+            try:
+                automation_token = OCConnectionParameters._get_automation_token(
+                    secret_reader, cluster.automation_token, cluster
+                )
+            except SecretNotFound:
+                logging.error(
+                    f"[{cluster.name}] automation token {cluster.automation_token} not found"
+                )
         else:
-            if cluster.automation_token:
-                try:
-                    automation_token = OCConnectionParameters._get_automation_token(
-                        secret_reader, cluster.automation_token, cluster
-                    )
-                except SecretNotFound:
-                    logging.error(
-                        f"[{cluster.name}] automation token {cluster.automation_token} not found"
-                    )
-            else:
-                # Note, that currently OCMap uses OCLogMsg if a token is missing, i.e.,
-                # for now this is valid behavior.
-                logging.debug(f"No automation token for cluster '{cluster.name}'.")
+            # Note, that currently OCMap uses OCLogMsg if a token is missing, i.e.,
+            # for now this is valid behavior.
+            logging.debug(f"No automation token for cluster '{cluster.name}'.")
 
         disabled_integrations = []
         if cluster.disable:

reconcile/utils/ocm/base.py

@@ -207,7 +207,7 @@ class OCMCluster(BaseModel):
         return (
             self.managed
             and self.state == OCMClusterState.READY
-            and self.product.id in [PRODUCT_ID_OSD, PRODUCT_ID_ROSA]
+            and self.product.id in {PRODUCT_ID_OSD, PRODUCT_ID_ROSA}
         )
 
     @property