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.

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

Jump to bottom

Don't use VertxRecorder to get Vertx instance #167

Closed
wants to merge 1 commit into from
Closed

Don't use VertxRecorder to get Vertx instance #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions runtime/src/main/java/io/quarkus/vault/runtime/client/SharedVertxVaultClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

import jakarta.annotation.PreDestroy;
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.inject.Instance;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Singleton;

import io.quarkus.arc.Arc;
import io.quarkus.runtime.TlsConfig;
import io.quarkus.vault.VaultException;
import io.quarkus.vault.runtime.VaultConfigHolder;
import io.quarkus.vertx.runtime.VertxRecorder;
import io.vertx.mutiny.core.Vertx;
import io.vertx.mutiny.ext.web.client.WebClient;

Expand All @@ -24,9 +24,9 @@ public class SharedVertxVaultClient extends VertxVaultClient {

@Produces
@Dependent
public static VertxVaultClient createSharedVaultClient() {
public static VertxVaultClient createSharedVaultClient(Instance<Vertx> vertx) {
Annotation clientType;
if (VertxRecorder.getVertx() != null) {
if (vertx.isResolvable()) {
clientType = Shared.Literal.INSTANCE;
} else {
clientType = Private.Literal.INSTANCE;
Expand All @@ -36,11 +36,11 @@ public static VertxVaultClient createSharedVaultClient() {

private final AtomicReference<WebClient> webClient = new AtomicReference<>();

public SharedVertxVaultClient(VaultConfigHolder vaultConfigHolder, TlsConfig tlsConfig) {
public SharedVertxVaultClient(VaultConfigHolder vaultConfigHolder, Vertx quarkusMutinyVertx, TlsConfig tlsConfig) {
super(vaultConfigHolder.getVaultRuntimeConfig().url().orElseThrow(() -> new VaultException("no vault url provided")),
vaultConfigHolder.getVaultRuntimeConfig().enterprise().namespace(),
vaultConfigHolder.getVaultRuntimeConfig().readTimeout());
Vertx vertx = Vertx.newInstance(VertxRecorder.getVertx());
Vertx vertx = Vertx.newInstance(quarkusMutinyVertx.getDelegate());
this.webClient.set(createHttpClient(vertx, vaultConfigHolder.getVaultRuntimeConfig(), tlsConfig));
}

Expand Down
Loading