fix(deps): update dependency org.springframework.boot:spring-boot-sta…

…rter-parent to v3.4.0 (#3362) * fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v3.4.0 * fix(config): update certificate paths to use `file:` prefix in scheduler configuration # Issue When updating to Spring Boot 3.4.0 the certs would no longer be found. This is due to [Spring Boot 3.4.0 searching in the classpath first](spring-projects/spring-boot#43274). # Fix Prefix all paths with `file:`. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Silvestre Zabala <[email protected]>
cloudfoundry · Nov 25, 2024 · b15a587 · b15a587
1 parent 6660355
commit b15a587
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/jobs/scheduler/templates/scheduler.yml.erb b/jobs/scheduler/templates/scheduler.yml.erb
@@ -107,24 +107,24 @@ spring:
       pem:
         server:
           keystore:
-            certificate: "/var/vcap/jobs/scheduler/config/certs/server.crt"
-            private-key: "/var/vcap/jobs/scheduler/config/certs/server.key"
+            certificate: "file:/var/vcap/jobs/scheduler/config/certs/server.crt"
+            private-key: "file:/var/vcap/jobs/scheduler/config/certs/server.key"
           truststore:
-            certificate: "/var/vcap/jobs/scheduler/config/certs/ca.crt"
+            certificate: "file:/var/vcap/jobs/scheduler/config/certs/ca.crt"
         <% if_p("autoscaler.scheduler.health.ca_cert", "autoscaler.scheduler.health.server_cert", "autoscaler.scheduler.health.server_key") do %>
         healthendpoint:
           keystore:
-            certificate: "/var/vcap/jobs/scheduler/config/certs/healthendpoint/server.crt"
-            private-key: "/var/vcap/jobs/scheduler/config/certs/healthendpoint/server.key"
+            certificate: "file:/var/vcap/jobs/scheduler/config/certs/healthendpoint/server.crt"
+            private-key: "file:/var/vcap/jobs/scheduler/config/certs/healthendpoint/server.key"
           truststore:
-            certificate: "/var/vcap/jobs/scheduler/config/certs/healthendpoint/ca.crt"
+            certificate: "file:/var/vcap/jobs/scheduler/config/certs/healthendpoint/ca.crt"
         <% end %>
         scalingengine:
           keystore:
-            certificate: "/var/vcap/jobs/scheduler/config/certs/scalingengine/client.crt"
-            private-key: "/var/vcap/jobs/scheduler/config/certs/scalingengine/client.key"
+            certificate: "file:/var/vcap/jobs/scheduler/config/certs/scalingengine/client.crt"
+            private-key: "file:/var/vcap/jobs/scheduler/config/certs/scalingengine/client.key"
           truststore:
-            certificate: "/var/vcap/jobs/scheduler/config/certs/scalingengine/ca.crt"
+            certificate: "file:/var/vcap/jobs/scheduler/config/certs/scalingengine/ca.crt"
 
 
 ############################################################

diff --git a/src/autoscaler/integration/scheduler_application.template.yml b/src/autoscaler/integration/scheduler_application.template.yml
@@ -73,13 +73,13 @@ spring:
             pem:
               server:
                 keystore:
-                  certificate: {{ .TestCertDir }}/scheduler.crt
-                  private-key: {{ .TestCertDir }}/scheduler.key
+                  certificate: file:{{ .TestCertDir }}/scheduler.crt
+                  private-key: file:{{ .TestCertDir }}/scheduler.key
                 truststore:
-                  certificate: {{ .TestCertDir }}/autoscaler-ca.crt
+                  certificate: file:{{ .TestCertDir }}/autoscaler-ca.crt
               scalingengine:
                   keystore:
-                    certificate: {{ .TestCertDir }}/scalingengine.crt
-                    private-key: {{ .TestCertDir }}/scalingengine.key
+                    certificate: file:{{ .TestCertDir }}/scalingengine.crt
+                    private-key: file:{{ .TestCertDir }}/scalingengine.key
                   truststore:
-                    certificate: {{ .TestCertDir }}/autoscaler-ca.crt
+                    certificate: file:{{ .TestCertDir }}/autoscaler-ca.crt
diff --git a/src/scheduler/pom.xml b/src/scheduler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
         <relativePath/>
     </parent>
 

diff --git a/src/scheduler/src/main/resources/application.yml b/src/scheduler/src/main/resources/application.yml
@@ -55,16 +55,16 @@ spring:
             pem:
                 server:
                     keystore:
-                        certificate:  "src/test/resources/certs/test-scheduler.crt"
-                        private-key:  "src/test/resources/certs/test-scheduler.key"
+                        certificate:  "file:src/test/resources/certs/test-scheduler.crt"
+                        private-key:  "file:src/test/resources/certs/test-scheduler.key"
                     truststore:
-                        certificate: "src/test/resources/certs/test-ca.crt"
+                        certificate: "file:src/test/resources/certs/test-ca.crt"
                 scalingengine:
                   keystore:
-                    certificate:  "src/test/resources/certs/test-scheduler.crt"
-                    private-key:  "src/test/resources/certs/test-scheduler.key"
+                    certificate:  "file:src/test/resources/certs/test-scheduler.crt"
+                    private-key:  "file:src/test/resources/certs/test-scheduler.key"
                   truststore:
-                    certificate: "src/test/resources/certs/test-ca.crt"
+                    certificate: "file:src/test/resources/certs/test-ca.crt"
 
 ############################################################
 #    Logging