Skip to content

Commit

Permalink
Restore excluded class loader, resolve Sonar issues
Browse files Browse the repository at this point in the history 
Signed-off-by: Michael Edgar <[email protected]>
  • Loading branch information
@MikeEdgar
MikeEdgar committed Nov 2, 2024
1 parent 88130a2 commit 8f8de70
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 36 deletions.
4 changes: 2 additions & 2 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<excludes>
<exclude>com/github/streamshub/console/api/support/TrustAllCertificateManager.class</exclude>
</excludes>
<!--<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>-->
<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
<destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
<append>true</append>
</configuration>
Expand All @@ -330,7 +330,7 @@
<excludes>
<exclude>com/github/streamshub/console/api/support/TrustAllCertificateManager.class</exclude>
</excludes>
<!--<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>-->
<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
<destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
<append>true</append>
</configuration>
Expand Down
40 changes: 18 additions & 22 deletions api/src/main/java/com/github/streamshub/console/api/service/MetricsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.client.ClientRequestContext;
import jakarta.ws.rs.client.ClientRequestFilter;
import jakarta.ws.rs.core.HttpHeaders;

Expand Down Expand Up @@ -68,27 +67,24 @@ public class MetricsService {
}

ClientRequestFilter createAuthenticationFilter(PrometheusConfig config) {
return new ClientRequestFilter() {
@Override
public void filter(ClientRequestContext requestContext) {
var authConfig = config.getAuthentication();
String authHeader = null;

if (authConfig instanceof PrometheusConfig.Basic basic) {
authHeader = "Basic " + Base64.getEncoder().encodeToString("%s:%s".formatted(
basic.getUsername(),
basic.getPassword())
.getBytes());
} else if (authConfig instanceof PrometheusConfig.Bearer bearer) {
authHeader = "Bearer " + bearer.getToken();
} else if (config.getType() == Type.OPENSHIFT_MONITORING) {
// ServiceAccount needs cluster role `cluster-monitoring-view`
authHeader = "Bearer " + k8s.getConfiguration().getAutoOAuthToken();
}

if (authHeader != null) {
requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, authHeader);
}
return requestContext -> {
var authConfig = config.getAuthentication();
String authHeader = null;

if (authConfig instanceof PrometheusConfig.Basic basic) {
authHeader = "Basic " + Base64.getEncoder().encodeToString("%s:%s".formatted(
basic.getUsername(),
basic.getPassword())
.getBytes());
} else if (authConfig instanceof PrometheusConfig.Bearer bearer) {
authHeader = "Bearer " + bearer.getToken();
} else if (config.getType() == Type.OPENSHIFT_MONITORING) {
// ServiceAccount needs cluster role `cluster-monitoring-view`
authHeader = "Bearer " + k8s.getConfiguration().getAutoOAuthToken();
}

if (authHeader != null) {
requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION, authHeader);
}
};
}
Expand Down
5 changes: 1 addition & 4 deletions api/src/test/java/com/github/streamshub/console/api/KafkaClustersResourceMetricsIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,11 @@ void setup() throws IOException {
.map(KafkaClusterConfig::clusterKey)
.anyMatch(Cache.metaNamespaceKeyFunc(kafka1)::equals));

// Wait for the context map to be populated with all Kafka configurations
//await().atMost(10, TimeUnit.SECONDS).until(() -> configuredContexts.size() == STATIC_KAFKAS.size());

clusterId1 = consoleConfig.getKafka().getCluster("default/test-kafka1").get().getId();
}

@AfterEach
void teardown() throws IOException {
void teardown() {
client.resources(Kafka.class).inAnyNamespace().delete();
}

Expand Down
4 changes: 2 additions & 2 deletions operator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<goal>prepare-agent</goal>
</goals>
<configuration>
<!--<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>-->
<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
<destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
<append>true</append>
</configuration>
Expand All @@ -132,7 +132,7 @@
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<!--<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>-->
<exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
<destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
<append>true</append>
</configuration>
Expand Down
11 changes: 5 additions & 6 deletions operator/src/test/java/com/github/streamshub/console/ConsoleReconcilerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

//@QuarkusTestResource(KubernetesServerTestResource.class)
@QuarkusTest
class ConsoleReconcilerTest {

Expand Down Expand Up @@ -662,7 +661,7 @@ void testConsoleReconciliationWithSchemaRegistryUrl() {

client.resource(consoleCR).create();

assertConsoleConfig(consoleCR, consoleConfig -> {
assertConsoleConfig(consoleConfig -> {
String registryName = consoleConfig.getSchemaRegistries().get(0).getName();
assertEquals("example-registry", registryName);
String registryUrl = consoleConfig.getSchemaRegistries().get(0).getUrl();
Expand Down Expand Up @@ -722,7 +721,7 @@ void testConsoleReconciliationWithOpenShiftMonitoring() {

client.resource(consoleCR).create();

assertConsoleConfig(consoleCR, consoleConfig -> {
assertConsoleConfig(consoleConfig -> {
String metricsName = consoleConfig.getMetricsSources().get(0).getName();
assertEquals("ocp-platform-monitoring", metricsName);
String metricsUrl = consoleConfig.getMetricsSources().get(0).getUrl();
Expand Down Expand Up @@ -762,7 +761,7 @@ void testConsoleReconciliationWithPrometheusBasicAuthN() {

client.resource(consoleCR).create();

assertConsoleConfig(consoleCR, consoleConfig -> {
assertConsoleConfig(consoleConfig -> {
var prometheusConfig = consoleConfig.getMetricsSources().get(0);
assertEquals("some-prometheus", prometheusConfig.getName());
assertEquals("https://prometheus.example.com", prometheusConfig.getUrl());
Expand Down Expand Up @@ -805,7 +804,7 @@ void testConsoleReconciliationWithPrometheusBearerAuthN() {

client.resource(consoleCR).create();

assertConsoleConfig(consoleCR, consoleConfig -> {
assertConsoleConfig(consoleConfig -> {
var prometheusConfig = consoleConfig.getMetricsSources().get(0);
assertEquals("some-prometheus", prometheusConfig.getName());
assertEquals("https://prometheus.example.com", prometheusConfig.getUrl());
Expand Down Expand Up @@ -851,7 +850,7 @@ void testConsoleReconciliationWithPrometheusEmptyAuthN() {

// Utility

private void assertConsoleConfig(Console targetResource, Consumer<ConsoleConfig> assertion) {
private void assertConsoleConfig(Consumer<ConsoleConfig> assertion) {
await().ignoreException(NullPointerException.class).atMost(LIMIT).untilAsserted(() -> {
var consoleSecret = client.secrets().inNamespace("ns2").withName("console-1-" + ConsoleSecret.NAME).get();
assertNotNull(consoleSecret);
Expand Down

0 comments on commit 8f8de70

Please sign in to comment.