qontract-reconcile 0.10.2.dev37__tar.gz → 0.10.2.dev39__tar.gz

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev37
+Version: 0.10.2.dev39
 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.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/external_resources/aws.py

@@ -58,6 +58,8 @@ class AWSElasticacheFactory(AWSDefaultResourceFactory):
         if "replication_group_id" not in data:
             data["replication_group_id"] = spec.identifier
 
+        data["environment"] = spec.environment_type
+
         if cluster_mode := data.pop("cluster_mode", {}):
             for k, v in cluster_mode.items():
                 data[k] = v

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/gql_definitions/external_resources/external_resources_namespaces.py

@@ -505,6 +505,7 @@ query ExternalResourcesNamespaces {
     }
     environment {
       name
+      labels
     }
     app {
       path
@@ -1071,6 +1072,7 @@ class NamespaceTerraformProviderResourceAWSV1(NamespaceExternalResourceV1):
 
 class EnvironmentV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    labels: str = Field(..., alias="labels")
 
 
 class AppV1(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/gql_definitions/fragments/saas_target_namespace.py

@@ -34,7 +34,7 @@ class SaasSecretParametersV1(ConfiguredBaseModel):
 
 class EnvironmentV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
-    labels: Optional[Json] = Field(..., alias="labels")
+    labels: Json = Field(..., alias="labels")
     parameters: Optional[Json] = Field(..., alias="parameters")
     secret_parameters: Optional[list[SaasSecretParametersV1]] = Field(..., alias="secretParameters")
 

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/gql_definitions/introspection.json

@@ -16224,9 +16224,13 @@
                             "description": null,
                             "args": [],
                             "type": {
-                                "kind": "SCALAR",
-                                "name": "JSON",
-                                "ofType": null
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "JSON",
+                                    "ofType": null
+                                }
                             },
                             "isDeprecated": false,
                             "deprecationReason": null

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/gql_definitions/status_board/status_board.py

@@ -119,7 +119,7 @@ class NamespaceV1(ConfiguredBaseModel):
 
 class EnvironmentV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
-    labels: Optional[Json] = Field(..., alias="labels")
+    labels: Json = Field(..., alias="labels")
     product: ProductV1 = Field(..., alias="product")
     namespaces: Optional[list[NamespaceV1]] = Field(..., alias="namespaces")
 

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/jira_permissions_validator.py

@@ -2,7 +2,7 @@ import logging
 import random
 import sys
 import time
-from collections.abc import Callable, Iterable
+from collections.abc import Callable, Iterable, Sequence
 from enum import IntFlag, auto
 from typing import Any, TypedDict
 
@@ -199,7 +199,7 @@ def validate_boards(
     metrics_container: metrics.MetricsContainer,
     secret_reader: SecretReaderBase,
     jira_client_settings: JiraWatcherSettings | None,
-    jira_boards: Iterable[JiraBoardV1],
+    jira_boards: Sequence[JiraBoardV1],
     default_issue_type: str,
     default_reopen_state: str,
     board_check_interval_sec: int,
@@ -211,9 +211,14 @@ def validate_boards(
     jira_clients: dict[str, JiraClient] = {}
     for board in jira_boards:
         next_run_time = state.get(board.name, 0)
-        if not dry_run and time.time() <= next_run_time:
-            logging.debug(f"[{board.name}] Skipping board")
-            continue
+        if time.time() <= next_run_time:
+            if not dry_run:
+                # always skip for non-dry-run mode
+                continue
+            # dry-run mode
+            elif len(jira_boards) > 1:
+                logging.info(f"[{board.name}] Use cache results. Skipping ...")
+                continue
 
         logging.debug(f"[{board.name}] checking ...")
         if board.server.server_url not in jira_clients:

{qontract_reconcile-0.10.2.dev37 → qontract_reconcile-0.10.2.dev39}/reconcile/utils/external_resource_spec.py

@@ -116,6 +116,11 @@ class ExternalResourceSpec:
     def cluster_name(self) -> str:
         return self.namespace["cluster"]["name"]
 
+    @property
+    def environment_type(self) -> str:
+        labels = json.loads(self.namespace["environment"]["labels"])
+        return labels.get("type", "production")
+
     @property
     def output_prefix(self) -> str:
         # Adhere to DNS-1123 subdomain names spec. It's reasonable to have provider