chore: add RHTAP integration

Signed-off-by: Ruben Romero Montes <rromerom@redhat.com>

README.md

@@ -1,4 +1,4 @@
-# exhort-vuln-ingester
+# exhort-cve-service
 
 This project uses Quarkus, the Supersonic Subatomic Java Framework.
 
@@ -43,7 +43,7 @@ Or, if you don't have GraalVM installed, you can run the native executable build
 ./mvnw package -Pnative -Dquarkus.native.container-build=true
 ```
 
-You can then execute your native executable with: `./target/exhort-vuln-ingester-1.0.0-SNAPSHOT-runner`
+You can then execute your native executable with: `./target/exhort-cve-service-1.0.0-SNAPSHOT-runner`
 
 If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.
 

devfile.yaml

@@ -16,8 +16,6 @@ metadata:
     - OSV
   projectType: Quarkus
   language: Java
-  attributes:
-    alpha.dockerimage-port: 8080
 parent:
   id: java-quarkus
   registryUrl: 'https://registry.devfile.io'
@@ -29,30 +27,7 @@ components:
         uri: src/main/docker/Dockerfile.multi-stage
         buildContext: .
         rootRequired: false
-  - name: kubernetes-deploy
-    attributes:
-      deployment/replicas: 1
-      deployment/cpuRequest: 10m
-      deployment/memoryRequest: 128Mi
-      deployment/container-port: 9000
-    kubernetes:
-      uri: kubernetes/deploy.yaml
-      endpoints:
-        - name: http
-          targetPort: 8080
-          path: /
 commands:
   - id: build-image
     apply:
       component: image-build
-  - id: deployk8s
-    apply:
-      component: kubernetes-deploy
-  - id: deploy
-    composite:
-      commands:
-        - build-image
-        - deployk8s
-      group:
-        kind: deploy
-        isDefault: true

kubernetes/deploy.yaml

@@ -40,6 +40,11 @@ spec:
               secretKeyRef:
                 name: exhort-stage
                 key: db.port
+          - name: API_NVD_APIKEY
+            valueFrom:
+              secretKeyRef:
+                name: exhort-cve-secret
+                key: nvd.apikey
         livenessProbe:
           httpGet:
             path: /q/health/live

pom.xml

@@ -5,7 +5,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.redhat.ecosystemappeng</groupId>
-  <artifactId>exhort-osv-service</artifactId>
+  <artifactId>exhort-cve-service</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <properties>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
@@ -14,7 +14,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>3.6.3</quarkus.platform.version>
+    <quarkus.platform.version>3.6.4</quarkus.platform.version>
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
     <wiremock.version>3.3.1</wiremock.version>
@@ -58,6 +58,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-rest-client-reactive-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-health</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-redis-client</artifactId>
@@ -66,6 +70,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-resteasy-reactive-jackson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-openapi</artifactId>
+  </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-fault-tolerance</artifactId>

src/main/docker/Dockerfile.jvm

@@ -7,11 +7,11 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/exhort-vuln-ingester-jvm .
+# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/exhort-cve-service-jvm .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/exhort-vuln-ingester-jvm
+# docker run -i --rm -p 8080:8080 quarkus/exhort-cve-service-jvm
 #
 # If you want to include the debug port into your docker image
 # you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
@@ -20,7 +20,7 @@
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 quarkus/exhort-vuln-ingester-jvm
+# docker run -i --rm -p 8080:8080 quarkus/exhort-cve-service-jvm
 #
 # This image uses the `run-java.sh` script to run the application.
 # This scripts computes the command line to execute your Java application, and

src/main/docker/Dockerfile.legacy-jar

@@ -7,11 +7,11 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/exhort-vuln-ingester-legacy-jar .
+# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/exhort-cve-service-legacy-jar .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/exhort-vuln-ingester-legacy-jar
+# docker run -i --rm -p 8080:8080 quarkus/exhort-cve-service-legacy-jar
 #
 # If you want to include the debug port into your docker image
 # you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
@@ -20,7 +20,7 @@
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 quarkus/exhort-vuln-ingester-legacy-jar
+# docker run -i --rm -p 8080:8080 quarkus/exhort-cve-service-legacy-jar
 #
 # This image uses the `run-java.sh` script to run the application.
 # This scripts computes the command line to execute your Java application, and

src/main/docker/Dockerfile.native

@@ -7,11 +7,11 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/exhort-vuln-ingester .
+# docker build -f src/main/docker/Dockerfile.native -t quarkus/exhort-cve-service .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/exhort-vuln-ingester
+# docker run -i --rm -p 8080:8080 quarkus/exhort-cve-service
 #
 ###
 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3

src/main/docker/Dockerfile.native-micro

@@ -10,11 +10,11 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/exhort-vuln-ingester .
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/exhort-cve-service .
 #
 # Then run the container using:
 #
-# docker run -i --rm -p 8080:8080 quarkus/exhort-vuln-ingester
+# docker run -i --rm -p 8080:8080 quarkus/exhort-cve-service
 #
 ###
 FROM quay.io/quarkus/quarkus-micro-image:2.0

src/main/java/com/redhat/ecosystemappeng/service/nvd/NvdApi.java

@@ -24,7 +24,7 @@ public interface NvdApi {
     static final long NVD_API_WINDOW_SECS = 30;
 
     @GET
-    @ClientHeaderParam(name = "apiKey", value = "${migration.nvd.apikey}")
+    @ClientHeaderParam(name = "apiKey", value = "${api.nvd.apikey}")
     @Produces(MediaType.APPLICATION_JSON)
     @Fallback(value = NvdFallbackService.class, applyOn = WebApplicationException.class, skipOn = ClientWebApplicationException.class)
     @CircuitBreaker(delay = NVD_API_WINDOW_SECS, delayUnit = ChronoUnit.SECONDS)

src/main/resources/application.properties

@@ -1,6 +1,6 @@
 
 # quarkus.redis.hosts=redis://localhost/
-quarkus.redis.hosts=redis://${db.redis.host:localhost}:${db.redis.port:6379}/
+%prod.quarkus.redis.hosts=redis://${db.redis.host:localhost}:${db.redis.port:6379}/
 # quarkus.log.level=DEBUG
 
 migration.cve.file.path=/repo/cvelistV5/cves

src/test/java/com/redhat/ecosystemappeng/service/WireMockExtensions.java

@@ -35,7 +35,7 @@ public Map<String, String> start() {
 
         Map<String, String> props = new HashMap<>();
         props.put("quarkus.rest-client.nvd-api.url", wireMockServer.baseUrl());
-        props.put("migration.nvd.apikey", NVD_API_KEY);
+        props.put("api.nvd.apikey", NVD_API_KEY);
         return props;
     }