Merge pull request #191 from oslokommune/remove-external-client-report

Remove the external client report

jobs/client_report.py

@@ -206,44 +206,3 @@ def send_client_report_internal(event, context):
         _send_email(["[email protected]"], report)
     else:
         logger.info("No errors to report!")
-
-
-@logging_wrapper
-@xray_recorder.capture("send_client_report_external")
-def send_client_report_external(event, context):
-    """Send a report to each team with any registered Maskinporten clients."""
-    teams = {}
-
-    for env in MASKINPORTEN_ENVS:
-        for client in _active_clients(env):
-            client["env"] = env
-            try:
-                for team in _client_teams(client, env):
-                    if email := team["attributes"].get("email"):
-                        team_entry = teams.setdefault(
-                            team["name"],
-                            Team(email, []),
-                        )
-                        team_entry.clients.append(client)
-            except ClientWarning:
-                # Nothing to do about these at this point.
-                pass
-
-    for team_name, team in teams.items():
-        _send_email(
-            team.emails,
-            "\n\n".join(
-                [
-                    f"Hei {team_name}!",
-                    "Dere har følgende klienter registrert i Maskinporten:",
-                    *map(_format_client, team.clients),
-                    (
-                        "Husk at aktive klienter til enhver tid må være "
-                        "registrert i behandlingsoversikten. Klienter som "
-                        "ikke lenger er i bruk kan slettes ved å bruke "
-                        "okdata-cli."
-                    ),
-                    "Hilsen Dataspeilet",
-                ]
-            ),
-        )

serverless.yaml

@@ -78,17 +78,6 @@ functions:
           rate: cron(0 0 1 * ? *)
           enabled: ${self:custom.clientReportEnabled.${opt:stage, self:provider.stage}}
     timeout: 300
-  # client-report-external:
-  #   image:
-  #     name: okdata-maskinporten-api
-  #     command:
-  #       - jobs.client_report.send_client_report_external
-  #   events:
-  #     - schedule:
-  #         # At 10:00 on 10/10 every year (the security month).
-  #         rate: cron(0 10 10 10 ? *)
-  #         enabled: ${self:custom.clientReportEnabled.${opt:stage, self:provider.stage}}
-  #   timeout: 300
   key-rotator:
     image:
       name: okdata-maskinporten-api