From 5638f6fe14062540a2b0adeea0357d790a64ccf1 Mon Sep 17 00:00:00 2001 From: Anthony Johnson Date: Thu, 30 Apr 2015 00:09:54 -0400 Subject: [PATCH 1/2] cleanup zip file after uploaded to S3 --- .../codedeploy/AWSCodeDeployPublisher.java | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java b/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java index 931dcc3..a5eeb43 100644 --- a/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java +++ b/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java @@ -244,42 +244,47 @@ private void verifyCodeDeployApplication(AWSClients aws) throws IllegalArgumentE } private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePath workspace) throws IOException, InterruptedException { - + File zipFile = File.createTempFile(projectName + "-", ".zip"); - this.logger.println("Zipping workspace into " + zipFile.getAbsolutePath()); + String key; + + try { - workspace.zip( - new FileOutputStream(zipFile), - new DirScanner.Glob(this.includes, this.excludes) - ); + this.logger.println("Zipping workspace into " + zipFile.getAbsolutePath()); + workspace.zip( + new FileOutputStream(zipFile), + new DirScanner.Glob(this.includes, this.excludes) + ); - String key; - if (this.s3prefix.isEmpty()) { - key = zipFile.getName(); - } else { - key = this.s3prefix; - if (this.s3prefix.endsWith("/")) { - key += zipFile.getName(); + if (this.s3prefix.isEmpty()) { + key = zipFile.getName(); } else { - key += "/" + zipFile.getName(); + key = this.s3prefix; + if (this.s3prefix.endsWith("/")) { + key += zipFile.getName(); + } else { + key += "/" + zipFile.getName(); + } } - } - logger.println("Uploading zip to s3://" + this.s3bucket + "/" + key); - PutObjectResult s3result = aws.s3.putObject(this.s3bucket, key, zipFile); + logger.println("Uploading zip to s3://" + this.s3bucket + "/" + key); + PutObjectResult s3result = aws.s3.putObject(this.s3bucket, key, zipFile); - S3Location s3Location = new S3Location(); - s3Location.setBucket(this.s3bucket); - s3Location.setKey(key); - s3Location.setBundleType(BundleType.Zip); - s3Location.setETag(s3result.getETag()); + S3Location s3Location = new S3Location(); + s3Location.setBucket(this.s3bucket); + s3Location.setKey(key); + s3Location.setBundleType(BundleType.Zip); + s3Location.setETag(s3result.getETag()); - RevisionLocation revisionLocation = new RevisionLocation(); - revisionLocation.setRevisionType(RevisionLocationType.S3); - revisionLocation.setS3Location(s3Location); + RevisionLocation revisionLocation = new RevisionLocation(); + revisionLocation.setRevisionType(RevisionLocationType.S3); + revisionLocation.setS3Location(s3Location); - return revisionLocation; + return revisionLocation; + } finally { + zipFile.delete(); + } } private void registerRevision(AWSClients aws, RevisionLocation revisionLocation) { From a48258aee7bfb8f8b1970b12be69f02e0957f169 Mon Sep 17 00:00:00 2001 From: Anthony Johnson Date: Thu, 30 Apr 2015 00:13:38 -0400 Subject: [PATCH 2/2] Exchange tabs for spaces --- .../com/amazonaws/codedeploy/AWSCodeDeployPublisher.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java b/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java index a5eeb43..c45089d 100644 --- a/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java +++ b/src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java @@ -277,11 +277,11 @@ private RevisionLocation zipAndUpload(AWSClients aws, String projectName, FilePa s3Location.setBundleType(BundleType.Zip); s3Location.setETag(s3result.getETag()); - RevisionLocation revisionLocation = new RevisionLocation(); - revisionLocation.setRevisionType(RevisionLocationType.S3); - revisionLocation.setS3Location(s3Location); + RevisionLocation revisionLocation = new RevisionLocation(); + revisionLocation.setRevisionType(RevisionLocationType.S3); + revisionLocation.setS3Location(s3Location); - return revisionLocation; + return revisionLocation; } finally { zipFile.delete(); }