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

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,15 +12,23 @@ 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.aws_organization import AWSOrganization
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 
 DEFINITION = """
+fragment AWSOrganization on AWSOrganization_v1 {
+  payerAccount {
+    organizationAccountTags
+  }
+  tags
+}
+
 fragment VaultSecret on VaultSecret_v1 {
   path
   field
@@ -33,6 +41,7 @@ query TerraformInitAWSAccounts {
     name
     terraformUsername
     terraformState {
+      bucket
       region
     }
     resourcesDefaultRegion
@@ -42,18 +51,22 @@ query TerraformInitAWSAccounts {
     disable {
       integrations
     }
+    organization {
+      ...AWSOrganization
+    }
   }
 }
 """
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class TerraformStateAWSV1(ConfiguredBaseModel):
+    bucket: str = Field(..., alias="bucket")
     region: str = Field(..., alias="region")
 
 
@@ -68,6 +81,7 @@ class AWSAccountV1(ConfiguredBaseModel):
     resources_default_region: str = Field(..., alias="resourcesDefaultRegion")
     automation_token: VaultSecret = Field(..., alias="automationToken")
     disable: Optional[DisableClusterAutomationsV1] = Field(..., alias="disable")
+    organization: Optional[AWSOrganization] = Field(..., alias="organization")
 
 
 class TerraformInitAWSAccountsQueryData(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,
 )
@@ -108,6 +108,17 @@ query TerraformResourcesNamespaces {
             }
             managed_by_erv2
           }
+          ... on NamespaceTerraformResourceRDSProxy_v1 {
+            region
+            identifier
+            defaults
+            overrides
+            output_resource_name
+            annotations
+            tags
+            managed_by_erv2
+          }
+
           ... on NamespaceTerraformResourceS3_v1 {
             region
             identifier
@@ -397,6 +408,7 @@ query TerraformResourcesNamespaces {
             }
             output_resource_name
             annotations
+            secret_format
           }
           ... on NamespaceTerraformResourceASG_v1 {
             region
@@ -540,9 +552,9 @@ query TerraformResourcesNamespaces {
 
 
 class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
+    model_config = ConfigDict(
+        extra='forbid'
+    )
 
 
 class ExternalResourcesProvisionerV1(ConfiguredBaseModel):
@@ -598,6 +610,17 @@ class NamespaceTerraformResourceRDSV1(NamespaceTerraformResourceAWSV1):
     managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
 
 
+class NamespaceTerraformResourceRDSProxyV1(NamespaceTerraformResourceAWSV1):
+    region: Optional[str] = Field(..., alias="region")
+    identifier: str = Field(..., alias="identifier")
+    defaults: str = Field(..., alias="defaults")
+    overrides: Optional[str] = Field(..., alias="overrides")
+    output_resource_name: Optional[str] = Field(..., alias="output_resource_name")
+    annotations: Optional[str] = Field(..., alias="annotations")
+    tags: Optional[str] = Field(..., alias="tags")
+    managed_by_erv2: Optional[bool] = Field(..., alias="managed_by_erv2")
+
+
 class AWSS3EventNotificationV1(ConfiguredBaseModel):
     destination_type: str = Field(..., alias="destination_type")
     destination: str = Field(..., alias="destination")
@@ -949,6 +972,7 @@ class NamespaceTerraformResourceSecretsManagerV1(NamespaceTerraformResourceAWSV1
     secret: Optional[VaultSecret] = Field(..., alias="secret")
     output_resource_name: Optional[str] = Field(..., alias="output_resource_name")
     annotations: Optional[str] = Field(..., alias="annotations")
+    secret_format: Optional[str] = Field(..., alias="secret_format")
 
 
 class CloudinitConfigV1(ConfiguredBaseModel):
@@ -1076,7 +1100,7 @@ class NamespaceTerraformResourceMskV1(NamespaceTerraformResourceAWSV1):
 
 
 class NamespaceTerraformProviderResourceAWSV1(NamespaceExternalResourceV1):
-    resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceCloudWatchV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceRosaAuthenticatorVPCEV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceS3CloudFrontV1, NamespaceTerraformResourceElasticSearchV1, NamespaceTerraformResourceACMV1, NamespaceTerraformResourceKinesisV1, NamespaceTerraformResourceRoute53ZoneV1, NamespaceTerraformResourceSQSV1, NamespaceTerraformResourceDynamoDBV1, NamespaceTerraformResourceECRV1, NamespaceTerraformResourceS3CloudFrontPublicKeyV1, NamespaceTerraformResourceSecretsManagerV1, NamespaceTerraformResourceSecretsManagerServiceAccountV1, NamespaceTerraformResourceAWSV1]] = Field(..., alias="resources")
+    resources: list[Union[NamespaceTerraformResourceRDSV1, NamespaceTerraformResourceALBV1, NamespaceTerraformResourceRosaAuthenticatorV1, NamespaceTerraformResourceRoleV1, NamespaceTerraformResourceS3V1, NamespaceTerraformResourceASGV1, NamespaceTerraformResourceRDSProxyV1, NamespaceTerraformResourceElastiCacheV1, NamespaceTerraformResourceSNSTopicV1, NamespaceTerraformResourceCloudWatchV1, NamespaceTerraformResourceServiceAccountV1, NamespaceTerraformResourceS3SQSV1, NamespaceTerraformResourceKMSV1, NamespaceTerraformResourceRosaAuthenticatorVPCEV1, NamespaceTerraformResourceMskV1, NamespaceTerraformResourceS3CloudFrontV1, NamespaceTerraformResourceElasticSearchV1, NamespaceTerraformResourceACMV1, NamespaceTerraformResourceKinesisV1, NamespaceTerraformResourceSecretsManagerV1, NamespaceTerraformResourceRoute53ZoneV1, NamespaceTerraformResourceSQSV1, NamespaceTerraformResourceDynamoDBV1, NamespaceTerraformResourceECRV1, NamespaceTerraformResourceS3CloudFrontPublicKeyV1, NamespaceTerraformResourceSecretsManagerServiceAccountV1, NamespaceTerraformResourceAWSV1]] = Field(..., alias="resources")
 
 
 class EnvironmentV1(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,
 )
@@ -51,6 +51,16 @@ fragment AWSAccountCommon on AWSAccount_v1 {
   deleteKeys
   premiumSupport
   partition
+  organization {
+    ...AWSOrganization
+  }
+}
+
+fragment AWSOrganization on AWSOrganization_v1 {
+  payerAccount {
+    organizationAccountTags
+  }
+  tags
 }
 
 fragment TerraformState on TerraformStateAWS_v1 {
@@ -82,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}}
@@ -195,6 +196,7 @@ def run(dry_run: bool) -> None:
         accounts=[],
         settings=settings,
         prefetch_resources_by_schemas=["/aws/asg-defaults-1.yml"],
+        default_tags=None,
     )
 
     for instance in jenkins_instances: