qontract-reconcile 0.9.1rc162__py3-none-any.whl → 0.9.1rc164__py3-none-any.whl

reconcile/openshift_saas_deploy_trigger_base.py

@@ -5,6 +5,7 @@ from threading import Lock
 from typing import (
     Any,
     Optional,
+    cast,
 )
 
 from sretoolbox.utils import threaded
@@ -13,13 +14,6 @@ import reconcile.jenkins_plugins as jenkins_base
 import reconcile.openshift_base as osb
 from reconcile import queries
 from reconcile.openshift_tekton_resources import build_one_per_saas_file_tkn_object_name
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
-from reconcile.typed_queries.saas_files import (
-    get_saas_files,
-    get_saasherder_settings,
-)
 from reconcile.utils.defer import defer
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.oc import OC_Map
@@ -31,11 +25,7 @@ from reconcile.utils.saasherder import (
     SaasHerder,
     TriggerSpecUnion,
 )
-from reconcile.utils.saasherder.interfaces import SaasPipelinesProviderTekton
-from reconcile.utils.saasherder.models import TriggerTypes
-from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.sharding import is_in_shard
-from reconcile.utils.state import init_state
 
 _trigger_lock = Lock()
 
@@ -47,7 +37,7 @@ class TektonTimeoutBadValueError(Exception):
 @defer
 def run(
     dry_run: bool,
-    trigger_type: TriggerTypes,
+    trigger_type: str,
     integration: str,
     integration_version: str,
     thread_pool_size: int,
@@ -72,7 +62,7 @@ def run(
     Returns:
         bool: True if there was an error, False otherwise
     """
-    saasherder, oc_map = setup(
+    saasherder, oc_map, error = setup(
         thread_pool_size=thread_pool_size,
         internal=internal,
         use_jump_host=use_jump_host,
@@ -80,6 +70,8 @@ def run(
         integration_version=integration_version,
         include_trigger_trace=include_trigger_trace,
     )
+    if error:
+        return error
     if defer:  # defer is set by method decorator. this makes just mypy happy
         defer(oc_map.cleanup)
 
@@ -111,7 +103,7 @@ def setup(
     integration: str,
     integration_version: str,
     include_trigger_trace: bool,
-) -> tuple[SaasHerder, OC_Map]:
+) -> tuple[SaasHerder, OC_Map, bool]:
     """Setup required resources for triggering integrations
 
     Args:
@@ -125,21 +117,22 @@ def setup(
     Returns:
         saasherder (SaasHerder): a SaasHerder instance
         oc_map (OC_Map): a dictionary of OC clients per cluster
+        error (bool): True if one happened, False otherwise
     """
-    vault_settings = get_app_interface_vault_settings()
-    saasherder_settings = get_saasherder_settings()
-    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-    saas_files = get_saas_files()
+
+    saas_files = queries.get_saas_files()
     if not saas_files:
         raise RuntimeError("no saas files found")
-    saas_files = [sf for sf in saas_files if is_in_shard(sf.name)]
+    saas_files = [sf for sf in saas_files if is_in_shard(sf["name"])]
 
     # Remove saas-file targets that are disabled
     for saas_file in saas_files[:]:
-        for rt in saas_file.resource_templates[:]:
-            for target in rt.targets[:]:
-                if target.disable:
-                    rt.targets.remove(target)
+        resource_templates = saas_file["resourceTemplates"]
+        for rt in resource_templates[:]:
+            targets = rt["targets"]
+            for target in targets[:]:
+                if target["disable"]:
+                    targets.remove(target)
 
     instance = queries.get_gitlab_instance()
     settings = queries.get_app_interface_settings()
@@ -147,9 +140,7 @@ def setup(
     jenkins_map = jenkins_base.get_jenkins_map()
     pipelines_providers = queries.get_pipelines_providers()
     tkn_provider_namespaces = [
-        pp["namespace"]
-        for pp in pipelines_providers
-        if pp["provider"] == Providers.TEKTON.value
+        pp["namespace"] for pp in pipelines_providers if pp["provider"] == "tekton"
     ]
 
     oc_map = OC_Map(
@@ -164,18 +155,16 @@ def setup(
     saasherder = SaasHerder(
         saas_files,
         thread_pool_size=thread_pool_size,
+        gitlab=gl,
         integration=integration,
         integration_version=integration_version,
-        secret_reader=secret_reader,
-        hash_length=saasherder_settings.hash_length,
-        repo_url=saasherder_settings.repo_url,
-        gitlab=gl,
+        settings=settings,
         jenkins_map=jenkins_map,
-        state=init_state(integration=integration, secret_reader=secret_reader),
+        initialise_state=True,
         include_trigger_trace=include_trigger_trace,
     )
 
-    return saasherder, oc_map
+    return saasherder, oc_map, False
 
 
 def trigger(
@@ -203,8 +192,10 @@ def trigger(
         bool: True if there was an error, False otherwise
     """
     saas_file_name = spec.saas_file_name
+    provider_name = cast(dict, spec.pipelines_provider)["provider"]
+
     error = False
-    if spec.pipelines_provider.provider == Providers.TEKTON.value:
+    if provider_name == Providers.TEKTON:
         error = _trigger_tekton(
             spec,
             dry_run,
@@ -216,10 +207,7 @@ def trigger(
         )
     else:
         error = True
-        logging.error(
-            f"[{saas_file_name}] unsupported provider: "
-            + f"{spec.pipelines_provider.provider}"
-        )
+        logging.error(f"[{saas_file_name}] unsupported provider: " + f"{provider_name}")
 
     return error
 
@@ -233,23 +221,28 @@ def _trigger_tekton(
     integration: str,
     integration_version: str,
 ) -> bool:
-    if not isinstance(spec.pipelines_provider, SaasPipelinesProviderTekton):
-        # This should never happen. It's here to make mypy happy
-        raise TypeError(
-            f"spec.pipelines_provider should be of type "
-            f"SaasPipelinesProviderTekton, got {type(spec.pipelines_provider)}"
-        )
-    pipeline_template_name = (
-        spec.pipelines_provider.pipeline_templates.openshift_saas_deploy.name
-        if spec.pipelines_provider.pipeline_templates
-        else spec.pipelines_provider.defaults.pipeline_templates.openshift_saas_deploy.name
-    )
+    saas_file_name = spec.saas_file_name
+    env_name = spec.env_name
+    timeout = spec.timeout
+    pipelines_provider = cast(dict, spec.pipelines_provider)
+
+    pipeline_template_name = pipelines_provider["defaults"]["pipelineTemplates"][
+        "openshiftSaasDeploy"
+    ]["name"]
+
+    if pipelines_provider["pipelineTemplates"]:
+        pipeline_template_name = pipelines_provider["pipelineTemplates"][
+            "openshiftSaasDeploy"
+        ]["name"]
+
     tkn_pipeline_name = build_one_per_saas_file_tkn_object_name(
-        pipeline_template_name, spec.saas_file_name
+        pipeline_template_name, saas_file_name
     )
-    tkn_namespace_name = spec.pipelines_provider.namespace.name
-    tkn_cluster_name = spec.pipelines_provider.namespace.cluster.name
-    tkn_cluster_console_url = spec.pipelines_provider.namespace.cluster.console_url
+
+    tkn_namespace_info = pipelines_provider["namespace"]
+    tkn_namespace_name = tkn_namespace_info["name"]
+    tkn_cluster_name = tkn_namespace_info["cluster"]["name"]
+    tkn_cluster_console_url = tkn_namespace_info["cluster"]["consoleUrl"]
 
     # if pipeline does not exist it means that either it hasn't been
     # statically created from app-interface or it hasn't been dynamically
@@ -266,10 +259,10 @@ def _trigger_tekton(
         return False
 
     tkn_trigger_resource, tkn_name = _construct_tekton_trigger_resource(
-        spec.saas_file_name,
-        spec.env_name,
+        saas_file_name,
+        env_name,
         tkn_pipeline_name,
-        spec.timeout,
+        timeout,
         tkn_cluster_console_url,
         tkn_namespace_name,
         integration,

reconcile/openshift_saas_deploy_trigger_cleaner.py

@@ -44,7 +44,7 @@ def run(
     tkn_namespaces = [
         pp["namespace"]
         for pp in pipelines_providers
-        if pp["provider"] == Providers.TEKTON.value
+        if pp["provider"] == Providers.TEKTON
     ]
 
     oc_map = OC_Map(
@@ -63,7 +63,7 @@ def run(
         if not retention:
             continue
 
-        if pp["provider"] == Providers.TEKTON.value:
+        if pp["provider"] == Providers.TEKTON:
             ns_info = pp["namespace"]
             namespace = ns_info["name"]
             cluster = ns_info["cluster"]["name"]

reconcile/openshift_tekton_resources.py

@@ -92,7 +92,7 @@ def fetch_tkn_providers(saas_file_name: Optional[str]) -> dict[str, Any]:
     duplicates: set[str] = set()
     all_tkn_providers = {}
     for pipeline_provider in queries.get_pipelines_providers():
-        if pipeline_provider["provider"] != Providers.TEKTON.value:
+        if pipeline_provider["provider"] != Providers.TEKTON:
             continue
 
         if pipeline_provider["name"] in all_tkn_providers:

reconcile/saas_file_validator.py

@@ -1,45 +1,32 @@
 import logging
 import sys
 
+from reconcile import queries
 from reconcile.jenkins_job_builder import init_jjb
 from reconcile.status import ExitCodes
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
-from reconcile.typed_queries.repos import get_repos
-from reconcile.typed_queries.saas_files import (
-    get_saas_files,
-    get_saasherder_settings,
-)
 from reconcile.utils.jjb_client import JJB
 from reconcile.utils.saasherder import SaasHerder
-from reconcile.utils.secret_reader import create_secret_reader
+from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.semver_helper import make_semver
 
 QONTRACT_INTEGRATION = "saas-file-validator"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
-def run(dry_run: bool) -> None:
-    vault_settings = get_app_interface_vault_settings()
-    saasherder_settings = get_saasherder_settings()
-    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-    saas_files = get_saas_files()
-    if not saas_files:
-        logging.error("no saas files found")
-        raise RuntimeError("no saas files found")
-
+def run(dry_run):
+    saas_files = queries.get_saas_files()
+    settings = queries.get_app_interface_settings()
+    secret_reader = SecretReader(settings)
     saasherder = SaasHerder(
-        saas_files=saas_files,
+        saas_files,
         thread_pool_size=1,
+        gitlab=None,
         integration=QONTRACT_INTEGRATION,
         integration_version=QONTRACT_INTEGRATION_VERSION,
-        secret_reader=secret_reader,
-        hash_length=saasherder_settings.hash_length,
-        repo_url=saasherder_settings.repo_url,
+        settings=settings,
         validate=True,
     )
-    app_int_repos = get_repos()
+    app_int_repos = queries.get_repos()
     missing_repos = [r for r in saasherder.repo_urls if r not in app_int_repos]
     for r in missing_repos:
         logging.error(f"repo is missing from codeComponents: {r}")

reconcile/slack_base.py

@@ -5,10 +5,7 @@ from typing import (
 )
 
 from reconcile import queries
-from reconcile.utils.secret_reader import (
-    SecretReader,
-    SecretReaderBase,
-)
+from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.slack_api import (
     HasClientConfig,
     SlackApi,
@@ -28,7 +25,7 @@ def slackapi_from_queries(
 
 def slackapi_from_slack_workspace(
     slack_workspace: Mapping[str, Any],
-    secret_reader: SecretReaderBase,
+    secret_reader: SecretReader,
     integration_name: str,
     init_usergroups: bool = True,
     channel: Optional[str] = None,

reconcile/test/conftest.py

@@ -69,17 +69,6 @@ def data_default_none(
                         data_default_none(field.type_, item)
                         for item in data[field.alias]
                     ]
-            elif field.sub_fields and 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):
-                        data[field.alias].update(
-                            data_default_none(sub_field.type_, data[field.alias])
-                        )
 
     return data
 

reconcile/test/test_auto_promoter.py

@@ -1,21 +1,24 @@
-import json
 from unittest import TestCase
 
 from reconcile.utils.mr.auto_promoter import (
+    TARGET_CONFIG_HASH,
     AutoPromoter,
     ParentSaasConfigPromotion,
 )
-from reconcile.utils.saasherder.models import Promotion
-from reconcile.utils.saasherder.saasherder import TARGET_CONFIG_HASH
+
+# from unittest.mock import MagicMock
+
+
+# from .fixtures import Fixtures
 
 
 class TestPromotions(TestCase):
-    def test_init_promotion_data(self) -> None:
-        promotion = Promotion(
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="123123123",
-        )
+    def test_init_promotion_data(self):
+        promotion = {
+            "commit_sha": "ahash",
+            "saas_file": "saas_file",
+            "target_config_hash": "123123123",
+        }
 
         expected = {
             "channel": "test-channel",
@@ -30,7 +33,7 @@ class TestPromotions(TestCase):
         ret = AutoPromoter.init_promotion_data("test-channel", promotion)
         self.assertEqual(ret, expected)
 
-    def test_init_parent_saas_config_dataclass(self) -> None:
+    def test_init_parent_saas_config_dataclass(self):
         data = {
             "parent_saas": "saas_file",
             TARGET_CONFIG_HASH: "123123123",
@@ -42,15 +45,15 @@ class TestPromotions(TestCase):
         self.assertEqual(obj.target_config_hash, data[TARGET_CONFIG_HASH])
         self.assertEqual(obj.parent_saas, data["parent_saas"])
 
-    def test_process_promotion_init_promotion_data(self) -> None:
-        promotion = Promotion(
-            saas_file_name="saas_file",
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            target_config_hash="111111111",
-        )
+    def test_process_promotion_init_promotion_data(self):
+        promotion = {
+            "saas_file_paths": ["destination-saas-file"],
+            "auto": True,
+            "publish": ["test-channel"],
+            "commit_sha": "ahash",
+            "saas_file": "saas_file",
+            TARGET_CONFIG_HASH: "111111111",
+        }
 
         target_promotion = {
             "auto": True,
@@ -62,19 +65,19 @@ class TestPromotions(TestCase):
         )
         self.assertTrue(modified)
 
-        tp = target_promotion["promotion_data"][0]  # type: ignore
+        tp = target_promotion["promotion_data"][0]
         tp_hash = tp["data"][0]["target_config_hash"]
         self.assertEqual(tp_hash, "111111111")
 
-    def test_process_promotion_update_when_config_hash_changes(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-        )
+    def test_process_promotion_update_when_config_hash_changes(self):
+        promotion = {
+            "saas_file_paths": ["destination-saas-file"],
+            "auto": True,
+            "publish": ["test-channel"],
+            "commit_sha": "ahash",
+            "saas_file": "saas_file",
+            TARGET_CONFIG_HASH: "111111111",
+        }
 
         target_promotion = {
             "auto": True,
@@ -98,19 +101,19 @@ class TestPromotions(TestCase):
         )
         self.assertTrue(modified)
 
-        tp = target_promotion["promotion_data"][0]  # type: ignore
+        tp = target_promotion["promotion_data"][0]
         tp_hash = tp["data"][0]["target_config_hash"]
         self.assertEqual(tp_hash, "111111111")
 
-    def test_process_promotion_dont_update_when_equal_config_hashes(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-        )
+    def test_process_promotion_dont_update_when_equal_config_hashes(self):
+        promotion = {
+            "saas_file_paths": ["destination-saas-file"],
+            "auto": True,
+            "publish": ["test-channel"],
+            "commit_sha": "ahash",
+            "saas_file": "saas_file",
+            TARGET_CONFIG_HASH: "111111111",
+        }
 
         target_promotion = {
             "auto": True,
@@ -133,163 +136,3 @@ class TestPromotions(TestCase):
             promotion, target_promotion, ["test-channel"]
         )
         self.assertFalse(modified)
-
-    def test_title_property(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-        )
-
-        ap = AutoPromoter([promotion])
-        self.assertEqual(
-            ap.title, "[auto_promoter] openshift-saas-deploy automated promotion 769891"
-        )
-
-    def test_description_property(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-        )
-
-        ap = AutoPromoter([promotion])
-        self.assertEqual(ap.description, "openshift-saas-deploy automated promotion")
-
-    def test_gitlab_data_property(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-        )
-
-        ap = AutoPromoter([promotion])
-        self.assertTrue(ap.gitlab_data["source_branch"].startswith("auto_promoter-"))
-        self.assertEqual(ap.gitlab_data["target_branch"], "master")
-        self.assertEqual(
-            ap.gitlab_data["title"],
-            "[auto_promoter] openshift-saas-deploy automated promotion 769891",
-        )
-        self.assertEqual(
-            ap.gitlab_data["description"], "openshift-saas-deploy automated promotion"
-        )
-        self.assertEqual(ap.gitlab_data["remove_source_branch"], True)
-        self.assertEqual(ap.gitlab_data["labels"], ["bot/automerge"])
-
-    def test_sqs_data_property(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-        )
-
-        ap = AutoPromoter([promotion])
-        self.assertEqual(
-            ap.sqs_data,
-            {
-                "pr_type": "auto_promoter",
-                "promotions": [
-                    {
-                        "commit_sha": "ahash",
-                        "saas_file_name": "saas_file",
-                        "target_config_hash": "111111111",
-                        "auto": True,
-                        "publish": ["test-channel"],
-                        "subscribe": None,
-                        "promotion_data": None,
-                        "saas_file_paths": ["destination-saas-file"],
-                        "target_paths": None,
-                    }
-                ],
-            },
-        )
-
-    def test_sqs_data_json_serializable(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-            promotion_data=[
-                {
-                    "channel": "test-channel",
-                    "data": [
-                        {
-                            "parent_saas": "saas_file",
-                            "target_config_hash": "111111111",
-                            "type": "parent_saas_config",
-                        }
-                    ],
-                }
-            ],
-        )
-
-        ap = AutoPromoter([promotion])
-        sqs_json = '{"pr_type": "auto_promoter", "promotions": [{"commit_sha": "ahash", "saas_file_name": "saas_file", "target_config_hash": "111111111", "auto": true, "publish": ["test-channel"], "subscribe": null, "promotion_data": [{"channel": "test-channel", "data": [{"type": "parent_saas_config", "parent_saas": "saas_file", "target_config_hash": "111111111"}]}], "saas_file_paths": ["destination-saas-file"], "target_paths": null}]}'
-        self.assertEqual(json.dumps(ap.sqs_data), sqs_json)
-
-    def test_init_with_promotion_object(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-            promotion_data=[
-                {
-                    "channel": "test-channel",
-                    "data": [
-                        {
-                            "parent_saas": "saas_file",
-                            "target_config_hash": "111111111",
-                            "type": "parent_saas_config",
-                        }
-                    ],
-                }
-            ],
-        )
-
-        ap = AutoPromoter([promotion])
-        self.assertEqual(ap.promotions, [promotion.dict(by_alias=True)])
-        self.assertEqual(ap._promotions, [promotion])
-
-    def test_init_with_dict_object(self) -> None:
-        promotion = Promotion(
-            saas_file_paths=["destination-saas-file"],
-            auto=True,
-            publish=["test-channel"],
-            commit_sha="ahash",
-            saas_file_name="saas_file",
-            target_config_hash="111111111",
-            promotion_data=[
-                {
-                    "channel": "test-channel",
-                    "data": [
-                        {
-                            "parent_saas": "saas_file",
-                            "target_config_hash": "111111111",
-                            "type": "parent_saas_config",
-                        }
-                    ],
-                }
-            ],
-        )
-
-        ap = AutoPromoter([promotion.dict(by_alias=True)])
-        self.assertEqual(ap.promotions, [promotion.dict(by_alias=True)])
-        self.assertEqual(ap._promotions, [promotion])