Merge pull request #627 from datafold/LAB-70

only render jinja in the specified profile target

Author: dlawin

data_diff/dbt_parser.py

@@ -258,35 +258,38 @@ def get_connection_creds(self) -> Tuple[Dict[str, str], str]:
             dbt_profile_var,
             DataDiffDbtProfileNotFoundError(f"No profile '{dbt_profile_var}' found in '{profiles_path}'."),
         )
-        # values can contain env_vars
-        rendered_profile = ProfileRenderer().render_data(profile)
         profile_target = get_from_dict_with_raise(
-            rendered_profile,
+            profile,
             "target",
             DataDiffDbtProfileNotFoundError(f"No target found in profile '{dbt_profile_var}' in '{profiles_path}'."),
         )
+
+        # some use an env var in target:
+        rendered_profile_target = ProfileRenderer().render_data(profile_target)
+
         outputs = get_from_dict_with_raise(
-            rendered_profile,
+            profile,
             "outputs",
             DataDiffDbtProfileNotFoundError(f"No outputs found in profile '{dbt_profile_var}' in '{profiles_path}'."),
         )
         credentials = get_from_dict_with_raise(
             outputs,
-            profile_target,
+            rendered_profile_target,
             DataDiffDbtProfileNotFoundError(
-                f"No credentials found for target '{profile_target}' in profile '{dbt_profile_var}' in '{profiles_path}'."
+                f"No credentials found for target '{rendered_profile_target}' in profile '{dbt_profile_var}' in '{profiles_path}'."
             ),
         )
         conn_type = get_from_dict_with_raise(
             credentials,
             "type",
             DataDiffDbtProfileNotFoundError(
-                f"No type found for target '{profile_target}' in profile '{dbt_profile_var}' in '{profiles_path}'."
+                f"No type found for target '{rendered_profile_target}' in profile '{dbt_profile_var}' in '{profiles_path}'."
             ),
         )
         conn_type = conn_type.lower()
 
-        return credentials, conn_type
+        # resolve any jinja
+        return ProfileRenderer().render_data(credentials), conn_type
 
     def set_connection(self):
         credentials, conn_type = self.get_connection_creds()

tests/dbt_artifacts/profiles.yml

@@ -5,3 +5,7 @@ jaffle_shop:
       type: duckdb
       path: "./tests/dbt_artifacts/jaffle_shop.duckdb"
       schema: dev
+    different_dev:
+      type: duckdb
+      path: "./tests/dbt_artifacts/jaffle_shop.duckdb"
+      schema: "{{ env_var('some_env_var') }}"

tests/test_dbt_parser.py

@@ -342,13 +342,13 @@ def test_get_connection_creds_success(self, mock_open, mock_profile_renderer, mo
                 "target": "a_target",
             }
         }
-        profile = profiles_dict["a_profile"]
+        target = profiles_dict["a_profile"]["target"]
         expected_credentials = profiles_dict["a_profile"]["outputs"]["a_target"]
         mock_self = Mock()
         mock_self.profiles_dir = Path()
         mock_self.project_dict = {"profile": "a_profile"}
         mock_yaml.safe_load.return_value = profiles_dict
-        mock_profile_renderer().render_data.return_value = profile
+        mock_profile_renderer().render_data.side_effect = [target, expected_credentials]
         credentials, conn_type = DbtParser.get_connection_creds(mock_self)
         self.assertEqual(credentials, expected_credentials)
         self.assertEqual(conn_type, "type1")
@@ -420,8 +420,8 @@ def test_get_connection_no_credentials(self, mock_open, mock_profile_renderer, m
         mock_self.profiles_dir = Path()
         mock_self.project_dict = {"profile": "a_profile"}
         mock_yaml.safe_load.return_value = profiles_dict
-        profile = profiles_dict["a_profile"]
-        mock_profile_renderer().render_data.return_value = profile
+        profile_target = profiles_dict["a_profile"]["target"]
+        mock_profile_renderer().render_data.return_value = profile_target
         with self.assertRaises(DataDiffDbtProfileNotFoundError):
             _, _ = DbtParser.get_connection_creds(mock_self)
 
@@ -440,8 +440,8 @@ def test_get_connection_no_target_credentials(self, mock_open, mock_profile_rend
         mock_self = Mock()
         mock_self.profiles_dir = Path()
         mock_self.project_dict = {"profile": "a_profile"}
-        profile = profiles_dict["a_profile"]
-        mock_profile_renderer().render_data.return_value = profile
+        profile_target = profiles_dict["a_profile"]["target"]
+        mock_profile_renderer().render_data.return_value = profile_target
         mock_yaml.safe_load.return_value = profiles_dict
         with self.assertRaises(DataDiffDbtProfileNotFoundError):
             _, _ = DbtParser.get_connection_creds(mock_self)
@@ -460,7 +460,7 @@ def test_get_connection_no_type(self, mock_open, mock_profile_renderer, mock_yam
         mock_self.profiles_dir = Path()
         mock_self.project_dict = {"profile": "a_profile"}
         mock_yaml.safe_load.return_value = profiles_dict
-        profile = profiles_dict["a_profile"]
-        mock_profile_renderer().render_data.return_value = profile
+        profile_target = profiles_dict["a_profile"]["target"]
+        mock_profile_renderer().render_data.return_value = profile_target
         with self.assertRaises(DataDiffDbtProfileNotFoundError):
             _, _ = DbtParser.get_connection_creds(mock_self)