qontract-reconcile 0.10.1rc764__py3-none-any.whl → 0.10.1rc766__py3-none-any.whl

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

@@ -11,29 +11,22 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_content_multiple_namespaces(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("multiple_namespaces")
     renderer = Renderer()

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

@@ -11,29 +11,22 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_content_single_namespace(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="current_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("single_namespace")
     renderer = Renderer()
@@ -49,16 +42,16 @@ def test_content_single_namespace_no_previous_hash(
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("single_namespace_no_hash")
     renderer = Renderer()
@@ -74,10 +67,10 @@ def test_content_single_namespace_no_desired_hash(
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [],
-        CHANNELS: ["channel-a"],
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("single_namespace_ignore_hash")
     renderer = Renderer()

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

@@ -11,21 +11,15 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_content_single_target(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
@@ -48,9 +42,9 @@ def test_must_not_line_wrap(
 ):
     namespace_name = "/services/sosososolong/namespaces/loooooooooooooooooooooooooooooooooooooooooooooooooooooooooong.yml"
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": namespace_name},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": namespace_name},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",

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

@@ -11,35 +11,28 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_json_path_selector_include(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {
+        "NAMESPACE": {
             "path": "/some/namespace.yml",
             "name": "test-namespace",
             "cluster": {
                 "name": "test-cluster",
             },
         },
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("json_path_selector_includes")
     renderer = Renderer()
@@ -55,22 +48,22 @@ def test_json_path_selector_exclude(
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {
+        "NAMESPACE": {
             "path": "/some/namespace.yml",
             "name": "test-namespace",
             "cluster": {
                 "name": "test-cluster",
             },
         },
-        REF: "hyper_sha",
-        CONFIG_HASHES: [
+        "DESIRED_REF": "hyper_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="hyper_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("json_path_selector_excludes")
     renderer = Renderer()

reconcile/utils/internal_groups/models.py

@@ -54,7 +54,7 @@ class Group(BaseModel):
             self.description == other.description
             and self.member_approval_type == other.member_approval_type
             and self.contact_list == other.contact_list
-            and self.owners == other.owners
+            and set(self.owners) == set(other.owners)
             and self.display_name == other.display_name
             and self.notes == other.notes
             and set(self.members) == set(other.members)

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

@@ -1,4 +0,0 @@
-REF = "ref"
-CONFIG_HASHES = "config_hashes"
-CHANNELS = "channels"
-NAMESPACE = "namespace"

reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py

@@ -1,89 +0,0 @@
-from collections import defaultdict
-from collections.abc import (
-    Callable,
-    Mapping,
-)
-from typing import Any
-
-import pytest
-
-from reconcile.gql_definitions.fragments.saas_target_namespace import (
-    SaasTargetNamespace,
-)
-from reconcile.saas_auto_promotions_manager.publisher import (
-    DeploymentInfo,
-    Publisher,
-)
-from reconcile.saas_auto_promotions_manager.subscriber import (
-    Channel,
-    ConfigHash,
-    Subscriber,
-)
-
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASH,
-    CUR_CONFIG_HASHES,
-    CUR_SUBSCRIBER_REF,
-    DESIRED_REF,
-    DESIRED_TARGET_HASHES,
-    NAMESPACE,
-    REAL_WORLD_SHA,
-    SUCCESSFUL_DEPLOYMENT,
-    TARGET_FILE_PATH,
-    USE_TARGET_CONFIG_HASH,
-)
-
-
-@pytest.fixture
-def subscriber_builder(
-    saas_target_namespace_builder: Callable[..., SaasTargetNamespace],
-) -> Callable[[Mapping[str, Any]], Subscriber]:
-    def builder(data: Mapping[str, Any]) -> Subscriber:
-        channels: list[Channel] = []
-        for channel_name, channel_data in data.get(CHANNELS, {}).items():
-            channel = Channel(name=channel_name, publishers=[])
-            for publisher_name, publisher_data in channel_data.items():
-                publisher = Publisher(
-                    ref="",
-                    uid="",
-                    repo_url="",
-                    cluster_name="",
-                    namespace_name="",
-                    saas_name="",
-                    saas_file_path="",
-                    app_name="",
-                    resource_template_name="",
-                    target_name=None,
-                    publish_job_logs=True,
-                    has_subscriber=True,
-                    auth_code=None,
-                )
-                publisher.commit_sha = publisher_data[REAL_WORLD_SHA]
-                publisher.deployment_info_by_channel[channel_name] = DeploymentInfo(
-                    success=publisher_data.get(SUCCESSFUL_DEPLOYMENT, True),
-                    target_config_hash=publisher_data.get(CONFIG_HASH, ""),
-                    saas_file=publisher_name,
-                )
-                channel.publishers.append(publisher)
-            channels.append(channel)
-        cur_config_hashes_by_channel: dict[str, list[ConfigHash]] = defaultdict(list)
-        for cur_config_hash in data.get(CUR_CONFIG_HASHES, []):
-            cur_config_hashes_by_channel[cur_config_hash.channel].append(
-                cur_config_hash
-            )
-        subscriber = Subscriber(
-            target_namespace=saas_target_namespace_builder(data.get(NAMESPACE, {})),
-            ref=data.get(CUR_SUBSCRIBER_REF, ""),
-            saas_name="",
-            target_file_path=data.get(TARGET_FILE_PATH, ""),
-            template_name="",
-            use_target_config_hash=data.get(USE_TARGET_CONFIG_HASH, True),
-        )
-        subscriber.channels = channels
-        subscriber.config_hashes_by_channel_name = cur_config_hashes_by_channel
-        subscriber.desired_ref = data.get(DESIRED_REF, "")
-        subscriber.desired_hashes = data.get(DESIRED_TARGET_HASHES, [])
-        return subscriber
-
-    return builder

reconcile/test/saas_auto_promotions_manager/subscriber/data_keys.py

@@ -1,11 +0,0 @@
-CUR_SUBSCRIBER_REF = "cur_subscriber_ref"
-REAL_WORLD_SHA = "real_world_sha"
-CONFIG_HASH = "config_hash"
-CHANNELS = "channels"
-SUCCESSFUL_DEPLOYMENT = "successful_deployment"
-CUR_CONFIG_HASHES = "cur_config_hashes"
-TARGET_FILE_PATH = "target_file_path"
-DESIRED_REF = "desired_ref"
-DESIRED_TARGET_HASHES = "desired_target_hashes"
-USE_TARGET_CONFIG_HASH = "use_target_config_hash"
-NAMESPACE = "namespace"

reconcile/test/saas_auto_promotions_manager/subscriber/test_content_hash.py

@@ -1,130 +0,0 @@
-from collections.abc import (
-    Callable,
-    Mapping,
-)
-
-from reconcile.saas_auto_promotions_manager.subscriber import (
-    CONTENT_HASH_LENGTH,
-    ConfigHash,
-    Subscriber,
-)
-
-from .data_keys import (
-    DESIRED_REF,
-    DESIRED_TARGET_HASHES,
-    NAMESPACE,
-    TARGET_FILE_PATH,
-)
-
-
-def test_can_compute_content_hash(subscriber_builder: Callable[[Mapping], Subscriber]):
-    subscribers = [
-        subscriber_builder({
-            NAMESPACE: {"path": "some_namespace"},
-            TARGET_FILE_PATH: "some_saas",
-            DESIRED_REF: "new",
-            DESIRED_TARGET_HASHES: [
-                ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-                ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-            ],
-        }),
-        subscriber_builder({
-            NAMESPACE: {"path": "other_namespace"},
-            TARGET_FILE_PATH: "other_saas",
-            DESIRED_REF: "new",
-            DESIRED_TARGET_HASHES: [
-                ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-                ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-            ],
-        }),
-    ]
-    assert (
-        len(Subscriber.combined_content_hash(subscribers=subscribers))
-        == CONTENT_HASH_LENGTH
-    )
-
-
-def test_content_hash_is_deterministic(
-    subscriber_builder: Callable[[Mapping], Subscriber],
-):
-    subscribers = [
-        subscriber_builder({
-            NAMESPACE: {"path": "some_namespace"},
-            TARGET_FILE_PATH: "some_saas",
-            DESIRED_REF: "new",
-            DESIRED_TARGET_HASHES: [
-                ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-                ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-            ],
-        }),
-        subscriber_builder({
-            NAMESPACE: {"path": "other_namespace"},
-            TARGET_FILE_PATH: "other_saas",
-            DESIRED_REF: "old",
-            DESIRED_TARGET_HASHES: [
-                ConfigHash(channel="h", target_config_hash="i", parent_saas="j"),
-                ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-            ],
-        }),
-    ]
-    hashes = set()
-    for _ in range(3):
-        hashes.add(Subscriber.combined_content_hash(subscribers=subscribers))
-    assert len(hashes) == 1
-
-
-def test_content_hash_differs(subscriber_builder: Callable[[Mapping], Subscriber]):
-    subscriber_a = subscriber_builder({
-        NAMESPACE: {"path": "some_namespace"},
-        TARGET_FILE_PATH: "some_saas",
-        DESIRED_REF: "new",
-        DESIRED_TARGET_HASHES: [
-            ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-            ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-        ],
-    })
-
-    subscriber_b = subscriber_builder({
-        NAMESPACE: {"path": "some_namespace"},
-        TARGET_FILE_PATH: "some_other_saas",
-        DESIRED_REF: "new",
-        DESIRED_TARGET_HASHES: [
-            ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-        ],
-    })
-
-    assert Subscriber.combined_content_hash([
-        subscriber_a
-    ]) != Subscriber.combined_content_hash([subscriber_b])
-
-
-def test_content_hash_equals(subscriber_builder: Callable[[Mapping], Subscriber]):
-    subscriber_a = subscriber_builder({
-        NAMESPACE: {"path": "some_namespace"},
-        TARGET_FILE_PATH: "some_saas",
-        DESIRED_REF: "new",
-        DESIRED_TARGET_HASHES: [
-            ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-            ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-            ConfigHash(channel="h", target_config_hash="i", parent_saas="j"),
-            ConfigHash(channel="k", target_config_hash="l", parent_saas="m"),
-        ],
-    })
-    subscriber_b = subscriber_builder({
-        NAMESPACE: {"path": "some_namespace"},
-        TARGET_FILE_PATH: "some_saas",
-        DESIRED_REF: "new",
-        DESIRED_TARGET_HASHES: list(
-            reversed([
-                ConfigHash(channel="a", target_config_hash="b", parent_saas="c"),
-                ConfigHash(channel="e", target_config_hash="f", parent_saas="g"),
-                ConfigHash(channel="h", target_config_hash="i", parent_saas="j"),
-                ConfigHash(channel="k", target_config_hash="l", parent_saas="m"),
-            ])
-        ),
-    })
-
-    assert Subscriber.combined_content_hash([
-        subscriber_a,
-        subscriber_b,
-    ]) == Subscriber.combined_content_hash([subscriber_b, subscriber_a])

reconcile/test/saas_auto_promotions_manager/subscriber/test_diff.py

@@ -1,161 +0,0 @@
-from collections.abc import (
-    Callable,
-    Mapping,
-)
-from typing import Any
-
-from reconcile.saas_auto_promotions_manager.subscriber import (
-    ConfigHash,
-    Subscriber,
-)
-
-from .data_keys import (
-    CUR_CONFIG_HASHES,
-    CUR_SUBSCRIBER_REF,
-    DESIRED_REF,
-    DESIRED_TARGET_HASHES,
-)
-
-
-def test_has_config_hash_diff(
-    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-) -> None:
-    subscriber = subscriber_builder({
-        CUR_SUBSCRIBER_REF: "current_sha",
-        CUR_CONFIG_HASHES: [
-            ConfigHash(
-                channel="channel-a",
-                parent_saas="publisher_a",
-                target_config_hash="pub_a_hash",
-            ),
-            ConfigHash(
-                channel="channel-b",
-                parent_saas="publisher_b",
-                target_config_hash="pub_b_hash",
-            ),
-        ],
-        DESIRED_REF: "current_sha",
-        DESIRED_TARGET_HASHES: [
-            ConfigHash(
-                channel="channel-a",
-                parent_saas="publisher_a",
-                target_config_hash="pub_a_hash",
-            ),
-            ConfigHash(
-                channel="channel-b",
-                parent_saas="publisher_b",
-                target_config_hash="new_hash",
-            ),
-        ],
-    })
-    assert subscriber.has_diff()
-
-
-def test_has_ref_diff(
-    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-) -> None:
-    subscriber = subscriber_builder({
-        CUR_SUBSCRIBER_REF: "current_sha",
-        CUR_CONFIG_HASHES: [],
-        DESIRED_REF: "new_sha",
-        DESIRED_TARGET_HASHES: [],
-    })
-    assert subscriber.has_diff()
-
-
-def test_no_diff(
-    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-) -> None:
-    config_hashes = [
-        ConfigHash(
-            channel="channel-a",
-            parent_saas="publisher_a",
-            target_config_hash="pub_a_hash",
-        ),
-        ConfigHash(
-            channel="channel-b",
-            parent_saas="publisher_b",
-            target_config_hash="pub_b_hash",
-        ),
-    ]
-    subscriber = subscriber_builder({
-        CUR_SUBSCRIBER_REF: "current_sha",
-        CUR_CONFIG_HASHES: config_hashes,
-        DESIRED_REF: "current_sha",
-        DESIRED_TARGET_HASHES: list(reversed(config_hashes)),
-    })
-    assert not subscriber.has_diff()
-
-
-def test_hashes_desired_subset_of_current(
-    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-) -> None:
-    """
-    We do not react on additional current hashes, i.e., SAPM is not responsible
-    for deleting dangling hashes -> we only care about desired hashes being in place.
-    """
-    subscriber = subscriber_builder({
-        CUR_SUBSCRIBER_REF: "current_sha",
-        CUR_CONFIG_HASHES: [
-            ConfigHash(
-                channel="channel-a",
-                parent_saas="saas-a",
-                target_config_hash="hash-a",
-            ),
-            ConfigHash(
-                channel="channel-b",
-                parent_saas="saas-b",
-                target_config_hash="hash-b",
-            ),
-        ],
-        DESIRED_REF: "current_sha",
-        DESIRED_TARGET_HASHES: [
-            ConfigHash(
-                channel="channel-b",
-                parent_saas="saas-b",
-                target_config_hash="hash-b",
-            ),
-        ],
-    })
-    assert not subscriber.has_diff()
-
-
-def test_hashes_current_subset_of_desired(
-    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-) -> None:
-    subscriber = subscriber_builder({
-        CUR_SUBSCRIBER_REF: "current_sha",
-        CUR_CONFIG_HASHES: [
-            ConfigHash(
-                channel="channel-b",
-                parent_saas="saas-b",
-                target_config_hash="hash-b",
-            ),
-        ],
-        DESIRED_REF: "current_sha",
-        DESIRED_TARGET_HASHES: [
-            ConfigHash(
-                channel="channel-a",
-                parent_saas="saas-a",
-                target_config_hash="hash-a",
-            ),
-            ConfigHash(
-                channel="channel-b",
-                parent_saas="saas-b",
-                target_config_hash="hash-b",
-            ),
-        ],
-    })
-    assert subscriber.has_diff()
-
-
-def test_empty_hashes(
-    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-) -> None:
-    subscriber = subscriber_builder({
-        CUR_SUBSCRIBER_REF: "current_sha",
-        CUR_CONFIG_HASHES: [],
-        DESIRED_REF: "current_sha",
-        DESIRED_TARGET_HASHES: [],
-    })
-    assert not subscriber.has_diff()