qontract-reconcile 0.10.2.dev310__py3-none-any.whl → 0.10.2.dev439__py3-none-any.whl

tools/cli_commands/cost_report/view.py

@@ -4,6 +4,7 @@ from typing import Any
 
 from pydantic import BaseModel
 
+from reconcile.utils.json import json_dumps
 from tools.cli_commands.cost_report.model import OptimizationReport, Report
 
 LAYOUT = """\
@@ -244,7 +245,7 @@ def render_summary(
     return template.format(
         date=get_date(reports),
         total_cost=format_cost_value(total_cost),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -274,7 +275,7 @@ def render_month_over_month_change(reports: Mapping[str, Report]) -> str:
     )
     return MONTH_OVER_MONTH_CHANGE.format(
         date=get_date(reports),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -304,7 +305,7 @@ def render_aws_services_cost(
         items_total=format_cost_value(report.items_total),
         items_delta_value=format_delta_value(report.items_delta_value),
         items_delta_percent=format_delta_percent(report.items_delta_percent),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -316,7 +317,7 @@ def render_openshift_workloads_cost(
         items_total=format_cost_value(report.items_total),
         items_delta_value=format_delta_value(report.items_delta_value),
         items_delta_percent=format_delta_percent(report.items_delta_percent),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -362,7 +363,7 @@ def render_child_apps_cost(report: Report) -> str:
     )
     return CHILD_APPS_COST.format(
         child_apps_total=format_cost_value(report.child_apps_total),
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 
@@ -509,7 +510,7 @@ def render_optimization(
     )
     return OPTIMIZATION.format(
         app_name=report.app_name,
-        json_table=json_table.json(indent=2),
+        json_table=json_dumps(json_table, indent=2, mode="python"),
     )
 
 

tools/cli_commands/erv2.py

@@ -133,7 +133,7 @@ class Erv2Cli:
 
     @property
     def input_data(self) -> str:
-        return self._resource.json(exclude={"data": {FLAG_RESOURCE_MANAGED_BY_ERV2}})
+        return self._resource.export(exclude={"data": {FLAG_RESOURCE_MANAGED_BY_ERV2}})
 
     @property
     def image(self) -> str:

tools/cli_commands/gpg_encrypt.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from reconcile import queries
+from reconcile.openshift_base import OCLogMsg
 from reconcile.utils import (
     config,
     gpg,
@@ -80,6 +81,8 @@ class GPGEncryptCommand:
                 init_projects=False,
             )
             oc = oc_map.get(cluster_name)
+            if isinstance(oc, OCLogMsg):
+                raise oc
             data = oc.get(namespace, "Secret", name=secret, allow_not_found=False)[
                 "data"
             ]
@@ -114,7 +117,7 @@ class GPGEncryptCommand:
             f"No argument given which defines how to fetch the secret {self._command_data}"
         )
 
-    def _get_gpg_key(self) -> str | None:
+    def _get_gpg_key(self) -> str:
         target_user = self._command_data.target_user
         users = queries.get_users_by(
             refs=False,

tools/cli_commands/systems_and_tools.py

@@ -132,6 +132,7 @@ from reconcile.typed_queries.vault import get_vault_instances
 from reconcile.utils import (
     gql,
 )
+from reconcile.utils.slack_api import is_gov_slack_workspace
 
 
 class SystemTool(BaseModel):
@@ -322,11 +323,14 @@ class SystemTool(BaseModel):
 
     @classmethod
     def init_from_slack_workspace(cls, s: SlackWorkspaceV1, enumeration: Any) -> Self:
+        # Automatically determine the correct Slack domain based on GOV_SLACK environment variable
+        domain = "slack-gov.com" if is_gov_slack_workspace() else "slack.com"
+
         return cls(
             system_type="slack",
             system_id=s.name,
             name=s.name,
-            url=f"https://{s.name}.slack.com",
+            url=f"https://{s.name}.{domain}",
             description=s.description,
             enumeration=enumeration,
         )

tools/qontract_cli.py

@@ -13,7 +13,6 @@ import tempfile
 import textwrap
 from collections import defaultdict
 from datetime import (
-    UTC,
     datetime,
     timedelta,
 )
@@ -122,6 +121,7 @@ from reconcile.utils.binary import (
     binary,
     binary_version,
 )
+from reconcile.utils.datetime_util import from_utc_iso_format, utc_now
 from reconcile.utils.early_exit_cache import (
     CacheKey,
     CacheKeyWithDigest,
@@ -141,6 +141,7 @@ from reconcile.utils.gitlab_api import (
 )
 from reconcile.utils.glitchtip.client import GlitchtipClient
 from reconcile.utils.gql import GqlApiSingleton
+from reconcile.utils.json import json_dumps
 from reconcile.utils.keycloak import (
     KeycloakAPI,
     SSOClient,
@@ -417,8 +418,8 @@ def get_upgrade_policies_data(
             upgrade_next_run = None
         upgrade_emoji = "💫"
         if upgrade_next_run:
-            dt = datetime.strptime(upgrade_next_run, "%Y-%m-%dT%H:%M:%SZ")
-            now = datetime.utcnow()
+            dt = from_utc_iso_format(upgrade_next_run)
+            now = utc_now()
             if dt > now:
                 upgrade_emoji = "⏰"
             hours_ago = (now - dt).total_seconds() / 3600
@@ -841,7 +842,7 @@ def alert_report(
             )
             sys.exit(1)
 
-        now = datetime.utcnow()
+        now = utc_now()
         from_timestamp = int((now - timedelta(days=days)).timestamp())
         to_timestamp = int(now.timestamp())
 
@@ -887,7 +888,9 @@ def alert_report(
             "Triggered": str(data.triggered_alerts),
             "Resolved": str(data.resolved_alerts),
             "Median time to resolve (h:mm:ss)": median_elapsed,
-            "Response Rate": f"{data.responsed_alerts / data.triggered_alerts * 100:.2f}%",
+            "Response Rate": f"{data.responsed_alerts / data.triggered_alerts * 100:.2f}%"
+            if data.triggered_alerts != 0
+            else "0.00%",
         })
 
     # TODO(mafriedm, rporres): Fix this
@@ -1299,7 +1302,7 @@ def user_credentials_migrate_output(ctx: click.Context, account_name: str) -> No
     skip_accounts, appsre_pgp_key, _ = tfu.get_reencrypt_settings()
 
     accounts, working_dirs, _, aws_api = tfu.setup(
-        False,
+        None,
         1,
         skip_accounts,
         account_name=account_name,
@@ -1564,7 +1567,7 @@ def rosa_create_cluster_command(ctx: click.Context, cluster_name: str) -> None:
         billing_account = account.billing_account.uid
     else:
         with AWSApi(
-            1, [account.dict(by_alias=True)], settings=settings, init_users=False
+            1, [account.model_dump(by_alias=True)], settings=settings, init_users=False
         ) as aws_api:
             billing_account = aws_api.get_organization_billing_account(account.name)
 
@@ -1748,7 +1751,7 @@ def aws_terraform_resources(ctx: click.Context) -> None:
     for ns_info in namespaces:
         specs = (
             get_external_resource_specs(
-                ns_info.dict(by_alias=True), provision_provider=PROVIDER_AWS
+                ns_info.model_dump(by_alias=True), provision_provider=PROVIDER_AWS
             )
             or []
         )
@@ -1806,7 +1809,7 @@ def rds(ctx: click.Context) -> None:
         specs = [
             s
             for s in get_external_resource_specs(
-                namespace.dict(by_alias=True), provision_provider=PROVIDER_AWS
+                namespace.model_dump(by_alias=True), provision_provider=PROVIDER_AWS
             )
             if s.provider == "rds"
         ]
@@ -2184,6 +2187,8 @@ def root_owner(
         init_api_resources=True,
     )
     oc = oc_map.get(cluster)
+    if isinstance(oc, OCLogMsg):
+        raise oc
     obj = oc.get(namespace, kind, name)
     root_owner = oc.get_obj_root_owner(
         namespace, obj, allow_not_found=True, allow_not_controller=True
@@ -2196,7 +2201,7 @@ def root_owner(
     if ctx.obj["options"]["output"] != "json":
         ctx.obj["options"]["output"] = "yaml"
 
-    print_output(ctx.obj["options"], root_owner)
+    print_output(ctx.obj["options"], root_owner)  # type: ignore
 
 
 @get.command()
@@ -2270,7 +2275,7 @@ def app_interface_merge_queue(ctx: click.Context) -> None:
         "labels",
     ]
     merge_queue_data = []
-    now = datetime.utcnow()
+    now = utc_now()
     for mr in merge_requests:
         item = {
             "id": f"[{mr['mr'].iid}]({mr['mr'].web_url})",
@@ -2279,7 +2284,7 @@ def app_interface_merge_queue(ctx: click.Context) -> None:
             + 1,  # adding 1 for human readability
             "approved_at": mr["approved_at"],
             "approved_span_minutes": (
-                now - datetime.strptime(mr["approved_at"], glhk.DATE_FORMAT)
+                now - from_utc_iso_format(mr["approved_at"])
             ).total_seconds()
             / 60,
             "approved_by": mr["approved_by"],
@@ -2693,7 +2698,7 @@ def ec2_jenkins_workers(
     client = boto3.client("autoscaling")
     ec2 = boto3.resource("ec2")
     results = []
-    now = datetime.now(UTC)
+    now = utc_now()
     columns = [
         "type",
         "id",
@@ -2953,11 +2958,11 @@ def osd_component_versions(ctx: click.Context) -> None:
 @get.command()
 @click.pass_context
 def maintenances(ctx: click.Context) -> None:
-    now = datetime.now(UTC)
+    now = utc_now()
     maintenances = maintenances_gql.query(gql.get_api().query).maintenances or []
     data = [
         {
-            **m.dict(),
+            **m.model_dump(),
             "services": ", ".join(a.name for a in m.affected_services),
         }
         for m in maintenances
@@ -3668,7 +3673,7 @@ def template(
             continue
         if openshift_resource.name != name:
             continue
-        print_output({"output": "yaml", "sort": False}, openshift_resource.body)
+        print_output({"output": "yaml", "sort": False}, openshift_resource.body)  # type: ignore
         break
 
 
@@ -4095,7 +4100,9 @@ def sre_checkpoint_metadata(
 ) -> None:
     """Check an app path for checkpoint-related metadata."""
     data = queries.get_app_metadata(app_path)
-    settings = queries.get_app_interface_settings()
+    vault_settings = get_app_interface_vault_settings()
+    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+
     app = data[0]
 
     if jiradef:
@@ -4108,7 +4115,14 @@ def sre_checkpoint_metadata(
     # Overrides for easier testing
     if jiraboard:
         board["name"] = jiraboard
-    report_invalid_metadata(app, app_path, board, settings, parent_ticket, dry_run)
+    report_invalid_metadata(
+        app=app,
+        path=app_path,
+        board=board,
+        secret_reader=secret_reader,
+        parent=parent_ticket,
+        dry_run=dry_run,
+    )
 
 
 @root.command()
@@ -4285,7 +4299,7 @@ def create(
         bg="red",
         fg="white",
     )
-    print(sso_client.json(by_alias=True, indent=2))
+    print(json_dumps(sso_client, indent=2))
 
 
 @sso_client.command()
@@ -4837,11 +4851,12 @@ def top_talkers(ctx: click.Context, top: int) -> None:
             assert project.organization  # make mypy happy
             assert project.pk  # make mypy happy
 
+            now = utc_now()
             stat = client.project_statistics(
                 organization_slug=project.organization.slug,
                 project_pk=project.pk,
-                start=datetime.now(tz=UTC) - timedelta(hours=24),
-                end=datetime.now(tz=UTC),
+                start=now - timedelta(hours=24),
+                end=now,
             )
             stats.append((project, stat))
 

tools/template_validation.py

@@ -67,7 +67,9 @@ def main(templates: tuple[str]) -> None:
             tests.append(test_yaml)
 
         template_raw["templateTest"] = tests
-        template: TemplateV1 = TemplateV1(**data_default_none(TemplateV1, template_raw))
+        data = data_default_none(TemplateV1, template_raw)
+        assert isinstance(data, dict)
+        template: TemplateV1 = TemplateV1(**data)
 
         # templates_to_validate = {}
         for test in template.template_test:

reconcile/jenkins/types.py

@@ -1,77 +0,0 @@
-from __future__ import annotations
-
-from enum import Enum
-
-from pydantic import (
-    BaseModel,
-    Field,
-)
-
-
-class SSHHostKeyVerificationStrategy(Enum):
-    MANUALLY_TRUSTED_KEY_VERIFICATION_STRATEGY = (
-        "manuallyTrustedKeyVerificationStrategy"
-    )
-    MANUALLY_PROVIDED_KEY_VERIFICATION_STRATEGY = (
-        "manuallyProvidedKeyVerificationStrategy"
-    )
-    NON_VERIFYING_KEY_VERIFICATION_STRATEGY = "nonVerifyingKeyVerificationStrategy"
-    KNOWN_HOSTS_FILE_KEY_VERIFICATION_STRATEGY = "knownHostsFileKeyVerificationStrategy"
-
-
-class SSHConnector(BaseModel):
-    credentials_id: str = Field(..., alias="credentialsId")
-    launch_timeout_seconds: int | None = Field(None, alias="launchTimeoutSeconds")
-    max_num_retries: int | None = Field(None, alias="maxNumRetries")
-    retry_wait_time: int | None = Field(None, alias="retryWaitTime")
-    port: int | None = 22
-    jvm_options: str | None = Field(None, alias="jvmOptions")
-    ssh_host_key_verification_strategy: SSHHostKeyVerificationStrategy = Field(
-        SSHHostKeyVerificationStrategy.NON_VERIFYING_KEY_VERIFICATION_STRATEGY,
-        alias="sshHostKeyVerificationStrategy",
-    )
-
-    class Config:
-        use_enum_values = True
-
-
-class ComputerConnector(BaseModel):
-    # alias name is defined by jcasc schema
-    ssh_connector: SSHConnector = Field(..., alias="sSHConnector")
-
-
-class JenkinsWorkerFleet(BaseModel):
-    # following options comes form https://github.com/jenkinsci/ec2-fleet-plugin/blob/master/docs/
-    name: str
-    fleet: str
-    region: str
-    min_size: int = Field(..., alias="minSize")
-    max_size: int = Field(..., alias="maxSize")
-    computer_connector: ComputerConnector = Field(..., alias="computerConnector")
-    fs_root: str = Field(..., alias="fsRoot")
-    label_string: str = Field(..., alias="labelString")
-    num_executors: int = Field(2, alias="numExecutors")
-    idle_minutes: int = Field(30, alias="idleMinutes")
-    min_spare_size: int = Field(0, alias="minSpareSize")
-    max_total_uses: int = Field(-1, alias="maxTotalUses")
-    no_delay_provision: bool = Field(False, alias="noDelayProvision")
-    add_node_only_if_running: bool = Field(True, alias="addNodeOnlyIfRunning")
-    always_reconnect: bool = Field(True, alias="alwaysReconnect")
-    private_ip_used: bool = Field(True, alias="privateIpUsed")
-    restrict_usage: bool = Field(True, alias="restrictUsage")
-
-    def __lt__(self, other: JenkinsWorkerFleet) -> bool:
-        return self.fleet < other.fleet
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, JenkinsWorkerFleet):
-            raise NotImplementedError(
-                "Cannot compare to non JenkinsWorkerFleet objects."
-            )
-        return self.fleet == other.fleet and self.region == other.region
-
-    def __hash__(self) -> int:
-        return hash(self.fleet + self.region)
-
-    def differ(self, other: JenkinsWorkerFleet) -> bool:
-        return self.dict() != other.dict()