qontract-reconcile 0.9.1rc163__py3-none-any.whl → 0.9.1rc165__py3-none-any.whl

{qontract_reconcile-0.9.1rc163.dist-info → qontract_reconcile-0.9.1rc165.dist-info}/METADATA

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

@@ -108,7 +108,7 @@ reconcile/quay_mirror.py,sha256=9pwl1gLzRpsVXF5yPULM4ET_C5F8_xPmH8Mv8AS2AfI,1340
 reconcile/quay_mirror_org.py,sha256=E1OdRe-ppxTkNCwu20iVRhEdG1fPDBroLY02NgiMN7c,10381
 reconcile/quay_permissions.py,sha256=_3PCWjNWoU7VHlYgHzUevvL_jJmEMsWfXV_nzjeiyhU,4099
 reconcile/quay_repos.py,sha256=7609RBVQihis96FNOOe-i9tCTYwcTVy4WpKAL6HpnkU,7031
-reconcile/queries.py,sha256=SZ0Ud0ffph6lD-UEVdjyCGXyz7zS8X8QN3FSYJ-zS5I,57742
+reconcile/queries.py,sha256=NRpanRc0Q9TdBisfTUs7qLbtN6h8mxi8yxnYyrXycnA,57638
 reconcile/query_validator.py,sha256=oLEZIAsQCzxmmZ7b9dSw-OKuEjpI1dbVu4XfCfjpmi8,1503
 reconcile/requests_sender.py,sha256=m00QET0mh6rys5r0y5uurZS7RIylXf04HU1dTdhjt0A,3791
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
@@ -128,7 +128,7 @@ reconcile/terraform_aws_route53.py,sha256=U_6MoiGC61fnGTITbdEeXYogzoToG6g3a-JnVE
 reconcile/terraform_cloudflare_dns.py,sha256=fut76uLzA9FPSh3kDGo2oTyfhDMlh16_p4P5CeNbEtc,11858
 reconcile/terraform_cloudflare_resources.py,sha256=kLFW7JFRr3_zNtw1kxed8YJFyHojUFQVBL2nEyr5drs,7028
 reconcile/terraform_cloudflare_users.py,sha256=lTbrxi8OtW9Pfcr7Yp-70ihldMQKx9dJ7ZgbGHey1XE,13627
-reconcile/terraform_resources.py,sha256=1xiQB1Hd3VhJQdNw-DoPOp66iHg8Ue8MD-qIDZTZBRc,21818
+reconcile/terraform_resources.py,sha256=GJtbB37YEUznHJ2ZNVPMVENeyEqIkB57iHUT3P4MxWI,21888
 reconcile/terraform_tgw_attachments.py,sha256=c8aDE6g0i9PmJQOQMq2GhKNeIOu8LGE-fK9RhCYHBjU,7443
 reconcile/terraform_users.py,sha256=AzDvEQCdLpsXoS3nLbIQRraQvJHa8JmL40lZFv8YXMk,9321
 reconcile/terraform_vpc_peerings.py,sha256=0W9OyOal7RqUQeWRlr3M1FZtityDHy5NZDGWtdDoO-M,21006
