From 9ff7abe089e1a5ce0a9d7a94a77144de8d028719 Mon Sep 17 00:00:00 2001
From: Matt Casters <mattcasters@gmail.com>
Date: Tue, 14 Jan 2025 17:35:21 +0100
Subject: [PATCH] Improvements for issues #3454 and #4771 (integration tests)

---
 ...t.yaml => integration-tests-resolver.yaml} |   0
 .../0001-vault-add-secrets.hpl}               |   0
 .../0001-vault-resolve-secrets.hpl}           |   2 +-
 .../0002-pipeline-get-configurations.hpl      | 191 ++++++++++
 .../resolver/0002-pipeline-resolver-test.hpl  | 342 ++++++++++++++++++
 .../0001-golden-resolved-variables.csv        |   0
 .../0002-golden-pipeline-resolver.csv         |   4 +
 .../resolver/dev-env-config.json              |   3 +
 .../resolver/files/db1.properties             |   7 +
 .../resolver/files/db2.properties             |   7 +
 .../resolver/files/db3.properties             |   7 +
 .../{vault => resolver}/hop-config.json       |   0
 .../main-0001-resolve-secrets.hwf             |  12 +-
 .../resolver/main-0002-pipeline-resolver.hwf  |  79 ++++
 .../0001-golden-resolved-variables.json       |   0
 .../0002-golden-pipeline-resolver.json        |  48 +++
 .../pipeline-run-configuration/local.json     |   0
 .../0001-vault-resolve-secrets UNIT.json}     |   4 +-
 .../0002-pipeline-resolver-test UNIT.json     |  81 +++++
 .../metadata/variable-resolver/conf.json      |  13 +
 .../metadata/variable-resolver/pipeline.json  |  13 +
 .../metadata/variable-resolver/vault.json     |   0
 .../workflow-run-configuration/local.json     |   0
 .../{vault => resolver}/project-config.json   |   0
 integration-tests/vault/dev-env-config.json   |  19 -
 25 files changed, 805 insertions(+), 27 deletions(-)
 rename docker/integration-tests/{integration-tests-vault.yaml => integration-tests-resolver.yaml} (100%)
 rename integration-tests/{vault/0001-add-secrets.hpl => resolver/0001-vault-add-secrets.hpl} (100%)
 rename integration-tests/{vault/0001-resolve-secrets.hpl => resolver/0001-vault-resolve-secrets.hpl} (98%)
 create mode 100644 integration-tests/resolver/0002-pipeline-get-configurations.hpl
 create mode 100644 integration-tests/resolver/0002-pipeline-resolver-test.hpl
 rename integration-tests/{vault => resolver}/datasets/0001-golden-resolved-variables.csv (100%)
 create mode 100644 integration-tests/resolver/datasets/0002-golden-pipeline-resolver.csv
 create mode 100644 integration-tests/resolver/dev-env-config.json
 create mode 100644 integration-tests/resolver/files/db1.properties
 create mode 100644 integration-tests/resolver/files/db2.properties
 create mode 100644 integration-tests/resolver/files/db3.properties
 rename integration-tests/{vault => resolver}/hop-config.json (100%)
 rename integration-tests/{vault => resolver}/main-0001-resolve-secrets.hwf (91%)
 create mode 100644 integration-tests/resolver/main-0002-pipeline-resolver.hwf
 rename integration-tests/{vault => resolver}/metadata/dataset/0001-golden-resolved-variables.json (100%)
 create mode 100644 integration-tests/resolver/metadata/dataset/0002-golden-pipeline-resolver.json
 rename integration-tests/{vault => resolver}/metadata/pipeline-run-configuration/local.json (100%)
 rename integration-tests/{vault/metadata/unit-test/0001-resolve-secrets UNIT.json => resolver/metadata/unit-test/0001-vault-resolve-secrets UNIT.json} (91%)
 create mode 100644 integration-tests/resolver/metadata/unit-test/0002-pipeline-resolver-test UNIT.json
 create mode 100644 integration-tests/resolver/metadata/variable-resolver/conf.json
 create mode 100644 integration-tests/resolver/metadata/variable-resolver/pipeline.json
 rename integration-tests/{vault => resolver}/metadata/variable-resolver/vault.json (100%)
 rename integration-tests/{vault => resolver}/metadata/workflow-run-configuration/local.json (100%)
 rename integration-tests/{vault => resolver}/project-config.json (100%)
 delete mode 100644 integration-tests/vault/dev-env-config.json

