qontract-reconcile 0.10.1rc888__py3-none-any.whl → 0.10.1rc890__py3-none-any.whl

{qontract_reconcile-0.10.1rc888.dist-info → qontract_reconcile-0.10.1rc890.dist-info}/METADATA

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

@@ -812,7 +812,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=uy9eRHf6EdvD8ZY2WYdroGXm18DOdnqVZyxaWN3Bm_0,17724
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=PYFiVIc37qFOl3UxXt04o-V50Leu37pAFndTRMu_WBs,121059
+tools/qontract_cli.py,sha256=lEK5alQqOXQryqdpWwrZPmWUWx3YYL60armyCu4Dguc,123885
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -833,18 +833,18 @@ tools/saas_metrics_exporter/commit_distance/channel.py,sha256=XEAh3eL8TmgMe7V2Bs
 tools/saas_metrics_exporter/commit_distance/commit_distance.py,sha256=pUWaZfZf0TYOwAW0gDdU8cYgTR586J_8S_DWxqHMWNA,3116
 tools/saas_metrics_exporter/commit_distance/metrics.py,sha256=5-y6n-sGACAS3eJ5ndY-2BFxcd0fxLfhvZmmBHu4JuA,426
 tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/saas_promotion_state/saas_promotion_state.py,sha256=_jP9E8-VcWho6FIOGdcjNN6uvMVhpdXOMHw59qNnEmE,2855
+tools/saas_promotion_state/saas_promotion_state.py,sha256=5LJ9rygZ304vxfsIuRfuxueoYRb72EZNKKITEcJ4Mtk,3908
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/conftest.py,sha256=YLtiauk_StNFE-lirLnfG_BpJmlB2NGMZISE9A4zwvk,2421
 tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvftCWEEf-g1mfXOtgCog-g,1271
 tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
-tools/test/test_saas_promotion_state.py,sha256=48Qe5UA5WTI5NVgL7Nz0TSS77osetcijfHNCNdsHfSI,2726
+tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc888.dist-info/METADATA,sha256=Jdlu3njSekBAi5WRIsJmrYWirEt8p6xfH9Iz73XPjK8,2273
-qontract_reconcile-0.10.1rc888.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc888.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc888.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc888.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc890.dist-info/METADATA,sha256=uW1T4A_Joz3NL5bMmkHBoXkqSD773MmIw8yuIq6cD-E,2273
+qontract_reconcile-0.10.1rc890.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc890.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc890.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc890.dist-info/RECORD,,

tools/qontract_cli.py

@@ -56,6 +56,14 @@ from reconcile.cli import (
     config_file,
     use_jump_host,
 )
+from reconcile.external_resources.manager import (
+    FLAG_RESOURCE_MANAGED_BY_ERV2,
+    setup_factories,
+)
+from reconcile.external_resources.model import (
+    ExternalResourcesInventory,
+    load_module_inventory,
+)
 from reconcile.gql_definitions.advanced_upgrade_service.aus_clusters import (
     query as aus_clusters_query,
 )
@@ -72,6 +80,11 @@ from reconcile.typed_queries.app_interface_vault_settings import (
     get_app_interface_vault_settings,
 )
 from reconcile.typed_queries.clusters import get_clusters
+from reconcile.typed_queries.external_resources import (
+    get_modules,
+    get_namespaces,
+    get_settings,
+)
 from reconcile.typed_queries.saas_files import get_saas_files
 from reconcile.typed_queries.slo_documents import get_slo_documents
 from reconcile.typed_queries.status_board import get_status_board
@@ -3677,6 +3690,27 @@ def get_promotion_state(channel: str, sha: str):
             print(state)
 
 
