qontract-reconcile 0.10.2.dev299__py3-none-any.whl → 0.10.2.dev430__py3-none-any.whl

reconcile/gitlab_permissions.py

@@ -94,14 +94,6 @@ class GroupPermissionHandler:
         desired_state: dict[str, GroupSpec],
         current_state: dict[str, GroupSpec],
     ) -> None:
-        # gather list of app-interface managed repos
-        instance = queries.get_gitlab_instance()
-        managed_repos = {
-            f"{instance['url']}/{project_request['group']}/{r}"
-            for project_request in instance.get("projectRequests", [])
-            for r in project_request.get("projects", [])
-        }
-
         # get the diff data
         diff_data = diff_mappings(
             current=current_state,
@@ -112,11 +104,10 @@ class GroupPermissionHandler:
         errors: list[Exception] = []
         for repo in diff_data.add:
             project = self.gl.get_project(repo)
-            if not project and repo in managed_repos:
-                logging.info(
-                    f"New app-interface managed repository {repo} hasn't been created yet - skipping"
-                )
+            if not project:
+                logging.info(f"{repo} hasn't been created yet - skipping")
                 continue
+
             if not self.can_share_project(project):
                 errors.append(
                     GroupAccessLevelError(
@@ -136,8 +127,13 @@ class GroupPermissionHandler:
                     group_id=self.group.id,
                     access_level=self.access_level,
                 )
+
         for repo in diff_data.change:
             project = self.gl.get_project(repo)
+            if not project:
+                logging.info(f"{repo} hasn't been created yet - skipping")
+                continue
+
             if not self.can_share_project(project):
                 errors.append(
                     GroupAccessLevelError(

reconcile/glitchtip_project_alerts/integration.py

@@ -69,7 +69,9 @@ class GlitchtipProjectAlertsIntegration(
         return QONTRACT_INTEGRATION
 
     def get_early_exit_desired_state(self) -> dict[str, Any] | None:
-        return {"projects": [c.dict() for c in self.get_projects(gql.get_api().query)]}
+        return {
+            "projects": [c.model_dump() for c in self.get_projects(gql.get_api().query)]
+        }
 
     def get_projects(self, query_func: Callable) -> list[GlitchtipProjectV1]:
         return glitchtip_project_query(query_func=query_func).glitchtip_projects or []

reconcile/gql_definitions/acs/acs_instances.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -22,17 +22,17 @@ from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 DEFINITION = """
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query AcsInstance {
   instances: acs_instance_v1 {
     url
     credentials {
-      ... VaultSecret
+      ...VaultSecret
     }
     authProvider {
       name
@@ -44,9 +44,9 @@ query AcsInstance {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AcsInstanceAuthProviderV1(ConfiguredBaseModel):

reconcile/gql_definitions/acs/acs_policies.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -68,9 +68,9 @@ query AcsPolicy {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AcsPolicyScopeV1(ConfiguredBaseModel):

reconcile/gql_definitions/acs/acs_rbac.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,14 +12,14 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
 
 
 DEFINITION = """
-query AcsRbac  {
+query AcsRbac {
   acs_rbacs: users_v1 {
     org_username
     roles {
@@ -48,9 +48,9 @@ query AcsRbac  {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class OidcPermissionV1(ConfiguredBaseModel):

reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -26,16 +26,16 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
   name
   labels
   environment {
-    ... OCMEnvironment
+    ...OCMEnvironment
   }
   orgId
   accessTokenClientId
   accessTokenUrl
   accessTokenClientSecret {
-    ... VaultSecret
+    ...VaultSecret
   }
   disable {
-    ... DisableAutomations
+    ...DisableAutomations
   }
   blockedVersions
   addonManagedUpgrades
@@ -46,7 +46,7 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
     instance {
       name
       token {
-        ... VaultSecret
+        ...VaultSecret
       }
     }
     name
@@ -58,11 +58,11 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
       name
     }
     publishVersionData {
-      ... MinimalOCMOrganization
+      ...MinimalOCMOrganization
     }
   }
   publishVersionData {
-    ... MinimalOCMOrganization
+    ...MinimalOCMOrganization
   }
   sectors {
     name
@@ -82,7 +82,7 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
       id
     }
     upgradePolicy {
-      ... ClusterUpgradePolicyV1
+      ...ClusterUpgradePolicyV1
     }
   }
   ausClusterHealthChecks {
@@ -113,41 +113,41 @@ fragment MinimalOCMOrganization on OpenShiftClusterManager_v1 {
 }
 
 fragment OCMEnvironment on OpenShiftClusterManagerEnvironment_v1 {
-    name
-    description
-    labels
-    url
-    accessTokenClientId
-    accessTokenUrl
-    accessTokenClientSecret {
-        ... VaultSecret
-    }
+  name
+  description
+  labels
+  url
+  accessTokenClientId
+  accessTokenUrl
+  accessTokenClientSecret {
+    ...VaultSecret
+  }
 }
 
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query AUSClusters($name: String) {
   clusters: clusters_v1(name: $name) {
     name
     ocm {
-        ... AUSOCMOrganization
+      ...AUSOCMOrganization
     }
     upgradePolicy {
-        ... ClusterUpgradePolicyV1
+      ...ClusterUpgradePolicyV1
     }
     spec {
-        product
-        id
-        external_id
-        version
+      product
+      id
+      external_id
+      version
     }
     disable {
-        integrations
+      integrations
     }
   }
 }
@@ -155,9 +155,9 @@ query AUSClusters($name: String) {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class ClusterSpecV1(ConfiguredBaseModel):

reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -25,16 +25,16 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
   name
   labels
   environment {
-    ... OCMEnvironment
+    ...OCMEnvironment
   }
   orgId
   accessTokenClientId
   accessTokenUrl
   accessTokenClientSecret {
-    ... VaultSecret
+    ...VaultSecret
   }
   disable {
-    ... DisableAutomations
+    ...DisableAutomations
   }
   blockedVersions
   addonManagedUpgrades
@@ -45,7 +45,7 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
     instance {
       name
       token {
-        ... VaultSecret
+        ...VaultSecret
       }
     }
     name
@@ -57,11 +57,11 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
       name
     }
     publishVersionData {
-      ... MinimalOCMOrganization
+      ...MinimalOCMOrganization
     }
   }
   publishVersionData {
-    ... MinimalOCMOrganization
+    ...MinimalOCMOrganization
   }
   sectors {
     name
@@ -81,7 +81,7 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
       id
     }
     upgradePolicy {
-      ... ClusterUpgradePolicyV1
+      ...ClusterUpgradePolicyV1
     }
   }
   ausClusterHealthChecks {
@@ -112,36 +112,36 @@ fragment MinimalOCMOrganization on OpenShiftClusterManager_v1 {
 }
 
 fragment OCMEnvironment on OpenShiftClusterManagerEnvironment_v1 {
-    name
-    description
-    labels
-    url
-    accessTokenClientId
-    accessTokenUrl
-    accessTokenClientSecret {
-        ... VaultSecret
-    }
+  name
+  description
+  labels
+  url
+  accessTokenClientId
+  accessTokenUrl
+  accessTokenClientSecret {
+    ...VaultSecret
+  }
 }
 
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query AUSOrganizations($name: String) {
   organizations: ocm_instances_v1(name: $name) {
-    ... AUSOCMOrganization
+    ...AUSOCMOrganization
   }
 }
 """
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AUSOrganizationsQueryData(ConfiguredBaseModel):

reconcile/gql_definitions/app_interface_metrics_exporter/onboarding_status.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -20,8 +20,7 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 
 DEFINITION = """
 query OnboardingStatus {
-  apps: apps_v1
-  {
+  apps: apps_v1 {
     onboardingStatus
   }
 }
@@ -29,9 +28,9 @@ query OnboardingStatus {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AppV1(ConfiguredBaseModel):

reconcile/gql_definitions/app_sre_tekton_access_revalidation/roles.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -38,9 +38,9 @@ query AppSRETektonAccessRevalidationRoles {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class NamespaceV1(ConfiguredBaseModel):

reconcile/gql_definitions/app_sre_tekton_access_revalidation/users.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -40,9 +40,9 @@ query AppSRETektonAccessRevalidationUsers {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class ClusterV1(ConfiguredBaseModel):

reconcile/gql_definitions/automated_actions/instance.py

@@ -1,5 +1,5 @@
 """
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+Generated by qenerate plugin=pydantic_v2. DO NOT MODIFY MANUALLY!
 """
 from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
 from datetime import datetime  # noqa: F401 # pylint: disable=W0611
@@ -12,7 +12,7 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
@@ -28,7 +28,7 @@ fragment CommonJumphostFields on ClusterJumpHost_v1 {
   port
   remotePort
   identity {
-    ... VaultSecret
+    ...VaultSecret
   }
 }
 
@@ -52,10 +52,10 @@ fragment OcConnectionCluster on Cluster_v1 {
 }
 
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query AutomatedActionsInstances {
@@ -132,6 +132,21 @@ query AutomatedActionsInstances {
           identifier
         }
       }
+      ... on AutomatedActionOpenshiftTriggerCronjob_v1 {
+        openshift_trigger_cronjob_arguments: arguments {
+          namespace {
+            name
+            delete
+            cluster {
+              name
+              disable {
+                integrations
+              }
+            }
+          }
+          cronjob
+        }
+      }
       ... on AutomatedActionOpenshiftWorkloadDelete_v1 {
         openshift_workload_delete_arguments: arguments {
           namespace {
@@ -172,9 +187,9 @@ query AutomatedActionsInstances {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class NamespaceV1(ConfiguredBaseModel):
@@ -297,11 +312,35 @@ class DisableClusterAutomationsV1(ConfiguredBaseModel):
     integrations: Optional[list[str]] = Field(..., alias="integrations")
 
 
-class AutomatedActionOpenshiftWorkloadDeleteArgumentV1_NamespaceV1_ClusterV1(ConfiguredBaseModel):
+class AutomatedActionOpenshiftTriggerCronjobArgumentV1_NamespaceV1_ClusterV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     disable: Optional[DisableClusterAutomationsV1] = Field(..., alias="disable")
 
 
+class AutomatedActionOpenshiftTriggerCronjobArgumentV1_NamespaceV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    delete: Optional[bool] = Field(..., alias="delete")
+    cluster: AutomatedActionOpenshiftTriggerCronjobArgumentV1_NamespaceV1_ClusterV1 = Field(..., alias="cluster")
+
+
+class AutomatedActionOpenshiftTriggerCronjobArgumentV1(ConfiguredBaseModel):
+    namespace: AutomatedActionOpenshiftTriggerCronjobArgumentV1_NamespaceV1 = Field(..., alias="namespace")
+    cronjob: str = Field(..., alias="cronjob")
+
+
+class AutomatedActionOpenshiftTriggerCronjobV1(AutomatedActionV1):
+    openshift_trigger_cronjob_arguments: list[AutomatedActionOpenshiftTriggerCronjobArgumentV1] = Field(..., alias="openshift_trigger_cronjob_arguments")
+
+
+class AutomatedActionOpenshiftWorkloadDeleteArgumentV1_NamespaceV1_ClusterV1_DisableClusterAutomationsV1(ConfiguredBaseModel):
+    integrations: Optional[list[str]] = Field(..., alias="integrations")
+
+
+class AutomatedActionOpenshiftWorkloadDeleteArgumentV1_NamespaceV1_ClusterV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    disable: Optional[AutomatedActionOpenshiftWorkloadDeleteArgumentV1_NamespaceV1_ClusterV1_DisableClusterAutomationsV1] = Field(..., alias="disable")
+
+
 class AutomatedActionOpenshiftWorkloadDeleteArgumentV1_NamespaceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     delete: Optional[bool] = Field(..., alias="delete")
@@ -347,7 +386,7 @@ class AutomatedActionOpenshiftWorkloadRestartV1(AutomatedActionV1):
 class AutomatedActionsInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     deployment: NamespaceV1 = Field(..., alias="deployment")
-    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceFlushElastiCacheV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionExternalResourceRdsSnapshotV1, AutomatedActionOpenshiftWorkloadDeleteV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
+    actions: Optional[list[Union[AutomatedActionActionListV1, AutomatedActionExternalResourceFlushElastiCacheV1, AutomatedActionExternalResourceRdsRebootV1, AutomatedActionExternalResourceRdsSnapshotV1, AutomatedActionOpenshiftTriggerCronjobV1, AutomatedActionOpenshiftWorkloadDeleteV1, AutomatedActionOpenshiftWorkloadRestartV1, AutomatedActionV1]]] = Field(..., alias="actions")
 
 
 class AutomatedActionsInstancesQueryData(ConfiguredBaseModel):