diff --git a/docker/integration-tests/integration-tests-vault.yaml b/docker/integration-tests/integration-tests-resolver.yaml
similarity index 100%
rename from docker/integration-tests/integration-tests-vault.yaml
rename to docker/integration-tests/integration-tests-resolver.yaml
diff --git a/integration-tests/vault/0001-add-secrets.hpl b/integration-tests/resolver/0001-vault-add-secrets.hpl
similarity index 100%
rename from integration-tests/vault/0001-add-secrets.hpl
rename to integration-tests/resolver/0001-vault-add-secrets.hpl
diff --git a/integration-tests/vault/0001-resolve-secrets.hpl b/integration-tests/resolver/0001-vault-resolve-secrets.hpl
similarity index 98%
rename from integration-tests/vault/0001-resolve-secrets.hpl
rename to integration-tests/resolver/0001-vault-resolve-secrets.hpl
index 5e2b5e1f290..91e88784856 100644
--- a/integration-tests/vault/0001-resolve-secrets.hpl
+++ b/integration-tests/resolver/0001-vault-resolve-secrets.hpl
@@ -19,7 +19,7 @@ limitations under the License.
 -->
 <pipeline>
   <info>
-    <name>0001-resolve-secrets</name>
+    <name>0001-vault-resolve-secrets</name>
     <name_sync_with_filename>Y</name_sync_with_filename>
     <description/>
     <extended_description/>
