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

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,
 )
@@ -37,7 +37,7 @@ fragment AWSAccountCommon on AWSAccount_v1 {
     email
   }
   automationToken {
-    ... VaultSecret
+    ...VaultSecret
   }
   enableDeletion
   deletionApprovals {
@@ -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 {
@@ -64,21 +74,17 @@ fragment TerraformState on TerraformStateAWS_v1 {
 }
 
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query AWSAccounts($name: String) {
-  accounts: awsaccounts_v1
-  (
-    name: $name
-  )
-  {
-    ... AWSAccountCommon
+  accounts: awsaccounts_v1(name: $name) {
+    ...AWSAccountCommon
     terraformState {
-      ... TerraformState
+      ...TerraformState
     }
   }
 }
@@ -86,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,
 )
@@ -22,10 +22,10 @@ from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 DEFINITION = """
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query UnleashFeatureToggles {
@@ -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,
 )
@@ -22,10 +22,10 @@ from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 DEFINITION = """
 fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
+  path
+  field
+  version
+  format
 }
 
 query VaultInstances {
@@ -37,77 +37,77 @@ query VaultInstances {
       provider
       secretEngine
       ... on VaultInstanceAuthApprole_v1 {
-      roleID {
-        ... VaultSecret
-      }
-      secretID {
-        ... VaultSecret
+        roleID {
+          ...VaultSecret
+        }
+        secretID {
+          ...VaultSecret
+        }
       }
     }
-    }
     replication {
       vaultInstance {
         name
         address
         auth {
-            provider
-            secretEngine
-            ... on VaultInstanceAuthApprole_v1 {
-              roleID {
-                ... VaultSecret
-              }
-              secretID {
-                ... VaultSecret
-              }
+          provider
+          secretEngine
+          ... on VaultInstanceAuthApprole_v1 {
+            roleID {
+              ...VaultSecret
+            }
+            secretID {
+              ...VaultSecret
             }
           }
+        }
       }
-    sourceAuth {
-      provider
-      secretEngine
-      ... on VaultInstanceAuthApprole_v1 {
-      roleID {
-        ... VaultSecret
-      }
-      secretID {
-        ... VaultSecret
-      }
-    }
-    }
-    destAuth {
-      provider
-      secretEngine
-      ... on VaultInstanceAuthApprole_v1 {
-      roleID {
-        ... VaultSecret
+      sourceAuth {
+        provider
+        secretEngine
+        ... on VaultInstanceAuthApprole_v1 {
+          roleID {
+            ...VaultSecret
+          }
+          secretID {
+            ...VaultSecret
+          }
+        }
       }
-      secretID {
-        ... VaultSecret
+      destAuth {
+        provider
+        secretEngine
+        ... on VaultInstanceAuthApprole_v1 {
+          roleID {
+            ...VaultSecret
+          }
+          secretID {
+            ...VaultSecret
+          }
+        }
       }
-    }
-    }
       paths {
         provider
-        ...on VaultReplicationJenkins_v1 {
-        jenkinsInstance {
-          name
-          serverUrl
-        }
-        policy {
-          name
-          instance {
+        ... on VaultReplicationJenkins_v1 {
+          jenkinsInstance {
             name
-            address
+            serverUrl
+          }
+          policy {
+            name
+            instance {
+              name
+              address
+            }
           }
         }
-        }
-        ...on VaultReplicationPolicy_v1 {
+        ... on VaultReplicationPolicy_v1 {
           policy {
+            name
+            instance {
               name
-              instance {
-                name
-                address
-              }
+              address
+            }
           }
         }
       }
@@ -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,
 )
@@ -20,21 +20,21 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 
 DEFINITION = """
 query VaultPolicies {
-    policy: vault_policies_v1 {
-        name
-        instance {
-            name
-        }
-        rules
+  policy: vault_policies_v1 {
+    name
+    instance {
+      name
     }
+    rules
+  }
 }
 """
 
 
 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,
 )
@@ -51,7 +51,7 @@ query VpcPeeringsValidator {
             name
           }
         }
-        ... on ClusterPeeringConnectionAccountVPCMesh_v1{
+        ... on ClusterPeeringConnectionAccountVPCMesh_v1 {
           name
           account {
             name
@@ -61,12 +61,12 @@ query VpcPeeringsValidator {
         }
         ... on ClusterPeeringConnectionClusterRequester_v1 {
           cluster {
-            ... VpcPeeringsValidatorPeeredCluster
+            ...VpcPeeringsValidatorPeeredCluster
           }
         }
         ... on ClusterPeeringConnectionClusterAccepter_v1 {
           cluster {
-            ... VpcPeeringsValidatorPeeredCluster
+            ...VpcPeeringsValidatorPeeredCluster
           }
         }
       }
@@ -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_job_builder.py

@@ -81,7 +81,7 @@ def run(
     if not print_only and config_name is not None:
         raise Exception("--config-name must works with --print-only mode")
     secret_reader = SecretReader(queries.get_secret_reader_settings())
-    jjb: JJB = init_jjb(secret_reader, instance_name, config_name, print_only)
+    jjb = init_jjb(secret_reader, instance_name, config_name, print_only)
     if defer:
         defer(jjb.cleanup)
 

reconcile/jenkins_worker_fleets.py

@@ -1,14 +1,12 @@
+from __future__ import annotations
+
 import logging
-from typing import (
-    Any,
-    cast,
-)
+from enum import Enum
+from typing import Any, cast
+
+from pydantic import BaseModel, Field
 
 from reconcile import queries
-from reconcile.jenkins.types import (
-    JenkinsWorkerFleet,
-    SSHConnector,
-)
 from reconcile.utils.external_resources import get_external_resource_specs
 from reconcile.utils.jenkins_api import JenkinsApi
 from reconcile.utils.secret_reader import SecretReader
@@ -17,6 +15,72 @@ from reconcile.utils.terrascript_aws_client import TerrascriptClient as Terrascr
 QONTRACT_INTEGRATION = "jenkins-worker-fleets"
 
 
+class SSHHostKeyVerificationStrategy(Enum):
+    MANUALLY_TRUSTED_KEY_VERIFICATION_STRATEGY = (
+        "manuallyTrustedKeyVerificationStrategy"
+    )
+    MANUALLY_PROVIDED_KEY_VERIFICATION_STRATEGY = (
+        "manuallyProvidedKeyVerificationStrategy"
+    )
+    NON_VERIFYING_KEY_VERIFICATION_STRATEGY = "nonVerifyingKeyVerificationStrategy"
+    KNOWN_HOSTS_FILE_KEY_VERIFICATION_STRATEGY = "knownHostsFileKeyVerificationStrategy"
+
+
+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")
+    retry_wait_time: int | None = Field(None, alias="retryWaitTime")
+    port: int | None = 22
+    jvm_options: str | None = Field(None, alias="jvmOptions")
+    ssh_host_key_verification_strategy: SSHHostKeyVerificationStrategy = Field(
+        SSHHostKeyVerificationStrategy.NON_VERIFYING_KEY_VERIFICATION_STRATEGY,
+        alias="sshHostKeyVerificationStrategy",
+    )
+
+
+class ComputerConnector(BaseModel):
+    # alias name is defined by jcasc schema
+    ssh_connector: SSHConnector = Field(..., alias="sSHConnector")
+
+
+class JenkinsWorkerFleet(BaseModel):
+    # following options comes form https://github.com/jenkinsci/ec2-fleet-plugin/blob/master/docs/
+    name: str
+    fleet: str
+    region: str
+    min_size: int = Field(..., alias="minSize")
+    max_size: int = Field(..., alias="maxSize")
+    computer_connector: ComputerConnector = Field(..., alias="computerConnector")
+    fs_root: str = Field(..., alias="fsRoot")
+    label_string: str = Field(..., alias="labelString")
+    num_executors: int = Field(2, alias="numExecutors")
+    idle_minutes: int = Field(30, alias="idleMinutes")
+    min_spare_size: int = Field(0, alias="minSpareSize")
+    max_total_uses: int = Field(-1, alias="maxTotalUses")
+    no_delay_provision: bool = Field(False, alias="noDelayProvision")
+    add_node_only_if_running: bool = Field(True, alias="addNodeOnlyIfRunning")
+    always_reconnect: bool = Field(True, alias="alwaysReconnect")
+    private_ip_used: bool = Field(True, alias="privateIpUsed")
+    restrict_usage: bool = Field(True, alias="restrictUsage")
+
+    def __lt__(self, other: JenkinsWorkerFleet) -> bool:
+        return self.fleet < other.fleet
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, JenkinsWorkerFleet):
+            raise NotImplementedError(
+                "Cannot compare to non JenkinsWorkerFleet objects."
+            )
+        return self.fleet == other.fleet and self.region == other.region
+
+    def __hash__(self) -> int:
+        return hash(self.fleet + self.region)
+
+    def differ(self, other: JenkinsWorkerFleet) -> bool:
+        return self.model_dump(mode="json") != other.model_dump(mode="json")
+
+
 def get_current_state(jenkins: JenkinsApi) -> list[JenkinsWorkerFleet]:
     current_state = []
 
@@ -92,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:
@@ -106,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}}
@@ -128,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: