qontract-reconcile 0.10.2.dev229__py3-none-any.whl → 0.10.2.dev231__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.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: qontract-reconcile
3
- Version: 0.10.2.dev229
3
+ Version: 0.10.2.dev231
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
@@ -77,7 +77,7 @@ reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_R
77
77
  reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
78
78
  reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
79
79
  reconcile/openshift_saas_deploy_change_tester.py,sha256=12uyBwaeMka1C3_pejmQPIBPAx2V1sJ4dJkScq-2e2M,8793
80
- reconcile/openshift_saas_deploy_trigger_base.py,sha256=YztjQZrpxq_uPjxqlwZxC3JaLTC4GBjC_CpsLDNKk1w,14534
80
+ reconcile/openshift_saas_deploy_trigger_base.py,sha256=ftG8vqXCfaMUrkl1QqbPjnRpnQAmMIGCG0IT-YWAG6U,14366
81
81
  reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=roLyVAVntaQptKaZbnN1LyLvCA8fyvqELfjU6M8xfeY,3511
82
82
  reconcile/openshift_saas_deploy_trigger_configs.py,sha256=eUejMGWuaQabZTLuvPLLvROfN5HOFyYZOpH4YEsiU_g,928
83
83
  reconcile/openshift_saas_deploy_trigger_images.py,sha256=iUsiBGJf-CyFw7tSLWo59rXmSvsVnN6TTaAObbsVpNg,936
@@ -612,7 +612,7 @@ reconcile/utils/external_resources.py,sha256=YzTb0xAcNdmKO326mGQy7BmST56CZcdru4l
612
612
  reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
613
613
  reconcile/utils/git.py,sha256=o4p9m8jlzCJDcutl2HErvGLhL6sZ1NB4Aw3zGcQIzso,2427
614
614
  reconcile/utils/github_api.py,sha256=S1vO-hvYPzm5BIychVIHSYibMns0HBmLgS78MkPfunE,3402
615
- reconcile/utils/gitlab_api.py,sha256=-wf1praBpU9h4TratCnAPBHEYgYJZLib6dl6Nszzrrw,28761
615
+ reconcile/utils/gitlab_api.py,sha256=4-DG5wV7k0jSl4Yp4ELQbp3qJY6uYuHukiZJ5tYkhCM,28648
616
616
  reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
617
617
  reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
618
618
  reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
@@ -803,7 +803,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
803
803
  tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
804
804
  tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
805
805
  tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
806
- qontract_reconcile-0.10.2.dev229.dist-info/METADATA,sha256=TtqPuJKbDOI4FK-V9gGy3bn01Xuw4UtOE9qfKSHv_DI,24431
807
- qontract_reconcile-0.10.2.dev229.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
808
- qontract_reconcile-0.10.2.dev229.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
809
- qontract_reconcile-0.10.2.dev229.dist-info/RECORD,,
806
+ qontract_reconcile-0.10.2.dev231.dist-info/METADATA,sha256=NWtMntw0DQ91OLL99zMdkiIsxd-2aaLPpWXK8TFd2p0,24431
807
+ qontract_reconcile-0.10.2.dev231.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
808
+ qontract_reconcile-0.10.2.dev231.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
809
+ qontract_reconcile-0.10.2.dev231.dist-info/RECORD,,
@@ -278,7 +278,6 @@ def _trigger_tekton(
278
278
  integration_version,
279
279
  saasherder.include_trigger_trace,
280
280
  spec.reason,
281
- spec.state_content,
282
281
  )
283
282
 
284
283
  error = False
@@ -335,7 +334,6 @@ def _construct_tekton_trigger_resource(
335
334
  integration_version: str,
336
335
  include_trigger_trace: bool,
337
336
  reason: str | None,
338
- target_ref: str | None,
339
337
  ) -> tuple[OR, str]:
340
338
  """Construct a resource (PipelineRun) to trigger a deployment via Tekton.
341
339
 
@@ -350,7 +348,6 @@ def _construct_tekton_trigger_resource(
350
348
  integration_version (string): Version of calling integration
351
349
  include_trigger_trace (bool): Should include traces of the triggering integration and reason
352
350
  reason (string): The reason this trigger was created
353
- target_ref (string): the SHA ref of the target
354
351
 
355
352
  Returns:
356
353
  OpenshiftResource: OpenShift resource to be applied
@@ -388,7 +385,6 @@ def _construct_tekton_trigger_resource(
388
385
  "labels": {
389
386
  "qontract.saas_file_name": saas_file_name,
390
387
  "qontract.env_name": env_name,
391
- "qontract.target_ref": target_ref or "",
392
388
  },
393
389
  },
394
390
  "spec": {
@@ -298,16 +298,15 @@ class GitLabApi:
298
298
 
299
299
  @staticmethod
300
300
  def _is_bot_username(username: str) -> bool:
301
- """crudely checking for the username
302
-
303
- as gitlab-python require a major upgrade to use the billable members apis
304
- https://python-gitlab.readthedocs.io/en/stable/gl_objects/groups.html#id11 lists the api
305
- billable_membersis the attribute that provides billable members of groups
301
+ """
302
+ Checks if a given username matches the pattern for an internal GitLab bot user.
306
303
 
307
- the second api is https://python-gitlab.readthedocs.io/en/stable/gl_objects/group_access_tokens.html
308
- which provides a list of access tokens as well as their assigned users
304
+ This method uses a regular expression (GROUP_BOT_NAME_REGEX) to determine
305
+ if the username conforms to the naming convention for internal GitLab bots,
306
+ as described in the GitLab documentation.
309
307
 
310
- those apis are not avaliable in python-gitlab v1.x
308
+ Reference:
309
+ - GitLab Internal Users Documentation: https://docs.gitlab.com/administration/internal_users/
311
310
  """
312
311
  return GROUP_BOT_NAME_REGEX.match(username) is not None
313
312