+@root.command()
+@click.option("--channel", help="the channel that state is part of")
+@click.option("--sha", help="the commit sha we want state for")
+@click.option("--publisher-id", help="the publisher id we want state for")
+@environ(["APP_INTERFACE_STATE_BUCKET"])
+def mark_promotion_state_successful(channel: str, sha: str, publisher_id: str):
+    from tools.saas_promotion_state.saas_promotion_state import (
+        SaasPromotionState,
+    )
+
+    promotion_state = SaasPromotionState.create(promotion_state=None, saas_files=None)
+    print(f"Current states for {publisher_id=}")
+    print(promotion_state.get(channel=channel, sha=sha).get(publisher_id, None))
+    print()
+    print("Pushing new state ...")
+    promotion_state.set_successful(channel=channel, sha=sha, publisher_uid=publisher_id)
+    print()
+    print(f"New state for {publisher_id=}")
+    print(promotion_state.get(channel=channel, sha=sha).get(publisher_id, None))
+
+
 @root.command()
 @click.option("--change-type-name")
 @click.option("--role-name")
@@ -3784,5 +3818,45 @@ def remove(ctx, sso_client_vault_secret_path: str):
     )
 
 
+@root.group()
+@click.pass_context
+def external_resources(ctx):
+    """External resources commands"""
+
+
+@external_resources.command()
+@click.argument("provision-provider", required=True)
+@click.argument("provisioner", required=True)
+@click.argument("provider", required=True)
+@click.argument("identifier", required=True)
+@click.pass_context
+def get_input(
+    ctx, provision_provider: str, provisioner: str, provider: str, identifier: str
+):
+    """Gets the input data for an external resource asset. Input data is what is used
+    in the Reconciliation Job to manage the resource.
+
+    e.g: qontract-reconcile --config=<config> external-resources get-input aws app-sre-stage rds dashdotdb-stage
+    """
+    namespaces = [ns for ns in get_namespaces() if ns.external_resources]
+    er_inventory = ExternalResourcesInventory(namespaces)
+
+    spec = er_inventory.get_inventory_spec(
+        provision_provider=provision_provider,
+        provisioner=provisioner,
+        provider=provider,
+        identifier=identifier,
+    )
+    vault_settings = get_app_interface_vault_settings()
+    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+    er_settings = get_settings()[0]
+    m_inventory = load_module_inventory(get_modules())
+    factories = setup_factories(er_settings, m_inventory, er_inventory, secret_reader)
+    f = factories.get_factory(spec.provision_provider)
+    resource = f.create_external_resource(spec)
+    f.validate_external_resource(resource)
+    print(resource.json(exclude={"data": {FLAG_RESOURCE_MANAGED_BY_ERV2}}))
+
+
 if __name__ == "__main__":
     root()  # pylint: disable=no-value-for-parameter

tools/saas_promotion_state/saas_promotion_state.py

@@ -14,6 +14,14 @@ from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.state import init_state
 
 
+class SaasPromotionStateException(Exception):
+    pass
+
+
+class SaasPromotionStateMissingException(Exception):
+    pass
+
+
 class SaasPromotionState:
     def __init__(
         self, promotion_state: PromotionState, saas_files: Iterable[SaasFile]
@@ -54,6 +62,31 @@ class SaasPromotionState:
             )
         }
 
