qontract-reconcile 0.10.1rc845__py3-none-any.whl → 0.10.1rc847__py3-none-any.whl

{qontract_reconcile-0.10.1rc845.dist-info → qontract_reconcile-0.10.1rc847.dist-info}/METADATA

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

@@ -232,7 +232,7 @@ reconcile/gql_definitions/cna/queries/cna_provisioners.py,sha256=4k527BszdWB84Wk
 reconcile/gql_definitions/cna/queries/cna_resources.py,sha256=j9sa5iOOBsLT2qwlmEItnafSXK-vdNPXgd9Z4mg9mlc,2710
 reconcile/gql_definitions/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/common/alerting_services_settings.py,sha256=mT7cobC9mR_bhFSYeQX1apVA5zMqSbu5fYcdd4iZ9mg,1802
-reconcile/gql_definitions/common/app_code_component_repos.py,sha256=4I4hQ37rkAYh9HlJdE9eKBtML-82jY8qHkXhbCZCtmM,1951
+reconcile/gql_definitions/common/app_code_component_repos.py,sha256=SCpUVfnn1Vl9nN0UYs5zqJfW1-wIOE-W8_1JjhC-hK8,2034
 reconcile/gql_definitions/common/app_interface_custom_messages.py,sha256=5a-rmQqR0qmews01K1WiTw1ZHUIUmQoznF9v8_Uw9QQ,2000
 reconcile/gql_definitions/common/app_interface_dms_settings.py,sha256=h-N7-XGpmH7O9d3UBPhJJl48tpZvqihLloamZKdlgVg,2568
 reconcile/gql_definitions/common/app_interface_repo_settings.py,sha256=rud0rz9NIFF-h1fFdk3MnwGmx73rhwrn1taN_HefvyU,1754
@@ -786,7 +786,7 @@ reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XL
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=XXY35h8VWQ66z3LBPxaoUAMkIW50264DQiecrzyV6oA,9076
 reconcile/utils/saasherder/models.py,sha256=1DKXUmiTS_MejUfSpFCeuBLMTgR4ldv2N1tAz8qHAwc,5547
-reconcile/utils/saasherder/saasherder.py,sha256=Z6indeXBLzo_1w9Utc8Uj27wSe4J0OwBqykYYAqPpnI,86416
+reconcile/utils/saasherder/saasherder.py,sha256=5rKp1ONBgRgfRO9tMHheEHXjQbipqWB8kUALSCKMGDc,86545
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
@@ -811,7 +811,7 @@ tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=w8hl4jIEWk5wKbEFN6fVEOwUJGmdlvOqYodW3XSN7mU,4978
-tools/cli_commands/systems_and_tools.py,sha256=welsQO8ccDIeMm_1D_7MOMV7jtIQHz21kCpvq6EQEi0,11080
+tools/cli_commands/systems_and_tools.py,sha256=UCX_0czYXgm1EbWSAn_91D1CbfQui4RFX4QAlo4pjYA,11106
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/aws.py,sha256=bdvbT3bDymBOMx4Ve4kt154MeGiGusTSpOpMMFrQ4SM,5191
 tools/cli_commands/cost_report/cost_management_api.py,sha256=tFzjaZ3RSVJeAUsfSWXHiQlMVbV8dFcXibK158ODQcA,2549
@@ -834,8 +834,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
 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.1rc845.dist-info/METADATA,sha256=uCHwA8ZOObe-QcUMJ-ONwshusONEq-SqoTlgjw4korg,2273
-qontract_reconcile-0.10.1rc845.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc845.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc845.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc845.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc847.dist-info/METADATA,sha256=INYD7UnaUfqWYkXT3V-JyoXD9jjY6j3Ji6xD-E9vWA0,2273
+qontract_reconcile-0.10.1rc847.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc847.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc847.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc847.dist-info/RECORD,,

reconcile/gql_definitions/common/app_code_component_repos.py

@@ -23,6 +23,7 @@ query AppCodeComponentRepos {
   apps: apps_v1 {
     codeComponents {
       name
+      description
       resource
       url
     }
@@ -39,6 +40,7 @@ class ConfiguredBaseModel(BaseModel):
 
 class AppCodeComponentsV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    description: Optional[str] = Field(..., alias="description")
     resource: str = Field(..., alias="resource")
     url: str = Field(..., alias="url")
 

reconcile/utils/saasherder/saasherder.py

@@ -959,6 +959,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 )
                 raise
 
+            # add COMMIT_SHA only if it is unspecified
+            consolidated_parameters.setdefault("COMMIT_SHA", commit_sha)
+
             # add IMAGE_TAG only if it is unspecified
             if not (image_tag := consolidated_parameters.get("IMAGE_TAG", "")):
                 sha_substring = commit_sha[:hash_length]

tools/cli_commands/systems_and_tools.py

@@ -263,7 +263,7 @@ class SystemTool(BaseModel):
             system_id=c.name,
             name=c.name,
             url=c.url,
-            description=c.name,
+            description=c.description or "",
         )
 
 
@@ -322,7 +322,7 @@ def get_systems_and_tools_inventory() -> SystemToolInventory:
     inventory.update(get_vault_instances())
     inventory.update(get_cloudflare_accounts())
     inventory.update([
-        c for c in get_code_components() if c.resource == "app-interface"
+        c for c in get_code_components() if c.resource in {"gitops", "infrastructure"}
     ])
 
     inventory.systems_and_tools.append(