Skip to content

Feature/cleanup zip archive #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 10, 2015
Merged

Feature/cleanup zip archive #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5638f6f
cleanup zip file after uploaded to S3
ansoni Apr 30, 2015
a48258a
Exchange tabs for spaces
ansoni Apr 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions src/main/java/com/amazonaws/codedeploy/AWSCodeDeployPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down