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

reconcile/gql_definitions/openshift_serviceaccount_tokens/tokens.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,
 )
@@ -29,7 +29,7 @@ fragment CommonJumphostFields on ClusterJumpHost_v1 {
   port
   remotePort
   identity {
-    ... VaultSecret
+    ...VaultSecret
   }
 }
 
@@ -65,10 +65,10 @@ fragment ServiceAccountToken on ServiceAccountTokenSpec_v1 {
 }
 
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query ServiceAccountTokens {
@@ -92,9 +92,9 @@ query ServiceAccountTokens {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class SharedResourcesV1(ConfiguredBaseModel):

reconcile/gql_definitions/quay_membership/quay_membership.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,7 +22,7 @@ DEFINITION = """
 query QuayMembership {
   permissions: permissions_v1 {
     service
-    ...on PermissionQuayOrgTeam_v1 {
+    ... on PermissionQuayOrgTeam_v1 {
       quayOrg {
         name
         instance {
@@ -49,9 +49,9 @@ query QuayMembership {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class PermissionV1(ConfiguredBaseModel):

reconcile/gql_definitions/rhcs/certs.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,12 +12,13 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
 
 from reconcile.gql_definitions.fragments.jumphost_common_fields import CommonJumphostFields
+from reconcile.gql_definitions.rhcs.openshift_resource_rhcs_cert import OpenshiftResourceRhcsCert
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 
@@ -29,15 +30,30 @@ fragment CommonJumphostFields on ClusterJumpHost_v1 {
   port
   remotePort
   identity {
-    ... VaultSecret
+    ...VaultSecret
   }
 }
 
+fragment OpenshiftResourceRhcsCert on NamespaceOpenshiftResourceRhcsCert_v1 {
+  secret_name
+  service_account_name
+  service_account_password {
+    ... on VaultSecret_v1 {
+      path
+      field
+      version
+    }
+  }
+  auto_renew_threshold_days
+  certificate_format
+  annotations
+}
+
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query RhcsCerts {
@@ -46,37 +62,11 @@ query RhcsCerts {
     delete
     clusterAdmin
     openshiftResources {
-      provider
-      ... on NamespaceOpenshiftResourceRhcsCert_v1 {
-        secret_name
-        service_account_name
-        service_account_password {
-          ... on VaultSecret_v1 {
-            path
-            field
-            version
-          }
-        }
-        auto_renew_threshold_days
-        annotations
-      }
+      ...OpenshiftResourceRhcsCert
     }
     sharedResources {
       openshiftResources {
-        provider
-        ... on NamespaceOpenshiftResourceRhcsCert_v1 {
-          secret_name
-          service_account_name
-          service_account_password {
-            ... on VaultSecret_v1 {
-              path
-              field
-              version
-            }
-          }
-          auto_renew_threshold_days
-          annotations
-        }
+        ...OpenshiftResourceRhcsCert
       }
     }
     cluster {
@@ -84,13 +74,13 @@ query RhcsCerts {
       serverUrl
       insecureSkipTLSVerify
       jumpHost {
-        ... CommonJumphostFields
+        ...CommonJumphostFields
       }
       automationToken {
-        ... VaultSecret
+        ...VaultSecret
       }
       clusterAdminAutomationToken {
-        ... VaultSecret
+        ...VaultSecret
       }
       internal
       disable {
@@ -103,57 +93,13 @@ query RhcsCerts {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
-
-
-class NamespaceOpenshiftResourceV1(ConfiguredBaseModel):
-    provider: str = Field(..., alias="provider")
-
-
-class VaultSecretV1(ConfiguredBaseModel):
-    ...
-
-
-class VaultSecretV1_VaultSecretV1(VaultSecretV1):
-    path: str = Field(..., alias="path")
-    field: str = Field(..., alias="field")
-    version: Optional[int] = Field(..., alias="version")
-
-
-class NamespaceOpenshiftResourceRhcsCertV1(NamespaceOpenshiftResourceV1):
-    secret_name: str = Field(..., alias="secret_name")
-    service_account_name: str = Field(..., alias="service_account_name")
-    service_account_password: Union[VaultSecretV1_VaultSecretV1, VaultSecretV1] = Field(..., alias="service_account_password")
-    auto_renew_threshold_days: Optional[int] = Field(..., alias="auto_renew_threshold_days")
-    annotations: Optional[Json] = Field(..., alias="annotations")
-
-
-class SharedResourcesV1_NamespaceOpenshiftResourceV1(ConfiguredBaseModel):
-    provider: str = Field(..., alias="provider")
-
-
-class SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1(ConfiguredBaseModel):
-    ...
-
-
-class SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1_VaultSecretV1(SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1):
-    path: str = Field(..., alias="path")
-    field: str = Field(..., alias="field")
-    version: Optional[int] = Field(..., alias="version")
-
-
-class SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1(SharedResourcesV1_NamespaceOpenshiftResourceV1):
-    secret_name: str = Field(..., alias="secret_name")
-    service_account_name: str = Field(..., alias="service_account_name")
-    service_account_password: Union[SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1_VaultSecretV1, SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1_VaultSecretV1] = Field(..., alias="service_account_password")
-    auto_renew_threshold_days: Optional[int] = Field(..., alias="auto_renew_threshold_days")
-    annotations: Optional[Json] = Field(..., alias="annotations")
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class SharedResourcesV1(ConfiguredBaseModel):
-    openshift_resources: list[Union[SharedResourcesV1_NamespaceOpenshiftResourceV1_NamespaceOpenshiftResourceRhcsCertV1, SharedResourcesV1_NamespaceOpenshiftResourceV1]] = Field(..., alias="openshiftResources")
+    openshift_resources: list[OpenshiftResourceRhcsCert] = Field(..., alias="openshiftResources")
 
 
 class DisableClusterAutomationsV1(ConfiguredBaseModel):
@@ -175,7 +121,7 @@ class NamespaceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     delete: Optional[bool] = Field(..., alias="delete")
     cluster_admin: Optional[bool] = Field(..., alias="clusterAdmin")
-    openshift_resources: Optional[list[Union[NamespaceOpenshiftResourceRhcsCertV1, NamespaceOpenshiftResourceV1]]] = Field(..., alias="openshiftResources")
+    openshift_resources: Optional[list[OpenshiftResourceRhcsCert]] = Field(..., alias="openshiftResources")
     shared_resources: Optional[list[SharedResourcesV1]] = Field(..., alias="sharedResources")
     cluster: ClusterV1 = Field(..., alias="cluster")
 

reconcile/gql_definitions/rhcs/openshift_resource_rhcs_cert.py

@@ -0,0 +1,43 @@
+"""
+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
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    ConfigDict,
+    Field,
+    Json,
+)
+
+
+class ConfiguredBaseModel(BaseModel):
+    model_config = ConfigDict(
+        extra='forbid'
+    )
+
+
+class VaultSecretV1(ConfiguredBaseModel):
+    ...
+
+
+class VaultSecretV1_VaultSecretV1(VaultSecretV1):
+    path: str = Field(..., alias="path")
+    field: str = Field(..., alias="field")
+    version: Optional[int] = Field(..., alias="version")
+
+
+class OpenshiftResourceRhcsCert(ConfiguredBaseModel):
+    secret_name: str = Field(..., alias="secret_name")
+    service_account_name: str = Field(..., alias="service_account_name")
+    service_account_password: Union[VaultSecretV1_VaultSecretV1, VaultSecretV1] = Field(..., alias="service_account_password")
+    auto_renew_threshold_days: Optional[int] = Field(..., alias="auto_renew_threshold_days")
+    certificate_format: Optional[str] = Field(..., alias="certificate_format")
+    annotations: Optional[Json] = Field(..., alias="annotations")

reconcile/gql_definitions/rhidp/organizations.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,
 )
@@ -27,22 +27,22 @@ fragment DisableAutomations on DisableClusterAutomations_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 RhIdpOrganizations($name: String) {
@@ -61,9 +61,9 @@ query RhIdpOrganizations($name: String) {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class OpenShiftClusterManagerV1(ConfiguredBaseModel):

reconcile/gql_definitions/service_dependencies/jenkins_instance_fragment.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,16 +12,16 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class ServiceDependenciesJenkinsInstance(ConfiguredBaseModel):

reconcile/gql_definitions/service_dependencies/service_dependencies.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,7 +22,7 @@ from reconcile.gql_definitions.service_dependencies.jenkins_instance_fragment im
 
 DEFINITION = """
 fragment ServiceDependenciesJenkinsInstance on JenkinsInstance_v1 {
-    name
+  name
 }
 
 query ServiceDependencies {
@@ -36,7 +36,7 @@ query ServiceDependencies {
     }
     jenkinsConfigs {
       instance {
-        ... ServiceDependenciesJenkinsInstance
+        ...ServiceDependenciesJenkinsInstance
       }
     }
     saasFiles {
@@ -47,7 +47,7 @@ query ServiceDependencies {
         targets {
           upstream {
             instance {
-              ... ServiceDependenciesJenkinsInstance
+              ...ServiceDependenciesJenkinsInstance
             }
           }
         }
@@ -73,9 +73,9 @@ query ServiceDependencies {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class DependencyV1(ConfiguredBaseModel):

reconcile/gql_definitions/sharding/aws_accounts.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,20 +20,20 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 
 DEFINITION = """
 query AWSAccountSharding {
-    aws_accounts: awsaccounts_v1 {
-        name
-        disable {
-            integrations
-        }
+  aws_accounts: awsaccounts_v1 {
+    name
+    disable {
+      integrations
     }
+  }
 }
 """
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class DisableClusterAutomationsV1(ConfiguredBaseModel):

reconcile/gql_definitions/sharding/ocm_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,
 )
@@ -27,17 +27,17 @@ fragment MinimalOCMOrganization on OpenShiftClusterManager_v1 {
 }
 
 query OCMOrganizationSharding {
-    ocm_organizations: ocm_instances_v1 {
-       ... MinimalOCMOrganization
-    }
+  ocm_organizations: ocm_instances_v1 {
+    ...MinimalOCMOrganization
+  }
 }
 """
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class OCMOrganizationShardingQueryData(ConfiguredBaseModel):

reconcile/gql_definitions/skupper_network/site_controller_template.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,16 +12,16 @@ from typing import (  # noqa: F401 # pylint: disable=W0611
 
 from pydantic import (  # noqa: F401 # pylint: disable=W0611
     BaseModel,
-    Extra,
+    ConfigDict,
     Field,
     Json,
 )
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class SkupperSiteControllerTemplate(ConfiguredBaseModel):

reconcile/gql_definitions/skupper_network/skupper_networks.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,
 )
@@ -30,7 +30,7 @@ fragment CommonJumphostFields on ClusterJumpHost_v1 {
   port
   remotePort
   identity {
-    ... VaultSecret
+    ...VaultSecret
   }
 }
 
@@ -40,10 +40,10 @@ fragment SkupperSiteControllerTemplate on SkupperSiteControllerTemplate_v1 {
 }
 
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query SkupperNetworks {
@@ -105,9 +105,9 @@ query SkupperNetworks {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class NamespaceSkupperSiteConfigV1(ConfiguredBaseModel):

reconcile/gql_definitions/slack_usergroups/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,
 )
@@ -34,9 +34,9 @@ query SlackUsergroupCluster {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class ClusterAuthV1(ConfiguredBaseModel):