qontract-reconcile 0.10.2.dev394__py3-none-any.whl → 0.10.2.dev427__py3-none-any.whl

reconcile/gql_definitions/templating/templates.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,
 )
@@ -50,9 +50,9 @@ query Templatev1 {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class TemplatePatchV1(ConfiguredBaseModel):

reconcile/gql_definitions/terraform_cloudflare_dns/app_interface_cloudflare_dns_settings.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,9 +29,9 @@ query AppInterfaceSettingCloudflareDNS {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AppInterfaceSettingsV1(ConfiguredBaseModel):

reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.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,
 )
@@ -94,9 +94,9 @@ query CloudflareDnsZone {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AWSTerraformStateIntegrationsV1(ConfiguredBaseModel):

reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_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,
 )
@@ -64,9 +64,9 @@ query TerraformCloudflareAccounts {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AWSTerraformStateIntegrationsV1(ConfiguredBaseModel):

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

reconcile/gql_definitions/terraform_cloudflare_users/app_interface_setting_cloudflare_and_vault.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,9 +29,9 @@ query AppInterfaceSettingCloudflareAndVault {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AppInterfaceSettingsV1(ConfiguredBaseModel):

reconcile/gql_definitions/terraform_cloudflare_users/terraform_cloudflare_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,
 )
@@ -68,9 +68,9 @@ query CloudflareAccountRole {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class UserV1(ConfiguredBaseModel):

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

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

reconcile/gql_definitions/terraform_resources/database_access_manager.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 DatabaseAccessManager {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class VaultSecretV1(ConfiguredBaseModel):

reconcile/gql_definitions/terraform_resources/terraform_resources_namespaces.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,
 )
@@ -552,9 +552,9 @@ query TerraformResourcesNamespaces {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class ExternalResourcesProvisionerV1(ConfiguredBaseModel):

reconcile/gql_definitions/terraform_tgw_attachments/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,
 )
@@ -92,9 +92,9 @@ query AWSAccounts($name: String) {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class AWSAccountV1(AWSAccountCommon):

reconcile/gql_definitions/unleash_feature_toggles/feature_toggles.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,
 )
@@ -57,9 +57,9 @@ query UnleashFeatureToggles {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class UnleashFeatureToggleV1(ConfiguredBaseModel):

reconcile/gql_definitions/vault_instances/vault_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,
 )
@@ -118,9 +118,9 @@ query VaultInstances {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class VaultInstanceAuthV1(ConfiguredBaseModel):

reconcile/gql_definitions/vault_policies/vault_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,
 )
@@ -32,9 +32,9 @@ query VaultPolicies {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class VaultInstanceV1(ConfiguredBaseModel):

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

reconcile/gql_definitions/vpc_peerings_validator/vpc_peerings_validator_peered_cluster_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 ClusterNetworkV1(ConfiguredBaseModel):

reconcile/integrations_manager.py

@@ -122,7 +122,7 @@ def _build_helm_integration_spec(
     managed: IntegrationManagedV1,
     shard_manager: IntegrationShardManager,
 ) -> HelmIntegrationSpec:
-    integration_spec = managed.spec.dict(by_alias=True)
+    integration_spec = managed.spec.model_dump(by_alias=True)
     shard_specs = shard_manager.build_integration_shards(integration_name, managed)
     his = HelmIntegrationSpec(
         **integration_spec, name=integration_name, shard_specs=shard_specs
@@ -143,7 +143,7 @@ def build_helm_values(specs: Iterable[HelmIntegrationSpec]) -> dict:
         else:
             values.integrations.append(s)
 
-    return values.dict(exclude_none=True, by_alias=True)
+    return values.model_dump(exclude_none=True, by_alias=True)
 
 
 class IntegrationsEnvironment(BaseModel):
@@ -273,7 +273,7 @@ def run(
 
     ri, oc_map = ob.fetch_current_state(
         namespaces=[
-            ie.namespace.dict(by_alias=True) for ie in integration_environments
+            ie.namespace.model_dump(by_alias=True) for ie in integration_environments
         ],
         thread_pool_size=thread_pool_size,
         integration=QONTRACT_INTEGRATION,

reconcile/jenkins_worker_fleets.py

@@ -26,7 +26,7 @@ class SSHHostKeyVerificationStrategy(Enum):
     KNOWN_HOSTS_FILE_KEY_VERIFICATION_STRATEGY = "knownHostsFileKeyVerificationStrategy"
 
 
-class SSHConnector(BaseModel):
+class SSHConnector(BaseModel, use_enum_values=True):
     credentials_id: str = Field(..., alias="credentialsId")
     launch_timeout_seconds: int | None = Field(None, alias="launchTimeoutSeconds")
     max_num_retries: int | None = Field(None, alias="maxNumRetries")
@@ -38,9 +38,6 @@ class SSHConnector(BaseModel):
         alias="sshHostKeyVerificationStrategy",
     )
 
-    class Config:
-        use_enum_values = True
-
 
 class ComputerConnector(BaseModel):
     # alias name is defined by jcasc schema
@@ -81,7 +78,7 @@ class JenkinsWorkerFleet(BaseModel):
         return hash(self.fleet + self.region)
 
     def differ(self, other: JenkinsWorkerFleet) -> bool:
-        return self.dict() != other.dict()
+        return self.model_dump(mode="json") != other.model_dump(mode="json")
 
 
 def get_current_state(jenkins: JenkinsApi) -> list[JenkinsWorkerFleet]:
@@ -159,8 +156,8 @@ def act(
         current_fleet = current_state[current_state.index(f)]
         desired_fleet = desired_state[desired_state.index(f)]
         if current_fleet.differ(desired_fleet):
-            logging.debug("CURRENT: " + str(current_fleet.dict(by_alias=True)))
-            logging.debug("DESIRED: " + str(desired_fleet.dict(by_alias=True)))
+            logging.debug("CURRENT: " + str(current_fleet.model_dump(by_alias=True)))
+            logging.debug("DESIRED: " + str(desired_fleet.model_dump(by_alias=True)))
             to_update.append(desired_fleet)
 
     if to_add or to_delete or to_update:
@@ -173,7 +170,11 @@ def act(
 
         if not dry_run:
             d_clouds = [
-                {"eC2Fleet": d.dict(by_alias=True, exclude_none=True)}
+                {
+                    "eC2Fleet": d.model_dump(
+                        mode="json", by_alias=True, exclude_none=True
+                    )
+                }
                 for d in desired_state
             ]
             config = {"jenkins": {"clouds": d_clouds}}

reconcile/jira_permissions_validator.py

@@ -188,7 +188,7 @@ def _validate_issue_fields(
 
         for option in project_issue_field.options:
             if option == field.value:
-                custom_fields[project_issue_field.id] = option.dict()
+                custom_fields[project_issue_field.id] = option.model_dump()
                 break
         else:
             logging.error(
@@ -431,7 +431,7 @@ def get_jira_boards(
 
 
 def export_boards(boards: list[JiraBoardV1]) -> list[dict]:
-    return [board.dict() for board in boards]
+    return [board.model_dump() for board in boards]
 
 
 @defer

reconcile/ldap_groups/integration.py

@@ -58,7 +58,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
         """Return the desired state for early exit."""
         if not query_func:
             query_func = gql.get_api().query
-        return {"roles": [c.dict() for c in self.get_roles(query_func)]}
+        return {"roles": [c.model_dump() for c in self.get_roles(query_func)]}
 
     @defer
     def run(self, dry_run: bool, defer: Callable | None = None) -> None: