qontract-reconcile 0.10.2.dev145__py3-none-any.whl → 0.10.2.dev147__py3-none-any.whl

{qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev145
+Version: 0.10.2.dev147
 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

{qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/RECORD

@@ -208,7 +208,7 @@ reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMc
 reconcile/external_resources/model.py,sha256=hmb42GyIUn09DSCAik2zlWZ1x9eZzYy-_6NSCU-sZ5Y,13875
 reconcile/external_resources/reconciler.py,sha256=wB8cB5pmqDJ1_t5_Aly4mrULGnI3OQaKqUZCB_Z9RWw,9573
 reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
-reconcile/external_resources/state.py,sha256=gF3ACdl7YiUlbQ4uEGrD6i_Txxqr6mT9f8IFlTQ-8dY,13176
+reconcile/external_resources/state.py,sha256=Hyc3hszY1NFWg3t9QSXL2F5bRs0vP2FNDWzTGrHJsmE,13387
 reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/fleet_labeler/dependencies.py,sha256=MFiSfT25Ks0X3iQxwayNvFX_l6bQi97f3IiaNR1wtHc,3173
 reconcile/fleet_labeler/integration.py,sha256=HGlUJe5BCfAgk7YCxxsIteB8LH1pL8led-KfaIVh214,14614
@@ -512,7 +512,7 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
 reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=zqMMlKWV-aUDMtA-Xu5kl5pYLilewDClnKM0c807nNA,2146
 reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=hQ-WapiBNV3oEKQ813W3bD4HwQ4gADRPy80z9OLtW3Y,2317
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/templating/renderer.py,sha256=6qFeXNqAE8t85eewfm8Pcj9i_Fp2UJ1lad_zTqYmF7M,14753
+reconcile/templating/renderer.py,sha256=VA_lMMtsyEFc0Cwf0jehQdv3tMEJtfyZMzBgA5us5ME,14856
 reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
 reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/lib/merge_request_manager.py,sha256=XwpOR4rVS9ZiJ_Mn8qfCXPZ7CRLMGSJgeIkqD-8Jhgc,5228
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev145.dist-info/METADATA,sha256=Vv7MIziQ6gUpVdVo0qHBWdQeFDG6Eh9er8-hXsbqqsI,24627
-qontract_reconcile-0.10.2.dev145.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev145.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev145.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev147.dist-info/METADATA,sha256=ajrGUtWN2c7GorXZsNxLAxOBQSj7lo9LdCMMNH-qhQI,24627
+qontract_reconcile-0.10.2.dev147.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev147.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev147.dist-info/RECORD,,

reconcile/external_resources/state.py

@@ -300,11 +300,17 @@ class ExternalResourcesStateDynamoDB:
         """
         logging.debug("Getting Managed resources from DynamoDb")
         partials = {}
-        for item in self.aws_api.dynamodb.boto3_client.scan(
-            TableName=self._table, ProjectionExpression=self.PARTIALS_PROJECTED_VALUES
-        ).get("Items", []):
-            s = self.adapter.deserialize(item, partial_data=True)
-            partials[s.key] = s
+        paginator = self.aws_api.dynamodb.boto3_client.get_paginator("scan")
+        pages = paginator.paginate(
+            TableName=self._table,
+            ProjectionExpression=self.PARTIALS_PROJECTED_VALUES,
+            ConsistentRead=True,
+            PaginationConfig={"PageSize": 1000},
+        )
+        for page in pages:
+            for item in page.get("Items", []):
+                s = self.adapter.deserialize(item, partial_data=True)
+                partials[s.key] = s
         return partials
 
     def get_all_resource_keys(self) -> set[ExternalResourceKey]:

reconcile/templating/renderer.py

@@ -30,8 +30,8 @@ from reconcile.typed_queries.app_interface_repo_url import get_app_interface_rep
 from reconcile.typed_queries.github_orgs import get_github_orgs
 from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
 from reconcile.utils import gql
-from reconcile.utils.git import clone
-from reconcile.utils.gql import GqlApi, init_from_config
+from reconcile.utils.git import checkout, clone
+from reconcile.utils.gql import GqlApi
 from reconcile.utils.jinja2.utils import TemplateRenderOptions, process_jinja2_template
 from reconcile.utils.ruamel import create_ruamel_instance
 from reconcile.utils.runtime.integration import (
@@ -333,7 +333,6 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
     def reconcile(
         self, persistence: FilePersistence, ruamel_instance: yaml.YAML
     ) -> None:
-        gql_api = init_from_config(validate_schemas=False)
         for collection in get_template_collections(
             name=self.params.template_collection_name
         ):
@@ -351,7 +350,7 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
                 for item in for_each_items:
                     self.reconcile_template_collection(
                         collection=collection,
-                        gql_api=gql_api,
+                        gql_api=gql.get_api(),
                         persistence=p,
                         ruamel_instance=ruamel_instance,
                         each=item,
@@ -398,6 +397,8 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
             ) as temp_dir:
                 logging.debug(f"Cloning {url} to {temp_dir}")
                 clone(url, temp_dir, depth=1, verify=ssl_verify)
+                logging.debug(f"Checking out commit {gql.get_api().commit}")
+                checkout(str(gql.get_api().commit), temp_dir, verify=bool(ssl_verify))
                 persistence = ClonedRepoGitlabPersistence(
                     dry_run=dry_run,
                     local_path=temp_dir,