Improve logging. Refactor

Author: rnc

java-components/cli/src/main/java/com/redhat/hacbs/cli/driver/Pipeline.java

@@ -1,7 +1,5 @@
 package com.redhat.hacbs.cli.driver;
 
-import java.io.IOException;
-
 import jakarta.enterprise.context.control.ActivateRequestContext;
 import jakarta.inject.Inject;
 
@@ -30,8 +28,9 @@ public class Pipeline extends Base implements Runnable {
     @ActivateRequestContext // https://github.com/quarkusio/quarkus/issues/8758
     @Override
     public void run() {
-        logger.info("### in here with driver {}", driver);
-        driver.addValues(accessToken.orElse(""), quayRepo, processor);
+        driver.setQuayRepo(quayRepo);
+        driver.setProcessor(processor);
+        driver.setAccessToken(accessToken.orElse(""));
 
         BuildRequest request = BuildRequest.builder()
                 .namespace(namespace)
@@ -46,11 +45,6 @@ public void run() {
                 .repositoryBuildContentId("test-maven-konflux-int-0001")
                 .recipeImage(recipeImage)
                 .build();
-        try {
-            driver.create(request);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
+        driver.create(request);
     }
 }

java-components/driver/src/main/java/com/redhat/hacbs/driver/Driver.java

@@ -12,6 +12,7 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.text.StringSubstitutor;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,12 +28,15 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.tekton.pipeline.v1.PipelineRun;
 import io.quarkus.oidc.client.OidcClient;
+import lombok.Setter;
 
 @RequestScoped
 public class Driver {
 
     private static final Logger logger = LoggerFactory.getLogger(Driver.class);
 
+    private static final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
+
     @Inject
     OidcClient oidcClient;
 
@@ -43,25 +47,26 @@ public class Driver {
     @Inject
     KubernetesClient client;
 
-    ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
-
+    @Setter
     private String accessToken;
-    private String quayRepo;
-    private String processor;
 
-    public void addValues(String accessToken, String quayRepo, String processor) {
-        this.accessToken = accessToken;
-        this.quayRepo = quayRepo;
-        this.processor = processor;
-    }
+    @Setter
+    private String quayRepo = "quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/build-request-processor:latest";
+
+    @Setter
+    private String processor = "quay.io/redhat-user-workloads-stage/pnc-devel-tenant/pnc";
 
-    public void create(BuildRequest buildRequest) throws IOException {
+    public void create(BuildRequest buildRequest) {
         IndyTokenResponseDTO tokenResponseDTO = new IndyTokenResponseDTO(accessToken);
 
         if (isEmpty(accessToken)) {
+            logger.info("Establishing token from Indy using clientId {}",
+                    ConfigProvider.getConfig().getConfigValue("quarkus.oidc.client-id").getValue());
             tokenResponseDTO = indyService.getAuthToken(
                     new IndyTokenRequestDTO(buildRequest.getRepositoryBuildContentId()),
                     "Bearer " + getFreshAccessToken());
+            logger.debug("### new access token: {}", tokenResponseDTO.getToken()); // TODO: REMOVE
+
         }
 
         Map<String, String> templateProperties = new HashMap<>();
@@ -79,14 +84,17 @@ public void create(BuildRequest buildRequest) throws IOException {
         templateProperties.put("ACCESS_TOKEN", tokenResponseDTO.getToken());
         templateProperties.put("BUILD_ID", buildRequest.getRepositoryBuildContentId());
 
-        String pipeline = IOUtils.resourceToString("pipeline.yaml", StandardCharsets.UTF_8,
-                Thread.currentThread().getContextClassLoader());
+        String pipeline = "";
+        try {
+            pipeline = IOUtils.resourceToString("pipeline.yaml", StandardCharsets.UTF_8,
+                    Thread.currentThread().getContextClassLoader());
+        } catch (IOException e) {
+            // TODO: process
+        }
 
         PipelineRun run = createModelNode(pipeline, templateProperties, PipelineRun.class);
 
         var created = client.resource(run).inNamespace(buildRequest.getNamespace()).create();
-
-        System.err.println("### " + created);
     }
 
     /**
@@ -97,7 +105,7 @@ public void create(BuildRequest buildRequest) throws IOException {
      */
     public String getFreshAccessToken() {
         var result = oidcClient.getTokens().await().indefinitely().getAccessToken();
-        System.err.println("### result " + result);
+        logger.debug("### access token: {}", result); // TODO: REMOVE
         return result;
     }
 

java-components/driver/src/main/java/com/redhat/hacbs/driver/dto/BuildRequest.java

@@ -19,6 +19,8 @@ public class BuildRequest {
     private final String buildToolVersion;
     private final String javaVersion;
 
+    // TODO: Is this related to the name of the project (i.e. name returned from /v2/projects/{id}) or the build-config
+    private final String projectName;
     private final String scmUrl;
     // TODO: Do we need both?
     private final String scmRevision;

java-components/driver/src/main/resources/application.yaml

@@ -1,10 +1,12 @@
 quarkus:
+  application:
+    name: konflux-build-driver
   shutdown:
     timeout: 300
-#  log:
-#    category:
-#      "org.jboss.pnc":
-#        level: DEBUG
+  log:
+    category:
+      "com.redhat.hacbs":
+        level: DEBUG
 #    console:
 #      format: "%d{HH:mm:ss,SSS} %-5p traceId=%X{traceId}, parentId=%X{parentId}, spanId=%X{spanId}, sampled=%X{sampled} [%c{3.}] (%t) %s%e mdc:[%X]%n"
 #  http: