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

{qontract_reconcile-0.10.2.dev504.dist-info → qontract_reconcile-0.10.2.dev505.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev504
+Version: 0.10.2.dev505
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -302,9 +302,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
   template-validator              Test app-interface templates.
   terraform-aws-route53           Manage AWS Route53 resources using
                                   Terraform.
-  terraform-cloudflare-dns        Manage Cloudflare DNS using Terraform.
-  terraform-cloudflare-resources  Manage Cloudflare Resources using Terraform.
-  terraform-cloudflare-users      Manage Cloudflare Users using Terraform.
   terraform-init                  Initialize AWS accounts for Terraform usage.
   terraform-repo                  Manages raw HCL Terraform from a separate
                                   repository.

{qontract_reconcile-0.10.2.dev504.dist-info → qontract_reconcile-0.10.2.dev505.dist-info}/RECORD

@@ -8,7 +8,7 @@ reconcile/aws_iam_password_reset.py,sha256=5oajSspJVAvpGd445hKsxtEGYb75dM4l1_PJT
 reconcile/aws_support_cases_sos.py,sha256=G9g0oM6ohvuJ5N592ePjiPeaDug4_vapAy58RyG-S3Y,3478
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=Q5Ru36ZEwWw95ZkUXBf4VfvCmqDS9TcAF7QVroOf9Vk,5375
-reconcile/cli.py,sha256=bGWl826ucs0KOwH7DciYJkdZvEV90bqoSlMs36gxgg4,116607
+reconcile/cli.py,sha256=0xHsCeDEY8IdXrdI8K7FWw4VerBgAImcKgAfG6D8bRg,113602
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=_OKz7K7HHw0-gzxeEma8PcUCtd70pRBy7JMoaAm8IVU,4940
 reconcile/cluster_deployment_mapper.py,sha256=aKroYLY6-nNxWi2jxDu7VRMuNZ3YgSI0J6ek7Fet2AQ,2241
 reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4767
@@ -33,7 +33,7 @@ reconcile/gitlab_mr_sqs_consumer.py,sha256=3FB5vbVB9INBxMj4s1PrDIX-I1Gwu-CGBOH2_
 reconcile/gitlab_owners.py,sha256=So7OWq3B1f3-aYlhd2kARYt1nwPV4jrbf5YPRXoHPrM,14663
 reconcile/gitlab_permissions.py,sha256=0H2UCa_44hgWbbOKFTw7zxjOjhjqDmS-m6r1gFFkaLQ,8188
 reconcile/gitlab_projects.py,sha256=JIB1UP8CnwSkngEMZE7DFQETMX6sJMp4DXaKoS-Pdkc,1879
-reconcile/integrations_manager.py,sha256=fk5Vt7MaJMb0XnC2AZjcSPi8RQ-wM8tf8LADKsdu6G0,9416
+reconcile/integrations_manager.py,sha256=OCqNderRsiS-h1P_dXjCEo2BEJOSAFD87IHtlx3z2Ug,9282
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
 reconcile/jenkins_job_builder.py,sha256=eRR3AL3RN7U_8A4hceUlj_k_jWf-qHMyLr9gqxcj3kQ,3469
 reconcile/jenkins_job_builds_cleaner.py,sha256=l9eLyvdgv1sN2tAlkGx3T8g6Db9kIfWW3LJh5H6dV9A,4080
@@ -103,9 +103,6 @@ reconcile/sql_query.py,sha256=Go_H36p3YTW4Xv-elYDxW_Fe6Q4ErFhD6eQoFh9Jylw,26424
 reconcile/status.py,sha256=h73oaSxO5sftEGqFrXVAlySBvNYPWpowDaYYplcky5A,565
 reconcile/status_board.py,sha256=iv2CR3IsX_uDY5aXHjTOySeTR5d3vsABykYNiYNjZew,15316
 reconcile/terraform_aws_route53.py,sha256=rmV6-AhGB2q_u4v7scIjol99jfSwjTJpmZZwePikZOU,10443
-reconcile/terraform_cloudflare_dns.py,sha256=L3vmwAq46Npc1eswQM3gDT48Zocbm6bwh-vsHuxf2aU,13474
-reconcile/terraform_cloudflare_resources.py,sha256=KxUH05BHSFxuF89Q1DT2lVxCIhTY_dVTw6vjvyv772g,15024
-reconcile/terraform_cloudflare_users.py,sha256=J48VZekuu6owmitdWuXCCji4PSPI1PI8TbLrzyDL2Rk,13540
 reconcile/terraform_repo.py,sha256=YkC-OD86oTMuvkcDPQijCQTWktrC78QrKVSof_pSV2I,15763
 reconcile/terraform_resources.py,sha256=aqhOX7WyFQA5ALppbrGetdwkM2_rYZn4g6qa-3eUF6s,19907
 reconcile/terraform_tgw_attachments.py,sha256=zWDvTkjUp7iHgQpyolmJeg9YMaRuDlqgL14iSvvW3x8,19324
@@ -358,7 +355,7 @@ reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=S2EMzBNjAt5TLDib
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=lOUipTG-B_4JVVmMvTOE8f85xligovO2hgFcMzIO3Ww,5193
 reconcile/gql_definitions/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/integrations/integrations.py,sha256=IPG3dqeZY7Ax1SIdXzB-wBeRFQfnhxYucrHKtIjWXbg,11560
+reconcile/gql_definitions/integrations/integrations.py,sha256=_6iPnU-1fYz69hRl3Lu1km8RE40msR6Znp7Pcz5RBwk,10585
 reconcile/gql_definitions/jenkins_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/jenkins_configs/jenkins_configs.py,sha256=Boepc9jr03xJB_qvOYyKmSqPVtLwHfRndrhhU7850jM,2948
 reconcile/gql_definitions/jenkins_configs/jenkins_instances.py,sha256=DYUY-HuZVFOJzHIlnj2HVI_18Sn6tM4isTsbHuETqpA,2151
@@ -419,15 +416,6 @@ reconcile/gql_definitions/statuspage/statuspages.py,sha256=TJVD-0rwJ8WEzHLju4bn4
 reconcile/gql_definitions/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/templating/template_collection.py,sha256=pHkxuBQmk3yIA58bJnu2zCa_wb5a1SZl90Appg2hV5U,4118
 reconcile/gql_definitions/templating/templates.py,sha256=Cv2NhRngl_9oW_eLM7wMYfajDrCboyqfDmwoWqwvHcc,3367
-reconcile/gql_definitions/terraform_cloudflare_dns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/terraform_cloudflare_dns/app_interface_cloudflare_dns_settings.py,sha256=wjj3g0UBnS7FsfSoFMRHq_x8WJ4BfgfX0IbAS8bIMcY,1916
-reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py,sha256=F9A6csePJZNUxr0N7-8CC_RcZ4RPMdNwuFMaBtXZqzQ,5817
-reconcile/gql_definitions/terraform_cloudflare_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_accounts.py,sha256=Wd6i1oo5WxlyXHeab2GuyXL8xgpm1NXCphCyMdQ2MLw,3707
-reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py,sha256=btJaFYHp1jxOXEsScRTIgLDlgoyytTdFBFBHvH7ymjY,12257
-reconcile/gql_definitions/terraform_cloudflare_users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/terraform_cloudflare_users/app_interface_setting_cloudflare_and_vault.py,sha256=gRxCfy4X9otRyOHtTo038gdYYD3lJ6FTz0yiGavGbfY,1956
-reconcile/gql_definitions/terraform_cloudflare_users/terraform_cloudflare_roles.py,sha256=CFYS6kM0q3Wqrsyr7zhCLfeAkVK_Z6pD5xmkMwOyrG4,4012
 reconcile/gql_definitions/terraform_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_init/aws_accounts.py,sha256=xutFbwVVBVhmhjHp3z_O5t53fRoPT1ePrPVM9sm3ZSI,3037
 reconcile/gql_definitions/terraform_repo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -547,7 +535,6 @@ reconcile/typed_queries/apps.py,sha256=IzgDQnKnvGKvFsgfIkha935I1T24tAYEp_LwrLrwV
 reconcile/typed_queries/aws_account_tags.py,sha256=ifD3ZTiQ-1_aNmNFtQ0oKbUHnsoBDGce_Zx2l_TOMJA,1319
 reconcile/typed_queries/aws_vpc_requests.py,sha256=fr2o1vp_j_0JAlTYfbwGqPr-99EihCfCOFjC5z4Sx5M,345
 reconcile/typed_queries/aws_vpcs.py,sha256=SBQ-uQeXLj98Rqqju1m-3cx2-IYRqINK5Pi7cdwbNoc,326
-reconcile/typed_queries/cloudflare.py,sha256=jOsqgCzMrjomPaIWc1isTcQAGONmMIJDTBcpmCheonA,308
 reconcile/typed_queries/clusters.py,sha256=0GJO4T3AKQUDNsUucwcV6QBmOiTKlcM3R6zqmjcgxIQ,458
 reconcile/typed_queries/clusters_minimal.py,sha256=XmEvQoSTG_2Xx92kVRGWDWzgo4f6oKwwLk9MFQAZnLY,469
 reconcile/typed_queries/clusters_with_dms.py,sha256=QkT7wMgW2039G-GGPfnDYCAiHx2McIJZijndFtTBcyI,506
@@ -619,7 +606,7 @@ reconcile/utils/environ.py,sha256=UOYbV7K1MpU7lwcjslKB7oJ7Ek8pOAwf12fA2lV9LM4,81
 reconcile/utils/exceptions.py,sha256=2cKJD01d_uZM_j0CTcvDoo-WDisZJVYaeY2KUbfUHCc,686
 reconcile/utils/expiration.py,sha256=6GrQp-sYDKf6scuzzUPxSS8_q_6IiQyjcdvZEVQZzGc,1353
 reconcile/utils/extended_early_exit.py,sha256=QSktrmfw37zSRMNk930tDbQsVeKxaPPPD43e79DGwZw,6754
-reconcile/utils/external_resource_spec.py,sha256=itiV8s87pD5LZ7Xx_rMTf3P-VsEdR7F5Sh7EDXJIGdE,8309
+reconcile/utils/external_resource_spec.py,sha256=rVJT5kbD_MonUXnlDXS_3Kg4xq1BkRII9SeASXjkxHo,8176
 reconcile/utils/external_resources.py,sha256=YzTb0xAcNdmKO326mGQy7BmST56CZcdru4lX7ai_7kw,7579
 reconcile/utils/filtering.py,sha256=rvCr0drVeD9x4yVox-kvbHEufBktlz3yyQjM-y3IJsM,422
 reconcile/utils/git.py,sha256=o4p9m8jlzCJDcutl2HErvGLhL6sZ1NB4Aw3zGcQIzso,2427
@@ -767,7 +754,7 @@ reconcile/utils/runtime/environment.py,sha256=rRrj4t11R1JSQO08RcJxkQkyHhRGI8ePo-
 reconcile/utils/runtime/integration.py,sha256=etpSg6D9iqud3mG6UMmovBrRFBWHpjKLW6AUdlu5q5w,15172
 reconcile/utils/runtime/meta.py,sha256=M_EOxrb0KhQA4TwpHekbog2jOZqaBPVTIijXyRuMjn0,255
 reconcile/utils/runtime/runner.py,sha256=p7xCT1IDlDz6wKYMDMPOTEdztM4hbcxo0fw9gQf4q-A,9028
-reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
+reconcile/utils/runtime/sharding.py,sha256=bfcrQYAHiriM99koZGonrurWk8hPzifpOJAumjV4baE,13026
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
 reconcile/utils/saasherder/interfaces.py,sha256=9zEb02A1hnjyc7L5A7uzgYXifEaDWJ6AEPqeTo0qhNg,9447
 reconcile/utils/saasherder/models.py,sha256=QHxc-F1CekKG7x8KkDYpzyCyvd_nQHc5QfmRhVEwYE8,13036
@@ -775,11 +762,6 @@ reconcile/utils/saasherder/saasherder.py,sha256=-zbE4Zt5K-ig6cQDDJe7P_PkSroon_Q6
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
-reconcile/utils/terrascript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/terrascript/cloudflare_client.py,sha256=pHEjwqguHDQVr8zsWmXBAx9Jx4mx6BkLymXOmpBgFqc,10493
-reconcile/utils/terrascript/cloudflare_resources.py,sha256=mGU4WBveVWXr3FQL104Z2suduHBdeCHcV7S_u3x481A,15947
-reconcile/utils/terrascript/models.py,sha256=DZfSEqyaZh8fCE_g7toa9TUCzcn3MHnuumoWCdzACh0,441
-reconcile/utils/terrascript/resources.py,sha256=ucuudrCjmJYeSleklXTlmeSEwZOqVtEfzWFEiDZydxM,1361
 reconcile/utils/unleash/__init__.py,sha256=2PsN3GlLU8DOyWSvv5q9uzwuFn_vYtfEo-mmVaIFtpA,219
 reconcile/utils/unleash/client.py,sha256=YrJnauxjcy1ml7W2AHg7dzIH_fVK_GugoRu7IFmk6e0,3505
 reconcile/utils/unleash/server.py,sha256=X79h8E371IeBjJlKtufKxwfo3EBUPxrJ17yVRFMC2Ac,4403
@@ -797,7 +779,7 @@ tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 tools/cli_commands/container_images_report.py,sha256=8mAjCS6XR0yD7k0mfiVBlt6xbYU47q_ftdYNi5o5VKE,5566
 tools/cli_commands/erv2.py,sha256=0qx-BZJex4SUNpnSxlIkr3r7buOzjmMHhmB46C9cnJ0,24051
 tools/cli_commands/gpg_encrypt.py,sha256=EzCR3JvlCfO-a8VLG-mArD3edwM-aa0mUrDj1y0_NW0,5032
-tools/cli_commands/systems_and_tools.py,sha256=cBSHPOzjWhbYVFr50zsre5vGcVnovFkrZVSGsssUgqU,16985
+tools/cli_commands/systems_and_tools.py,sha256=QYc7dpHK2so2eo5spS1Sdo1-pl2EuftxHI6-E_zvHAE,16065
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/aws.py,sha256=JtwDfhaYLfa4Uz1LR6OfSBh_3nBlb90kQq6i3MV_ims,4563
 tools/cli_commands/cost_report/cost_management_api.py,sha256=lWBIsR8Q0NlbvVLMdgsPbYO4S3DfNnWK8uHTnmMqR_w,4686
@@ -817,7 +799,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev504.dist-info/METADATA,sha256=u1D6L0x1bQlbczcO7NirnJCDRnask9Rj_SjQuHsUgdo,24958
-qontract_reconcile-0.10.2.dev504.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev504.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev504.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev505.dist-info/METADATA,sha256=jXUVjfTPEzImBRH60j4FCxgYOFyB1s0ij0TCpyE7Rz8,24731
+qontract_reconcile-0.10.2.dev505.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev505.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev505.dist-info/RECORD,,

reconcile/cli.py

@@ -364,12 +364,6 @@ def account_name(function: Callable) -> Callable:
     return function
 
 
-def cloudflare_zone_name(function: Callable) -> Callable:
-    function = click.option("--zone-name", default=None)(function)
-
-    return function
-
-
 def account_name_multiple(function: Callable) -> Callable:
     """This option can be used when more than one account needs to be passed as argument"""
     function = click.option(
@@ -2337,108 +2331,6 @@ def terraform_resources(
     )
 
 
-@integration.command(short_help="Manage Cloudflare Resources using Terraform.")
-@print_to_file
-@enable_deletion(default=False)
-@threaded()
-@binary(["terraform"])
-@binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@account_name
-@vault_output_path
-@use_jump_host()
-@internal()
-@click.pass_context
-def terraform_cloudflare_resources(
-    ctx: click.Context,
-    print_to_file: str | None,
-    enable_deletion: bool,
-    thread_pool_size: int,
-    account_name: str | None,
-    vault_output_path: str,
-    internal: bool,
-    use_jump_host: bool,
-) -> None:
-    import reconcile.terraform_cloudflare_resources
-
-    run_integration(
-        reconcile.terraform_cloudflare_resources,
-        ctx,
-        print_to_file,
-        enable_deletion,
-        thread_pool_size,
-        account_name,
-        vault_output_path,
-        internal,
-        use_jump_host,
-    )
-
-
-@integration.command(short_help="Manage Cloudflare DNS using Terraform.")
-@print_to_file
-@enable_deletion(default=False)
-@threaded()
-@binary(["terraform"])
-@binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@account_name
-@cloudflare_zone_name
-@click.pass_context
-def terraform_cloudflare_dns(
-    ctx: click.Context,
-    print_to_file: str | None,
-    enable_deletion: bool,
-    thread_pool_size: int,
-    account_name: str | None,
-    zone_name: str | None,
-) -> None:
-    from reconcile import terraform_cloudflare_dns
-
-    run_class_integration(
-        integration=terraform_cloudflare_dns.TerraformCloudflareDNSIntegration(
-            terraform_cloudflare_dns.TerraformCloudflareDNSIntegrationParams(
-                print_to_file=print_to_file,
-                enable_deletion=enable_deletion,
-                thread_pool_size=thread_pool_size,
-                selected_account=account_name,
-                selected_zone=zone_name,
-            )
-        ),
-        ctx=ctx,
-    )
-
-
-@integration.command(short_help="Manage Cloudflare Users using Terraform.")
-@print_to_file
-@binary(["terraform"])
-@threaded()
-@binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@account_name
-@enable_deletion(default=True)
-@click.pass_context
-def terraform_cloudflare_users(
-    ctx: click.Context,
-    print_to_file: str | None,
-    account_name: str | None,
-    thread_pool_size: int,
-    enable_deletion: bool,
-) -> None:
-    from reconcile.terraform_cloudflare_users import (
-        TerraformCloudflareUsers,
-        TerraformCloudflareUsersParams,
-    )
-
-    run_class_integration(
-        TerraformCloudflareUsers(
-            TerraformCloudflareUsersParams(
-                print_to_file=print_to_file,
-                account_name=account_name,
-                thread_pool_size=thread_pool_size,
-                enable_deletion=enable_deletion,
-            )
-        ),
-        ctx,
-    )
-
-
 @integration.command(short_help="Manage auto-promotions defined in SaaS files")
 @threaded()
 @click.option("--env-name", default=None, help="environment to filter saas files by")

reconcile/gql_definitions/integrations/integrations.py

@@ -174,20 +174,6 @@ query Integrations {
             }
           }
         }
-
-        ... on CloudflareDNSZoneSharding_v1 {
-          shardSpecOverrides {
-            shard {
-              zone
-              identifier
-            }
-            imageRef
-            disabled
-            resources {
-              ...DeployResourcesFields
-            }
-          }
-        }
       }
     }
   }
@@ -323,26 +309,10 @@ class AWSAccountShardingV1(IntegrationShardingV1):
     shard_spec_overrides: Optional[list[AWSAccountShardSpecOverrideV1]] = Field(..., alias="shardSpecOverrides")
 
 
-class CloudflareDnsZoneV1(ConfiguredBaseModel):
-    zone: str = Field(..., alias="zone")
-    identifier: str = Field(..., alias="identifier")
-
-
-class CloudflareDNSZoneShardSpecOverrideV1(ConfiguredBaseModel):
-    shard: CloudflareDnsZoneV1 = Field(..., alias="shard")
-    image_ref: Optional[str] = Field(..., alias="imageRef")
-    disabled: Optional[bool] = Field(..., alias="disabled")
-    resources: Optional[DeployResourcesFields] = Field(..., alias="resources")
-
-
-class CloudflareDNSZoneShardingV1(IntegrationShardingV1):
-    shard_spec_overrides: Optional[list[CloudflareDNSZoneShardSpecOverrideV1]] = Field(..., alias="shardSpecOverrides")
-
-
 class IntegrationManagedV1(ConfiguredBaseModel):
     namespace: NamespaceV1 = Field(..., alias="namespace")
     spec: IntegrationSpecV1 = Field(..., alias="spec")
-    sharding: Optional[Union[StaticShardingV1, OpenshiftClusterShardingV1, OCMOrganizationShardingV1, AWSAccountShardingV1, CloudflareDNSZoneShardingV1, IntegrationShardingV1]] = Field(..., alias="sharding")
+    sharding: Optional[Union[StaticShardingV1, OpenshiftClusterShardingV1, OCMOrganizationShardingV1, AWSAccountShardingV1, IntegrationShardingV1]] = Field(..., alias="sharding")
 
 
 class IntegrationV1(ConfiguredBaseModel):

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)