fix(provider/gae): Delete gcs target directory in deploy.

spinnaker · Oct 18, 2017 · e2604b5 · e2604b5
1 parent 6b0586b
commit e2604b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...com/netflix/spinnaker/clouddriver/appengine/gcsClient/AppengineGcsRepositoryClient.groovy b/...com/netflix/spinnaker/clouddriver/appengine/gcsClient/AppengineGcsRepositoryClient.groovy
@@ -22,6 +22,7 @@ import com.netflix.spinnaker.clouddriver.appengine.storage.GcsStorageService
 import com.netflix.spinnaker.clouddriver.appengine.storage.StorageUtils
 import groovy.transform.TupleConstructor
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
+import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 
 @TupleConstructor
@@ -46,7 +47,7 @@ class AppengineGcsRepositoryClient implements AppengineRepositoryClient {
       throw new IllegalArgumentException("Repository is not a GCS bucket: " + repositoryUrl)
     }
 
-    def dest = targetDirectory + File.separator + applicationDirectoryRoot
+    def dest = applicationDirectoryRoot ? targetDirectory + File.separator + applicationDirectoryRoot : targetDirectory
 
     def fullPath = repositoryUrl.substring(gsPrefix.length())
     if (applicationDirectoryRoot) {
@@ -56,6 +57,12 @@ class AppengineGcsRepositoryClient implements AppengineRepositoryClient {
     def bucketName = fullPath.substring(0, slash)
     def bucketPath = fullPath.substring(slash + 1)
 
+    // Start with a clean directory for each deployment.
+    File appDirectory = new File(targetDirectory)
+    if (appDirectory.exists() && appDirectory.isDirectory()) {
+      FileUtils.forceDelete(appDirectory)
+    }
+
     if (fullPath.endsWith(".tar")) {
       InputStream tas = storage.openObjectStream(bucketName, bucketPath)
 

diff --git a/...ngine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/StorageUtils.java b/...ngine/src/main/java/com/netflix/spinnaker/clouddriver/appengine/storage/StorageUtils.java
@@ -18,6 +18,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;