add logic for workflowstep

rundeck-plugins · May 28, 2024 · e745a5d · e745a5d
1 parent b47ec15
commit e745a5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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<String,Object> Configuration, PluginStepContext context, String SERVICE_PROVIDER_NAME) {
+    static void propertyResolver(String pluginType, String property, Map<String,Object> 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<String,String> 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
@@ -65,7 +65,7 @@ public void executeNodeStep(PluginStepContext context, Map<String, Object> 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
@@ -73,7 +73,7 @@ public void executeStep(PluginStepContext pluginStepContext, Map<String, Object>
 
         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