Skip to content

Commit 92c11da

Browse files
committed
Fix resource path.
1 parent 4da7507 commit 92c11da

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

admin-cli/src/main/java/cloud/katta/cli/commands/storage/MinioStsSetup.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44

55
package cloud.katta.cli.commands.storage;
66

7-
import cloud.katta.cli.KattaSetupCli;
8-
import io.minio.admin.MinioAdminClient;
97
import org.apache.commons.io.IOUtils;
108
import org.json.JSONArray;
119
import org.json.JSONObject;
12-
import picocli.CommandLine;
1310

1411
import java.net.URI;
1512
import java.nio.charset.Charset;
1613
import java.util.List;
1714
import java.util.Objects;
1815
import java.util.concurrent.Callable;
1916

17+
import cloud.katta.cli.KattaSetupCli;
18+
import io.minio.admin.MinioAdminClient;
19+
import picocli.CommandLine;
20+
2021
/**
2122
* Sets up MinIO for Katta in STS mode:
2223
* <ul>
@@ -75,7 +76,7 @@ public Void call() throws Exception {
7576

7677
// /mc admin policy create myminio cipherduckcreatebucket /setup/minio_sts/createbucketpolicy.json
7778
{
78-
final JSONObject miniocreatebucketpolicy = new JSONObject(IOUtils.toString(KattaSetupCli.class.getResourceAsStream("/setup/minio_sts/createbucketpolicy.json"), Charset.defaultCharset()));
79+
final JSONObject miniocreatebucketpolicy = new JSONObject(IOUtils.toString(KattaSetupCli.class.getResourceAsStream("/setup/local/minio_sts/createbucketpolicy.json"), Charset.defaultCharset()));
7980
final JSONArray statements = miniocreatebucketpolicy.getJSONArray("Statement");
8081
for (int i = 0; i < statements.length(); i++) {
8182
final List<String> list = statements.getJSONObject(i).getJSONArray("Resource").toList().stream().map(Objects::toString).map(s -> s.replace("katta", bucketPrefix)).toList();
@@ -86,7 +87,7 @@ public Void call() throws Exception {
8687
}
8788
// /mc admin policy create myminio cipherduckaccessbucket /setup/minio_sts/accessbucketpolicy.json
8889
{
89-
final JSONObject minioaccessbucketpolicy = new JSONObject(IOUtils.toString(KattaSetupCli.class.getResourceAsStream("/setup/minio_sts/accessbucketpolicy.json"), Charset.defaultCharset()));
90+
final JSONObject minioaccessbucketpolicy = new JSONObject(IOUtils.toString(KattaSetupCli.class.getResourceAsStream("/setup/local/minio_sts/accessbucketpolicy.json"), Charset.defaultCharset()));
9091
final JSONArray statements = minioaccessbucketpolicy.getJSONArray("Statement");
9192
for (int i = 0; i < statements.length(); i++) {
9293
final List<String> list = statements.getJSONObject(i).getJSONArray("Resource").toList().stream().map(Objects::toString).map(s -> s.replace("katta", bucketPrefix)).toList();

0 commit comments

Comments
 (0)