🐛 Fix SpringBootIntegrationBuilder deploy on OCP

avano · Oct 18, 2022 · e052ce6 · e052ce6
1 parent 23df77c
commit e052ce6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/fuse-products/src/main/java/software/tnb/product/csb/application/OpenshiftSpringBootApp.java b/fuse-products/src/main/java/software/tnb/product/csb/application/OpenshiftSpringBootApp.java
@@ -33,7 +33,7 @@ public OpenshiftSpringBootApp(AbstractIntegrationBuilder<?> integrationBuilder)
         Path baseDirectory;
         if (integrationBuilder instanceof AbstractMavenGitIntegrationBuilder) {
             AbstractMavenGitIntegrationBuilder<?> mavenGitIntegrationBuilder = (AbstractMavenGitIntegrationBuilder<?>) integrationBuilder;
-            baseDirectory = mavenGitApp.getProjectLocation();
+            baseDirectory = mavenGitApp != null ? mavenGitApp.getProjectLocation() : TestConfiguration.appLocation().resolve(name);
             finalName = mavenGitIntegrationBuilder.getFinalName().orElse(getName());
         } else {
             baseDirectory = TestConfiguration.appLocation().resolve(name);

diff --git a/.../main/java/software/tnb/product/csb/integration/builder/SpringBootIntegrationBuilder.java b/.../main/java/software/tnb/product/csb/integration/builder/SpringBootIntegrationBuilder.java
@@ -23,6 +23,7 @@ public final class SpringBootIntegrationBuilder extends AbstractMavenGitIntegrat
 
     public SpringBootIntegrationBuilder(String integrationName) {
         super(integrationName);
+        withFinalName(integrationName);
     }
 
     protected SpringBootIntegrationBuilder self() {

diff --git a/fuse-products/src/main/java/software/tnb/product/deploystrategy/impl/JKubeStrategy.java b/fuse-products/src/main/java/software/tnb/product/deploystrategy/impl/JKubeStrategy.java
@@ -141,6 +141,12 @@ public void preDeploy() {
             //patch to avoid too characters on OCP resource names
             final Model model = Maven.loadPom(pomFile);
             model.setArtifactId(model.getArtifactId().replaceAll("camel-example-spring-boot-", "csb-"));
+
+            //set final name if present
+             ((AbstractMavenGitIntegrationBuilder) integrationBuilder).getFinalName().ifPresent(finalName -> {
+                 model.getBuild().setFinalName((String) finalName);
+             });
+
             Maven.writePom(pomFile, model);
         }