From e745a5d4a15373fa6f64fb7855782233895366d2 Mon Sep 17 00:00:00 2001 From: Jake Cohen Date: Tue, 28 May 2024 14:06:21 -0700 Subject: [PATCH] add logic for workflowstep --- src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java | 6 +++--- .../edu/ohio/ais/rundeck/HttpWorkflowNodeStepPlugin.java | 2 +- .../java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java b/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java index 28763d2..756cf87 100644 --- a/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java +++ b/src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java @@ -464,10 +464,10 @@ public void setHeaders(String headers, RequestBuilder request){ } } - static void propertyResolver(String property, Map Configuration, PluginStepContext context, String SERVICE_PROVIDER_NAME) { + static void propertyResolver(String pluginType, String property, Map Configuration, PluginStepContext context, String SERVICE_PROVIDER_NAME) { - String projectPrefix = "project.plugin.WorkflowNodeStep." + SERVICE_PROVIDER_NAME + "."; - String frameworkPrefix = "framework.plugin.WorkflowNodeStep" + SERVICE_PROVIDER_NAME + "."; + String projectPrefix = "project.plugin." + pluginType + "." + SERVICE_PROVIDER_NAME + "."; + String frameworkPrefix = "framework.plugin." + pluginType + "." + SERVICE_PROVIDER_NAME + "."; Map projectProperties = context.getFramework().getFrameworkProjectMgr().getFrameworkProject(context.getFrameworkProject()).getProperties(); IPropertyLookup frameworkProperties = context.getFramework().getPropertyLookup(); diff --git a/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowNodeStepPlugin.java b/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowNodeStepPlugin.java index 60789e5..155759a 100644 --- a/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowNodeStepPlugin.java +++ b/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowNodeStepPlugin.java @@ -65,7 +65,7 @@ public void executeNodeStep(PluginStepContext context, Map confi Description description = new HttpDescription(SERVICE_PROVIDER_NAME, "HTTP Request Node Step", "Performs an HTTP request with or without authentication (per node)").getDescription(); description.getProperties().forEach(prop-> - propertyResolver(prop.getName(), configuration, context, SERVICE_PROVIDER_NAME) + propertyResolver("WorlflowNodeStep", prop.getName(), configuration, context, SERVICE_PROVIDER_NAME) ); // Parse out the options diff --git a/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java b/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java index c5c2083..f7a9d7c 100644 --- a/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java +++ b/src/main/java/edu/ohio/ais/rundeck/HttpWorkflowStepPlugin.java @@ -73,7 +73,7 @@ public void executeStep(PluginStepContext pluginStepContext, Map Description description = new HttpDescription(SERVICE_PROVIDER_NAME, "HTTP Request Node Step", "Performs an HTTP request with or without authentication (per node)").getDescription(); description.getProperties().forEach(prop-> - propertyResolver(prop.getName(), options, pluginStepContext, SERVICE_PROVIDER_NAME) + propertyResolver("WorflowStep",prop.getName(), options, pluginStepContext, SERVICE_PROVIDER_NAME) ); // Parse out the options