#108 vault property dao class can be injected when use the extensions…

…-configuration-store-vault module
boozallen · Jun 12, 2024 · fa2a0a1 · fa2a0a1
1 parent d1a3d90
commit fa2a0a1
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 13 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -70,6 +70,8 @@
         <version.neo4j>4.1.5_for_spark_3</version.neo4j>
         <version.aws.sdk.bundle>1.12.262</version.aws.sdk.bundle>
         <version.baton>1.0.0</version.baton>
+        <version.quarkus.cucumber>0.6.0</version.quarkus.cucumber>
+        <version.quarkus.cucumber.java>7.4.1</version.quarkus.cucumber.java>
 
         <!-- ***************** -->
         <!-- Repository Deployment URLs - mostly in aissemble-root -->

diff --git a/extensions/extensions-configuration-store-vault/pom.xml b/extensions/extensions-configuration-store-vault/pom.xml
@@ -32,6 +32,37 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>${project.basedir}/src/main/resources/quarkus-app.xml</descriptor>
+                    </descriptors>
+                    <finalName>quarkus</finalName>
+                    <appendAssemblyId>true</appendAssemblyId>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -46,11 +77,32 @@
                             <skipTests>false</skipTests>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>net.masterthought</groupId>
+                        <artifactId>maven-cucumber-reporting</artifactId>
+                    </plugin>
                 </plugins>
             </build>
+            <dependencies>
+                <dependency>
+                    <groupId>net.masterthought</groupId>
+                    <artifactId>cucumber-reporting</artifactId>
+                    <version>${version.cucumber.reporting.plugin}</version>
+                </dependency>
+            </dependencies>
         </profile>
     </profiles>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>bom-component</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>io.cucumber</groupId>
@@ -86,11 +138,26 @@
             <groupId>com.boozallen.aissemble</groupId>
             <artifactId>foundation-configuration-store</artifactId>
             <version>${version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.quarkiverse.cucumber</groupId>
+                    <artifactId>quarkus-cucumber</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-junit5</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-reactive</artifactId>
             <version>${version.quarkus}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core</artifactId>
+            <version>${version.quarkus}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/extensions/extensions-configuration-store-vault/src/main/resources/META-INF/beans.xml b/extensions/extensions-configuration-store-vault/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  aiSSEMBLE::Foundation::Alerting::Core
+  %%
+  Copyright (C) 2021 Booz Allen
+  %%
+  This software package is licensed under the Booz Allen Public License. All Rights Reserved.
+  #L%
+  -->
+
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="annotated">
+
+</beans>
diff --git a/extensions/extensions-configuration-store-vault/src/main/resources/quarkus-app.xml b/extensions/extensions-configuration-store-vault/src/main/resources/quarkus-app.xml
@@ -0,0 +1,28 @@
+<!--
+  #%L
+  AIOps Docker Baseline::Versioning::Service
+  %%
+  Copyright (C) 2021 Booz Allen
+  %%
+  This software package is licensed under the Booz Allen Public License. All Rights Reserved.
+  #L%
+  -->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>app</id>
+
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/quarkus-app/</directory>
+            <outputDirectory>quarkus-app/</outputDirectory>
+        </fileSet>
+    </fileSets>
+
+</assembly>
diff --git a/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml b/extensions/extensions-data-lineage/extensions-data-lineage-http-consumer-service/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
 <!--    Overriding cucumber version to align with quarkus-cucumber -->
-    <version.cucumber>7.4.1</version.cucumber>
+    <version.cucumber>${version.quarkus.cucumber.java}</version.cucumber>
   </properties>
 
   <dependencies>
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>io.quarkiverse.cucumber</groupId>
       <artifactId>quarkus-cucumber</artifactId>
-      <version>0.6.0</version>
+      <version>${version.quarkus.cucumber}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/extensions/extensions-pipeline-invocation-service/pom.xml b/extensions/extensions-pipeline-invocation-service/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <quarkus.package.type>uber-jar</quarkus.package.type>
-        <version.cucumber>7.4.1</version.cucumber>
+        <version.cucumber>${version.quarkus.cucumber.java}</version.cucumber>
     </properties>
 
     <dependencyManagement>
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>io.quarkiverse.cucumber</groupId>
             <artifactId>quarkus-cucumber</artifactId>
-            <version>0.6.0</version>
+            <version>${version.quarkus.cucumber}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/foundation/foundation-configuration-store/pom.xml b/foundation/foundation-configuration-store/pom.xml
@@ -65,6 +65,10 @@
                     </environmentVariables>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>net.masterthought</groupId>
+                <artifactId>maven-cucumber-reporting</artifactId>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
@@ -79,13 +83,7 @@
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-java</artifactId>
-                <version>7.15.0</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>messages</artifactId>
-                <version>22.0.0</version>
+                <version>${version.quarkus.cucumber.java}</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
@@ -153,7 +151,13 @@
         <dependency>
             <groupId>io.quarkiverse.cucumber</groupId>
             <artifactId>quarkus-cucumber</artifactId>
-            <version>0.6.0</version>
+            <version>${version.quarkus.cucumber}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.masterthought</groupId>
+            <artifactId>cucumber-reporting</artifactId>
+            <version>${version.cucumber.reporting.plugin}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/foundation/foundation-configuration-store/src/main/resources/META-INF/beans.xml b/foundation/foundation-configuration-store/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  #%L
+  AIOps Foundation::AIOps Data Delivery::Spark
+  %%
+  Copyright (C) 2021 Booz Allen
+  %%
+  This software package is licensed under the Booz Allen Public License. All Rights Reserved.
+  #L%
+  -->
+
+<!-- Originally generated from: templates/beans.xml.vm -->
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="annotated">       
+
+</beans>
diff --git a/foundation/foundation-configuration-store/src/test/java/CucumberTest.java b/foundation/foundation-configuration-store/src/test/java/CucumberTest.java
@@ -7,8 +7,14 @@
  * This software package is licensed under the Booz Allen Public License. All Rights Reserved.
  * #L%
  */
+import io.quarkiverse.cucumber.CucumberOptions;
+
 import io.quarkiverse.cucumber.CucumberQuarkusTest;
 
+@CucumberOptions(
+        features = "src/test/resources/specifications",
+        plugin = {"json:target/cucumber-reports/cucumber.json"},
+        tags = "not @manual")
 public class CucumberTest extends CucumberQuarkusTest {
     public static void main(String[] args) {
         runMain(CucumberTest.class, args);