groups bugfix

Author: haritamar

integration_tests/tests/test_dbt_artifacts/test_groups.py

@@ -108,7 +108,9 @@ def test_model_and_groups(dbt_project: DbtProject, tmp_path):
         "models": [
             {
                 "name": model_name,
-                "group": group_name,
+                "config": {
+                    "group": group_name,
+                },
                 "description": "A model assigned to a group for testing",
             }
         ],
@@ -180,12 +182,16 @@ def test_two_groups(dbt_project: DbtProject, tmp_path):
         "models": [
             {
                 "name": model_name_1,
-                "group": group_name_1,
+                "config": {
+                    "group": group_name_1,
+                },
                 "description": "A model assigned to group 1 for testing",
             },
             {
                 "name": model_name_2,
-                "group": group_name_2,
+                "config": {
+                    "group": group_name_2,
+                },
                 "description": "A model assigned to group 2 for testing",
             },
         ],
@@ -262,7 +268,9 @@ def test_test_group_attribute(dbt_project: DbtProject, tmp_path):
         "models": [
             {
                 "name": model_name,
-                "group": group_name,
+                "config": {
+                    "group": group_name,
+                },
                 "description": "A model assigned to a group for testing",
                 "columns": [{"name": "col", "tests": ["unique"]}],
             }
@@ -332,7 +340,9 @@ def test_test_override_group(dbt_project: DbtProject, tmp_path):
         "models": [
             {
                 "name": model_name,
-                "group": test_group,
+                "config": {
+                    "group": test_group,
+                },
                 "description": "A model assigned to a group for testing",
                 "columns": [
                     {
@@ -395,7 +405,9 @@ def test_seed_group_attribute(dbt_project: DbtProject, tmp_path):
         "seeds": [
             {
                 "name": seed_name,
-                "group": group_name,
+                "config": {
+                    "group": group_name,
+                },
                 "description": "A seed assigned to a group for testing",
             }
         ],
@@ -465,7 +477,9 @@ def test_snapshot_group_attribute(dbt_project: DbtProject, tmp_path):
         "snapshots": [
             {
                 "name": snapshot_name,
-                "group": group_name,
+                "config": {
+                    "group": group_name,
+                },
                 "description": "A snapshot assigned to a group for testing",
             }
         ],

macros/edr/dbt_artifacts/upload_dbt_tests.sql

@@ -133,13 +133,16 @@
       {% endif %}
     {% endif %}
 
+    {% set group_name = config_dict.get("group") or node_dict.get("group") %}
+
     {% set primary_test_model_database = none %}
     {% set primary_test_model_schema = none %}
     {%- if primary_test_model_id.data is not none -%}
         {% set tested_model_node = elementary.get_node(primary_test_model_id.data) %}
         {%- if tested_model_node -%}
             {% set primary_test_model_database = tested_model_node.get('database') %}
             {% set primary_test_model_schema = tested_model_node.get('schema') %}
+            {% set group_name = group_name or tested_model_node.get('group') %}
         {%- endif -%}
     {%- endif -%}
 
@@ -178,7 +181,7 @@
         'path': node_dict.get('path'),
         'generated_at': elementary.datetime_now_utc_as_string(),
         'quality_dimension': unified_meta.get('quality_dimension') or elementary.get_quality_dimension(test_original_name, test_namespace),
-        'group_name': config_dict.get("group") or node_dict.get("group"),
+        'group_name': group_name,
     }%}
     {% do flatten_test_metadata_dict.update({"metadata_hash": elementary.get_artifact_metadata_hash(flatten_test_metadata_dict)}) %}
     {{ return(flatten_test_metadata_dict) }}