qontract-reconcile 0.10.2.dev243__tar.gz → 0.10.2.dev245__tar.gz

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev243
+Version: 0.10.2.dev245
 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
@@ -181,8 +181,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
   jenkins-job-builder             Manage Jenkins jobs configurations using
                                   jenkins-jobs.
   jenkins-job-builds-cleaner      Clean up jenkins job history.
-  jenkins-job-cleaner             Delete Jenkins jobs in multiple tenant
-                                  instances.
   jenkins-roles                   Manage Jenkins roles association via REST
                                   API.
   jenkins-webhooks                Manage web hooks to Jenkins jobs.

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/README.md

@@ -116,8 +116,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
   jenkins-job-builder             Manage Jenkins jobs configurations using
                                   jenkins-jobs.
   jenkins-job-builds-cleaner      Clean up jenkins job history.
-  jenkins-job-cleaner             Delete Jenkins jobs in multiple tenant
-                                  instances.
   jenkins-roles                   Manage Jenkins roles association via REST
                                   API.
   jenkins-webhooks                Manage web hooks to Jenkins jobs.

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/reconcile/automated_actions/config/integration.py

@@ -19,6 +19,7 @@ from reconcile.gql_definitions.automated_actions.instance import (
     AutomatedActionActionListV1,
     AutomatedActionExternalResourceFlushElastiCacheV1,
     AutomatedActionExternalResourceRdsRebootV1,
+    AutomatedActionExternalResourceRdsSnapshotV1,
     AutomatedActionOpenshiftWorkloadRestartArgumentV1,
     AutomatedActionOpenshiftWorkloadRestartV1,
     AutomatedActionsInstanceV1,
@@ -178,13 +179,30 @@ class AutomatedActionsConfigIntegration(
                                 "identifier": ec_arg.identifier,
                             })
                 case AutomatedActionExternalResourceRdsRebootV1():
-                    for rds_arg in action.external_resource_rds_reboot_arguments:
-                        for rds_er in rds_arg.namespace.external_resources or []:
-                            if not isinstance(rds_er.provisioner, AWSAccountV1):
+                    for rds_reboot_arg in action.external_resource_rds_reboot_arguments:
+                        for rds_reboot_er in (
+                            rds_reboot_arg.namespace.external_resources or []
+                        ):
+                            if not isinstance(rds_reboot_er.provisioner, AWSAccountV1):
                                 continue
                             parameters.append({
-                                "account": f"^{rds_er.provisioner.name}$",
-                                "identifier": rds_arg.identifier,
+                                "account": f"^{rds_reboot_er.provisioner.name}$",
+                                "identifier": rds_reboot_arg.identifier,
+                            })
+                case AutomatedActionExternalResourceRdsSnapshotV1():
+                    for (
+                        rds_snapshot_arg
+                    ) in action.external_resource_rds_snapshot_arguments:
+                        for rds_snapshot_er in (
+                            rds_snapshot_arg.namespace.external_resources or []
+                        ):
+                            if not isinstance(
+                                rds_snapshot_er.provisioner, AWSAccountV1
+                            ):
+                                continue
+                            parameters.append({
+                                "account": f"^{rds_snapshot_er.provisioner.name}$",
+                                "identifier": rds_snapshot_arg.identifier,
                             })
                 case AutomatedActionOpenshiftWorkloadRestartV1():
                     parameters.extend(

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/reconcile/cli.py

@@ -1103,14 +1103,6 @@ def jenkins_job_builds_cleaner(ctx: click.Context) -> None:
     run_integration(reconcile.jenkins_job_builds_cleaner, ctx)
 
 
-@integration.command(short_help="Delete Jenkins jobs in multiple tenant instances.")
-@click.pass_context
-def jenkins_job_cleaner(ctx: click.Context) -> None:
-    import reconcile.jenkins_job_cleaner
-
-    run_integration(reconcile.jenkins_job_cleaner, ctx)
-
-
 @integration.command(short_help="Manage web hooks to Jenkins jobs.")
 @click.pass_context
 def jenkins_webhooks(ctx: click.Context) -> None:

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/reconcile/gql_definitions/automated_actions/instance.py

@@ -118,6 +118,20 @@ query AutomatedActionsInstances {
           identifier
         }
       }
