chore(sync native): Continue the import in case an error happens while getting dependencies (#344)

Author: Vitor-Avila

src/preset_cli/cli/superset/sync/native/command.py

@@ -372,24 +372,24 @@ def import_resources_individually(  # pylint: disable=too-many-locals
 
                 asset_configs = {path: config}
                 _logger.debug("Processing %s for import", path.relative_to("bundle"))
-                for uuid in get_related_uuids(config):
-                    asset_configs.update(related_configs[uuid])
-                related_configs[config["uuid"]] = asset_configs
-
-                if path in assets_to_skip or (
-                    asset_type != ResourceType.ASSET
-                    and asset_type.resource_name not in resource_name
-                ):
-                    continue
-
-                _logger.info("Importing %s", path.relative_to("bundle"))
                 asset_log = {
                     "uuid": config["uuid"],
                     "path": str(path),
                     "status": "SUCCESS",
                 }
-
                 try:
+                    for uuid in get_related_uuids(config):
+                        asset_configs.update(related_configs[uuid])
+                    related_configs[config["uuid"]] = asset_configs
+
+                    if path in assets_to_skip or (
+                        asset_type != ResourceType.ASSET
+                        and asset_type.resource_name not in resource_name
+                    ):
+                        continue
+
+                    _logger.info("Importing %s", path.relative_to("bundle"))
+
                     contents = {str(k): yaml.dump(v) for k, v in asset_configs.items()}
                     import_resources(contents, client, overwrite, asset_type)
                 except Exception:  # pylint: disable=broad-except

tests/cli/superset/sync/native/command_test.py

@@ -1230,6 +1230,27 @@ def test_native_split_continue(  # pylint: disable=too-many-locals
         },
         "uuid": "5",
     }
+    dashboard_deleted_chart = {
+        "dashboard_title": "Dashboard with deleted chart",
+        "is_managed_externally": False,
+        "position": {
+            "DASHBOARD_VERSION_KEY": "v2",
+            "CHART-BVI44PWH": {
+                "type": "CHART",
+                "meta": {
+                    "uuid": "3",
+                },
+            },
+            "CHART-BLAH": {
+                "type": "CHART",
+                "meta": {
+                    "uuid": None,
+                },
+            },
+        },
+        "metadata": {},
+        "uuid": "6",
+    }
 
     fs.create_file(
         root / "databases/gsheets.yaml",
@@ -1251,6 +1272,10 @@ def test_native_split_continue(  # pylint: disable=too-many-locals
         root / "dashboards/dashboard_deleted_dataset.yaml",
         contents=yaml.dump(dashboard_deleted_dataset),
     )
+    fs.create_file(
+        root / "dashboards/dashboard_deleted_chart.yaml",
+        contents=yaml.dump(dashboard_deleted_chart),
+    )
 
     SupersetClient = mocker.patch(
         "preset_cli.cli.superset.sync.native.command.SupersetClient",
@@ -1262,6 +1287,8 @@ def test_native_split_continue(  # pylint: disable=too-many-locals
     mocker.patch("preset_cli.cli.superset.main.UsernamePasswordAuth")
     mocker.patch("preset_cli.cli.superset.lib.LOG_FILE_PATH", Path("progress.log"))
 
+    assert not Path("progress.log").exists()
+
     runner = CliRunner()
     result = runner.invoke(
         superset_cli,
@@ -1330,6 +1357,43 @@ def test_native_split_continue(  # pylint: disable=too-many-locals
         any_order=True,
     )
 
+    with open("progress.log", encoding="utf-8") as log:
+        content = yaml.load(log, Loader=yaml.SafeLoader)
+
+    assert content["ownership"] == []
+    assert content["assets"] == [
+        {
+            "path": "bundle/databases/gsheets.yaml",
+            "uuid": "1",
+            "status": "SUCCESS",
+        },
+        {
+            "path": "bundle/datasets/gsheets/test.yaml",
+            "uuid": "2",
+            "status": "SUCCESS",
+        },
+        {
+            "path": "bundle/charts/chart.yaml",
+            "uuid": "3",
+            "status": "SUCCESS",
+        },
+        {
+            "path": "bundle/dashboards/dashboard_deleted_chart.yaml",
+            "uuid": "6",
+            "status": "FAILED",
+        },
+        {
+            "path": "bundle/dashboards/dashboard_deleted_dataset.yaml",
+            "uuid": "5",
+            "status": "SUCCESS",
+        },
+        {
+            "path": "bundle/dashboards/dashboard.yaml",
+            "uuid": "4",
+            "status": "SUCCESS",
+        },
+    ]
+
 
 def test_native_continue_without_split(
     mocker: MockerFixture,