Skip to content
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.

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

camel-quarkus-minio: quarkus.minio.url is not mandatory #2911

Merged
merged 1 commit into from
Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;

class MinioProcessor {

Expand All @@ -27,4 +28,9 @@ class MinioProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}

@BuildStep
RunTimeConfigurationDefaultBuildItem allowEmptyMinioClient() {
return new RunTimeConfigurationDefaultBuildItem("quarkus.minio.allow-empty", "true");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@

public class MinioClientProducer {

public static String MINIO_CLIENT_URL_PARAMETER = MinioClientProducer.class.getSimpleName() + "_url";

@Produces
@Singleton
@Named("minioClient")
public MinioClient produceMinioClient() {
return MinioClient.builder()
.endpoint(ConfigProvider.getConfig().getValue("quarkus.minio.url", String.class))
.endpoint(ConfigProvider.getConfig().getValue(MINIO_CLIENT_URL_PARAMETER, String.class))
.credentials(MinioResource.SERVER_ACCESS_KEY, MinioResource.SERVER_SECRET_KEY)
.build();
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public String consumer() {
final String message = consumerTemplate.receiveBody(
"minio://mycamel?moveAfterRead=true&destinationBucketName=camel-kafka-connector&autoCreateBucket=true"
+ "&accessKey=" + SERVER_ACCESS_KEY
+ "&secretKey=RAW(" + SERVER_SECRET_KEY + ")"
+ "&minioClient=#minioClient",
+ "&secretKey=RAW(" + SERVER_SECRET_KEY + ")",
5000, String.class);
return message;
}
Expand All @@ -77,8 +76,7 @@ public String operation(String body,
@QueryParam(MinioConstants.DESTINATION_BUCKET_NAME) String destinationBucketName) {

String endpoint = "minio:mycamel?accessKey=" + SERVER_ACCESS_KEY
+ "&secretKey=RAW(" + SERVER_SECRET_KEY + ")"
+ "&minioClient=#minioClient";
+ "&secretKey=RAW(" + SERVER_SECRET_KEY + ")";

MinioOperations op = (operation != "" && !"".equals(operation) ? MinioOperations.valueOf(operation) : null);

Expand Down Expand Up @@ -135,8 +133,8 @@ public String getUsingPojo(String bucket,

String endpoint = "minio:mycamel?accessKey=" + SERVER_ACCESS_KEY
+ "&secretKey=RAW(" + SERVER_SECRET_KEY + ")"
+ "&minioClient=#minioClient"
+ "&pojoRequest=true";
+ "&pojoRequest=true"
+ "&minioClient=#minioClient";

GetObjectArgs.Builder body = GetObjectArgs.builder()
.bucket(bucket)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public Map<String, String> start() {
String host = minioServer.getHost();

return CollectionHelper.mapOf(
"quarkus.minio.url", String.format("http://%s:%s", host, port));
MinioClientProducer.MINIO_CLIENT_URL_PARAMETER, String.format("http://%s:%s", host, port));
}

@Override
Expand Down