diff --git a/integration-tests/resolver/0002-pipeline-get-configurations.hpl b/integration-tests/resolver/0002-pipeline-get-configurations.hpl
new file mode 100644
index 00000000000..3358e05c089
--- /dev/null
+++ b/integration-tests/resolver/0002-pipeline-get-configurations.hpl
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<pipeline>
+  <info>
+    <name>0002-pipeline-get-configurations</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/01/14 17:20:35.075</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/01/14 17:20:35.075</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>files/${TYPE}.properties</from>
+      <to>get values</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>get values</from>
+      <to>OUTPUT</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>OUTPUT</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>432</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>files/${TYPE}.properties</name>
+    <type>PropertyInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <encoding>UTF-8</encoding>
+    <fields>
+      <field>
+        <column>key</column>
+        <length>-1</length>
+        <name>Key</name>
+        <precision>-1</precision>
+        <repeat>N</repeat>
+        <trim_type>none</trim_type>
+        <type>String</type>
+      </field>
+      <field>
+        <column>value</column>
+        <length>-1</length>
+        <name>Value</name>
+        <precision>-1</precision>
+        <repeat>N</repeat>
+        <trim_type>none</trim_type>
+        <type>String</type>
+      </field>
+    </fields>
+    <file>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+      <name>${PROJECT_HOME}/files/${TYPE}.properties</name>
+    </file>
+    <file_type>property</file_type>
+    <filefield>N</filefield>
+    <include>N</include>
+    <ini_section>N</ini_section>
+    <isaddresult>Y</isaddresult>
+    <limit>0</limit>
+    <resetrownumber>N</resetrownumber>
+    <resolvevaluevariable>N</resolvevaluevariable>
+    <rownum>N</rownum>
+    <attributes/>
+    <GUI>
+      <xloc>128</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>get values</name>
+    <type>Denormaliser</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <field_name>Value</field_name>
+        <key_value>hostname</key_value>
+        <target_aggregation_type>-</target_aggregation_type>
+        <target_length>-1</target_length>
+        <target_name>hostname</target_name>
+        <target_precision>-1</target_precision>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <field_name>Value</field_name>
+        <key_value>port</key_value>
+        <target_aggregation_type>-</target_aggregation_type>
+        <target_length>-1</target_length>
+        <target_name>port</target_name>
+        <target_precision>-1</target_precision>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <field_name>Value</field_name>
+        <key_value>db</key_value>
+        <target_aggregation_type>-</target_aggregation_type>
+        <target_length>-1</target_length>
+        <target_name>db</target_name>
+        <target_precision>-1</target_precision>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <field_name>Value</field_name>
+        <key_value>username</key_value>
+        <target_aggregation_type>-</target_aggregation_type>
+        <target_length>-1</target_length>
+        <target_name>username</target_name>
+        <target_precision>-1</target_precision>
+        <target_type>String</target_type>
+      </field>
+      <field>
+        <field_name>Value</field_name>
+        <key_value>password</key_value>
+        <target_aggregation_type>-</target_aggregation_type>
+        <target_length>-1</target_length>
+        <target_name>password</target_name>
+        <target_precision>-1</target_precision>
+        <target_type>String</target_type>
+      </field>
+    </fields>
+    <group>
+</group>
+    <key_field>Key</key_field>
+    <attributes/>
+    <GUI>
+      <xloc>288</xloc>
+      <yloc>80</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/integration-tests/resolver/0002-pipeline-resolver-test.hpl b/integration-tests/resolver/0002-pipeline-resolver-test.hpl
new file mode 100644
index 00000000000..ca6309c6424
--- /dev/null
+++ b/integration-tests/resolver/0002-pipeline-resolver-test.hpl
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<pipeline>
+  <info>
+    <name>0002-pipeline-resolver-test</name>
+    <name_sync_with_filename>Y</name_sync_with_filename>
+    <description/>
+    <extended_description/>
+    <pipeline_version/>
+    <pipeline_type>Normal</pipeline_type>
+    <parameters>
+    </parameters>
+    <capture_transform_performance>N</capture_transform_performance>
+    <transform_performance_capturing_delay>1000</transform_performance_capturing_delay>
+    <transform_performance_capturing_size_limit>100</transform_performance_capturing_size_limit>
+    <created_user>-</created_user>
+    <created_date>2025/01/14 17:22:13.379</created_date>
+    <modified_user>-</modified_user>
+    <modified_date>2025/01/14 17:22:13.379</modified_date>
+  </info>
+  <notepads>
+  </notepads>
+  <order>
+    <hop>
+      <from>get db1 configuration</from>
+      <to>db1</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>get db2 configuration</from>
+      <to>db2</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>get db3 configuration</from>
+      <to>db3</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>db1</from>
+      <to>Union</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>db2</from>
+      <to>Union</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>db3</from>
+      <to>Union</to>
+      <enabled>Y</enabled>
+    </hop>
+    <hop>
+      <from>Union</from>
+      <to>Validate</to>
+      <enabled>Y</enabled>
+    </hop>
+  </order>
+  <transform>
+    <name>Validate</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>544</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>Union</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>432</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>db1</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>304</xloc>
+      <yloc>64</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>db2</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>304</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>db3</name>
+    <type>Dummy</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <attributes/>
+    <GUI>
+      <xloc>304</xloc>
+      <yloc>192</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>get db1 configuration</name>
+    <type>GetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <length>-1</length>
+        <name>hostname</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db1:hostname}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>port</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db1:port}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>db</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db1:db}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>username</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db1:username}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>password</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db1:port}</variable>
+      </field>
+    </fields>
+    <attributes/>
+    <GUI>
+      <xloc>144</xloc>
+      <yloc>64</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>get db2 configuration</name>
+    <type>GetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <length>-1</length>
+        <name>hostname</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db2:hostname}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>port</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db2:port}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>db</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db2:db}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>username</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db2:username}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>password</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db2:port}</variable>
+      </field>
+    </fields>
+    <attributes/>
+    <GUI>
+      <xloc>144</xloc>
+      <yloc>128</yloc>
+    </GUI>
+  </transform>
+  <transform>
+    <name>get db3 configuration</name>
+    <type>GetVariable</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <fields>
+      <field>
+        <length>-1</length>
+        <name>hostname</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db3:hostname}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>port</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db3:port}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>db</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db3:db}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>username</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db3:username}</variable>
+      </field>
+      <field>
+        <length>-1</length>
+        <name>password</name>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <type>String</type>
+        <variable>#{conf:db3:port}</variable>
+      </field>
+    </fields>
+    <attributes/>
+    <GUI>
+      <xloc>144</xloc>
+      <yloc>192</yloc>
+    </GUI>
+  </transform>
+  <transform_error_handling>
+  </transform_error_handling>
+  <attributes/>
+</pipeline>
diff --git a/integration-tests/vault/datasets/0001-golden-resolved-variables.csv b/integration-tests/resolver/datasets/0001-golden-resolved-variables.csv
similarity index 100%
rename from integration-tests/vault/datasets/0001-golden-resolved-variables.csv
rename to integration-tests/resolver/datasets/0001-golden-resolved-variables.csv
diff --git a/integration-tests/resolver/datasets/0002-golden-pipeline-resolver.csv b/integration-tests/resolver/datasets/0002-golden-pipeline-resolver.csv
new file mode 100644
index 00000000000..2e62e22f338
--- /dev/null
+++ b/integration-tests/resolver/datasets/0002-golden-pipeline-resolver.csv
@@ -0,0 +1,4 @@
+hostname,port,db,username,password
+hostname1,port1,db1,user1,port1
+hostname2,port2,db2,user2,port2
+hostname3,port3,db3,user3,port3
diff --git a/integration-tests/resolver/dev-env-config.json b/integration-tests/resolver/dev-env-config.json
new file mode 100644
index 00000000000..1a9e9503b0b
--- /dev/null
+++ b/integration-tests/resolver/dev-env-config.json
@@ -0,0 +1,3 @@
+{
+  "variables" : []
+}
\ No newline at end of file
diff --git a/integration-tests/resolver/files/db1.properties b/integration-tests/resolver/files/db1.properties
new file mode 100644
index 00000000000..91fbf75db5a
--- /dev/null
+++ b/integration-tests/resolver/files/db1.properties
@@ -0,0 +1,7 @@
+
+username=user1
+password=pwd1
+hostname=hostname1
+port=port1
+db=db1
+
diff --git a/integration-tests/resolver/files/db2.properties b/integration-tests/resolver/files/db2.properties
new file mode 100644
index 00000000000..e2bc4b9b335
--- /dev/null
+++ b/integration-tests/resolver/files/db2.properties
@@ -0,0 +1,7 @@
+
+username=user2
+password=pwd2
+hostname=hostname2
+port=port2
+db=db2
+
diff --git a/integration-tests/resolver/files/db3.properties b/integration-tests/resolver/files/db3.properties
new file mode 100644
index 00000000000..5d0364f73f8
--- /dev/null
+++ b/integration-tests/resolver/files/db3.properties
@@ -0,0 +1,7 @@
+
+username=user3
+password=pwd3
+hostname=hostname3
+port=port3
+db=db3
+
diff --git a/integration-tests/vault/hop-config.json b/integration-tests/resolver/hop-config.json
similarity index 100%
rename from integration-tests/vault/hop-config.json
rename to integration-tests/resolver/hop-config.json
diff --git a/integration-tests/vault/main-0001-resolve-secrets.hwf b/integration-tests/resolver/main-0001-resolve-secrets.hwf
similarity index 91%
rename from integration-tests/vault/main-0001-resolve-secrets.hwf
rename to integration-tests/resolver/main-0001-resolve-secrets.hwf
index 898f1347d7f..ed5f53cb6ab 100644
--- a/integration-tests/vault/main-0001-resolve-secrets.hwf
+++ b/integration-tests/resolver/main-0001-resolve-secrets.hwf
@@ -49,7 +49,7 @@ limitations under the License.
       <attributes_hac/>
     </action>
     <action>
