qontract-reconcile 0.10.2.dev191__tar.gz → 0.10.2.dev193__tar.gz

{qontract_reconcile-0.10.2.dev191 → qontract_reconcile-0.10.2.dev193}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev191
+Version: 0.10.2.dev193
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev191 → qontract_reconcile-0.10.2.dev193}/pyproject.toml

@@ -293,7 +293,6 @@ module = [
     "reconcile.requests_sender",
     "reconcile.sendgrid_teammates",
     "reconcile.service_dependencies",
-    "reconcile.sql_query",
     "reconcile.status_page_components",
     "reconcile.status",
     "reconcile.statuspage.atlassian",
@@ -408,7 +407,6 @@ module = [
     "reconcile.test.test_secret_reader",
     "reconcile.test.test_slack_base",
     "reconcile.test.test_slack_usergroups",
-    "reconcile.test.test_sql_query",
     "reconcile.test.test_terraform_cloudflare_dns",
     "reconcile.test.test_terraform_cloudflare_resources",
     "reconcile.test.test_terraform_cloudflare_users",

{qontract_reconcile-0.10.2.dev191 → qontract_reconcile-0.10.2.dev193}/reconcile/gitlab_housekeeping.py

@@ -72,6 +72,7 @@ HOLD_LABELS = [
 QONTRACT_INTEGRATION = "gitlab-housekeeping"
 DATE_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
 EXPIRATION_DATE_FORMAT = "%Y-%m-%d"
+SQUASH_OPTION_ALWAYS = "always"
 
 merged_merge_requests = Counter(
     name="qontract_reconcile_merged_merge_requests",
@@ -613,7 +614,8 @@ def merge_merge_requests(
         logging.info(["merge", gl.project.name, mr.iid])
         if not dry_run and merges < merge_limit:
             try:
-                mr.merge()
+                squash = (gl.project.squash_option == SQUASH_OPTION_ALWAYS) or mr.squash
+                mr.merge(squash=squash)
                 labels = mr.labels
                 merged_merge_requests.labels(
                     project_id=mr.target_project_id,

{qontract_reconcile-0.10.2.dev191 → qontract_reconcile-0.10.2.dev193}/reconcile/openshift_resources_base.py

@@ -62,7 +62,7 @@ from reconcile.utils.openshift_resource import (
 )
 from reconcile.utils.openshift_resource import OpenshiftResource as OR
 from reconcile.utils.runtime.integration import DesiredStateShardConfig
-from reconcile.utils.secret_reader import SecretReader
+from reconcile.utils.secret_reader import SecretReader, SecretReaderBase
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.sharding import is_in_shard
 from reconcile.utils.vault import (
@@ -402,9 +402,16 @@ def fetch_provider_vault_secret(
     validate_alertmanager_config: bool = False,
     alertmanager_config_key: str = "alertmanager.yaml",
     settings: Mapping[str, Any] | None = None,
+    secret_reader: SecretReaderBase | None = None,
 ) -> OR:
-    # get the fields from vault
-    secret_reader = SecretReader(settings)
+    if not secret_reader and not settings:
+        raise Exception(
+            "Parameter settings or secret_reader must be provided to run fetch_provider_vault_secret."
+        )
+
+    if not secret_reader:
+        # get the fields from vault
+        secret_reader = SecretReader(settings)
     raw_data = {
         k: v
         for k, v in secret_reader.read_all({"path": path, "version": version}).items()

{qontract_reconcile-0.10.2.dev191 → qontract_reconcile-0.10.2.dev193}/reconcile/sql_query.py

@@ -19,6 +19,9 @@ from reconcile import (
 )
 from reconcile import openshift_resources_base as orb
 from reconcile.status import ExitCodes
+from reconcile.typed_queries.app_interface_vault_settings import (
+    get_app_interface_vault_settings,
+)
 from reconcile.utils.defer import defer
 from reconcile.utils.external_resources import get_external_resource_specs
 from reconcile.utils.oc import (
@@ -30,7 +33,10 @@ from reconcile.utils.openshift_resource import (
     ResourceInventory,
 )
 from reconcile.utils.ruamel import create_ruamel_instance
-from reconcile.utils.secret_reader import SecretReader
+from reconcile.utils.secret_reader import (
+    SecretReaderBase,
+    create_secret_reader,
+)
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.smtp_client import (
     DEFAULT_SMTP_TIMEOUT,
@@ -187,14 +193,16 @@ def get_tf_resource_info(
 
 
 def collect_queries(
-    settings: dict[str, Any], smtp_client: SmtpClient, query_name: str | None = None
+    secret_reader: SecretReaderBase,
+    smtp_client: SmtpClient,
+    query_name: str | None = None,
 ) -> list[dict[str, Any]]:
     """
     Consults the app-interface and constructs the list of queries
     to be executed.
 
     :param query_name: (optional) query to look for
-    :param settings: App Interface settings
+    :param secret_reader: SecretReaderBase
 
     :return: List of queries dictionaries
     """
@@ -218,8 +226,8 @@ def collect_queries(
         "",
         1,
         accounts=[],
-        settings=settings,
         prefetch_resources_by_schemas=["/aws/rds-defaults-1.yml"],
+        secret_reader=secret_reader,
     )
 
     for sql_query in sql_queries:
@@ -499,11 +507,11 @@ def get_service_account(name: str, labels: dict) -> dict[str, Any]:
     }
 
 
-def split_long_query(q, size) -> list[str]:
+def split_long_query(q: str, size: int) -> list[str]:
     return [q[i : i + size] for i in range(0, len(q), size)]
 
 
-def merge_files_command(directory, file_glob, output_file):
+def merge_files_command(directory: str, file_glob: str, output_file: str) -> str:
     return f"cat ''{directory}''/{file_glob} > ''{output_file}''"
 
 
@@ -582,8 +590,8 @@ def _build_openshift_resources(
     query: dict[str, Any],
     image_repository: str,
     pull_secret: dict[str, Any] | None,
-    settings: dict[str, Any],
-):
+    secret_reader: SecretReaderBase,
+) -> list[OpenshiftResource]:
     query_name = query["name"]
     common_resource_labels = _build_common_resource_labels(query)
     openshift_resources: list[OpenshiftResource] = []
@@ -600,7 +608,7 @@ def _build_openshift_resources(
             type=pull_secret["type"],
             integration=QONTRACT_INTEGRATION,
             integration_version=QONTRACT_INTEGRATION_VERSION,
-            settings=settings,
+            secret_reader=secret_reader,
         )
         openshift_resources.append(secret_resource)
     # ConfigMap gpg
@@ -696,14 +704,14 @@ def _reconstruct_for_metrics(
     query: dict[str, Any],
     image_repository: str,
     pull_secret: dict[str, Any] | None,
-    settings: dict[str, Any],
     ri: ResourceInventory,
+    secret_reader: SecretReaderBase,
 ) -> None:
     openshift_resources = _build_openshift_resources(
         query,
         image_repository,
         pull_secret,
-        settings,
+        secret_reader,
     )
     cluster = query["cluster"]
     namespace = query["namespace"]["name"]
@@ -762,6 +770,7 @@ def _process_existing_query(
     image_repository: str,
     pull_secret: dict[str, Any],
     ri: ResourceInventory,
+    secret_reader: SecretReaderBase,
 ) -> None:
     match _get_query_status(query, state):
         case QueryStatus.ACTIVE:
@@ -769,8 +778,8 @@ def _process_existing_query(
                 query,
                 image_repository,
                 pull_secret,
-                settings,
                 ri,
+                secret_reader,
             )
         case QueryStatus.PENDING_DELETION:
             _delete_query_resources(
@@ -797,12 +806,10 @@ def _process_new_query(
     image_repository: str,
     pull_secret: dict[str, Any],
     ri: ResourceInventory,
-):
+    secret_reader: SecretReaderBase,
+) -> None:
     openshift_resources = _build_openshift_resources(
-        query,
-        image_repository,
-        pull_secret,
-        settings,
+        query, image_repository, pull_secret, secret_reader
     )
 
     cluster = query["cluster"]
@@ -835,12 +842,14 @@ def run(
 ) -> None:
     settings = queries.get_app_interface_settings()
     state = init_state(integration=QONTRACT_INTEGRATION)
+    vault_settings = get_app_interface_vault_settings()
+    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
     if defer:
         defer(state.cleanup)
     smtp_settings = typed_queries.smtp.settings()
     smtp_client = SmtpClient(
         server=get_smtp_server_connection(
-            secret_reader=SecretReader(settings=queries.get_secret_reader_settings()),
+            secret_reader=secret_reader,
             secret=smtp_settings.credentials,
         ),
         mail_address=smtp_settings.mail_address,
@@ -854,7 +863,7 @@ def run(
         image_repository = sql_query_settings["imageRepository"]
         pull_secret = sql_query_settings["pullSecret"]
 
-    queries_list = collect_queries(settings=settings, smtp_client=smtp_client)
+    queries_list = collect_queries(secret_reader=secret_reader, smtp_client=smtp_client)
     query_states = {s.lstrip("/") for s in state.ls()}
     ri = ResourceInventory()
     for query in queries_list:
@@ -868,6 +877,7 @@ def run(
                 image_repository,
                 pull_secret,
                 ri,
+                secret_reader,
             )
         else:
             _process_new_query(
@@ -878,6 +888,7 @@ def run(
                 image_repository,
                 pull_secret,
                 ri,
+                secret_reader,
             )
     openshift_base.publish_metrics(ri, QONTRACT_INTEGRATION)