Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 70f3f8d

Browse files
author
Julio Faerman
committed
1.6.5 Corrected version strings and bucket policy passing
1 parent cb4c132 commit 70f3f8d

5 files changed

Lines changed: 13 additions & 6 deletions

File tree

jreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project:
22
name: cloud-janitor
3-
version: 1.5.0
3+
version: 1.6.5
44
description: Cloud Janitor
55
longDescription: Automating cleanup, maintenance and troubleshooting tasks in Cloud Computing
66
links:

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>caravanacloud</groupId>
66
<artifactId>cloud-janitor</artifactId>
77
<!-- Also change CloudJanitor.VERSION and jreleaser.yml -->
8-
<version>1.5.0</version>
8+
<version>1.6.5</version>
99

1010
<description>Automating cleanup, maintenance and troubleshooting tasks in Cloud Computing</description>
1111
<url>https://github.com/CaravanaCloud/cloud-janitor</url>

src/main/java/cj/BaseTask.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,12 @@ public void submitAll(List<Task> delegates) {
234234
}
235235

236236
public Optional<String> inputString(Input key) {
237-
return input(key).map(Object::toString);
237+
var value = input(key);
238+
var result = value.map(Object::toString);
239+
if("bucketPolicy".equals(key.toString())){
240+
System.out.println();
241+
}
242+
return result;
238243
}
239244

240245
public Object output(Output key, Object value) {

src/main/java/cj/CloudJanitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@ApplicationScoped
1515
public class CloudJanitor implements QuarkusApplication {
16-
public static final String VERSION = "1.5.0";
16+
public static final String VERSION = "1.6.5";
1717
@Inject
1818
Logger log;
1919

src/main/java/cj/aws/s3/AWSGetBucketTask.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ private void getOrCreateBucket(String bucketName) {
5353
}else {
5454
debug("Data bucket not found {}. Creating...", bucketName);
5555
var policy = inputString(bucketPolicy);
56-
var task = createBucket.withInput(targetBucketName, bucketName)
57-
.withInput(AWSInput.bucketPolicy, policy);
56+
var task = createBucket.withInput(targetBucketName, bucketName);
57+
if (policy.isPresent()){
58+
task = task.withInput(AWSInput.bucketPolicy, policy.get());
59+
}
5860
submit(task);
5961
debug("Checking if bucket was created");
6062
bucket = getBucket(bucketName);

0 commit comments

Comments
 (0)