-      <name>0001-add-secrets</name>
+      <name>0001-vault-add-secrets.hpl</name>
       <description/>
       <type>PIPELINE</type>
       <attributes/>
@@ -59,7 +59,9 @@ limitations under the License.
       <clear_rows>N</clear_rows>
       <create_parent_folder>N</create_parent_folder>
       <exec_per_row>N</exec_per_row>
-      <filename>${PROJECT_HOME}/0001-add-secrets.hpl</filename>
+      <filename>${PROJECT_HOME}/0001-vault-add-secrets.hpl</filename>
+      <logext/>
+      <logfile/>
       <loglevel>Basic</loglevel>
       <parameters>
         <pass_all_parameters>Y</pass_all_parameters>
@@ -81,7 +83,7 @@ limitations under the License.
       <attributes/>
       <test_names>
         <test_name>
-          <name>0001-resolve-secrets UNIT</name>
+          <name>0001-vault-resolve-secrets UNIT</name>
         </test_name>
       </test_names>
       <parallel>N</parallel>
@@ -93,13 +95,13 @@ limitations under the License.
   <hops>
     <hop>
       <from>Start</from>
-      <to>0001-add-secrets</to>
+      <to>0001-vault-add-secrets.hpl</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>
     <hop>
-      <from>0001-add-secrets</from>
+      <from>0001-vault-add-secrets.hpl</from>
       <to>Run Pipeline Unit Tests</to>
       <enabled>Y</enabled>
       <evaluation>Y</evaluation>