+      ... on AutomatedActionExternalResourceRdsSnapshot_v1 {
+        external_resource_rds_snapshot_arguments: arguments {
+          namespace {
+            externalResources {
+              provisioner {
+                ... on AWSAccount_v1 {
+                  name
+                }
+              }
+            }
+          }
+          identifier
+        }
+      }
       ... on AutomatedActionOpenshiftWorkloadRestart_v1 {
         openshift_workload_restart_arguments: arguments {
           namespace {
@@ -237,6 +251,31 @@ class AutomatedActionExternalResourceRdsRebootV1(AutomatedActionV1):
     external_resource_rds_reboot_arguments: list[AutomatedActionExternalResourceRdsRebootV1_AutomatedActionExternalResourceArgumentV1] = Field(..., alias="external_resource_rds_reboot_arguments")
 
 
+class AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1(ConfiguredBaseModel):
+    ...
+
+
+class AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1_AWSAccountV1(AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1):
+    name: str = Field(..., alias="name")
+
+
+class AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1(ConfiguredBaseModel):
+    provisioner: Union[AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1_AWSAccountV1, AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1_ExternalResourcesProvisionerV1] = Field(..., alias="provisioner")
+
+
+class AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1(ConfiguredBaseModel):
+    external_resources: Optional[list[AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1_NamespaceExternalResourceV1]] = Field(..., alias="externalResources")
+
+
+class AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1(ConfiguredBaseModel):
+    namespace: AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1_NamespaceV1 = Field(..., alias="namespace")
+    identifier: str = Field(..., alias="identifier")
+
+
+class AutomatedActionExternalResourceRdsSnapshotV1(AutomatedActionV1):
+    external_resource_rds_snapshot_arguments: list[AutomatedActionExternalResourceRdsSnapshotV1_AutomatedActionExternalResourceArgumentV1] = Field(..., alias="external_resource_rds_snapshot_arguments")
+
+
 class DisableClusterAutomationsV1(ConfiguredBaseModel):
     integrations: Optional[list[str]] = Field(..., alias="integrations")
 
@@ -265,7 +304,7 @@ class AutomatedActionOpenshiftWorkloadRestartV1(AutomatedActionV1):
 class AutomatedActionsInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     deployment: NamespaceV1 = Field(..., alias="deployment")
-    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceFlushElastiCacheV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
+    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceFlushElastiCacheV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionExternalResourceRdsSnapshotV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
 
 
 class AutomatedActionsInstancesQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/reconcile/gql_definitions/introspection.json

@@ -5696,6 +5696,11 @@
                             "name": "AutomatedActionExternalResourceRdsReboot_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "AutomatedActionExternalResourceRdsSnapshot_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "AutomatedActionNoOp_v1",
@@ -27286,6 +27291,11 @@
                             "name": "AutomatedActionExternalResourceRdsReboot_v1",
                             "ofType": null
                         },
+                        {
+                            "kind": "OBJECT",
+                            "name": "AutomatedActionExternalResourceRdsSnapshot_v1",
+                            "ofType": null
+                        },
                         {
                             "kind": "OBJECT",
                             "name": "AutomatedActionNoOp_v1",
@@ -53550,6 +53560,172 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
+                {
+                    "kind": "OBJECT",
+                    "name": "AutomatedActionExternalResourceRdsSnapshot_v1",
+                    "description": null,
+                    "fields": [
+                        {
+                            "name": "schema",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "path",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "type",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "String",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "description",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "SCALAR",
+                                "name": "String",
+                                "ofType": null
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "maxOps",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "SCALAR",
+                                    "name": "Int",
+                                    "ofType": null
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "instances",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "AutomatedActionsInstance_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "permissions",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "LIST",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "NON_NULL",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "OBJECT",
+                                        "name": "PermissionAutomatedActions_v1",
+                                        "ofType": null
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        },
+                        {
+                            "name": "arguments",
+                            "description": null,
+                            "args": [],
+                            "type": {
+                                "kind": "NON_NULL",
+                                "name": null,
+                                "ofType": {
+                                    "kind": "LIST",
+                                    "name": null,
+                                    "ofType": {
+                                        "kind": "NON_NULL",
+                                        "name": null,
+                                        "ofType": {
+                                            "kind": "OBJECT",
+                                            "name": "AutomatedActionExternalResourceArgument_v1",
+                                            "ofType": null
+                                        }
+                                    }
+                                }
+                            },
+                            "isDeprecated": false,
+                            "deprecationReason": null
+                        }
+                    ],
+                    "inputFields": null,
+                    "interfaces": [
+                        {
+                            "kind": "INTERFACE",
+                            "name": "AutomatedAction_v1",
+                            "ofType": null
+                        },
+                        {
+                            "kind": "INTERFACE",
+                            "name": "DatafileObject_v1",
+                            "ofType": null
+                        }
+                    ],
+                    "enumValues": null,
+                    "possibleTypes": null
+                },
                 {
                     "kind": "OBJECT",
                     "name": "AutomatedActionNoOp_v1",

{qontract_reconcile-0.10.2.dev243 → qontract_reconcile-0.10.2.dev245}/reconcile/utils/jenkins_api.py

@@ -93,20 +93,6 @@ class JenkinsApi:
         )
         res.raise_for_status()
 
-    def delete_job(self, job_name):
-        kwargs = self.get_crumb_kwargs()
-
-        url = f"{self.url}/job/{job_name}/doDelete"
-        res = requests.post(
-            url,
-            verify=self.ssl_verify,
-            auth=(self.user, self.password),
-            timeout=60,
-            **kwargs,
-        )
-
-        res.raise_for_status()
-
     def get_all_roles(self):
         url = f"{self.url}/role-strategy/strategy/getAllRoles"
         res = requests.get(

qontract_reconcile-0.10.2.dev243/reconcile/jenkins_job_cleaner.py

@@ -1,51 +0,0 @@
-import logging
-from collections.abc import Iterable
-
-from reconcile import queries
-from reconcile.jenkins_job_builder import init_jjb
-from reconcile.utils.jenkins_api import JenkinsApi
-from reconcile.utils.secret_reader import SecretReader
-
-QONTRACT_INTEGRATION = "jenkins-job-cleaner"
-
-
-def get_managed_job_names(
-    job_names: Iterable[str], managed_projects: Iterable[str]
-) -> list[str]:
-    managed_jobs = set()
-    for job_name in job_names:
-        for managed_project in managed_projects:
-            if job_name.startswith(managed_project):
-                managed_jobs.add(job_name)
-
-    return list(managed_jobs)
-
-
-def get_desired_job_names(instance_name: str, secret_reader: SecretReader) -> list[str]:
-    jjb = init_jjb(secret_reader)
-    desired_jobs = jjb.get_all_jobs(instance_name=instance_name)[instance_name]
-    return [j["name"] for j in desired_jobs]
-
-
-def run(dry_run: bool) -> None:
-    jenkins_instances = queries.get_jenkins_instances()
-    secret_reader = SecretReader(queries.get_secret_reader_settings())
-
-    for instance in jenkins_instances:
-        if instance.get("deleteMethod") != "manual":
-            continue
-        managed_projects = instance.get("managedProjects")
-        if not managed_projects:
-            continue
-
-        instance_name = instance["name"]
-        jenkins = JenkinsApi.init_jenkins_from_secret(secret_reader, instance["token"])
-        all_job_names = jenkins.get_job_names()
-        managed_job_names = get_managed_job_names(all_job_names, managed_projects)
-        desired_job_names = get_desired_job_names(instance_name, secret_reader)
-        delete_job_names = [j for j in managed_job_names if j not in desired_job_names]
-
-        for job_name in delete_job_names:
-            logging.info(["delete_job", instance_name, job_name])
-            if not dry_run:
-                jenkins.delete_job(job_name)