@@ -157,7 +157,7 @@ reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 reconcile/glitchtip/integration.py,sha256=52TnE8OH3I-GMg7p3IvlbnV-ysgnGBM2Rt57Hi0KI7s,6216
 reconcile/glitchtip/reconciler.py,sha256=U0ywAmdKjBU8Y75_YJhKEbTUJmX0IDjHvgLDb31xXPY,11608
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip_project_dsn/integration.py,sha256=Dg3NVrR5fnFJXJqqkPJy3Niil7aCOsD9JjCGgYVtcwU,7811
+reconcile/glitchtip_project_dsn/integration.py,sha256=IvFlSYumDPhUw7gLfFX1P8tg-7Vns0ot2-Nqf2_sE18,7997
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -436,7 +436,7 @@ reconcile/utils/state.py,sha256=LKI3d0A5AbUZgUe9IHU2s9SP-zDMnYZbOrHK8hHx92Q,7195
 reconcile/utils/structs.py,sha256=B05uQsZLxl4a-wLqiUTJ8ccr1dkjG_UbleMY2jrqoe0,296
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=9eDnk-3NWV0847cGvRQDC-vZPZ5DTkFYxa6ewYiYSAQ,27605
-reconcile/utils/terrascript_aws_client.py,sha256=KlHw_abhtrIltXsrH3DZLxUg5VJMxacKklrHos4og1c,248363
+reconcile/utils/terrascript_aws_client.py,sha256=qJvEUxfkrN2fKLi3cMWYIapI9F3NXHT28-51rge_Np8,248618
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/unleash.py,sha256=xY8fXxJApZhYnhJHmqNAK1YPNWf6larzDtk0VuNvn08,2875
 reconcile/utils/vault.py,sha256=L0zamAiM39Vskv-uF_rcQf5iKvo1zSN0oU4UYRwBFhM,14375
@@ -482,8 +482,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.1rc163.dist-info/METADATA,sha256=0XOX0bCw0nwsO0CmOIwvfDMVjVUdzCXWL86ZwLZfQ08,2259
-qontract_reconcile-0.9.1rc163.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc163.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc163.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc163.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc165.dist-info/METADATA,sha256=JFfNy_B07IUmZyM1ZszYDfuw2ZhePNdLwbPinoFIsko,2259
+qontract_reconcile-0.9.1rc165.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc165.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc165.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc165.dist-info/RECORD,,

reconcile/glitchtip_project_dsn/integration.py

