From 5f1cc5baccb7b15720352eb5108402c2f11ea37b Mon Sep 17 00:00:00 2001 From: Joshua Palis Date: Wed, 20 Sep 2023 21:22:53 +0000 Subject: [PATCH] Pulls all required data from content rather than from params, fixes javadoc error Signed-off-by: Joshua Palis --- build.gradle | 3 ++- .../workflow/CreateIngestPipelineStep.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index aa20423ee..c3b193b15 100644 --- a/build.gradle +++ b/build.gradle @@ -56,6 +56,7 @@ opensearchplugin { dependencyLicenses.enabled = false // This requires an additional Jar not published as part of build-tools loggerUsageCheck.enabled = false +thirdPartyAudit.enabled = false // No need to validate pom, as we do not upload to maven/sonatype validateNebulaPom.enabled = false @@ -106,7 +107,7 @@ dependencies { implementation "org.opensearch:opensearch:${opensearch_version}" implementation 'org.junit.jupiter:junit-jupiter:5.10.0' implementation "com.google.code.gson:gson:2.10.1" - compileOnly "com.google.guava:guava:32.1.2-jre" + implementation "com.google.guava:guava:32.1.2-jre" api group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" configurations.all { diff --git a/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java b/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java index a9b73610d..d31212481 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/CreateIngestPipelineStep.java @@ -34,6 +34,11 @@ public class CreateIngestPipelineStep implements WorkflowStep { // Client to store response data into global context index private final Client client; + /** + * Instantiates a new CreateIngestPipelineStep + * + * @param client The client to create a pipeline and store workflow data into the global context index + */ public CreateIngestPipelineStep(Client client) { this.clusterAdminClient = client.admin().cluster(); this.client = client; @@ -51,10 +56,11 @@ public CompletableFuture execute(List data) { Map parameters = workflowData.getParams(); Map content = workflowData.getContent(); + logger.debug("Previous step sent params: {}, content: {}", parameters, content); - if (parameters.containsKey("id")) { - pipelineId = parameters.get("id"); + if (content.containsKey("id")) { + pipelineId = (String) content.get("id"); } if (content.containsKey("source")) { source = (String) content.get("source");