From d2ee02510cf29914b2f7232cf6181a3512b1140f Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Thu, 25 Jul 2024 10:13:34 +1000
Subject: [PATCH] Failsafe wiring of real tests if secrets configured

---
 .github/workflows/test.yml                    | 17 ++++++---
 .gitignore                                    |  1 +
 kiteworks-spring-service/pom.xml              | 35 +++++++++++++++++++
 .../{EndToEndTestIT.java => EndToEndIT.java}  |  2 +-
 ...egrationTest.java => ServiceWireTest.java} |  2 +-
 5 files changed, 51 insertions(+), 6 deletions(-)
 rename kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/{EndToEndTestIT.java => EndToEndIT.java} (98%)
 rename kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/{IntegrationTest.java => ServiceWireTest.java} (98%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1d47eea..5293328 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,16 @@ jobs:
         KITEWORKS_ACCESS_TOKEN_URI: ${{ secrets.KITEWORKS_ACCESS_TOKEN_URI }}
       run: mvn clean install  -Dspring.profiles.active=cicd
 
-#    - name: Publish to GitHub Packages Apache Maven
-#        run: mvn deploy
-#        env:
-#          GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password
+    - name: Package artifacts
+      run: |
+       mkdir staging
+       cp  */target/*.jar staging
+       cp -rf */target/*reports staging
+       cp -r  */target/generated-sources/openapi/api staging
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: Package
+        path: staging
+        overwrite: true
diff --git a/.gitignore b/.gitignore
index 65f20b1..722fd09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 target/
+/staging
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
diff --git a/kiteworks-spring-service/pom.xml b/kiteworks-spring-service/pom.xml
index e5986bd..37e71fc 100644
--- a/kiteworks-spring-service/pom.xml
+++ b/kiteworks-spring-service/pom.xml
@@ -67,6 +67,41 @@
                 <groupId>org.apache.maven.plugins </groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>IntegrationTest</id>
+                        <goals>
+                            <goal>verify</goal>
+                            <goal>integration-test</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*IntegrationTest.java</include>
+                            </includes>
+                            <skipTests>${skipTests}</skipTests>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>IT</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/*IT.java</include>
+                            </includes>
+                            <systemPropertyVariables>
+                                <!--
+                                Set a system property for the test clients to use when connecting.
+                                Something like Apache's commons-configuration can pick this up
+                                transparently.
+                                -->
+                            </systemPropertyVariables>
+                            <skipTests>${skipTests}</skipTests>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/EndToEndTestIT.java b/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/EndToEndIT.java
similarity index 98%
rename from kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/EndToEndTestIT.java
rename to kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/EndToEndIT.java
index fdc507a..cd89c1d 100644
--- a/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/EndToEndTestIT.java
+++ b/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/EndToEndIT.java
@@ -23,7 +23,7 @@
 @SpringBootTest( classes = {KiteworksSpringService.class, ProxyConfig.class})
 @EnableConfigurationProperties
 @ActiveProfiles("cicd")
-public class EndToEndTestIT {
+public class EndToEndIT {
 
     @Autowired
     private KiteworksService kiteworksService;
diff --git a/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/IntegrationTest.java b/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/ServiceWireTest.java
similarity index 98%
rename from kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/IntegrationTest.java
rename to kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/ServiceWireTest.java
index 13a76e8..193815a 100644
--- a/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/IntegrationTest.java
+++ b/kiteworks-spring-service/src/test/java/au/gov/qld/ssq/kiteworks/ServiceWireTest.java
@@ -19,7 +19,7 @@
 @Import({KiteworksTestConfig.class})
 @EnableConfigurationProperties
 @ActiveProfiles("test")
-public class IntegrationTest {
+public class ServiceWireTest {
 
     @Autowired
     private KiteworksService kiteworksService;