@@ -117,6 +117,9 @@ def fetch_desired_state(
     for glitchtip_project in glitchtip_projects:
         org = Organization(name=glitchtip_project.organization.name)
         project = Project(name=glitchtip_project.name)
+        if project not in glitchtip_client.projects(organization_slug=org.slug):
+            logging.info(f"Project {project.name} does not exist (yet). Skipping.")
+            continue
         key = glitchtip_client.project_key(
             organization_slug=org.slug, project_slug=project.slug
         )

reconcile/queries.py

@@ -2586,6 +2586,23 @@ def get_unleash_instances():
     return gqlapi.query(UNLEASH_INSTANCES_QUERY)["unleash_instances"]
 
 
+DNS_RECORD = """
+name
+type
+ttl
+alias {
+  name
+  zone_id
+  evaluate_target_health
+}
+weighted_routing_policy {
+  weight
+}
+set_identifier
+records
+"""
+
+
 DNS_ZONES_QUERY = """
 {
   zones: dns_zone_v1 {
@@ -2607,24 +2624,7 @@ DNS_ZONES_QUERY = """
       region
     }
     records {
-      name
-      type
-      ttl
-      alias {
-        name
-        zone_id
-        evaluate_target_health
-      }
-      weighted_routing_policy {
-        weight
-      }
-      geolocation_routing_policy {
-        continent
-        country
-        subdivision
-      }
-      set_identifier
-      records
+      %s
       _healthcheck {
         fqdn
         port
@@ -2662,7 +2662,9 @@ DNS_ZONES_QUERY = """
     }
   }
 }
-"""
+""" % (
+    indent(DNS_RECORD, 6 * " "),
+)
 
 
 def get_dns_zones(account_name=None):

reconcile/terraform_resources.py

@@ -358,6 +358,9 @@ provider
   name
   output_resource_name
   annotations
+  records {
+    %s
+  }
 }
 ... on NamespaceTerraformResourceRosaAuthenticator_V1 {
   region
@@ -385,7 +388,9 @@ provider
   annotations
   defaults
 }
-"""
+""" % (
+    indent(queries.DNS_RECORD, 4 * " "),
+)
 
 
 TF_NAMESPACES_QUERY = """

reconcile/utils/terrascript_aws_client.py

@@ -229,6 +229,7 @@ VARIABLE_KEYS = [
     "vpce_id",
     "fifo_topic",
     "subscriptions",
+    "records",
     "extra_tags",
 ]
 
@@ -845,41 +846,50 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             zone_resource = aws_route53_zone(zone_res_name, **zone_values)
             self.add_resource(acct_name, zone_resource)
 
-            counts = {}
-            for record in zone["records"]:
-                record_fqdn = f"{record['name']}.{zone['name']}"
-                record_id = safe_resource_id(f"{record_fqdn}_{record['type'].upper()}")
-
-                # Count record names so we can generate unique IDs
-                if record_id not in counts:
-                    counts[record_id] = 0
-                counts[record_id] += 1
-
-                # If more than one record with a given name, append _{count}
-                if counts[record_id] > 1:
-                    record_id = f"{record_id}_{counts[record_id]}"
-
-                # Use default TTL if none is specified
-                # or if this record is an alias
-                # None/zero is accepted but not a good default
-                if not record.get("alias") and record.get("ttl") is None:
-                    record["ttl"] = default_ttl
-
-                # Define healthcheck if needed
-                healthcheck = record.pop("healthcheck", None)
-                if healthcheck:
-                    healthcheck_id = record_id
-                    healthcheck_values = {**healthcheck}
-                    healthcheck_resource = aws_route53_health_check(
-                        healthcheck_id, **healthcheck_values
-                    )
-                    self.add_resource(acct_name, healthcheck_resource)
-                    # Assign the healthcheck resource ID to the record
-                    record["health_check_id"] = f"${{{healthcheck_resource.id}}}"
+            self.populate_route53_records(acct_name, zone, zone_resource, default_ttl)
+
+    def populate_route53_records(
+        self,
+        acct_name: str,
+        zone: dict[str, Any],
+        zone_resource: aws_route53_zone,
+        default_ttl: int = 300,
+    ):
+        counts = {}
+        for record in zone.get("records") or []:
+            record_fqdn = f"{record['name']}.{zone['name']}"
+            record_id = safe_resource_id(f"{record_fqdn}_{record['type'].upper()}")
+
+            # Count record names so we can generate unique IDs
+            if record_id not in counts:
+                counts[record_id] = 0
+            counts[record_id] += 1
+
+            # If more than one record with a given name, append _{count}
+            if counts[record_id] > 1:
+                record_id = f"{record_id}_{counts[record_id]}"
+
+            # Use default TTL if none is specified
+            # or if this record is an alias
+            # None/zero is accepted but not a good default
+            if not record.get("alias") and record.get("ttl") is None:
+                record["ttl"] = default_ttl
+
+            # Define healthcheck if needed
+            healthcheck = record.pop("healthcheck", None)
+            if healthcheck:
+                healthcheck_id = record_id
+                healthcheck_values = {**healthcheck}
+                healthcheck_resource = aws_route53_health_check(
+                    healthcheck_id, **healthcheck_values
+                )
+                self.add_resource(acct_name, healthcheck_resource)
+                # Assign the healthcheck resource ID to the record
+                record["health_check_id"] = f"${{{healthcheck_resource.id}}}"
 
-                record_values = {"zone_id": f"${{{zone_resource.id}}}", **record}
-                record_resource = aws_route53_record(record_id, **record_values)
-                self.add_resource(acct_name, record_resource)
+            record_values = {"zone_id": f"${{{zone_resource.id}}}", **record}
+            record_resource = aws_route53_record(record_id, **record_values)
+            self.add_resource(acct_name, record_resource)
 
     def populate_vpc_peerings(self, desired_state):
         for item in desired_state:
@@ -5114,6 +5124,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         zone_id = safe_resource_id(identifier)
         zone_tf_resource = aws_route53_zone(zone_id, **values)
         tf_resources.append(zone_tf_resource)
+        self.populate_route53_records(account, common_values, zone_tf_resource)
 
         policy = {
             "Version": "2012-10-17",