Merge pull request #26 from DarwisNarvaezDev/RSE-852

RSE-852 Fix: Visible Error in HttpWorkflowNodeStepPlugin Output

Author: ltamaster

src/main/java/edu/ohio/ais/rundeck/HttpBuilder.java

@@ -125,6 +125,7 @@ public void doRequest(Map<String, Object> options, HttpUriRequest request, Integ
             throw new StepException("Unable to complete request after maximum number of attempts.", StepFailureReason.IOFailure);
         }
         CloseableHttpResponse response = null;
+        String output = "";
         try {
             response = this.getHttpClient(options).execute(request);
 
@@ -135,15 +136,18 @@ public void doRequest(Map<String, Object> options, HttpUriRequest request, Integ
 
             //print the response content
             if(options.containsKey("printResponse") && Boolean.parseBoolean(options.get("printResponse").toString())) {
-                String output = this.prettyPrint(response);
+                output = getOutputForResponse(this.prettyPrint(response));
                 //print response
                 log.log(2, output);
             }
 
             if(options.containsKey("printResponseToFile") && Boolean.parseBoolean(options.get("printResponseToFile").toString())){
-                String output = this.prettyPrint(response);
                 File file = new File(options.get("file").toString());
                 BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+                if( output.isEmpty() ){
+                    output = getOutputForResponse(this.prettyPrint(response));
+                }
+
                 writer.write (output);
 
                 //Close writer
@@ -244,6 +248,10 @@ public void doRequest(Map<String, Object> options, HttpUriRequest request, Integ
         }
     }
 
+    private String getOutputForResponse(String printer){
+        return !printer.isEmpty() ? printer : "";
+    }
+
     private StringBuffer getPageContent(HttpResponse response) {
 
         BufferedReader rd = null;

src/test/java/edu/ohio/ais/rundeck/HttpWorkflowNodeStepPluginTest.java

@@ -11,11 +11,18 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import edu.ohio.ais.rundeck.util.OAuthClientTest;
+import org.apache.tools.ant.util.FileUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -46,6 +53,8 @@ public class HttpWorkflowNodeStepPluginTest {
     protected PluginStepContext pluginContext;
     protected PluginLogger pluginLogger;
     protected INodeEntry node;
+    protected File resourcePath = new File("src" + File.separator + "test" + File.separator + "resources");
+    protected File testResource = new File(resourcePath + File.separator + "example.json");
 
     /**
      * Setup options for simple execution for the given method.
@@ -92,9 +101,22 @@ public Map<String, Object> getOAuthOptions(String method) {
         return options;
     }
 
+    private static String readFileAsString(String filePath) throws IOException {
+        Path path = Paths.get(filePath);
+        byte[] bytes = Files.readAllBytes(path);
+        return new String(bytes);
+    }
+
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(18089);
 
+    @After
+    public void tearDown(){
+        if( Files.exists(this.testResource.toPath()) ){
+            FileUtils.delete(this.testResource);
+        }
+    }
+
     @Before
     public void setUp() {
         plugin = new HttpWorkflowNodeStepPlugin();
@@ -346,4 +368,34 @@ public void canPrintNoContent() throws NodeStepException {
 
         this.plugin.executeNodeStep(pluginContext, options, node );
     }
+
+    @Test
+    public void canPrintContentToFile() throws NodeStepException, IOException {
+        Map<String, Object> options = new HashMap<>();
+
+        options.put("remoteUrl", OAuthClientTest.BASE_URI + NO_CONTENT_URL);
+        options.put("method", "GET");
+        options.put("printResponse",true);
+        options.put("printResponseToFile",true);
+        options.put("file", testResource);
+
+        assertNotNull(Paths.get(testResource.toString()));
+        this.plugin.executeNodeStep(pluginContext, options, node );
+        assertNotNull(readFileAsString(testResource.toString()));
+    }
+
+    @Test
+    public void canPrintContentToFileIfPrintResponseIsFalse() throws NodeStepException, IOException {
+        Map<String, Object> options = new HashMap<>();
+
+        options.put("remoteUrl", OAuthClientTest.BASE_URI + NO_CONTENT_URL);
+        options.put("method", "GET");
+        options.put("printResponse",false);
+        options.put("printResponseToFile",true);
+        options.put("file", testResource);
+
+        assertNotNull(Paths.get(testResource.toString()));
+        this.plugin.executeNodeStep(pluginContext, options, node );
+        assertNotNull(readFileAsString(testResource.toString()));
+    }
 }