qontract-reconcile 0.10.2.dev504__py3-none-any.whl → 0.10.2.dev506__py3-none-any.whl

reconcile/integrations_manager.py

@@ -41,7 +41,6 @@ from reconcile.utils.openshift_resource import (
 from reconcile.utils.runtime.meta import IntegrationMeta
 from reconcile.utils.runtime.sharding import (
     AWSAccountShardingStrategy,
-    CloudflareDnsZoneShardingStrategy,
     IntegrationShardManager,
     OCMOrganizationShardingStrategy,
     OpenshiftClusterShardingStrategy,
@@ -257,7 +256,6 @@ def run(
             StaticShardingStrategy.IDENTIFIER: StaticShardingStrategy(),
             AWSAccountShardingStrategy.IDENTIFIER: AWSAccountShardingStrategy(),
             OpenshiftClusterShardingStrategy.IDENTIFIER: OpenshiftClusterShardingStrategy(),
-            CloudflareDnsZoneShardingStrategy.IDENTIFIER: CloudflareDnsZoneShardingStrategy(),
             OCMOrganizationShardingStrategy.IDENTIFIER: OCMOrganizationShardingStrategy(),
         },
         integration_runtime_meta=integration_runtime_meta,

reconcile/utils/external_resource_spec.py

@@ -125,8 +125,7 @@ class ExternalResourceSpec:
     def output_prefix(self) -> str:
         # Adhere to DNS-1123 subdomain names spec. It's reasonable to have provider
         # names that have underscores, but without replacing them with hyphens we run
-        # into issues. Alternatively, we could change Cloudflare worker_script to
-        # worker-script and prevent the use of underscores going forward.
+        # into issues.
         #
         # More info can be found at:
         # https://kubernetes.io/docs/concepts/overview/working-with-objects/names/.

reconcile/utils/runtime/sharding.py

@@ -14,8 +14,6 @@ from reconcile.gql_definitions.fragments.minimal_ocm_organization import (
 from reconcile.gql_definitions.integrations.integrations import (
     AWSAccountShardingV1,
     AWSAccountShardSpecOverrideV1,
-    CloudflareDNSZoneShardingV1,
-    CloudflareDNSZoneShardSpecOverrideV1,
     IntegrationManagedV1,
     IntegrationShardingV1,
     IntegrationSpecV1,
@@ -31,12 +29,6 @@ from reconcile.gql_definitions.sharding import aws_accounts as sharding_aws_acco
 from reconcile.gql_definitions.sharding import (
     ocm_organization as sharding_ocm_organization,
 )
-from reconcile.gql_definitions.terraform_cloudflare_dns import (
-    terraform_cloudflare_zones,
-)
-from reconcile.gql_definitions.terraform_cloudflare_dns.terraform_cloudflare_zones import (
-    CloudflareDnsZoneV1,
-)
 from reconcile.typed_queries.clusters_minimal import get_clusters_minimal
 from reconcile.utils import gql
 from reconcile.utils.runtime.meta import IntegrationMeta
@@ -49,7 +41,6 @@ class ShardSpec(BaseModel):
     shard_spec_overrides: (
         AWSAccountShardSpecOverrideV1
         | OpenshiftClusterShardSpecOverrideV1
-        | CloudflareDNSZoneShardSpecOverrideV1
         | OCMOrganizationShardSpecOverrideV1
         | None
     ) = None
@@ -363,77 +354,6 @@ class OpenshiftClusterShardingStrategy:
         return shards
 
 
-class CloudflareDnsZoneShardingStrategy:
-    """
-    This provides a new sharding strategy that each shard is targeting a Cloudflare zone.
-    It uses the combination of the Cloudflare account name and the zone's identifier as the unique sharding key.
-    """
-
-    IDENTIFIER = "per-cloudflare-dns-zone"
-
-    def __init__(self, cloudflare_zones: Iterable[CloudflareDnsZoneV1] | None = None):
-        if not cloudflare_zones:
-            self.cloudflare_zones = (
-                terraform_cloudflare_zones.query(query_func=gql.get_api().query).zones
-                or []
-            )
-        else:
-            self.cloudflare_zones = list(cloudflare_zones)
-
-    def _get_shard_key(self, dns_zone: CloudflareDnsZoneV1) -> str:
-        return f"{dns_zone.account.name}-{dns_zone.identifier}"
-
-    def get_shard_spec_overrides(
-        self, sharding: IntegrationShardingV1 | None
-    ) -> dict[str, CloudflareDNSZoneShardSpecOverrideV1]:
-        spos: dict[str, CloudflareDNSZoneShardSpecOverrideV1] = {}
-
-        if (
-            isinstance(sharding, CloudflareDNSZoneShardingV1)
-            and sharding.shard_spec_overrides
-        ):
-            for override in sharding.shard_spec_overrides:
-                key = f"{override.shard.zone}-{override.shard.identifier}"
-                spos[key] = override
-        return spos
-
-    def check_integration_sharding_params(self, meta: IntegrationMeta) -> None:
-        if "--zone-name" not in meta.args:
-            raise ValueError(
-                f"integration {meta.name} does not support the provided argument. "
-                f"--zone-name is required by the '{self.IDENTIFIER}' sharding "
-                "strategy."
-            )
-
-    def build_shard_spec(
-        self,
-        dns_zone: CloudflareDnsZoneV1,
-        integration_spec: IntegrationSpecV1,
-        spo: CloudflareDNSZoneShardSpecOverrideV1 | None,
-    ) -> ShardSpec:
-        return ShardSpec(
-            shard_key=self._get_shard_key(dns_zone),
-            shard_name_suffix=f"-{self._get_shard_key(dns_zone)}",
-            extra_args=(integration_spec.extra_args or "")
-            + f" --zone-name {dns_zone.identifier}",
-            shard_spec_overrides=spo,
-        )
-
-    def build_integration_shards(
-        self,
-        integration_meta: IntegrationMeta,
-        integration_managed: IntegrationManagedV1,
-    ) -> list[ShardSpec]:
-        self.check_integration_sharding_params(integration_meta)
-        spos = self.get_shard_spec_overrides(integration_managed.sharding)
-        shards = []
-        for zone in self.cloudflare_zones or []:
-            spo = spos.get(self._get_shard_key(zone))
-            base_shard = self.build_shard_spec(zone, integration_managed.spec, spo)
-            shards.append(base_shard)
-        return shards
-
-
 @dataclass
 class IntegrationShardManager:
     strategies: dict[str, ShardingStrategy]

tools/cli_commands/systems_and_tools.py

@@ -85,12 +85,6 @@ from reconcile.gql_definitions.statuspage.statuspages import (
 from reconcile.gql_definitions.statuspage.statuspages import (
     StatusPageV1,
 )
-from reconcile.gql_definitions.terraform_cloudflare_resources.terraform_cloudflare_accounts import (
-    DEFINITION as CLOUDFLARE_ACCOUNTS_DEFINITION,
-)
-from reconcile.gql_definitions.terraform_cloudflare_resources.terraform_cloudflare_accounts import (
-    CloudflareAccountV1,
-)
 from reconcile.gql_definitions.terraform_tgw_attachments.aws_accounts import (
     DEFINITION as AWS_ACCOUNTS_DEFINITION,
 )
@@ -110,7 +104,6 @@ from reconcile.gql_definitions.vault_instances.vault_instances import (
     VaultInstanceV1,
 )
 from reconcile.statuspage.integration import get_status_pages
-from reconcile.typed_queries.cloudflare import get_cloudflare_accounts
 from reconcile.typed_queries.clusters import get_clusters
 from reconcile.typed_queries.dynatrace import get_dynatrace_environments
 from reconcile.typed_queries.gitlab_instances import (
@@ -180,8 +173,6 @@ class SystemTool(BaseModel):
                 return cls.init_from_unleash_instance(model, enumeration)
             case VaultInstanceV1():
                 return cls.init_from_vault_instance(model, enumeration)
-            case CloudflareAccountV1():
-                return cls.init_from_cloudflare_account(model, enumeration)
             case AppCodeComponentsV1():
                 return cls.init_from_code_component(model, enumeration)
             case _:
@@ -368,19 +359,6 @@ class SystemTool(BaseModel):
             enumeration=enumeration,
         )
 
-    @classmethod
-    def init_from_cloudflare_account(
-        cls, a: CloudflareAccountV1, enumeration: Any
-    ) -> Self:
-        return cls(
-            system_type="cloudflare",
-            system_id=a.name,
-            name=a.name,
-            url="https://dash.cloudflare.com/",
-            description=a.description,
-            enumeration=enumeration,
-        )
-
     @classmethod
     def init_from_code_component(cls, c: AppCodeComponentsV1, enumeration: Any) -> Self:
         return cls(
@@ -469,7 +447,6 @@ def get_systems_and_tools_inventory() -> SystemToolInventory:
     inventory.update(get_status_pages(), STATUS_PAGES_DEFINITION)
     inventory.update(get_unleash_instances(), UNLEASH_INSTANCES_DEFINITION)
     inventory.update(get_vault_instances(), VAULT_INSTANCES_DEFINITION)
-    inventory.update(get_cloudflare_accounts(), CLOUDFLARE_ACCOUNTS_DEFINITION)
     inventory.update(
         [
             c

reconcile/gql_definitions/terraform_cloudflare_dns/app_interface_cloudflare_dns_settings.py

@@ -1,62 +0,0 @@
-"""
-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,
-)
-
-
-DEFINITION = """
-query AppInterfaceSettingCloudflareDNS {
-  settings: app_interface_settings_v1 {
-    cloudflareDNSZoneMaxRecords
-    vault
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    model_config = ConfigDict(
-        extra='forbid'
-    )
-
-
-class AppInterfaceSettingsV1(ConfiguredBaseModel):
-    cloudflare_dns_zone_max_records: Optional[int] = Field(..., alias="cloudflareDNSZoneMaxRecords")
-    vault: bool = Field(..., alias="vault")
-
-
-class AppInterfaceSettingCloudflareDNSQueryData(ConfiguredBaseModel):
-    settings: Optional[list[AppInterfaceSettingsV1]] = Field(..., alias="settings")
-
-
-def query(query_func: Callable, **kwargs: Any) -> AppInterfaceSettingCloudflareDNSQueryData:
-    """
-    This is a convenience function which queries and parses the data into
-    concrete types. It should be compatible with most GQL clients.
-    You do not have to use it to consume the generated data classes.
-    Alternatively, you can also mime and alternate the behavior
-    of this function in the caller.
-
-    Parameters:
-        query_func (Callable): Function which queries your GQL Server
-        kwargs: optional arguments that will be passed to the query function
-
-    Returns:
-        AppInterfaceSettingCloudflareDNSQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return AppInterfaceSettingCloudflareDNSQueryData(**raw_data)

reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py

@@ -1,193 +0,0 @@
-"""
-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,
-)
-
-from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
-
-
-DEFINITION = """
-fragment VaultSecret on VaultSecret_v1 {
-  path
-  field
-  version
-  format
-}
-
-query CloudflareDnsZone {
-  zones: cloudflare_dns_zone_v1 {
-    identifier
-    zone
-    account {
-      name
-      type
-      description
-      providerVersion
-      enforceTwofactor
-      apiCredentials {
-        ...VaultSecret
-      }
-      terraformStateAccount {
-        name
-        consoleUrl
-        terraformUsername
-        automationToken {
-          ...VaultSecret
-        }
-        terraformState {
-          provider
-          bucket
-          region
-          integrations {
-            integration
-            key
-          }
-        }
-      }
-      deletionApprovals {
-        expiration
-        name
-        type
-      }
-    }
-    records {
-      identifier
-      name
-      type
-      ttl
-      value
-      priority
-      proxied
-      data {
-        algorithm
-        protocol
-        public_key
-        digest_type
-        digest
-        key_tag
-        flags
-        tag
-        value
-      }
-    }
-    type
-    plan
-    max_records
-    delete
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    model_config = ConfigDict(
-        extra='forbid'
-    )
-
-
-class AWSTerraformStateIntegrationsV1(ConfiguredBaseModel):
-    integration: str = Field(..., alias="integration")
-    key: str = Field(..., alias="key")
-
-
-class TerraformStateAWSV1(ConfiguredBaseModel):
-    provider: str = Field(..., alias="provider")
-    bucket: str = Field(..., alias="bucket")
-    region: str = Field(..., alias="region")
-    integrations: list[AWSTerraformStateIntegrationsV1] = Field(..., alias="integrations")
-
-
-class AWSAccountV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    console_url: str = Field(..., alias="consoleUrl")
-    terraform_username: Optional[str] = Field(..., alias="terraformUsername")
-    automation_token: VaultSecret = Field(..., alias="automationToken")
-    terraform_state: Optional[TerraformStateAWSV1] = Field(..., alias="terraformState")
-
-
-class DeletionApprovalV1(ConfiguredBaseModel):
-    expiration: str = Field(..., alias="expiration")
-    name: str = Field(..., alias="name")
-    q_type: str = Field(..., alias="type")
-
-
-class CloudflareAccountV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    q_type: Optional[str] = Field(..., alias="type")
-    description: Optional[str] = Field(..., alias="description")
-    provider_version: str = Field(..., alias="providerVersion")
-    enforce_twofactor: Optional[bool] = Field(..., alias="enforceTwofactor")
-    api_credentials: VaultSecret = Field(..., alias="apiCredentials")
-    terraform_state_account: AWSAccountV1 = Field(..., alias="terraformStateAccount")
-    deletion_approvals: Optional[list[DeletionApprovalV1]] = Field(..., alias="deletionApprovals")
-
-
-class CloudflareDnsRecordDataSettingsV1(ConfiguredBaseModel):
-    algorithm: Optional[int] = Field(..., alias="algorithm")
-    protocol: Optional[int] = Field(..., alias="protocol")
-    public_key: Optional[str] = Field(..., alias="public_key")
-    digest_type: Optional[int] = Field(..., alias="digest_type")
-    digest: Optional[str] = Field(..., alias="digest")
-    key_tag: Optional[int] = Field(..., alias="key_tag")
-    flags: Optional[int] = Field(..., alias="flags")
-    tag: Optional[str] = Field(..., alias="tag")
-    value: Optional[str] = Field(..., alias="value")
-
-
-class CloudflareDnsRecordV1(ConfiguredBaseModel):
-    identifier: str = Field(..., alias="identifier")
-    name: str = Field(..., alias="name")
-    q_type: str = Field(..., alias="type")
-    ttl: int = Field(..., alias="ttl")
-    value: Optional[str] = Field(..., alias="value")
-    priority: Optional[int] = Field(..., alias="priority")
-    proxied: Optional[bool] = Field(..., alias="proxied")
-    data: Optional[CloudflareDnsRecordDataSettingsV1] = Field(..., alias="data")
-
-
-class CloudflareDnsZoneV1(ConfiguredBaseModel):
-    identifier: str = Field(..., alias="identifier")
-    zone: str = Field(..., alias="zone")
-    account: CloudflareAccountV1 = Field(..., alias="account")
-    records: Optional[list[CloudflareDnsRecordV1]] = Field(..., alias="records")
-    q_type: Optional[str] = Field(..., alias="type")
-    plan: Optional[str] = Field(..., alias="plan")
-    max_records: Optional[int] = Field(..., alias="max_records")
-    delete: Optional[bool] = Field(..., alias="delete")
-
-
-class CloudflareDnsZoneQueryData(ConfiguredBaseModel):
-    zones: Optional[list[CloudflareDnsZoneV1]] = Field(..., alias="zones")
-
-
-def query(query_func: Callable, **kwargs: Any) -> CloudflareDnsZoneQueryData:
-    """
-    This is a convenience function which queries and parses the data into
-    concrete types. It should be compatible with most GQL clients.
-    You do not have to use it to consume the generated data classes.
-    Alternatively, you can also mime and alternate the behavior
-    of this function in the caller.
-
-    Parameters:
-        query_func (Callable): Function which queries your GQL Server
-        kwargs: optional arguments that will be passed to the query function
-
-    Returns:
-        CloudflareDnsZoneQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return CloudflareDnsZoneQueryData(**raw_data)

reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_accounts.py

@@ -1,127 +0,0 @@
-"""
-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,
-)
-
-from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
-
-
-DEFINITION = """
-fragment VaultSecret on VaultSecret_v1 {
-  path
-  field
-  version
-  format
-}
-
-query TerraformCloudflareAccounts {
-  accounts: cloudflare_accounts_v1 {
-    name
-    description
-    providerVersion
-    apiCredentials {
-      ...VaultSecret
-    }
-    terraformStateAccount {
-      name
-      automationToken {
-        ...VaultSecret
-      }
-      terraformState {
-        provider
-        bucket
-        region
-        integrations {
-          integration
-          key
-        }
-      }
-    }
-    deletionApprovals {
-      expiration
-      name
-      type
-    }
-    enforceTwofactor
-    type
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    model_config = ConfigDict(
-        extra='forbid'
-    )
-
-
-class AWSTerraformStateIntegrationsV1(ConfiguredBaseModel):
-    integration: str = Field(..., alias="integration")
-    key: str = Field(..., alias="key")
-
-
-class TerraformStateAWSV1(ConfiguredBaseModel):
-    provider: str = Field(..., alias="provider")
-    bucket: str = Field(..., alias="bucket")
-    region: str = Field(..., alias="region")
-    integrations: list[AWSTerraformStateIntegrationsV1] = Field(..., alias="integrations")
-
-
-class AWSAccountV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    automation_token: VaultSecret = Field(..., alias="automationToken")
-    terraform_state: Optional[TerraformStateAWSV1] = Field(..., alias="terraformState")
-
-
-class DeletionApprovalV1(ConfiguredBaseModel):
-    expiration: str = Field(..., alias="expiration")
-    name: str = Field(..., alias="name")
-    q_type: str = Field(..., alias="type")
-
-
-class CloudflareAccountV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    description: Optional[str] = Field(..., alias="description")
-    provider_version: str = Field(..., alias="providerVersion")
-    api_credentials: VaultSecret = Field(..., alias="apiCredentials")
-    terraform_state_account: AWSAccountV1 = Field(..., alias="terraformStateAccount")
-    deletion_approvals: Optional[list[DeletionApprovalV1]] = Field(..., alias="deletionApprovals")
-    enforce_twofactor: Optional[bool] = Field(..., alias="enforceTwofactor")
-    q_type: Optional[str] = Field(..., alias="type")
-
-
-class TerraformCloudflareAccountsQueryData(ConfiguredBaseModel):
-    accounts: Optional[list[CloudflareAccountV1]] = Field(..., alias="accounts")
-
-
-def query(query_func: Callable, **kwargs: Any) -> TerraformCloudflareAccountsQueryData:
-    """
-    This is a convenience function which queries and parses the data into
-    concrete types. It should be compatible with most GQL clients.
-    You do not have to use it to consume the generated data classes.
-    Alternatively, you can also mime and alternate the behavior
-    of this function in the caller.
-
-    Parameters:
-        query_func (Callable): Function which queries your GQL Server
-        kwargs: optional arguments that will be passed to the query function
-
-    Returns:
-        TerraformCloudflareAccountsQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return TerraformCloudflareAccountsQueryData(**raw_data)