Merge branch 'main' into integrate-cf-api-with-scalingengine

cloudfoundry · Feb 17, 2025 · 5fe6b08 · 5fe6b08
2 parents 09b0f6c + 96cee54
commit 5fe6b08
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 48 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM jetpackio/devbox:latest@sha256:3e9b26747056d019dcedf295604a9b42dfe5a3b326fcc76de712b54a674314bd
+FROM jetpackio/devbox:latest@sha256:fb517afe634cf0b176e930441892cc1b2a97aa95636acb98db4f760c0a68a517
 
 # Installing your devbox project
 WORKDIR /code

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -18,7 +18,7 @@ env:
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
-    container: jetpackio/devbox:latest@sha256:3e9b26747056d019dcedf295604a9b42dfe5a3b326fcc76de712b54a674314bd
+    container: jetpackio/devbox:latest@sha256:fb517afe634cf0b176e930441892cc1b2a97aa95636acb98db4f760c0a68a517
     permissions:
       contents: read
       packages: write

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: SARIF file
           path: results.sarif

diff --git a/ci/dockerfiles/autoscaler-tools/Dockerfile b/ci/dockerfiles/autoscaler-tools/Dockerfile
@@ -63,7 +63,7 @@ RUN apt-get update && \
 
 # Install bosh_cli
 # renovate: datasource=github-releases depName=bosh-cli lookupName=cloudfoundry/bosh-cli
-ARG BOSH_VERSION=7.8.6
+ARG BOSH_VERSION=7.9.2
 RUN wget -q https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_VERSION}/bosh-cli-${BOSH_VERSION}-linux-amd64 && \
   mv bosh-cli-* /usr/local/bin/bosh && \
   chmod +x /usr/local/bin/bosh

diff --git a/devbox.lock b/devbox.lock
@@ -361,51 +361,51 @@
         }
       }
     },
-    "credhub-cli@2.9.29": {
-      "last_modified": "2024-05-29T10:04:41Z",
-      "resolved": "github:NixOS/nixpkgs/ac82a513e55582291805d6f09d35b6d8b60637a1#credhub-cli",
+    "credhub-cli@2.9.42": {
+      "last_modified": "2025-02-01T23:23:45Z",
+      "resolved": "github:NixOS/nixpkgs/6c4e0724e0a785a20679b1bca3a46bfce60f05b6#credhub-cli",
       "source": "devbox-search",
-      "version": "2.9.29",
+      "version": "2.9.42",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/20xi78w44q6wn4847jrrlmxddyjycbrn-credhub-cli-2.9.29",
+              "path": "/nix/store/246b18f9f65as1gkf4zzzcrszmkgjza8-credhub-cli-2.9.42",
               "default": true
             }
           ],
-          "store_path": "/nix/store/20xi78w44q6wn4847jrrlmxddyjycbrn-credhub-cli-2.9.29"
+          "store_path": "/nix/store/246b18f9f65as1gkf4zzzcrszmkgjza8-credhub-cli-2.9.42"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/5hv8vj4dhy521m49sc4wwmaz2q319z9a-credhub-cli-2.9.29",
+              "path": "/nix/store/59prjsqn57m5a9fi3a9061s2s3y1vpgw-credhub-cli-2.9.42",
               "default": true
             }
           ],
-          "store_path": "/nix/store/5hv8vj4dhy521m49sc4wwmaz2q319z9a-credhub-cli-2.9.29"
+          "store_path": "/nix/store/59prjsqn57m5a9fi3a9061s2s3y1vpgw-credhub-cli-2.9.42"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/c5d2ggn5c819spywi74pzksbzds9ryym-credhub-cli-2.9.29",
+              "path": "/nix/store/3rvibdp921bmi8287n4qy55j080jw0cl-credhub-cli-2.9.42",
               "default": true
             }
           ],
-          "store_path": "/nix/store/c5d2ggn5c819spywi74pzksbzds9ryym-credhub-cli-2.9.29"
+          "store_path": "/nix/store/3rvibdp921bmi8287n4qy55j080jw0cl-credhub-cli-2.9.42"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/3y6r6lgrbaq8521hk3zbalf3gz3albcg-credhub-cli-2.9.29",
+              "path": "/nix/store/515jd0q0p3zx8790ks6b5bi0jpbsgnk4-credhub-cli-2.9.42",
               "default": true
             }
           ],
-          "store_path": "/nix/store/3y6r6lgrbaq8521hk3zbalf3gz3albcg-credhub-cli-2.9.29"
+          "store_path": "/nix/store/515jd0q0p3zx8790ks6b5bi0jpbsgnk4-credhub-cli-2.9.42"
         }
       }
     },
@@ -505,51 +505,51 @@
         }
       }
     },
-    "fly@7.12.0": {
-      "last_modified": "2025-01-19T08:16:51Z",
-      "resolved": "github:NixOS/nixpkgs/50165c4f7eb48ce82bd063e1fb8047a0f515f8ce#fly",
+    "fly@7.12.1": {
+      "last_modified": "2025-01-24T11:25:45Z",
+      "resolved": "github:NixOS/nixpkgs/ecd26a469ac56357fd333946a99086e992452b6a#fly",
       "source": "devbox-search",
-      "version": "7.12.0",
+      "version": "7.12.1",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/18b6ivnni1azzymzzlgy9dqzrh5cr3va-fly-7.12.0",
+              "path": "/nix/store/snfhzmrglv074rwbkqjvkcpnabyympp3-fly-7.12.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/18b6ivnni1azzymzzlgy9dqzrh5cr3va-fly-7.12.0"
+          "store_path": "/nix/store/snfhzmrglv074rwbkqjvkcpnabyympp3-fly-7.12.1"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/7l0qwz5riwcxf5aa30nkry32jzckr037-fly-7.12.0",
+              "path": "/nix/store/vbcdr8zfn91p9imwg81hd2rwsa4gfxrm-fly-7.12.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/7l0qwz5riwcxf5aa30nkry32jzckr037-fly-7.12.0"
+          "store_path": "/nix/store/vbcdr8zfn91p9imwg81hd2rwsa4gfxrm-fly-7.12.1"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/25zv07kj03kspmby0sarihsq4ssb1g9b-fly-7.12.0",
+              "path": "/nix/store/pmdzxvlab6871lfbiwpbhdm55l5c7si5-fly-7.12.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/25zv07kj03kspmby0sarihsq4ssb1g9b-fly-7.12.0"
+          "store_path": "/nix/store/pmdzxvlab6871lfbiwpbhdm55l5c7si5-fly-7.12.1"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/s7rfg1gxlsylvnd6x01vaznzhasrjxp4-fly-7.12.0",
+              "path": "/nix/store/14a2l3cqxks7932vbzxpcpwzgafvrixs-fly-7.12.1",
               "default": true
             }
           ],
-          "store_path": "/nix/store/s7rfg1gxlsylvnd6x01vaznzhasrjxp4-fly-7.12.0"
+          "store_path": "/nix/store/14a2l3cqxks7932vbzxpcpwzgafvrixs-fly-7.12.1"
         }
       }
     },
@@ -1848,7 +1848,7 @@
         }
       }
     },
-    "temurin-bin-21@latest": {
+    "temurin-bin-21@21.0.3": {
       "last_modified": "2024-10-13T23:44:06Z",
       "resolved": "github:NixOS/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732#temurin-bin-21",
       "source": "devbox-search",

diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.22.2
 	github.com/onsi/gomega v1.36.2
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pivotal-cf/brokerapi/v12 v12.0.0
+	github.com/pivotal-cf/brokerapi/v12 v12.0.1
 	github.com/prometheus/client_golang v1.20.5
 	github.com/rubyist/circuitbreaker v2.2.1+incompatible
 	github.com/steinfletcher/apitest v1.5.17

diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum
@@ -802,8 +802,8 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pivotal-cf/brokerapi/v12 v12.0.0 h1:wlFDAeN96/Z3iLthhGT8VqGZ/ov7Isz8d5M61mZsDIQ=
-github.com/pivotal-cf/brokerapi/v12 v12.0.0/go.mod h1:Bmk6g2UzyiXohTQmty3129fhD3UMLi21txtgeWV4xGE=
+github.com/pivotal-cf/brokerapi/v12 v12.0.1 h1:xCXgWqgkte+KA1j15zQMHO3hpag+R0s6K7z/+QRMuz4=
+github.com/pivotal-cf/brokerapi/v12 v12.0.1/go.mod h1:wKmh9o08HHHpchY8j7WyyHQj+lCaQ43/0lpYS1L2G+0=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

diff --git a/src/autoscaler/mta.tpl.yaml b/src/autoscaler/mta.tpl.yaml
@@ -5,6 +5,12 @@ provider: Cloud Foundry Foundation
 copyright: Apache License 2.0
 version: MTA_VERSION
 
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+      - make clean vendor
+
 modules:
   - name: metricsforwarder
     type: go
@@ -26,10 +32,6 @@ modules:
       instances: 2
       stack: cflinuxfs4
       routes:
-    build-parameters:
-      builder: custom
-      commands:
-      - make clean vendor
   - name: publicapiserver
     type: go
     path: .
@@ -48,10 +50,6 @@ modules:
       instances: 2
       stack: cflinuxfs4
       routes:
-    build-parameters:
-      builder: custom
-      commands:
-      - make clean vendor
 
 resources:
 - name: metricsforwarder-config

diff --git a/src/scheduler/pom.xml b/src/scheduler/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>

diff --git a/src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/SchedulerApplication.java b/src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/SchedulerApplication.java
@@ -4,8 +4,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.autoconfigure.audit.AuditAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.info.InfoContributorAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.autoconfigure.context.ConfigurationPropertiesAutoConfiguration;
@@ -28,9 +26,7 @@
 @SpringBootApplication(
     exclude = {
       AopAutoConfiguration.class,
-      AuditAutoConfiguration.class,
       DataSourceAutoConfiguration.class,
-      InfoContributorAutoConfiguration.class,
       WebClientAutoConfiguration.class,
       ProjectInfoAutoConfiguration.class,
       ConfigurationPropertiesAutoConfiguration.class,