Fix output file creation for deploy task

3 files changed, 14 insertions, 8 deletions

diff --git a/buildSrc/src/main/java/deployment/DeploymentRequestProcessStepTask.java b/buildSrc/src/main/java/deployment/DeploymentRequestProcessStepTask.java
index 89ad4f89b..e54bb7fff 100644
--- a/buildSrc/src/main/java/deployment/DeploymentRequestProcessStepTask.java
+++ b/buildSrc/src/main/java/deployment/DeploymentRequestProcessStepTask.java
@@ -1,6 +1,6 @@
 package deployment;
 
-import static deployment.DeploymentStatusRequestTask.makeBuildDir;
+import static deployment.DeploymentStatusRequestTask.createEmptyOutputFile;
 
 import github.DeploymentCreate;
 import java.io.File;
@@ -57,7 +57,7 @@ public class DeploymentRequestProcessStepTask extends DefaultTask {
     @TaskAction
     public void deploymentRequestAction() {
         try {
-            makeBuildDir(getProject());
+            createEmptyOutputFile(getStatueFile());
             final DeploymentCreate.Response response =
                     deploymentRequest(
                             new DeploymentCommandLineArgs(getProject().getProperties()),
diff --git a/buildSrc/src/main/java/deployment/DeploymentStatusRequestTask.java b/buildSrc/src/main/java/deployment/DeploymentStatusRequestTask.java
index df6eed23d..38cd87be6 100644
--- a/buildSrc/src/main/java/deployment/DeploymentStatusRequestTask.java
+++ b/buildSrc/src/main/java/deployment/DeploymentStatusRequestTask.java
@@ -10,7 +10,6 @@ import java.util.Arrays;
 import java.util.Locale;
 import javax.inject.Inject;
 import org.gradle.api.DefaultTask;
-import org.gradle.api.Project;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
@@ -20,12 +19,19 @@ public abstract class DeploymentStatusRequestTask extends DefaultTask {
     private String mDeploymentId;
     private String mDeploymentState;
 
-    static void makeBuildDir(Project project) throws IOException {
-        File buildDir = project.getBuildDir();
+    static void createEmptyOutputFile(File outputFile) throws IOException {
+        File buildDir = outputFile.getParentFile();
         if (!buildDir.isDirectory() && !buildDir.mkdirs()) {
             throw new IOException(
                     "Failed to create build output folder: " + buildDir.getAbsolutePath());
         }
+
+        if (outputFile.isFile() && !outputFile.delete()) {
+            throw new IOException(
+                    "Failed to delete existing output file : " + outputFile.getAbsolutePath());
+        }
+
+        Files.createFile(outputFile.toPath());
     }
 
     @Inject
@@ -70,7 +76,7 @@ public abstract class DeploymentStatusRequestTask extends DefaultTask {
     @TaskAction
     public void statusAction() {
         try {
-            makeBuildDir(getProject());
+            createEmptyOutputFile(getStatueFile());
             final DeploymentStatus.Response response =
                     statusRequest(
                             new RequestCommandLineArgs(getProject().getProperties()),
diff --git a/buildSrc/src/main/java/deployment/DeploymentSuccessRequestTask.java b/buildSrc/src/main/java/deployment/DeploymentSuccessRequestTask.java
index 8e673d62e..2580f09ae 100644
--- a/buildSrc/src/main/java/deployment/DeploymentSuccessRequestTask.java
+++ b/buildSrc/src/main/java/deployment/DeploymentSuccessRequestTask.java
@@ -1,6 +1,6 @@
 package deployment;
 
-import static deployment.DeploymentStatusRequestTask.makeBuildDir;
+import static deployment.DeploymentStatusRequestTask.createEmptyOutputFile;
 
 import github.DeploymentStatus;
 import github.DeploymentsList;
@@ -61,7 +61,7 @@ public abstract class DeploymentSuccessRequestTask extends DefaultTask {
     public void statusAction() {
         final String processName = mEnvironmentName.substring(0, mEnvironmentName.indexOf('_') + 1);
         try {
-            makeBuildDir(getProject());
+            createEmptyOutputFile(getStatueFile());
             final RequestCommandLineArgs data =
                     new RequestCommandLineArgs(getProject().getProperties());
             final DeploymentsList.Response[] responses = listRequest(data, mEnvironmentSha);