diff --git a/integration-tests/resolver/main-0002-pipeline-resolver.hwf b/integration-tests/resolver/main-0002-pipeline-resolver.hwf
new file mode 100644
index 00000000000..2d18bfb8303
--- /dev/null
+++ b/integration-tests/resolver/main-0002-pipeline-resolver.hwf
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<workflow>
+  <name>main-0002-pipeline-resolver</name>
+  <name_sync_with_filename>Y</name_sync_with_filename>
+  <description/>
+  <extended_description/>
+  <workflow_version/>
+  <created_user>-</created_user>
+  <created_date>2025/01/14 17:21:30.278</created_date>
+  <modified_user>-</modified_user>
+  <modified_date>2025/01/14 17:21:30.278</modified_date>
+  <parameters>
+    </parameters>
+  <actions>
+    <action>
+      <name>Start</name>
+      <description/>
+      <type>SPECIAL</type>
+      <attributes/>
+      <DayOfMonth>1</DayOfMonth>
+      <hour>12</hour>
+      <intervalMinutes>60</intervalMinutes>
+      <intervalSeconds>0</intervalSeconds>
+      <minutes>0</minutes>
+      <repeat>N</repeat>
+      <schedulerType>0</schedulerType>
+      <weekDay>1</weekDay>
+      <parallel>N</parallel>
+      <xloc>96</xloc>
+      <yloc>64</yloc>
+      <attributes_hac/>
+    </action>
+    <action>
+      <name>Run Pipeline Unit Tests</name>
+      <description/>
+      <type>RunPipelineTests</type>
+      <attributes/>
+      <test_names>
+        <test_name>
+          <name>0002-pipeline-resolver-test UNIT</name>
+        </test_name>
+      </test_names>
+      <parallel>N</parallel>
+      <xloc>256</xloc>
+      <yloc>64</yloc>
+      <attributes_hac/>
+    </action>
+  </actions>
+  <hops>
+    <hop>
+      <from>Start</from>
+      <to>Run Pipeline Unit Tests</to>
+      <enabled>Y</enabled>
+      <evaluation>Y</evaluation>
+      <unconditional>Y</unconditional>
+    </hop>
+  </hops>
+  <notepads>
+  </notepads>
+  <attributes/>
+</workflow>
diff --git a/integration-tests/vault/metadata/dataset/0001-golden-resolved-variables.json b/integration-tests/resolver/metadata/dataset/0001-golden-resolved-variables.json
similarity index 100%
rename from integration-tests/vault/metadata/dataset/0001-golden-resolved-variables.json
rename to integration-tests/resolver/metadata/dataset/0001-golden-resolved-variables.json
diff --git a/integration-tests/resolver/metadata/dataset/0002-golden-pipeline-resolver.json b/integration-tests/resolver/metadata/dataset/0002-golden-pipeline-resolver.json
new file mode 100644
index 00000000000..c864a438938
--- /dev/null
+++ b/integration-tests/resolver/metadata/dataset/0002-golden-pipeline-resolver.json
@@ -0,0 +1,48 @@
+{
+  "base_filename": "0002-golden-pipeline-resolver.csv",
+  "name": "0002-golden-pipeline-resolver",
+  "description": "",
+  "dataset_fields": [
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "hostname",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "port",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "db",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "username",
+      "field_format": ""
+    },
+    {
+      "field_comment": "",
+      "field_length": -1,
+      "field_type": 2,
+      "field_precision": -1,
+      "field_name": "password",
+      "field_format": ""
+    }
+  ],
+  "folder_name": ""
+}
\ No newline at end of file
diff --git a/integration-tests/vault/metadata/pipeline-run-configuration/local.json b/integration-tests/resolver/metadata/pipeline-run-configuration/local.json
similarity index 100%
rename from integration-tests/vault/metadata/pipeline-run-configuration/local.json
rename to integration-tests/resolver/metadata/pipeline-run-configuration/local.json
diff --git a/integration-tests/vault/metadata/unit-test/0001-resolve-secrets UNIT.json b/integration-tests/resolver/metadata/unit-test/0001-vault-resolve-secrets UNIT.json
similarity index 91%
rename from integration-tests/vault/metadata/unit-test/0001-resolve-secrets UNIT.json
rename to integration-tests/resolver/metadata/unit-test/0001-vault-resolve-secrets UNIT.json
index efd87aa6368..ef349db4543 100644
--- a/integration-tests/vault/metadata/unit-test/0001-resolve-secrets UNIT.json	
+++ b/integration-tests/resolver/metadata/unit-test/0001-vault-resolve-secrets UNIT.json	
@@ -47,7 +47,7 @@
     }
   ],
   "input_data_sets": [],
