This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new 94aceac5af Variablesmap was not passed correctly, fixes #8234 (#8240)
94aceac5af is described below
commit 94aceac5af8c9bc1a965d95acc60dac3d8a47292
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Sep 2 16:39:34 2026 +0200
Variablesmap was not passed correctly, fixes #8234 (#8240)
---
.gitignore | 2 +
.../engines/remote/RemotePipelineEngine.java | 3 +-
.../java/org/apache/hop/resource/ResourceUtil.java | 31 +++--
.../engines/remote/RemoteWorkflowEngine.java | 3 +-
.../org/apache/hop/resource/ResourceUtilTest.java | 75 ++++++++++
.../hop_server/0015-write-exported-pipeline.hpl | 153 +++++++++++++++++++++
integration-tests/hop_server/dev-env-config.json | 12 +-
.../main-0015-test-exported-pipeline-datapath.hwf | 149 ++++++++++++++++++++
.../remote-mapped-folders.json | 19 +++
.../export/MetadataResourceExportTest.java | 31 +----
10 files changed, 431 insertions(+), 47 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3c419065be..3cc07bb270 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,8 @@ docs/.pnp
docs/.pnp.js
tmp/images
+# Output folders written by the hop_server remote-execution tests (main-0007,
main-0015)
+integration-tests/hop_server/output-*/
integration-tests/mail/output/
integration-tests/ftp/output/
# Generated spreadsheet writer outputs (under files/ historically; now also
under output/)
diff --git
a/engine/src/main/java/org/apache/hop/pipeline/engines/remote/RemotePipelineEngine.java
b/engine/src/main/java/org/apache/hop/pipeline/engines/remote/RemotePipelineEngine.java
index 3fd301fa46..95f3c15a59 100644
---
a/engine/src/main/java/org/apache/hop/pipeline/engines/remote/RemotePipelineEngine.java
+++
b/engine/src/main/java/org/apache/hop/pipeline/engines/remote/RemotePipelineEngine.java
@@ -390,8 +390,7 @@ public class RemotePipelineEngine extends Variables
implements IPipelineEngine<P
clonedConfiguration,
CONFIGURATION_IN_EXPORT_FILENAME,
remotePipelineRunConfiguration.getNamedResourcesSourceFolder(),
-
remotePipelineRunConfiguration.getNamedResourcesTargetFolder(),
- executionConfiguration.getVariablesMap());
+
remotePipelineRunConfiguration.getNamedResourcesTargetFolder());
// Send the zip file over to the hop server...
//
diff --git a/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
b/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
index f5b7770ef3..5be0b5ebea 100644
--- a/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
+++ b/engine/src/main/java/org/apache/hop/resource/ResourceUtil.java
@@ -31,12 +31,12 @@ import java.util.zip.ZipOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
+import org.apache.hop.IExecutionConfiguration;
import org.apache.hop.core.Const;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.metadata.SerializableMetadataProvider;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.core.vfs.HopVfs;
-import org.apache.hop.core.xml.IXml;
import org.apache.hop.core.xml.XmlHandler;
import org.apache.hop.i18n.BaseMessages;
import org.apache.hop.metadata.api.HopMetadataProperty;
@@ -60,14 +60,14 @@ public class ResourceUtil {
* @param resourceExportInterface the interface to serialize
* @param variables the variables to use for variable replacement
* @param metadataProvider The metadata for which we want to include the
metadata.json file
- * @param executionConfiguration The XML interface to inject into the
resulting ZIP archive
- * (optional, can be null)
+ * @param executionConfiguration The execution configuration to inject into
the resulting ZIP
+ * archive (optional, can be null). The generated named-resource folder
variables are added to
+ * its variables map, so they travel with the archive to the remote
server.
* @param injectFilename The name of the file for the XML to inject in the
ZIP archive (optional,
* can be null)
* @param sourceResourceFolderMapping The source folder to use as a
reference for named resources,
* typically something like ${PROJECT}
* @param targetResourceFolderMapping the target folder of named resources
to translate to.
- * @param variablesMap The variables map of the execution configuration
* @return The full VFS filename reference to the serialized export
interface XML file in the ZIP
* archive.
* @throws HopException in case anything goes wrong during serialization
@@ -77,11 +77,10 @@ public class ResourceUtil {
IResourceExport resourceExportInterface,
IVariables variables,
IHopMetadataProvider metadataProvider,
- IXml executionConfiguration,
+ IExecutionConfiguration executionConfiguration,
String injectFilename,
String sourceResourceFolderMapping,
- String targetResourceFolderMapping,
- Map<String, String> variablesMap)
+ String targetResourceFolderMapping)
throws HopException {
ZipOutputStream out = null;
@@ -119,12 +118,18 @@ public class ResourceUtil {
// configuration. Otherwise the rewritten filenames
(${DATA_PATH_1}/file.txt) stay
// unresolved on the remote server (see #7209).
//
- assignNamedResourceDirectoryVariables(
- variables,
- namingInterface.getDirectoryMap(),
- sourceResourceFolderMapping,
- targetResourceFolderMapping,
- variablesMap);
+ // The values go straight into the configuration that is serialized
into the archive below.
+ // Writing them into any other map leaves the archive without them,
which is how the remote
+ // pipeline engine lost them again (see #8234).
+ //
+ if (executionConfiguration != null) {
+ assignNamedResourceDirectoryVariables(
+ variables,
+ namingInterface.getDirectoryMap(),
+ sourceResourceFolderMapping,
+ targetResourceFolderMapping,
+ executionConfiguration.getVariablesMap());
+ }
// In case we want to add an extra pay-load to the exported ZIP file.
// We add an extra file definition which gets picked up below and
zipped up.
diff --git
a/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
b/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
index 74db2c0783..c457692dcd 100644
---
a/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
+++
b/engine/src/main/java/org/apache/hop/workflow/engines/remote/RemoteWorkflowEngine.java
@@ -530,8 +530,7 @@ public class RemoteWorkflowEngine extends Variables
implements IWorkflowEngine<W
executionConfiguration,
CONFIGURATION_IN_EXPORT_FILENAME,
remoteWorkflowRunConfiguration.getNamedResourcesSourceFolder(),
-
remoteWorkflowRunConfiguration.getNamedResourcesTargetFolder(),
- executionConfiguration.getVariablesMap());
+
remoteWorkflowRunConfiguration.getNamedResourcesTargetFolder());
// Send the zip file over to the hop server...
String result =
diff --git a/engine/src/test/java/org/apache/hop/resource/ResourceUtilTest.java
b/engine/src/test/java/org/apache/hop/resource/ResourceUtilTest.java
index 2fda07a130..32c27345bf 100644
--- a/engine/src/test/java/org/apache/hop/resource/ResourceUtilTest.java
+++ b/engine/src/test/java/org/apache/hop/resource/ResourceUtilTest.java
@@ -18,12 +18,28 @@
package org.apache.hop.resource;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.vfs2.FileSystemException;
+import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.core.variables.Variables;
+import org.apache.hop.core.vfs.HopVfs;
+import org.apache.hop.metadata.serializer.memory.MemoryMetadataProvider;
+import org.apache.hop.pipeline.Pipeline;
+import org.apache.hop.pipeline.PipelineExecutionConfiguration;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
/**
* Tests for {@link ResourceUtil#assignNamedResourceDirectoryVariables}, the
resolution of the
@@ -102,4 +118,63 @@ class ResourceUtilTest {
assertEquals("/server/files", variablesMap.get("DATA_PATH_1"));
}
+
+ /**
+ * The generated folder variables are only of use to the remote server if
they are part of the
+ * execution configuration that travels inside the export archive. The
remote pipeline engine used
+ * to hand this method a clone of its configuration while the variables were
written into the
+ * original, so the archive carried none of them and the server created a
folder literally called
+ * ${DATA_PATH_1} (#8234).
+ */
+ @Test
+ void generatedFolderVariablesEndUpInTheArchivedConfiguration(@TempDir File
tempDir)
+ throws Exception {
+ File dataFolder = new File(tempDir, "data");
+ assertTrue(dataFolder.mkdirs());
+ File dataFile = new File(dataFolder, "input.txt");
+ Files.write(dataFile.toPath(), "content".getBytes(StandardCharsets.UTF_8));
+
+ IVariables variables = new Variables();
+ PipelineExecutionConfiguration executionConfiguration = new
PipelineExecutionConfiguration();
+
+ // A minimal export that renames one referenced file, exactly as a file
transform does.
+ IResourceExport resourceExport =
+ (vars, definitions, naming, provider) -> {
+ try {
+ String renamed =
+
naming.nameResource(HopVfs.getFileObject(dataFile.getAbsolutePath()), vars,
true);
+ assertTrue(renamed.startsWith("${DATA_PATH_1}/"), renamed);
+ } catch (FileSystemException e) {
+ throw new HopException(e);
+ }
+ definitions.put("main.hpl", new ResourceDefinition("main.hpl",
"<pipeline/>"));
+ return "main.hpl";
+ };
+
+ File zip = new File(tempDir, "export.zip");
+ ResourceUtil.serializeResourceExportInterface(
+ zip.getAbsolutePath(),
+ resourceExport,
+ variables,
+ new MemoryMetadataProvider(),
+ executionConfiguration,
+ Pipeline.CONFIGURATION_IN_EXPORT_FILENAME,
+ null,
+ null);
+
+ String configurationXml = readEntry(zip,
Pipeline.CONFIGURATION_IN_EXPORT_FILENAME);
+ assertNotNull(configurationXml);
+ assertTrue(
+ configurationXml.contains("DATA_PATH_1"),
+ "the archived execution configuration should carry the generated
folder variable: "
+ + configurationXml);
+ }
+
+ private static String readEntry(File zip, String name) throws IOException {
+ try (ZipFile zipFile = new ZipFile(zip)) {
+ ZipEntry entry = zipFile.getEntry(name);
+ assertNotNull(entry, name + " is missing from the export archive");
+ return IOUtils.toString(zipFile.getInputStream(entry),
StandardCharsets.UTF_8);
+ }
+ }
}
diff --git a/integration-tests/hop_server/0015-write-exported-pipeline.hpl
b/integration-tests/hop_server/0015-write-exported-pipeline.hpl
new file mode 100644
index 0000000000..53f201c573
--- /dev/null
+++ b/integration-tests/hop_server/0015-write-exported-pipeline.hpl
@@ -0,0 +1,153 @@
+<?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>0015-write-exported-pipeline</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description>Writes a file to a path built from two environment variables,
${NFS}/${REP}, just
+ like the pipeline reported in issue #8234. Both are defined in
dev-env-config.json. This
+ pipeline is sent to the Hop Server by a remote PIPELINE run
configuration with exported
+ resources, so the export resolves that path and rewrites the filename to
+ ${DATA_PATH_1}/... .</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>2024/01/01 00:00:00.000</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2024/01/01 00:00:00.000</modified_date>
+ <key_for_session_key/>
+ <is_key_private>N</is_key_private>
+ </info>
+ <notepads>
+ </notepads>
+ <order>
+ <hop>
+ <from>Generate rows</from>
+ <to>Write exported pipeline output</to>
+ <enabled>Y</enabled>
+ </hop>
+ </order>
+ <transform>
+ <name>Generate rows</name>
+ <type>RowGenerator</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <fields>
+ <field>
+ <name>message</name>
+ <type>String</type>
+ <format/>
+ <currency/>
+ <decimal/>
+ <group/>
+ <nullif>exported-pipeline-8234</nullif>
+ <length>-1</length>
+ <precision>-1</precision>
+ <set_empty_string>N</set_empty_string>
+ </field>
+ </fields>
+ <limit>1</limit>
+ <never_ending>N</never_ending>
+ <interval_in_ms>5000</interval_in_ms>
+ <row_time_field>now</row_time_field>
+ <last_time_field>FiveSecondsAgo</last_time_field>
+ <attributes/>
+ <GUI>
+ <xloc>144</xloc>
+ <yloc>96</yloc>
+ </GUI>
+ </transform>
+ <transform>
+ <name>Write exported pipeline output</name>
+ <type>TextFileOutput</type>
+ <description/>
+ <distribute>Y</distribute>
+ <custom_distribution/>
+ <copies>1</copies>
+ <partitioning>
+ <method>none</method>
+ <schema_name/>
+ </partitioning>
+ <separator>;</separator>
+ <enclosure>"</enclosure>
+ <enclosure_forced>N</enclosure_forced>
+ <enclosure_fix_disabled>N</enclosure_fix_disabled>
+ <header>Y</header>
+ <footer>N</footer>
+ <format>DOS</format>
+ <compression>None</compression>
+ <encoding>UTF-8</encoding>
+ <endedLine/>
+ <fileNameInField>N</fileNameInField>
+ <fileNameField/>
+ <create_parent_folder>Y</create_parent_folder>
+ <file>
+ <name>${NFS}/${REP}/exported-pipeline</name>
+ <servlet_output>N</servlet_output>
+ <do_not_open_new_file_init>N</do_not_open_new_file_init>
+ <extention>txt</extention>
+ <append>N</append>
+ <split>N</split>
+ <haspartno>N</haspartno>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <SpecifyFormat>N</SpecifyFormat>
+ <date_time_format/>
+ <add_to_result_filenames>Y</add_to_result_filenames>
+ <pad>N</pad>
+ <fast_dump>N</fast_dump>
+ <splitevery/>
+ </file>
+ <fields>
+ <field>
+ <name>message</name>
+ <type>String</type>
+ <format/>
+ <currency/>
+ <decimal/>
+ <group/>
+ <nullif/>
+ <trim_type>none</trim_type>
+ <length>-1</length>
+ <precision>-1</precision>
+ </field>
+ </fields>
+ <attributes/>
+ <GUI>
+ <xloc>384</xloc>
+ <yloc>96</yloc>
+ </GUI>
+ </transform>
+ <transform_error_handling>
+ </transform_error_handling>
+ <attributes/>
+</pipeline>
diff --git a/integration-tests/hop_server/dev-env-config.json
b/integration-tests/hop_server/dev-env-config.json
index e091c09a87..83cfb35474 100644
--- a/integration-tests/hop_server/dev-env-config.json
+++ b/integration-tests/hop_server/dev-env-config.json
@@ -1,3 +1,11 @@
{
- "variables" : [ ]
-}
\ No newline at end of file
+ "variables" : [ {
+ "name" : "NFS",
+ "value" : "${PROJECT_HOME}/output-0015",
+ "description" : "Stands in for the shared storage root of issue #8234.
Together with ${REP} it builds the output path of 0015-write-exported-pipeline,
so that pipeline reaches the file through combined environment variables rather
than a single one."
+ }, {
+ "name" : "REP",
+ "value" : "extraction",
+ "description" : "Sub folder under ${NFS}, see issue #8234."
+ } ]
+}
diff --git
a/integration-tests/hop_server/main-0015-test-exported-pipeline-datapath.hwf
b/integration-tests/hop_server/main-0015-test-exported-pipeline-datapath.hwf
new file mode 100644
index 0000000000..d3530677a1
--- /dev/null
+++ b/integration-tests/hop_server/main-0015-test-exported-pipeline-datapath.hwf
@@ -0,0 +1,149 @@
+<?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-0015-test-exported-pipeline-datapath</name>
+ <name_sync_with_filename>Y</name_sync_with_filename>
+ <description>Regression test for issue #8234: the #7209 fix (give every
generated ${DATA_PATH_n}
+ folder variable a value) only ever reached the remote WORKFLOW engine. The
remote PIPELINE
+ engine hands ResourceUtil a *clone* of its execution configuration but
lets the DATA_PATH_n
+ variables be written into the original, so the configuration that travels
inside the export ZIP
+ carries none of them and the server writes to a folder literally called
${DATA_PATH_1}.
+
+ The pipeline writes to ${NFS}/${REP}/exported-pipeline.txt, two
environment variables from
+ dev-env-config.json, matching the combined-variable path of the report.
Neither variable is
+ what reaches the server: the export resolves the whole path on the client
and replaces it with
+ ${DATA_PATH_1}/exported-pipeline.txt.
+
+ This workflow runs on the client and executes
0015-write-exported-pipeline.hpl through the
+ "remote-mapped-folders" pipeline run configuration (export_resources=true,
named resources
+ mapped from ${PROJECT_HOME} onto /hop_server_volume - the same host
folder, mounted inside the
+ server container). ${DATA_PATH_1} must therefore arrive on the server as
+ /hop_server_volume/output-0015/extraction. The check below runs back on
the client, where that
+ folder is ${NFS}/${REP}, and so observes what the server actually wrote.
+
+ main-0007 covers the same variable for the remote workflow engine and
keeps passing; only this
+ test goes red before the fix.</description>
+ <extended_description/>
+ <workflow_version/>
+ <created_user>-</created_user>
+ <created_date>2024/01/01 00:00:00.000</created_date>
+ <modified_user>-</modified_user>
+ <modified_date>2024/01/01 00:00:00.000</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>50</xloc>
+ <yloc>50</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Cleanup expected path</name>
+ <description>Remove anything a previous run left behind so the check
below can only succeed on
+ a file the server writes now. It also keeps the export from bundling
an existing file.</description>
+ <type>DELETE_FILE</type>
+ <attributes/>
+ <filename>${NFS}/${REP}/exported-pipeline.txt</filename>
+ <fail_if_file_not_exists>N</fail_if_file_not_exists>
+ <parallel>N</parallel>
+ <xloc>220</xloc>
+ <yloc>50</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Run pipeline on the server with exported resources</name>
+ <description/>
+ <type>PIPELINE</type>
+ <attributes/>
+ <filename>${PROJECT_HOME}/0015-write-exported-pipeline.hpl</filename>
+ <params_from_previous>N</params_from_previous>
+ <exec_per_row>N</exec_per_row>
+ <set_logfile>N</set_logfile>
+ <logfile/>
+ <logext/>
+ <add_date>N</add_date>
+ <add_time>N</add_time>
+ <loglevel>Basic</loglevel>
+ <run_configuration>remote-mapped-folders</run_configuration>
+ <wait_until_finished>Y</wait_until_finished>
+ <create_parent_folder>N</create_parent_folder>
+ <parameters>
+ <pass_all_parameters>Y</pass_all_parameters>
+ </parameters>
+ <set_append_logfile>N</set_append_logfile>
+ <parallel>N</parallel>
+ <xloc>470</xloc>
+ <yloc>50</yloc>
+ <attributes_hac/>
+ </action>
+ <action>
+ <name>Verify file written to the mapped folder</name>
+ <description>Before the fix the server resolves ${DATA_PATH_1} to
nothing and creates a
+ literal "${DATA_PATH_1}" folder inside its own installation directory,
so nothing shows up
+ here and the workflow fails.</description>
+ <type>FILE_EXISTS</type>
+ <attributes/>
+ <filename>${NFS}/${REP}/exported-pipeline.txt</filename>
+ <parallel>N</parallel>
+ <xloc>760</xloc>
+ <yloc>50</yloc>
+ <attributes_hac/>
+ </action>
+ </actions>
+ <hops>
+ <hop>
+ <from>Start</from>
+ <to>Cleanup expected path</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>Cleanup expected path</from>
+ <to>Run pipeline on the server with exported resources</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>Y</unconditional>
+ </hop>
+ <hop>
+ <from>Run pipeline on the server with exported resources</from>
+ <to>Verify file written to the mapped folder</to>
+ <enabled>Y</enabled>
+ <evaluation>Y</evaluation>
+ <unconditional>N</unconditional>
+ </hop>
+ </hops>
+ <notepads>
+ </notepads>
+ <attributes/>
+</workflow>
diff --git
a/integration-tests/hop_server/metadata/pipeline-run-configuration/remote-mapped-folders.json
b/integration-tests/hop_server/metadata/pipeline-run-configuration/remote-mapped-folders.json
new file mode 100644
index 0000000000..0ae912c694
--- /dev/null
+++
b/integration-tests/hop_server/metadata/pipeline-run-configuration/remote-mapped-folders.json
@@ -0,0 +1,19 @@
+{
+ "engineRunConfiguration": {
+ "Remote": {
+ "export_resources": true,
+ "resources_target_folder": "/hop_server_volume",
+ "resources_source_folder": "${PROJECT_HOME}",
+ "run_config": "local",
+ "server_poll_interval": "",
+ "hop_server": "testserver",
+ "server_poll_delay": ""
+ }
+ },
+ "defaultSelection": false,
+ "configurationVariables": [],
+ "name": "remote-mapped-folders",
+ "description": "Runs a pipeline on the test Hop Server with linked resources
exported. The named-resource folders are mapped from the client project folder
onto /hop_server_volume, which is the same host folder mounted inside the
server container, so the client can observe what the server wrote. Used by
main-0015.",
+ "dataProfile": "",
+ "executionInfoLocationName": ""
+}
diff --git
a/plugins/misc/reflection/src/test/java/org/apache/hop/reflection/export/MetadataResourceExportTest.java
b/plugins/misc/reflection/src/test/java/org/apache/hop/reflection/export/MetadataResourceExportTest.java
index 147b1eea4b..9776f07210 100644
---
a/plugins/misc/reflection/src/test/java/org/apache/hop/reflection/export/MetadataResourceExportTest.java
+++
b/plugins/misc/reflection/src/test/java/org/apache/hop/reflection/export/MetadataResourceExportTest.java
@@ -25,7 +25,6 @@ import java.io.File;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -135,15 +134,7 @@ class MetadataResourceExportTest {
File zip = new File(tempDir, "export.zip");
ResourceUtil.serializeResourceExportInterface(
- zip.getAbsolutePath(),
- mainMeta,
- variables,
- provider,
- null,
- null,
- null,
- null,
- new HashMap<>());
+ zip.getAbsolutePath(), mainMeta, variables, provider, null, null,
null, null);
List<String> entries = new ArrayList<>();
String metadataJson = null;
@@ -196,15 +187,7 @@ class MetadataResourceExportTest {
File zip = new File(tempDir, "export.zip");
ResourceUtil.serializeResourceExportInterface(
- zip.getAbsolutePath(),
- mainMeta,
- variables,
- provider,
- null,
- null,
- null,
- null,
- new HashMap<>());
+ zip.getAbsolutePath(), mainMeta, variables, provider, null, null,
null, null);
List<String> entries = new ArrayList<>();
String metadataJson = null;
@@ -262,15 +245,7 @@ class MetadataResourceExportTest {
File zip = new File(tempDir, "export.zip");
ResourceUtil.serializeResourceExportInterface(
- zip.getAbsolutePath(),
- mainMeta,
- variables,
- provider,
- null,
- null,
- null,
- null,
- new HashMap<>());
+ zip.getAbsolutePath(), mainMeta, variables, provider, null, null,
null, null);
List<String> entries = new ArrayList<>();
String metadataJson = null;
