qontract-reconcile 0.10.1rc481__py3-none-any.whl → 0.10.1rc483__py3-none-any.whl

{qontract_reconcile-0.10.1rc481.dist-info → qontract_reconcile-0.10.1rc483.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc481
+Version: 0.10.1rc483
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc481.dist-info → qontract_reconcile-0.10.1rc483.dist-info}/RECORD

@@ -68,7 +68,7 @@ reconcile/openshift_namespaces.py,sha256=DboMc6t0vXD54lL9ZP9P9fQnCRo2g_0z5FWubtW
 reconcile/openshift_network_policies.py,sha256=_qqv7yj17OM1J8KJPsFmzFZ85gzESJeBocC672z4_WU,4231
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=kwsY5cko7udEKNlhL2oKiKv_5wzEw9wmmwROE016ng8,1400
-reconcile/openshift_resources_base.py,sha256=aMrblZnviFMiAPS5SZsYWmGIRA-l8XlHwtxPr_klui0,45728
+reconcile/openshift_resources_base.py,sha256=p0YEHJrRgpFQOVvs5vAGDhLno_OJMHWMxnICEEQHFxk,45669
 reconcile/openshift_rolebindings.py,sha256=0sEKajdqVuBSzlagyPbLxtNXQdI2vyabmbIRifs0des,6629
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=MySDWBQN2N3rv_B8ifWzRY5t2Afq3DEVkFECHMpW_Sk,11908
@@ -407,7 +407,7 @@ reconcile/test/test_openshift_saas_deploy.py,sha256=YLJGkc--u5aP0UkQ-b9ZGEFGS2gw
 reconcile/test/test_openshift_saas_deploy_change_tester.py,sha256=1yVe54Hx9YdVjn6qdnKge5Sa_s732c-8uZqCnuT1gGI,12871
 reconcile/test/test_openshift_tekton_resources.py,sha256=RtRWsdm51S13OSkENC9nY_rOH0QELSCaO5tjF0XqIDI,11222
 reconcile/test/test_openshift_upgrade_watcher.py,sha256=na5Q5l88c0ZHMh82gvNpYheoMOAzEZRG0ZvzzDhafYE,7100
-reconcile/test/test_prometheus_rules_tester.py,sha256=Qc9J4k0lSVie361lGr_cOy0EaBTD5LDqGZf7CYVFKr8,5677
+reconcile/test/test_prometheus_rules_tester.py,sha256=nj17JNpjArMKwLc1B7Y6Ca-tkO24Y-yXhQXB78Mco0o,5968
 reconcile/test/test_quay_membership.py,sha256=e29Giz5S9ckFgjpTO8PBo8qVPocIQmy4WqsRhgTFd9A,2643
 reconcile/test/test_quay_mirror.py,sha256=-oPPFjx2OmzTwZ5oxblrvx2y4zzgUj8SYHdnjcOIqCE,5693
 reconcile/test/test_quay_mirror_org.py,sha256=eudGIGCUlYul2UHx4Ku6zFvwLeJtRyOIx06XuwFox2U,2630
@@ -567,7 +567,7 @@ reconcile/utils/state.py,sha256=-a3fOnGZnDRcTXw9Hg3QtGdKePGtnmoCkPeCt-5HgbE,1367
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=V7AMQOEU4tvUOT-LQN2cXLqcphD5L93PMGMfurQQyPY,31753
-reconcile/utils/terrascript_aws_client.py,sha256=zGVd9DLUKLucyCiYlNqt5O39kLTwEdgSGwKE86326DE,262689
+reconcile/utils/terrascript_aws_client.py,sha256=V1Gs9aKVqWlnSfA1jyfRQvmrHrJQ7gClbuzmEeSImNA,262908
 reconcile/utils/three_way_diff_strategy.py,sha256=nyqeQsLCoPI6e16k2CF3b9KNgQLU-rPf5RtfdUfVMwE,4468
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/unleash.py,sha256=1D56CsZfE3ShDtN3IErE1T2eeIwNmxhK-yYbCotJ99E,3601
@@ -650,8 +650,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc481.dist-info/METADATA,sha256=jZMsz3VARFTAKwiJcGIRi44sy1t2hVDVdYZ-4tWkqg8,2348
-qontract_reconcile-0.10.1rc481.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc481.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc481.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc481.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc483.dist-info/METADATA,sha256=B1PHnviRfQ_7JdO4SaqPjqnfPfz4_Rghq9Y78KK2Xq4,2348
+qontract_reconcile-0.10.1rc483.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc483.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc483.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc483.dist-info/RECORD,,

reconcile/openshift_resources_base.py

@@ -6,55 +6,32 @@ import logging
 import re
 import sys
 from collections import defaultdict
-from collections.abc import (
-    Iterable,
-    Mapping,
-    Sequence,
-)
+from collections.abc import Iterable, Mapping, Sequence
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cache
 from textwrap import indent
 from threading import Lock
-from typing import (
-    Any,
-    Optional,
-    Protocol,
-    Tuple,
-)
+from typing import Any, Optional, Protocol, Tuple
 from urllib import parse
 
 import anymarkup
 import jinja2
 import jinja2.sandbox
 from deepdiff import DeepHash