-  "name": "0001-resolve-secrets UNIT",
+  "name": "0001-vault-resolve-secrets UNIT",
   "trans_test_tweaks": [],
-  "pipeline_filename": "./0001-resolve-secrets.hpl"
+  "pipeline_filename": "./0001-vault-resolve-secrets.hpl"
 }
\ No newline at end of file
diff --git a/integration-tests/resolver/metadata/unit-test/0002-pipeline-resolver-test UNIT.json b/integration-tests/resolver/metadata/unit-test/0002-pipeline-resolver-test UNIT.json
new file mode 100644
index 00000000000..3996790f32f
--- /dev/null
+++ b/integration-tests/resolver/metadata/unit-test/0002-pipeline-resolver-test UNIT.json	
@@ -0,0 +1,81 @@
+{
+  "database_replacements": [],
+  "autoOpening": true,
+  "description": "",
+  "persist_filename": "",
+  "test_type": "UNIT_TEST",
+  "variableValues": [],
+  "basePath": "",
+  "golden_data_sets": [
+    {
+      "field_mappings": [
+        {
+          "transform_field": "hostname",
+          "data_set_field": "hostname"
+        },
+        {
+          "transform_field": "port",
+          "data_set_field": "port"
+        },
+        {
+          "transform_field": "db",
+          "data_set_field": "db"
+        },
+        {
+          "transform_field": "username",
+          "data_set_field": "username"
+        },
+        {
+          "transform_field": "password",
+          "data_set_field": "password"
+        }
+      ],
+      "field_order": [
+        "hostname",
+        "port",
+        "db",
+        "username",
+        "password"
+      ],
+      "data_set_name": "0002-golden-pipeline-resolver",
+      "transform_name": "Output"
+    },
+    {
+      "field_mappings": [
+        {
+          "transform_field": "hostname",
+          "data_set_field": "hostname"
+        },
+        {
+          "transform_field": "port",
+          "data_set_field": "port"
+        },
+        {
+          "transform_field": "db",
+          "data_set_field": "db"
+        },
+        {
+          "transform_field": "username",
+          "data_set_field": "username"
+        },
+        {
+          "transform_field": "password",
+          "data_set_field": "password"
+        }
+      ],
+      "field_order": [
+        "hostname",
+        "port",
+        "db",
+        "username",
+        "password"
+      ],
+      "data_set_name": "0002-golden-pipeline-resolver",
+      "transform_name": "Validate"
+    }
+  ],
+  "input_data_sets": [],
+  "name": "0002-pipeline-resolver-test UNIT",
+  "trans_test_tweaks": [],
+  "pipeline_filename": "./0002-pipeline-resolver-test.hpl"
+}
\ No newline at end of file
diff --git a/integration-tests/resolver/metadata/variable-resolver/conf.json b/integration-tests/resolver/metadata/variable-resolver/conf.json
new file mode 100644
index 00000000000..885e2ddcf1f
--- /dev/null
+++ b/integration-tests/resolver/metadata/variable-resolver/conf.json
@@ -0,0 +1,13 @@
+{
+  "virtualPath": "",
+  "name": "conf",
+  "description": "Uses a pipeline to read configuration files using variable expressions",
+  "variable-resolver": {
+    "Variable-Resolver-Pipeline": {
+      "outputTransformName": "OUTPUT",
+      "filename": "${PROJECT_HOME}/0002-pipeline-get-configurations.hpl",
+      "expressionVariableName": "TYPE",
+      "runConfigurationName": "local"
+    }
+  }
+}
\ No newline at end of file
diff --git a/integration-tests/resolver/metadata/variable-resolver/pipeline.json b/integration-tests/resolver/metadata/variable-resolver/pipeline.json
new file mode 100644
index 00000000000..ac2db410d5b
--- /dev/null
+++ b/integration-tests/resolver/metadata/variable-resolver/pipeline.json
@@ -0,0 +1,13 @@
+{
+  "virtualPath": "",
+  "name": "pipeline",
+  "description": "",
+  "variable-resolver": {
+    "Variable-Resolver-Pipeline": {
+      "outputTransformName": "OUTPUT",
+      "filename": "${PROJECT_HOME}/0002-pipeline-get-configurations.hpl",
+      "expressionVariableName": "TYPE",
+      "runConfigurationName": "local"
+    }
+  }
+}
\ No newline at end of file
diff --git a/integration-tests/vault/metadata/variable-resolver/vault.json b/integration-tests/resolver/metadata/variable-resolver/vault.json
similarity index 100%
rename from integration-tests/vault/metadata/variable-resolver/vault.json
rename to integration-tests/resolver/metadata/variable-resolver/vault.json
diff --git a/integration-tests/vault/metadata/workflow-run-configuration/local.json b/integration-tests/resolver/metadata/workflow-run-configuration/local.json
similarity index 100%
rename from integration-tests/vault/metadata/workflow-run-configuration/local.json
rename to integration-tests/resolver/metadata/workflow-run-configuration/local.json
diff --git a/integration-tests/vault/project-config.json b/integration-tests/resolver/project-config.json
similarity index 100%
rename from integration-tests/vault/project-config.json
rename to integration-tests/resolver/project-config.json
diff --git a/integration-tests/vault/dev-env-config.json b/integration-tests/vault/dev-env-config.json
deleted file mode 100644
index 3f420732ace..00000000000
--- a/integration-tests/vault/dev-env-config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "variables" : [ {
-    "name" : "NEO_HOSTNAME",
-    "value" : "neo4j",
-    "description" : "The neo4j hostname"
-  }, {
-    "name" : "NEO_PORT",
-    "value" : "7687",
-    "description" : "The data port "
-  }, {
-    "name" : "NEO_USERNAME",
-    "value" : "neo4j",
-    "description" : "Username: see the docker compose yml file"
-  }, {
-    "name" : "NEO_PASSWORD",
-    "value" : "abcdefgh",
-    "description" : "Password: see the docker compose yml file"
-  } ]
-}
\ No newline at end of file