+    def set_successful(self, channel: str, sha: str, publisher_uid: str) -> None:
+        current_data = self._promotion_state.get_promotion_data(
+            sha=sha,
+            channel=channel,
+            target_uid=publisher_uid,
+            use_cache=False,
+            pre_check_sha_exists=False,
+        )
+
+        if not current_data:
+            raise SaasPromotionStateMissingException(
+                f"No promotion state in S3 for given {publisher_uid=} {sha=} {channel=}"
+            )
+
+        if current_data.success:
+            raise SaasPromotionStateException(
+                f"The current promotion state is already marked successful for given {publisher_uid=} {sha=} {channel=}",
+                current_data,
+            )
+
+        current_data.success = True
+        self._promotion_state.publish_promotion_data(
+            data=current_data, sha=sha, channel=channel, target_uid=publisher_uid
+        )
+
     @staticmethod
     def create(
         promotion_state: PromotionState | None, saas_files: Iterable[SaasFile] | None

tools/test/test_saas_promotion_state.py

@@ -7,14 +7,18 @@ from unittest.mock import (
     create_autospec,
 )
 
+from pytest import raises
+
 from reconcile.typed_queries.saas_files import SaasFile
 from reconcile.utils.promotion_state import PromotionData, PromotionState
 from tools.saas_promotion_state.saas_promotion_state import (
     SaasPromotionState,
+    SaasPromotionStateException,
+    SaasPromotionStateMissingException,
 )
 
 
-def test_saas_promotion_state(
+def test_get_saas_promotion_state(
     saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]],
 ) -> None:
     saas_files = saas_files_builder([
@@ -84,3 +88,100 @@ def test_saas_promotion_state(
         target_uid="616af45d7fad7f4eea8d52b8b5e8a058cef82ab0",
         pre_check_sha_exists=False,
     )
+
+
+def test_set_saas_promotion_state_success(
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]],
+) -> None:
+    saas_files = saas_files_builder([{"resourceTemplates": []}])
+
+    current_data = PromotionData(
+        check_in="test1",
+        saas_file="test2",
+        success=False,
+        target_config_hash="test3",
+    )
+    promotion_state = create_autospec(spec=PromotionState)
+    promotion_state.get_promotion_data.return_value = current_data
+    saas_promotion_state = SaasPromotionState.create(
+        promotion_state=promotion_state, saas_files=saas_files
+    )
+    saas_promotion_state.set_successful(
+        channel="test-channel", sha="test-sha", publisher_uid="test-uid"
+    )
+
+    promotion_state.get_promotion_data.assert_called_once_with(
+        sha="test-sha",
+        channel="test-channel",
+        use_cache=False,
+        target_uid="test-uid",
+        pre_check_sha_exists=False,
+    )
+    promotion_state.publish_promotion_data.assert_called_once_with(
+        data=PromotionData(
+            check_in="test1",
+            saas_file="test2",
+            success=True,
+            target_config_hash="test3",
+        ),
+        channel="test-channel",
+        sha="test-sha",
+        target_uid="test-uid",
+    )
+
+
+def test_set_saas_promotion_state_missing(
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]],
+) -> None:
+    saas_files = saas_files_builder([{"resourceTemplates": []}])
+    promotion_state = create_autospec(spec=PromotionState)
+    promotion_state.get_promotion_data.return_value = None
+    saas_promotion_state = SaasPromotionState.create(
+        promotion_state=promotion_state, saas_files=saas_files
+    )
+
+    with raises(SaasPromotionStateMissingException):
+        saas_promotion_state.set_successful(
+            channel="test-channel", sha="test-sha", publisher_uid="test-uid"
+        )
+
+    promotion_state.get_promotion_data.assert_called_once_with(
+        sha="test-sha",
+        channel="test-channel",
+        use_cache=False,
+        target_uid="test-uid",
+        pre_check_sha_exists=False,
+    )
+    promotion_state.publish_promotion_data.assert_not_called()
+
+
+def test_set_saas_promotion_state_already_successful(
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]],
+) -> None:
+    saas_files = saas_files_builder([{"resourceTemplates": []}])
+
+    current_data = PromotionData(
+        check_in="test1",
+        saas_file="test2",
+        success=True,
+        target_config_hash="test3",
+    )
+    promotion_state = create_autospec(spec=PromotionState)
+    promotion_state.get_promotion_data.return_value = current_data
+    saas_promotion_state = SaasPromotionState.create(
+        promotion_state=promotion_state, saas_files=saas_files
+    )
+
+    with raises(SaasPromotionStateException):
+        saas_promotion_state.set_successful(
+            channel="test-channel", sha="test-sha", publisher_uid="test-uid"
+        )
+
+    promotion_state.get_promotion_data.assert_called_once_with(
+        sha="test-sha",
+        channel="test-channel",
+        use_cache=False,
+        target_uid="test-uid",
+        pre_check_sha_exists=False,
+    )
+    promotion_state.publish_promotion_data.assert_not_called()