qontract-reconcile 0.10.2.dev241__py3-none-any.whl → 0.10.2.dev243__py3-none-any.whl

{qontract_reconcile-0.10.2.dev241.dist-info → qontract_reconcile-0.10.2.dev243.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev241
+Version: 0.10.2.dev243
 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
@@ -190,8 +190,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
                                   instances.
   jenkins-worker-fleets           Manage Jenkins worker fleets via JCasC.
   jira-permissions-validator      Validate permissions in Jira.
-  jira-watcher                    Watch for changes in Jira boards and notify
-                                  on Slack.
   ldap-groups                     Manages LDAP groups based on App-Interface
                                   roles.
   ldap-users                      Removes users which are not found in LDAP

{qontract_reconcile-0.10.2.dev241.dist-info → qontract_reconcile-0.10.2.dev243.dist-info}/RECORD

@@ -7,8 +7,8 @@ reconcile/aws_iam_keys.py,sha256=mw_lvmWqpJkzYW8Za6lHfxEMkT-_DOzWiCPhJAmYPIQ,398
 reconcile/aws_iam_password_reset.py,sha256=O0JX2N5kNRKs3u2xzu4NNrI6p0ag5JWy3MTsvZmtleg,3173
 reconcile/aws_support_cases_sos.py,sha256=PDhilxQ4TBxVnxUPIUdTbKEaNUI0wzPiEsB91oHT2fY,3384
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
-reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=7uAtN-LiukRmaoowvgyHvmfTDf4Ffw-eo1teD11IK2g,113302
+reconcile/checkpoint.py,sha256=gjtS8g6KIyKFYlHMSZjAqDUOlVh83nh4go-9yNrhWZU,5016
+reconcile/cli.py,sha256=kp-YLjPfnqwyJdXDfVPE0lmfaRWDO1_ocTlZDCuVUOI,113061
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=al7m8EgnnYx90rY1REryW3byN_ItfJfAzEeLtjbCfi0,4921
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4767
@@ -44,7 +44,6 @@ reconcile/jenkins_webhooks.py,sha256=KANd1ExYw6jp6F-d-QEbX1L1CNbRF270yL2ppDCAjio
 reconcile/jenkins_webhooks_cleaner.py,sha256=tFbAzsFGvJ6UrHRZFdIuLdqG-Ocd5_OknfsbtN-eyFY,1619
 reconcile/jenkins_worker_fleets.py,sha256=L2wEXpd4xuEHrXGss4iH788nG8UlLSYduZe1EY2IVw4,5377
 reconcile/jira_permissions_validator.py,sha256=nVHZg7kNn04Q-ryNM20wthMrhXos28g3O9b0ahzxAKc,14690
-reconcile/jira_watcher.py,sha256=S3xbnyo-Xdn64eY_TyHv1TnuoS9_H4z6HwiLn6De6pc,4135
 reconcile/ldap_users.py,sha256=oP1CAxmgSi3zDJ3vKTPySjap6WmEX1U469FmFrov5l4,4599
 reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQg,1885
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
@@ -70,7 +69,7 @@ reconcile/openshift_prometheus_rules.py,sha256=onowXab248zmHH8SbYDTc1W1bl7JiqRFU
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=I2nO_C37mG3rfyGrd4cGwN3mVseVGuTAHAyhFzLyqF4,1518
 reconcile/openshift_resources_base.py,sha256=728-5nEmWMviSnhQH-EbEp_876VI2PGgC8LnrIfbD3U,42890
-reconcile/openshift_rhcs_certs.py,sha256=wty5ayzcIebe4-Vlkf1Zi3UzVqBU8WUtYmsOiYviWNs,10070
+reconcile/openshift_rhcs_certs.py,sha256=NEHOuSztYkNn7GFqUg2On7kmi3VajDJ5zHZt08Xa24A,10230
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
@@ -92,7 +91,7 @@ reconcile/quay_mirror.py,sha256=PBooiA0ShZpWYfO6oeKFqYYT6Syi7Q8JJD9kj0wRRLg,1403
 reconcile/quay_mirror_org.py,sha256=I-tEqRHLL6uFqbSi7qCfPuDNoae7EAI2U68NbDOhmv8,10809
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=Jmndc6jIGW_VZnDJ8u68mKXKNLk_XpiogeHrin9AJkc,50883
+reconcile/queries.py,sha256=4ljTNPmRwzJQz14RXHMH-GLW3uOTdoXMwvgJmnSJP7I,49924
 reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
@@ -653,7 +652,7 @@ reconcile/utils/rhcsv2_certs.py,sha256=ZnlUlEI2k6UrljGarkm1ey0znMlQtjeZB7VEfCH1A
 reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=MaP56KZaAE35EyYbgAitdm6fUSxdzWeGFSOym9qiZkw,10206
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
-reconcile/utils/sharding.py,sha256=DDBHfs5TT9UgjmzewiXUjbncnrPuceAZWeOA4veGa7s,843
+reconcile/utils/sharding.py,sha256=CNyU9mkSbt7FRANEhOOZpWJl7L-YliHhaxr898gmX8c,573
 reconcile/utils/slack_api.py,sha256=IcnXmQrKXQwYEhKfXTBmOeuYKxpSG2Wvc1Fq-Nf1Xgg,17551
 reconcile/utils/slo_document_manager.py,sha256=CPgM2oH4AVzBqenakWo59R5yfwB62tnxSnSOHgir7l8,9500
 reconcile/utils/smtp_client.py,sha256=0xefB4I9E5eBB-FlxFJYjvz3Kvuqi_K3Ma_Wk0NAQKM,2779
@@ -800,7 +799,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev241.dist-info/METADATA,sha256=ViFvxvTM7AENm6rMbK78w8OSX-py5ssEEjQfK387gPA,24289
-qontract_reconcile-0.10.2.dev241.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev241.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev241.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev243.dist-info/METADATA,sha256=6xA4naj3WZA1ys-EcVERD6rXI3ickOb_Qahp0lakNOI,24167
+qontract_reconcile-0.10.2.dev243.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev243.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev243.dist-info/RECORD,,

reconcile/checkpoint.py

@@ -133,7 +133,7 @@ def report_invalid_metadata(
     :param path: path in app-interface to said app
 
     :param board: JIRA board description, as per
-    queries.JIRA_BOARDS_QUERY
+    queries.JIRA_BOARDS_QUICK_QUERY
 
     :param settings: app-interface settings (necessary to log into the
     JIRA instance)

reconcile/cli.py

@@ -1146,14 +1146,6 @@ def jira_permissions_validator(
     )
 
 
-@integration.command(short_help="Watch for changes in Jira boards and notify on Slack.")
-@click.pass_context
-def jira_watcher(ctx: click.Context) -> None:
-    import reconcile.jira_watcher
-
-    run_integration(reconcile.jira_watcher, ctx)
-
-
 @integration.command(
     short_help="Watches for OpenShift upgrades and sends notifications."
 )

reconcile/openshift_rhcs_certs.py

@@ -59,6 +59,7 @@ class OpenshiftRhcsCertExpiration(GaugeMetric):
     cert_name: str
     cluster: str
     namespace: str
+    renewal_threshold_days: str
 
     @classmethod
     def name(cls) -> str:
@@ -200,6 +201,9 @@ def fetch_openshift_resource_for_cert_resource(
                 cert_name=cert_resource.secret_name,
                 namespace=ns.name,
                 cluster=ns.cluster.name,
+                renewal_threshold_days=str(
+                    cert_resource.auto_renew_threshold_days or 7
+                ),
             ),
             int(vault_cert_secret["expiration_timestamp"]),
         )

reconcile/queries.py

@@ -2137,62 +2137,6 @@ def get_pipelines_providers():
     return pipelines_providers
 
 
-JIRA_BOARDS_QUERY = """
-{
-  jira_boards: jira_boards_v1 {
-    path
-    name
-    server {
-      serverUrl
-      token {
-        path
-        field
-        version
-        format
-      }
-    }
-    {% if with_slack %}
-    slack {
-      workspace {
-        name
-        integrations {
-          name
-          token {
-            path
-            field
-            version
-            format
-          }
-          channel
-          icon_emoji
-          username
-        }
-        api_client {
-          global {
-            max_retries
-            timeout
-          }
-          methods {
-            name
-            args
-          }
-        }
-      }
-      channel
-    }
-    {% endif %}
-  }
-}
-"""
-
-
-def get_jira_boards(with_slack: bool | None = True):
-    """Returns Jira boards resources defined in app-interface"""
-    gqlapi = gql.get_api()
-    query = Template(JIRA_BOARDS_QUERY).render(with_slack=with_slack)
-    return gqlapi.query(query)["jira_boards"]
-
-
 # Use APATH as the place holder because Python formatting interferes
 # with graphql use of curly braces
 JIRA_BOARDS_QUICK_QUERY = """

reconcile/utils/sharding.py

@@ -25,17 +25,3 @@ def is_in_shard(value):
         LOG.debug("IN_SHARD FALSE: %s", value)
 
     return in_shard
-
-
-def is_in_shard_round_robin(value, index):
-    if SHARDS == 1:
-        return True
-
-    in_shard = index % SHARDS == SHARD_ID
-
-    if in_shard:
-        LOG.debug("IN_SHARD TRUE: %s", value)
-    else:
-        LOG.debug("IN_SHARD FALSE: %s", value)
-
-    return in_shard

reconcile/jira_watcher.py

@@ -1,131 +0,0 @@
-import logging
-from collections.abc import Callable, Mapping, Sequence
-from typing import Any
-
-from reconcile import queries
-from reconcile.slack_base import slackapi_from_slack_workspace
-from reconcile.utils.defer import defer
-from reconcile.utils.jira_client import JiraClient
-from reconcile.utils.secret_reader import SecretReader
-from reconcile.utils.sharding import is_in_shard_round_robin
-from reconcile.utils.slack_api import SlackApi
-from reconcile.utils.state import (
-    State,
-    init_state,
-)
-
-QONTRACT_INTEGRATION = "jira-watcher"
-
-
-def fetch_current_state(
-    jira_board: Mapping, settings: Mapping
-) -> tuple[JiraClient, dict[str, dict[str, str]]]:
-    jira = JiraClient(jira_board, settings=settings)
-    issues = jira.get_issues(fields=["key", "status", "summary"])
-    return jira, {
-        issue.key: {"status": issue.fields.status.name, "summary": issue.fields.summary}
-        for issue in issues
-    }
-
-
-def fetch_previous_state(state: State, project: str) -> dict:
-    return state.get(project, {})
-
-
-def format_message(
-    server: str,
-    key: str,
-    data: Mapping,
-    event: str,
-    previous_state: Mapping | None = None,
-    current_state: Mapping | None = None,
-) -> str:
-    summary = data["summary"]
-    info = (
-        ": {} -> {}".format(previous_state["status"], current_state["status"])
-        if previous_state and current_state
-        else ""
-    )
-    url = f"{server}/browse/{key}"
-    return f"{url} ({summary}) {event}{info}"
-
-
-def calculate_diff(
-    server: str, current_state: Mapping, previous_state: Mapping
-) -> list[str]:
-    messages = []
-    new_issues = [
-        format_message(server, key, data, "created")
-        for key, data in current_state.items()
-        if key not in previous_state
-    ]
-    messages.extend(new_issues)
-
-    deleted_issues = [
-        format_message(server, key, data, "deleted")
-        for key, data in previous_state.items()
-        if key not in current_state
-    ]
-    messages.extend(deleted_issues)
-
-    updated_issues = [
-        format_message(server, key, data, "status change", previous_state[key], data)
-        for key, data in current_state.items()
-        if key in previous_state and data["status"] != previous_state[key]["status"]
-    ]
-    messages.extend(updated_issues)
-
-    return messages
-
-
-def init_slack(jira_board: Mapping[str, Any]) -> SlackApi:
-    secret_reader = SecretReader(queries.get_secret_reader_settings())
-    slack_info = jira_board["slack"]
-
-    return slackapi_from_slack_workspace(
-        slack_info,
-        secret_reader,
-        QONTRACT_INTEGRATION,
-        channel=slack_info.get("channel"),
-        init_usergroups=False,
-    )
-
-
-def act(dry_run: bool, jira_board: Mapping[str, str], diffs: Sequence[str]) -> None:
-    if not dry_run and diffs:
-        slack = init_slack(jira_board)
-
-    for diff in reversed(diffs):
-        logging.info(diff)
-        if not dry_run:
-            slack.chat_post_message(diff)
-
-
-def write_state(state: State, project: str, state_to_write: Mapping) -> None:
-    state.add(project, value=state_to_write, force=True)
-
-
-@defer
-def run(dry_run: bool, defer: Callable | None = None) -> None:
-    jira_boards = [j for j in queries.get_jira_boards() if j.get("slack")]
-    settings = queries.get_app_interface_settings()
-    state = init_state(integration=QONTRACT_INTEGRATION)
-    if defer:
-        defer(state.cleanup)
-    for index, jira_board in enumerate(jira_boards):
-        if not is_in_shard_round_robin(jira_board["name"], index):
-            continue
-        jira, current_state = fetch_current_state(jira_board, settings)
-        if not current_state:
-            logging.warning(
-                "not acting on empty Jira boards. "
-                + "please create a ticket to get started."
-            )
-            continue
-        previous_state = fetch_previous_state(state, jira.project)
-        if previous_state:
-            assert jira.server
-            diffs = calculate_diff(jira.server, current_state, previous_state)
-            act(dry_run, jira_board, diffs)
-        if not dry_run:
-            write_state(state, jira.project, current_state)