qontract-reconcile 0.10.2.dev145__py3-none-any.whl → 0.10.2.dev147__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/METADATA +1 -1
- {qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/RECORD +6 -6
- reconcile/external_resources/state.py +11 -5
- reconcile/templating/renderer.py +5 -4
- {qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/WHEEL +0 -0
- {qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/entry_points.txt +0 -0
{qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/METADATA
RENAMED
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: qontract-reconcile
|
3
|
-
Version: 0.10.2.
|
3
|
+
Version: 0.10.2.dev147
|
4
4
|
Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
|
5
5
|
Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
|
6
6
|
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
RENAMED
@@ -208,7 +208,7 @@ reconcile/external_resources/metrics.py,sha256=KiBjMUaN_z0cSkF_7Ar_a8RiuiwVqjyMc
|
|
208
208
|
reconcile/external_resources/model.py,sha256=hmb42GyIUn09DSCAik2zlWZ1x9eZzYy-_6NSCU-sZ5Y,13875
|
209
209
|
reconcile/external_resources/reconciler.py,sha256=wB8cB5pmqDJ1_t5_Aly4mrULGnI3OQaKqUZCB_Z9RWw,9573
|
210
210
|
reconcile/external_resources/secrets_sync.py,sha256=ZDxzGZ6wC4zxLhA7-L39xDRH6rzUM285gytuzmRQdlw,16208
|
211
|
-
reconcile/external_resources/state.py,sha256=
|
211
|
+
reconcile/external_resources/state.py,sha256=Hyc3hszY1NFWg3t9QSXL2F5bRs0vP2FNDWzTGrHJsmE,13387
|
212
212
|
reconcile/fleet_labeler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
213
213
|
reconcile/fleet_labeler/dependencies.py,sha256=MFiSfT25Ks0X3iQxwayNvFX_l6bQi97f3IiaNR1wtHc,3173
|
214
214
|
reconcile/fleet_labeler/integration.py,sha256=HGlUJe5BCfAgk7YCxxsIteB8LH1pL8led-KfaIVh214,14614
|
@@ -512,7 +512,7 @@ reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9
|
|
512
512
|
reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=zqMMlKWV-aUDMtA-Xu5kl5pYLilewDClnKM0c807nNA,2146
|
513
513
|
reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=hQ-WapiBNV3oEKQ813W3bD4HwQ4gADRPy80z9OLtW3Y,2317
|
514
514
|
reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
515
|
-
reconcile/templating/renderer.py,sha256=
|
515
|
+
reconcile/templating/renderer.py,sha256=VA_lMMtsyEFc0Cwf0jehQdv3tMEJtfyZMzBgA5us5ME,14856
|
516
516
|
reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
|
517
517
|
reconcile/templating/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
518
518
|
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
|
|
797
797
|
tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
|
798
798
|
tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
|
799
799
|
tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
|
800
|
-
qontract_reconcile-0.10.2.
|
801
|
-
qontract_reconcile-0.10.2.
|
802
|
-
qontract_reconcile-0.10.2.
|
803
|
-
qontract_reconcile-0.10.2.
|
800
|
+
qontract_reconcile-0.10.2.dev147.dist-info/METADATA,sha256=ajrGUtWN2c7GorXZsNxLAxOBQSj7lo9LdCMMNH-qhQI,24627
|
801
|
+
qontract_reconcile-0.10.2.dev147.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
802
|
+
qontract_reconcile-0.10.2.dev147.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
|
803
|
+
qontract_reconcile-0.10.2.dev147.dist-info/RECORD,,
|
@@ -300,11 +300,17 @@ class ExternalResourcesStateDynamoDB:
|
|
300
300
|
"""
|
301
301
|
logging.debug("Getting Managed resources from DynamoDb")
|
302
302
|
partials = {}
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
303
|
+
paginator = self.aws_api.dynamodb.boto3_client.get_paginator("scan")
|
304
|
+
pages = paginator.paginate(
|
305
|
+
TableName=self._table,
|
306
|
+
ProjectionExpression=self.PARTIALS_PROJECTED_VALUES,
|
307
|
+
ConsistentRead=True,
|
308
|
+
PaginationConfig={"PageSize": 1000},
|
309
|
+
)
|
310
|
+
for page in pages:
|
311
|
+
for item in page.get("Items", []):
|
312
|
+
s = self.adapter.deserialize(item, partial_data=True)
|
313
|
+
partials[s.key] = s
|
308
314
|
return partials
|
309
315
|
|
310
316
|
def get_all_resource_keys(self) -> set[ExternalResourceKey]:
|
reconcile/templating/renderer.py
CHANGED
@@ -30,8 +30,8 @@ from reconcile.typed_queries.app_interface_repo_url import get_app_interface_rep
|
|
30
30
|
from reconcile.typed_queries.github_orgs import get_github_orgs
|
31
31
|
from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
|
32
32
|
from reconcile.utils import gql
|
33
|
-
from reconcile.utils.git import clone
|
34
|
-
from reconcile.utils.gql import GqlApi
|
33
|
+
from reconcile.utils.git import checkout, clone
|
34
|
+
from reconcile.utils.gql import GqlApi
|
35
35
|
from reconcile.utils.jinja2.utils import TemplateRenderOptions, process_jinja2_template
|
36
36
|
from reconcile.utils.ruamel import create_ruamel_instance
|
37
37
|
from reconcile.utils.runtime.integration import (
|
@@ -333,7 +333,6 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
|
|
333
333
|
def reconcile(
|
334
334
|
self, persistence: FilePersistence, ruamel_instance: yaml.YAML
|
335
335
|
) -> None:
|
336
|
-
gql_api = init_from_config(validate_schemas=False)
|
337
336
|
for collection in get_template_collections(
|
338
337
|
name=self.params.template_collection_name
|
339
338
|
):
|
@@ -351,7 +350,7 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
|
|
351
350
|
for item in for_each_items:
|
352
351
|
self.reconcile_template_collection(
|
353
352
|
collection=collection,
|
354
|
-
gql_api=
|
353
|
+
gql_api=gql.get_api(),
|
355
354
|
persistence=p,
|
356
355
|
ruamel_instance=ruamel_instance,
|
357
356
|
each=item,
|
@@ -398,6 +397,8 @@ class TemplateRendererIntegration(QontractReconcileIntegration):
|
|
398
397
|
) as temp_dir:
|
399
398
|
logging.debug(f"Cloning {url} to {temp_dir}")
|
400
399
|
clone(url, temp_dir, depth=1, verify=ssl_verify)
|
400
|
+
logging.debug(f"Checking out commit {gql.get_api().commit}")
|
401
|
+
checkout(str(gql.get_api().commit), temp_dir, verify=bool(ssl_verify))
|
401
402
|
persistence = ClonedRepoGitlabPersistence(
|
402
403
|
dry_run=dry_run,
|
403
404
|
local_path=temp_dir,
|
{qontract_reconcile-0.10.2.dev145.dist-info → qontract_reconcile-0.10.2.dev147.dist-info}/WHEEL
RENAMED
File without changes
|
File without changes
|