From 4cd1d57e6746c3354bd59424abfa818636e9670c Mon Sep 17 00:00:00 2001 From: noyaarie Date: Wed, 29 Jan 2025 18:14:52 +0200 Subject: [PATCH 1/2] add support for test description from 1.9 --- macros/edr/dbt_artifacts/upload_dbt_tests.sql | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/macros/edr/dbt_artifacts/upload_dbt_tests.sql b/macros/edr/dbt_artifacts/upload_dbt_tests.sql index 8327f90cf..ddcfba367 100644 --- a/macros/edr/dbt_artifacts/upload_dbt_tests.sql +++ b/macros/edr/dbt_artifacts/upload_dbt_tests.sql @@ -62,6 +62,13 @@ {% do meta_dict.update(elementary.safe_get_with_default(node_dict, 'meta', {})) %} {% do meta_dict.update(config_meta_dict) %} + {% set description = none %} + {% if dbt_version >= '1.9.0' and node_dict.get('description') %} + {% set description = node_dict.get('description') %} + {% elif meta_dict.get('description') %} + {% set description = meta_dict.pop('description') %} + {% endif %} + {% set config_tags = elementary.safe_get_with_default(config_dict, 'tags', []) %} {% set global_tags = elementary.safe_get_with_default(node_dict, 'tags', []) %} {% set meta_tags = elementary.safe_get_with_default(meta_dict, 'tags', []) %} @@ -160,7 +167,7 @@ 'depends_on_macros': elementary.filter_none_and_sort(depends_on_dict.get('macros', [])), 'depends_on_nodes': elementary.filter_none_and_sort(depends_on_dict.get('nodes', [])), 'parent_model_unique_id': primary_test_model_id.data, - 'description': meta_dict.get('description'), + 'description': description, 'name': node_dict.get('name'), 'package_name': node_dict.get('package_name'), 'type': elementary.get_test_sub_type(original_file_path, test_namespace), From c2c99e01c5e0a2418ca6883177321cff23a32599 Mon Sep 17 00:00:00 2001 From: noyaarie Date: Wed, 29 Jan 2025 18:21:32 +0200 Subject: [PATCH 2/2] remove default from meta --- macros/edr/dbt_artifacts/upload_dbt_tests.sql | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/macros/edr/dbt_artifacts/upload_dbt_tests.sql b/macros/edr/dbt_artifacts/upload_dbt_tests.sql index ddcfba367..5a4ee5a85 100644 --- a/macros/edr/dbt_artifacts/upload_dbt_tests.sql +++ b/macros/edr/dbt_artifacts/upload_dbt_tests.sql @@ -55,11 +55,7 @@ {% set default_description = elementary.get_default_description(test_original_name, test_namespace) %} {% set config_meta_dict = elementary.safe_get_with_default(config_dict, 'meta', {}) %} - {% set meta_dict = {} %} - {% if default_description %} - {% set meta_dict = {'description': default_description} %} - {% endif %} - {% do meta_dict.update(elementary.safe_get_with_default(node_dict, 'meta', {})) %} + {% set meta_dict = elementary.safe_get_with_default(node_dict, 'meta', {}) %} {% do meta_dict.update(config_meta_dict) %} {% set description = none %} @@ -67,6 +63,8 @@ {% set description = node_dict.get('description') %} {% elif meta_dict.get('description') %} {% set description = meta_dict.pop('description') %} + {% elif default_description %} + {% set description = default_description %} {% endif %} {% set config_tags = elementary.safe_get_with_default(config_dict, 'tags', []) %}