-from sretoolbox.utils import (
-    retry,
-    threaded,
-)
+from sretoolbox.utils import retry, threaded
 
 import reconcile.openshift_base as ob
 from reconcile import queries
 from reconcile.change_owners.diff import IDENTIFIER_FIELD_NAME
 from reconcile.checkpoint import url_makes_sense
 from reconcile.github_users import init_github
-from reconcile.utils import (
-    amtool,
-    gql,
-    openssl,
-)
+from reconcile.typed_queries.app_interface_repo_url import get_app_interface_repo_url
+from reconcile.utils import amtool, gql, openssl
 from reconcile.utils.defer import defer
 from reconcile.utils.exceptions import FetchResourceError
-from reconcile.utils.jinja2_ext import (
-    B64EncodeExtension,
-    RaiseErrorExtension,
-)
-from reconcile.utils.oc import (
-    OC_Map,
-    OCClient,
-    OCLogMsg,
-    StatusCodeError,
-)
+from reconcile.utils.jinja2_ext import B64EncodeExtension, RaiseErrorExtension
+from reconcile.utils.oc import OC_Map, OCClient, OCLogMsg, StatusCodeError
 from reconcile.utils.openshift_resource import (
     ConstructResourceError,
     ResourceInventory,
@@ -67,10 +44,7 @@ from reconcile.utils.runtime.integration import DesiredStateShardConfig
 from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.sharding import is_in_shard
-from reconcile.utils.vault import (
-    SecretVersionIsNone,
-    SecretVersionNotFound,
-)
+from reconcile.utils.vault import SecretVersionIsNone, SecretVersionNotFound
 
 # +-----------------------+-------------------------+-------------+
 # |   Current / Desired   |         Present         | Not Present |
@@ -224,7 +198,6 @@ NAMESPACES_QUERY = """
 QONTRACT_INTEGRATION = "openshift_resources_base"
 QONTRACT_INTEGRATION_VERSION = make_semver(1, 9, 2)
 QONTRACT_BASE64_SUFFIX = "_qb64"
-APP_INT_BASE_URL = "https://gitlab.cee.redhat.com/service/app-interface"
 KUBERNETES_SECRET_DATA_KEY_RE = "^[-._a-zA-Z0-9]+$"
 
 _log_lock = Lock()
@@ -488,6 +461,8 @@ def fetch_provider_resource(
 ) -> OR:
     path = resource["path"]
     content = resource["content"]
+    gqlapi = gql.get_api()
+    app_int_base_url = get_app_interface_repo_url(query_func=gqlapi.query)
     if tfunc:
         content = tfunc(body=content, vars=tvars, settings=settings)
 
@@ -544,9 +519,8 @@ def fetch_provider_resource(
                         annotations = rule.get("annotations")
                         if not annotations:
                             continue
-                        # TODO(mafriedm): make this better
                         rule["annotations"]["html_url"] = (
-                            f"{APP_INT_BASE_URL}/blob/master/resources{path}"
+                            f"{app_int_base_url}/blob/master/resources{path}"
                         )
             except Exception:
                 logging.warning(

reconcile/test/test_prometheus_rules_tester.py

@@ -1,20 +1,17 @@
 from typing import Any
-from unittest.mock import (
-    create_autospec,
-    patch,
-)
+from unittest.mock import create_autospec, patch
 
 import pytest
 
+from reconcile.gql_definitions.common.app_interface_repo_settings import (
+    DEFINITION as SETTINGS_QUERY,
+)
 from reconcile.gql_definitions.common.app_interface_vault_settings import (
     AppInterfaceSettingsV1,
 )
 from reconcile.openshift_resources_base import NAMESPACES_QUERY
 from reconcile.prometheus_rules_tester.integration import Test as PTest
-from reconcile.prometheus_rules_tester.integration import (
-    check_rules_and_tests,
-    run,
-)
+from reconcile.prometheus_rules_tester.integration import check_rules_and_tests, run
 from reconcile.status import ExitCodes
 from reconcile.utils import gql
 
@@ -42,6 +39,12 @@ class TestPrometheusRulesTester:
         """Mock for GqlApi.query using test_data set in setup_method."""
         if query == NAMESPACES_QUERY:
             return {"namespaces": self.ns_data}
+        if query == SETTINGS_QUERY:
+            return {
+                "settings": [
+                    {"repoUrl": "https://gitlab.cee.redhat.com/service/app-interface"}
+                ]
+            }
 
         raise TstUnsupportedGqlQueryError("Unsupported query")
 

reconcile/utils/terrascript_aws_client.py

@@ -2620,7 +2620,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
         if "subscriptions" in common_values.keys():
             subscriptions = common_values.get("subscriptions")
-            for sub in subscriptions:
+            for index, sub in enumerate(subscriptions):
                 sub_values = {}
                 sub_values["topic_arn"] = "${aws_sns_topic" + "." + identifier + ".arn}"
                 protocol = sub["protocol"]
@@ -2630,7 +2630,11 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     raise ValueError(msg)
                 sub_values["protocol"] = protocol
                 sub_values["endpoint"] = endpoint
-                sub_identifier = f"{identifier}_{protocol}_aws_sns_topic_subscription"
+                # append suffix only in case there are multiple subscriptions
+                suffix = f"_{index + 1}" if len(subscriptions) > 1 else ""
+                sub_identifier = (
+                    f"{identifier}_{protocol}_aws_sns_topic_subscription{suffix}"
+                )
                 sub_tf_resource = aws_sns_topic_subscription(
                     sub_identifier, **sub_values
                 )