qontract-reconcile 0.9.1rc207__py3-none-any.whl → 0.9.1rc208__py3-none-any.whl

{qontract_reconcile-0.9.1rc207.dist-info → qontract_reconcile-0.9.1rc208.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.9.1rc207
+Version: 0.9.1rc208
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.9.1rc207.dist-info → qontract_reconcile-0.9.1rc208.dist-info}/RECORD

@@ -235,7 +235,7 @@ reconcile/gql_definitions/terraform_cloudflare_dns/__init__.py,sha256=47DEQpj8HB
 reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py,sha256=RH92JBJB4HpAv2TzEzy_RVvv2yAEqTSjxa8lju_Rlso,5655
 reconcile/gql_definitions/terraform_cloudflare_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_accounts.py,sha256=LDiLFs6ShmooOOXllNbFr-dN81zC8BOo_LBj4p-g_Dw,3673
-reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py,sha256=Q3DV3Xa54nw3Q-U_JKHAko6quFCT-NX1mZ5qdL_nQQs,11379
+reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py,sha256=nCktp5K26yn8rl0Dywfxhhn0oiitLY3O6C4YID8w62c,11607
 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=OHfIzX9qAePtRwARYNERuvafwVv0Zy0YUbT83Frt3eA,1984
 reconcile/gql_definitions/terraform_cloudflare_users/terraform_cloudflare_roles.py,sha256=CopEDfqnz6M-rW4kwkbFK_5FvAj7t8NzzffGZUhCTuo,4059
@@ -368,7 +368,7 @@ reconcile/test/test_utils_terraform.py,sha256=ER02AnPHwoV8Ry0sSe1HXvOxFv0cxcblf3
 reconcile/test/test_utils_terraform_client.py,sha256=kKVtMerDRx9Ienw5gQt-t2UZOBefnu7VW7xuGGX0nZM,13578
 reconcile/test/test_utils_terraform_config_client.py,sha256=DhONtE58zrzwcvxEKS0rv1_wN996DYcut_Yk7Y-ptaw,8298
 reconcile/test/test_utils_terrascript_aws_client.py,sha256=uwfY0xQu4WHFjjVgVR4o1xOLB63NO8ZyCo1S6ma30DE,8272
-reconcile/test/test_utils_terrascript_cloudflare_client.py,sha256=bZGkVkzh3Gdl823bZUNDCP40aRKkd0_BxDBn6I5DRKE,19531
+reconcile/test/test_utils_terrascript_cloudflare_client.py,sha256=tmb-wdm9gi8Q8i-OptatfhRhhphpIUb1vA_lwP9C0iU,19855
 reconcile/test/test_utils_terrascript_cloudflare_resources.py,sha256=h1wKs6XIGIjyBa8etuovOkQ_66DBDVUqHLOKpBfWNGQ,754
 reconcile/test/test_vault_replication.py,sha256=BKDuwy9C0dsb4n8KRwfZDGlEyXCKAZMMKOU-pS4ZWu8,16865
 reconcile/test/test_vault_utils.py,sha256=vbJnc89XAuE07qbTuWxHM5o9F6R9SO5aHXA38fwxT7A,1122
@@ -497,7 +497,7 @@ reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79
 reconcile/utils/terraform/config_client.py,sha256=t4novdX7GeYPMYms97C_BBtLmt0M8CJCmCT7QHENwxg,4687
 reconcile/utils/terrascript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/terrascript/cloudflare_client.py,sha256=ip8UAM7Kq25sB3WWtw3aplJAHqLhNFjFsFArYT6YrSQ,9568
-reconcile/utils/terrascript/cloudflare_resources.py,sha256=XVMm7PGRMdb6vvyPQw-VXDmL_18AW5Zkd-ir2DX77Q0,14866
+reconcile/utils/terrascript/cloudflare_resources.py,sha256=GM8nHTbqUej3mjVGrv34l9GY3cXU3fDGFN3QU9LWm7Q,13896
 reconcile/utils/terrascript/models.py,sha256=x9HReI0k71MHBpRTvvmPlE0G6rri5GTzPXM9cqyTWm0,475
 reconcile/utils/terrascript/resources.py,sha256=bQzglnO41KZZEIeXYgi-qlup1p8R03Qyx_V944LRPsc,1391
 release/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -513,8 +513,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc207.dist-info/METADATA,sha256=7EMqV24ipSP5LGMSwCidhovKO2HWoLFbWHPGXG15X9s,2248
-qontract_reconcile-0.9.1rc207.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc207.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc207.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc207.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc208.dist-info/METADATA,sha256=a9IgT3fr73kk3vGi-rWRl2nJpI0bhIHCKxfcRqCkeGY,2248
+qontract_reconcile-0.9.1rc208.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc208.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc208.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc208.dist-info/RECORD,,

reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py

@@ -148,6 +148,9 @@ query TerraformCloudflareResources {
             ownership_challenge
             dataset
             frequency
+            job_name: name
+            filter
+            kind
           }
           ... on NamespaceTerraformResourceLogpullRetention_v1
           {
@@ -304,6 +307,9 @@ class NamespaceTerraformResourceLogpushJobV1(NamespaceTerraformResourceCloudflar
     ownership_challenge: Optional[str] = Field(..., alias="ownership_challenge")
     dataset: Optional[str] = Field(..., alias="dataset")
     frequency: Optional[str] = Field(..., alias="frequency")
+    job_name: Optional[str] = Field(..., alias="job_name")
+    filter: Optional[str] = Field(..., alias="filter")
+    kind: Optional[str] = Field(..., alias="kind")
 
 
 class NamespaceTerraformResourceLogpullRetentionV1(

reconcile/test/test_utils_terrascript_cloudflare_client.py

@@ -168,6 +168,7 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
             "ownership_challenge": "some-challenge",
             "dataset": "http_requests",
             "frequency": "high",
+            "kind": "edge",
         },
         {},
     )
@@ -183,6 +184,8 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
             "ownership_challenge": "some-challenge",
             "dataset": "http_requests",
             "frequency": "high",
+            "job_name": "Logpush job for account",
+            "filter": '{"key":"BotScore","operator":"lt","value":"30"}',
         },
         {},
     )
@@ -322,6 +325,7 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
                     "frequency": "high",
                     "logpull_options": "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                     "ownership_challenge": "some-challenge",
+                    "kind": "edge",
                 },
                 "logpush_job_account": {
                     "account_id": "${var.account_id}",
@@ -331,6 +335,8 @@ def test_create_cloudflare_resources_terraform_json(account_config, backend_conf
                     "frequency": "high",
                     "logpull_options": "fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339",
                     "ownership_challenge": "some-challenge",
+                    "name": "Logpush job for account",
+                    "filter": '{"key":"BotScore","operator":"lt","value":"30"}',
                 },
             },
             "cloudflare_logpull_retention": {

reconcile/utils/terrascript/cloudflare_resources.py

@@ -302,44 +302,21 @@ class CloudflareLogpushJob(TerrascriptResource):
     def populate(self) -> list[Union[Resource, Output, Data]]:
         resources = []
         values = ResourceValueResolver(self._spec).resolve()
-        destination_conf = values.get("destination_conf")
-        zone = values.get("zone_name")
-        enabled = values.get("enabled")
-        logpull_options = values.get("logpull_options")
-        dataset = values.get("dataset")
-        frequency = values.get("frequency")
-        ownership_challenge = values.get("ownership_challenge")
+        zone = values.pop("zone_name", None)
+        name = values.pop("job_name", None)
+
+        if name:
+            values["name"] = name
 
         if zone:
             resources.append(
                 self.cloudflare_zone(zone, name=zone, account_id="${var.account_id}")
             )
-            resources.append(
-                cloudflare_logpush_job(
-                    self._spec.identifier,
-                    enabled=enabled,
-                    logpull_options=logpull_options,
-                    ownership_challenge=ownership_challenge,
-                    dataset=dataset,
-                    frequency=frequency,
-                    destination_conf=destination_conf,
-                    zone_id=f"${{data.cloudflare_zone.{zone}.id}}",
-                )
-            )
+            values["zone_id"] = f"${{data.cloudflare_zone.{zone}.id}}"
         else:
-            resources.append(
-                cloudflare_logpush_job(
-                    self._spec.identifier,
-                    enabled=enabled,
-                    logpull_options=logpull_options,
-                    ownership_challenge=ownership_challenge,
-                    dataset=dataset,
-                    frequency=frequency,
-                    destination_conf=destination_conf,
-                    account_id="${var.account_id}",
-                )
-            )
+            values["account_id"] = "${var.account_id}"
 
+        resources.append(cloudflare_logpush_job(self._spec.identifier, **values))
         return resources