qontract-reconcile 0.10.1rc751__py3-none-any.whl → 0.10.1rc753__py3-none-any.whl

{qontract_reconcile-0.10.1rc751.dist-info → qontract_reconcile-0.10.1rc753.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc751
+Version: 0.10.1rc753
 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.10.1rc751.dist-info → qontract_reconcile-0.10.1rc753.dist-info}/RECORD

@@ -22,7 +22,7 @@ reconcile/database_access_manager.py,sha256=42dBJyihdwx4WjEBjwi3lUiDzQ1t_2ZFViJr
 reconcile/deadmanssnitch.py,sha256=n-5W-djUgwzpmdDM4eQIZpkkDmHY0vndt-42LJXI4Y8,7491
 reconcile/dynatrace_token_provider.py,sha256=P5jvMavremWp64LVknz1kCZI4aagwLrDDfXkmJ9diwY,17212
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
-reconcile/gabi_authorized_users.py,sha256=9kpSJGyMe_qYVHIgTFHhYf8E3lKSLO0Ia1WwK9ADNIE,4502
+reconcile/gabi_authorized_users.py,sha256=4jJNtmEwLqg2-keuWZ3sjKV-OMn7C9pfXWWdssVua8Y,4883
 reconcile/gcr_mirror.py,sha256=PAMnIL7tRTwt8KMZf-wM2k0r_et3LBgyJCEeyuqEM5E,8827
 reconcile/github_org.py,sha256=0vst4YETf2voTiMHcREngSeuKtG7jOOILfFBQ0AOVQg,13479
 reconcile/github_owners.py,sha256=s9NDIqTbaqgGE5lj89eh3Sr52B-6SCUWQILzQlzGyxw,2949
@@ -336,7 +336,7 @@ reconcile/gql_definitions/templating/template_collection.py,sha256=lS0vzEKV2ZrzO
 reconcile/gql_definitions/templating/templates.py,sha256=ejAvQ13zfNMQTz3FWtRUic6dSvio3aAgBKEqt600hbk,2821
 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=eyGX9HcTF6MZbOYZ6Kl6Mg3k6nJTUtwqs9gDxBP_8Dk,1920
-reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py,sha256=uVZYu5EUcvdAQYBK5YKD0mjoMKDb5inSuCJrrOD5KpE,5704
+reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py,sha256=dBQ2tyAp-eRZs59mguaTc6-x67JUoSxtZ8mOjbRqDuc,5832
 reconcile/gql_definitions/terraform_cloudflare_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_accounts.py,sha256=WHMyQlosDCby7p1wWd3PXpmooSeEZyR8CgRDP49bunU,3641
 reconcile/gql_definitions/terraform_cloudflare_resources/terraform_cloudflare_resources.py,sha256=YWjhWTjOR7B-RsX5gPt1PbRfYDzxPqncNq4vmVHpIQ0,12313
@@ -778,8 +778,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc751.dist-info/METADATA,sha256=siqrJyv1zzhjJ0bILXpBrFQywzS0NHPrPjwPEOPCshs,2382
-qontract_reconcile-0.10.1rc751.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc751.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc751.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc751.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc753.dist-info/METADATA,sha256=XxOXxeAxSQyr7D4Nr7l5sIcfOoFqaHHIUydTxR7CrEQ,2382
+qontract_reconcile-0.10.1rc753.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc753.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc753.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc753.dist-info/RECORD,,

reconcile/gabi_authorized_users.py

@@ -20,6 +20,7 @@ from reconcile import queries
 from reconcile.status import ExitCodes
 from reconcile.utils.aggregated_list import RunnerException
 from reconcile.utils.defer import defer
+from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.external_resources import get_external_resource_specs
 from reconcile.utils.openshift_resource import (
     OpenshiftResource,
@@ -76,6 +77,14 @@ def fetch_desired_state(
             namespace = i["namespace"]
             account = i["account"]
             identifier = i["identifier"]
+            cluster = namespace["cluster"]
+            if not integration_is_enabled(QONTRACT_INTEGRATION, cluster):
+                logging.debug(
+                    f"For cluster {cluster['name']} the integration "
+                    f"{QONTRACT_INTEGRATION} is not enabled. Skipping."
+                )
+                continue
+
             specs = get_external_resource_specs(namespace)
             found = False
             for spec in specs:
@@ -90,10 +99,10 @@ def fetch_desired_state(
                     f'for account {account} in namespace {namespace["name"]}. '
                     "If this is a removed read only instance, consider updating the identifier to the source replica."
                 )
-            users = get_usernames(g["users"], namespace["cluster"])
+            users = get_usernames(g["users"], cluster)
             resource = construct_gabi_oc_resource(g["name"], expiration_date, users)
             ri.add_desired(
-                namespace["cluster"]["name"],
+                cluster["name"],
                 namespace["name"],
                 resource.kind,
                 resource.name,

reconcile/gql_definitions/terraform_cloudflare_dns/terraform_cloudflare_zones.py

@@ -80,6 +80,8 @@ query CloudflareDnsZone {
         digest
         key_tag
         flags
+        tag
+        value
       }
     }
     type
@@ -142,6 +144,8 @@ class CloudflareDnsRecordDataSettingsV1(ConfiguredBaseModel):
     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):