cloudfoundry
diff --git a/‎devbox.lock‎
Lines changed: 34 additions & 3 deletions b/‎devbox.lock‎
Lines changed: 34 additions & 3 deletions
diff --git a/‎jobs/eventgenerator/templates/eventgenerator.yml.erb‎
Lines changed: 1 addition & 1 deletion b/‎jobs/eventgenerator/templates/eventgenerator.yml.erb‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎jobs/operator/templates/operator.yml.erb‎
Lines changed: 19 additions & 19 deletions b/‎jobs/operator/templates/operator.yml.erb‎
Lines changed: 19 additions & 19 deletions
diff --git a/‎operations/configure-cf-services.yml‎
Lines changed: 0 additions & 26 deletions b/‎operations/configure-cf-services.yml‎
Lines changed: 0 additions & 26 deletions
diff --git a/‎operations/use-cf-services.yml‎
Lines changed: 7 additions & 2 deletions b/‎operations/use-cf-services.yml‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎packages/operator/spec‎
Lines changed: 3 additions & 0 deletions b/‎packages/operator/spec‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎spec/jobs/eventgenerator/eventgenerator_spec.rb‎
Lines changed: 2 additions & 2 deletions b/‎spec/jobs/eventgenerator/eventgenerator_spec.rb‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎spec/jobs/operator/operator_spec.rb‎
Lines changed: 8 additions & 8 deletions b/‎spec/jobs/operator/operator_spec.rb‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎src/autoscaler/Makefile‎
Lines changed: 1 addition & 0 deletions b/‎src/autoscaler/Makefile‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/autoscaler/api/cmd/api/api_test.go‎
Lines changed: 12 additions & 19 deletions b/‎src/autoscaler/api/cmd/api/api_test.go‎
Lines changed: 12 additions & 19 deletions
@@ -583,7 +583,38 @@
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/6k49f7lzfvbfwx995xfz1n7nhjnzwdx2-ginkgo-2.23.4",
+              "path": "/nix/store/daixhlyywv99fwb7vj566s4hfn0741ds-ginkgo-2.23.4",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/daixhlyywv99fwb7vj566s4hfn0741ds-ginkgo-2.23.4"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/rkl11pk4dgrdf1j7r13qlmlhfmxv556l-ginkgo-2.23.4",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/rkl11pk4dgrdf1j7r13qlmlhfmxv556l-ginkgo-2.23.4"
+        }
+      }
+    },
+    "github:NixOS/nixpkgs/nixpkgs-unstable": {
+      "resolved": "github:NixOS/nixpkgs/b3582c75c7f21ce0b429898980eddbbf05c68e55?lastModified=1746576598&narHash=sha256-FshoQvr6Aor5SnORVvh%2FZdJ1Sa2U4ZrIMwKBX5k2wu0%3D"
+    },
+    "glibcLocales@latest": {
+      "last_modified": "2025-05-06T08:06:31Z",
+      "resolved": "github:NixOS/nixpkgs/1cb1c02a6b1b7cf67e3d7731cbbf327a53da9679#glibcLocales",
+      "source": "devbox-search",
+      "version": "2.40-66",
+      "systems": {
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/7af0gzp82zy3g8gn9khxwj60npcsmbvh-glibc-locales-2.40-66",
               "default": true
             }
           ],
@@ -1259,7 +1290,7 @@
     },
     "mysql@10.6.12": {
       "last_modified": "2023-02-24T09:01:09Z",
-      "plugin_version": "0.0.3",
+      "plugin_version": "0.0.4",
       "resolved": "github:NixOS/nixpkgs/7d0ed7f2e5aea07ab22ccb338d27fbe347ed2f11#mysql",
       "source": "devbox-search",
       "version": "10.6.12"
@@ -1503,7 +1534,7 @@
     },
     "python@3.13.3": {
       "last_modified": "2025-05-16T20:19:48Z",
-      "plugin_version": "0.0.3",
+      "plugin_version": "0.0.4",
       "resolved": "github:NixOS/nixpkgs/12a55407652e04dcf2309436eb06fef0d3713ef3#python313",
       "source": "devbox-search",
       "version": "3.13.3",
 
@@ -92,7 +92,7 @@ db:
     max_open_connections: <%= p("autoscaler.policy_db_connection_config.max_open_connections") %>
     max_idle_connections: <%= p("autoscaler.policy_db_connection_config.max_idle_connections") %>
     connection_max_lifetime: <%= p("autoscaler.policy_db_connection_config.connection_max_lifetime") %>
-  app_metrics_db:
+  appmetrics_db:
     url: <%= app_metrics_db_url %>
     max_open_connections: <%= p("autoscaler.appmetrics_db_connection_config.max_open_connections") %>
     max_idle_connections: <%= p("autoscaler.appmetrics_db_connection_config.max_idle_connections") %>
 
@@ -53,8 +53,6 @@ cf:
   idle_connection_timeout_ms: <%= p("autoscaler.cf.idle_connection_timeout_ms") %>
   max_idle_conns_per_host_ms: <%= p("autoscaler.cf.max_idle_conns_per_host_ms") %>
 
-
-
 logging:
   level: <%= p("autoscaler.operator.logging.level") %>
 health:
@@ -72,21 +70,33 @@ health:
 
 http_client_timeout: <%= p("autoscaler.operator.http_client_timeout") %>
 
-app_metrics_db:
-  db:
+db:
+  appmetrics_db:
     url: <%= app_metrics_db_url %>
     max_open_connections: <%= p("autoscaler.appmetrics_db_connection_config.max_open_connections") %>
     max_idle_connections: <%= p("autoscaler.appmetrics_db_connection_config.max_idle_connections") %>
     connection_max_lifetime: <%= p("autoscaler.appmetrics_db_connection_config.connection_max_lifetime") %>
-  refresh_interval: <%= p("autoscaler.operator.app_metrics_db.refresh_interval") %>
-  cutoff_duration: <%= p("autoscaler.operator.app_metrics_db.cutoff_duration") %>
-
-scaling_engine_db:
-  db:
+  scalingengine_db:
     url: <%= scaling_engine_db_url %>
     max_open_connections: <%= p("autoscaler.scalingengine_db_connection_config.max_open_connections") %>
     max_idle_connections: <%= p("autoscaler.scalingengine_db_connection_config.max_idle_connections") %>
     connection_max_lifetime: <%= p("autoscaler.scalingengine_db_connection_config.connection_max_lifetime") %>
+  policy_db:
+    url: <%= policy_db_url %>
+    max_open_connections: <%= p("autoscaler.policy_db_connection_config.max_open_connections") %>
+    max_idle_connections: <%= p("autoscaler.policy_db_connection_config.max_idle_connections") %>
+    connection_max_lifetime: <%= p("autoscaler.policy_db_connection_config.connection_max_lifetime") %>
+  lock_db:
+    url: <%= lock_db_url %>
+    max_open_connections: <%= p("autoscaler.lock_db_connection_config.max_open_connections") %>
+    max_idle_connections: <%= p("autoscaler.lock_db_connection_config.max_idle_connections") %>
+    connection_max_lifetime: <%= p("autoscaler.lock_db_connection_config.connection_max_lifetime") %>
+
+app_metrics_db:
+  refresh_interval: <%= p("autoscaler.operator.app_metrics_db.refresh_interval") %>
+  cutoff_duration: <%= p("autoscaler.operator.app_metrics_db.cutoff_duration") %>
+
+scaling_engine_db:
   refresh_interval: <%= p("autoscaler.operator.scaling_engine_db.refresh_interval") %>
   cutoff_duration: <%= p("autoscaler.operator.scaling_engine_db.cutoff_duration") %>
 
@@ -107,18 +117,8 @@ scheduler:
     ca_file: /var/vcap/jobs/operator/config/certs/scheduler/ca.crt
 
 app_syncer:
-  db:
-    url: <%= policy_db_url %>
-    max_open_connections: <%= p("autoscaler.policy_db_connection_config.max_open_connections") %>
-    max_idle_connections: <%= p("autoscaler.policy_db_connection_config.max_idle_connections") %>
-    connection_max_lifetime: <%= p("autoscaler.policy_db_connection_config.connection_max_lifetime") %>
   sync_interval:  <%= p("autoscaler.operator.app_sync_interval")  %>
 
 db_lock:
   ttl:  <%= p("autoscaler.operator.db_lock.ttl") %>
   retry_interval: <%= p("autoscaler.operator.db_lock.retry_interval") %>
-  db:
-    url: <%= lock_db_url %>
-    max_open_connections: <%= p("autoscaler.lock_db_connection_config.max_open_connections") %>
-    max_idle_connections: <%= p("autoscaler.lock_db_connection_config.max_idle_connections") %>
-    connection_max_lifetime: <%= p("autoscaler.lock_db_connection_config.connection_max_lifetime") %>
@@ -46,29 +46,3 @@
     uris:
       - ((deployment_name))-cf-scalingengine.((system_domain))
 
-
-## EVENTGENERATOR - Enable cf Server to receive calls from api running on cf --
-
-- type: replace
-  path: /instance_groups/name=eventgenerator/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/cf_server?/xfcc?/valid_org_guid?
-  value: ((!autoscaler_cf_server_xfcc_valid_org_guid))
-
-- type: replace
-  path: /instance_groups/name=eventgenerator/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/cf_server?/xfcc?/valid_space_guid?
-  value: ((!autoscaler_cf_server_xfcc_valid_space_guid))
-
-
-- type: replace
-  path: /instance_groups/name=eventgenerator/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/cf_server?/port?
-  value: 8080
-
-- type: replace
-  path: /instance_groups/name=eventgenerator/jobs/name=route_registrar/properties/route_registrar/routes/-
-  value:
-    name: ((deployment_name))-cf-eventgenerator
-    registration_interval: 20s
-    port: 8080
-    tags:
-      component: autoscaler_cf_eventgenerator
-    uris:
-      - ((deployment_name))-cf-eventgenerator.((system_domain))
@@ -51,12 +51,17 @@
 - type: remove
   path: /instance_groups/name=apiserver
 
-
 ## METRICSFORWARDER - remove metricsforwarder
 - type: remove
   path: /instance_groups/name=metricsforwarder
 
-## METRICSFORWARDER - remove metricsforwarder
+## EVENTGENERATOR - remove eventgenerator
 - type: remove
   path: /instance_groups/name=eventgenerator
 
+## OPERATOR - remove operator
+- type: remove
+  path: /instance_groups/name=operator
+
+
+
@@ -9,6 +9,7 @@ files:
 - autoscaler/vendor/*
 - autoscaler/operator/db/*
 - autoscaler/cf/* # gosub
+- autoscaler/configutil/* # gosub
 - autoscaler/db/* # gosub
 - autoscaler/db/sqldb/* # gosub
 - autoscaler/healthendpoint/* # gosub
@@ -29,6 +30,7 @@ files:
 - autoscaler/vendor/filippo.io/edwards25519/field/* # gosub
 - autoscaler/vendor/github.com/beorn7/perks/quantile/* # gosub
 - autoscaler/vendor/github.com/cespare/xxhash/v2/* # gosub
+- autoscaler/vendor/github.com/cloud-gov/go-cfenv/* # gosub
 - autoscaler/vendor/github.com/go-logr/logr/* # gosub
 - autoscaler/vendor/github.com/go-logr/logr/funcr/* # gosub
 - autoscaler/vendor/github.com/go-logr/stdr/* # gosub
@@ -55,6 +57,7 @@ files:
 - autoscaler/vendor/github.com/jackc/puddle/v2/internal/genstack/* # gosub
 - autoscaler/vendor/github.com/jmoiron/sqlx/* # gosub
 - autoscaler/vendor/github.com/jmoiron/sqlx/reflectx/* # gosub
+- autoscaler/vendor/github.com/mitchellh/mapstructure/* # gosub
 - autoscaler/vendor/github.com/munnerz/goautoneg/* # gosub
 - autoscaler/vendor/github.com/openzipkin/zipkin-go/idgenerator/* # gosub
 - autoscaler/vendor/github.com/openzipkin/zipkin-go/model/* # gosub
 
@@ -119,14 +119,14 @@
 
       context "appmetrics_db" do
         it "includes the ca, cert and key in url when configured" do
-          rendered_template["db"]["app_metrics_db"]["url"].tap do |url|
+          rendered_template["db"]["appmetrics_db"]["url"].tap do |url|
             check_if_certs_in_url(url, "appmetrics_db")
           end
         end
 
         it "does not include the ca, cert and key in url when not configured" do
           properties["autoscaler"]["appmetrics_db"]["tls"] = nil
-          rendered_template["db"]["app_metrics_db"]["url"].tap do |url|
+          rendered_template["db"]["appmetrics_db"]["url"].tap do |url|
             check_if_certs_not_in_url(url, "appmetrics_db")
           end
         end
 
@@ -40,59 +40,59 @@
     context "uses tls" do
       context "policy_db" do
         it "includes the ca, cert and key in url when configured" do
-          rendered_template["app_syncer"]["db"]["url"].tap do |url|
+          rendered_template["db"]["policy_db"]["url"].tap do |url|
             check_if_certs_in_url(url, "policy_db")
           end
         end
 
         it "does not include the ca, cert and key in url when not configured" do
           properties["autoscaler"]["policy_db"]["tls"] = nil
-          rendered_template["app_syncer"]["db"]["url"].tap do |url|
+          rendered_template["db"]["policy_db"]["url"].tap do |url|
             check_if_certs_not_in_url(url, "policy_db")
           end
         end
       end
 
       context "app_metrics_db" do
         it "includes the ca, cert and key in url when configured" do
-          rendered_template["app_metrics_db"]["db"]["url"].tap do |url|
+          rendered_template["db"]["appmetrics_db"]["url"].tap do |url|
             check_if_certs_in_url(url, "appmetrics_db")
           end
         end
 
         it "does not include the ca, cert and key in url when not configured" do
           properties["autoscaler"]["appmetrics_db"]["tls"] = nil
-          rendered_template["app_metrics_db"]["db"]["url"].tap do |url|
+          rendered_template["db"]["appmetrics_db"]["url"].tap do |url|
             check_if_certs_not_in_url(url, "appmetrics_db")
           end
         end
       end
 
       context "scaling_engine_db" do
         it "includes the ca, cert and key in url when configured" do
-          rendered_template["scaling_engine_db"]["db"]["url"].tap do |url|
+          rendered_template["db"]["scalingengine_db"]["url"].tap do |url|
             check_if_certs_in_url(url, "scalingengine_db")
           end
         end
 
         it "does not include the ca, cert and key in url when not configured" do
           properties["autoscaler"]["scalingengine_db"]["tls"] = nil
-          rendered_template["scaling_engine_db"]["db"]["url"].tap do |url|
+          rendered_template["db"]["scalingengine_db"]["url"].tap do |url|
             check_if_certs_not_in_url(url, "scalingengine_db")
           end
         end
       end
 
       context "db_lock" do
         it "includes the ca, cert and key in url when configured" do
-          rendered_template["db_lock"]["db"]["url"].tap do |url|
+          rendered_template["db"]["lock_db"]["url"].tap do |url|
             check_if_certs_in_url(url, "lock_db")
           end
         end
 
         it "does not include the ca, cert and key in url when not configured" do
           properties["autoscaler"]["lock_db"]["tls"] = nil
-          rendered_template["db_lock"]["db"]["url"].tap do |url|
+          rendered_template["db"]["lock_db"]["url"].tap do |url|
             check_if_certs_not_in_url(url, "lock_db")
           end
         end
 
@@ -168,6 +168,7 @@ package-dbtasks:
 vendor-changelogs:
 	cp $(MAKEFILE_DIR)/api/db/* $(MAKEFILE_DIR)/dbtasks/src/main/resources/.
 	cp $(MAKEFILE_DIR)/eventgenerator/db/* $(MAKEFILE_DIR)/dbtasks/src/main/resources/.
+	cp $(MAKEFILE_DIR)/operator/db/* $(MAKEFILE_DIR)/dbtasks/src/main/resources/.
 
 .PHONY: clean
 clean:
 
@@ -27,10 +27,10 @@ var _ = Describe("Api", func() {
 		runner *ApiRunner
 		rsp    *http.Response
 
-		brokerHttpClient    *http.Client
-		httpClientForHealth *http.Client
-		apiHttpClient       *http.Client
-		cfServerHttpClient  *http.Client
+		brokerHttpClient   *http.Client
+		healthHttpClient   *http.Client
+		apiHttpClient      *http.Client
+		cfServerHttpClient *http.Client
 
 		serverURL   *url.URL
 		brokerURL   *url.URL
@@ -47,7 +47,7 @@ var _ = Describe("Api", func() {
 		vcapPort = 8080 + GinkgoParallelProcess()
 
 		brokerHttpClient = testhelpers.NewServiceBrokerClient()
-		httpClientForHealth = &http.Client{}
+		healthHttpClient = &http.Client{}
 		apiHttpClient = testhelpers.NewPublicApiClient()
 		cfServerHttpClient = &http.Client{}
 
@@ -207,20 +207,13 @@ var _ = Describe("Api", func() {
 			runner.Interrupt()
 			Eventually(runner.Session, 5).Should(Exit(0))
 		})
+
 		When("a request to query health comes", func() {
 			It("returns with a 200", func() {
-				rsp, err := httpClientForHealth.Get(healthURL.String())
-				Expect(err).NotTo(HaveOccurred())
-				Expect(rsp.StatusCode).To(Equal(http.StatusOK))
-				raw, _ := io.ReadAll(rsp.Body)
-				healthData := string(raw)
-				Expect(healthData).To(ContainSubstring("_concurrent_http_request"))
-				Expect(healthData).To(ContainSubstring("_policyDB"))
-				Expect(healthData).To(ContainSubstring("_bindingDB"))
-				Expect(healthData).To(ContainSubstring("go_goroutines"))
-				Expect(healthData).To(ContainSubstring("go_memstats_alloc_bytes"))
-				rsp.Body.Close()
-
+				testhelpers.CheckHealthResponse(healthHttpClient, healthURL.String(), []string{
+					"autoscaler_golangapiserver_concurrent_http_request", "autoscaler_golangapiserver_policyDB",
+					"autoscaler_golangapiserver_bindingDB", "go_goroutines", "go_memstats_alloc_bytes",
+				})
 			})
 		})
 	})
@@ -234,13 +227,13 @@ var _ = Describe("Api", func() {
 		When("Health server is ready to serve RESTful API with basic Auth", func() {
 			When("username and password are incorrect for basic authentication during health check", func() {
 				It("should return 401", func() {
-					testhelpers.CheckHealthAuth(GinkgoT(), httpClientForHealth, healthURL.String(), "wrongusername", "wrongpassword", http.StatusUnauthorized)
+					testhelpers.CheckHealthAuth(GinkgoT(), healthHttpClient, healthURL.String(), "wrongusername", "wrongpassword", http.StatusUnauthorized)
 				})
 			})
 
 			When("username and password are correct for basic authentication during health check", func() {
 				It("should return 200", func() {
-					testhelpers.CheckHealthAuth(GinkgoT(), httpClientForHealth, healthURL.String(), conf.Health.BasicAuth.Username, conf.Health.BasicAuth.Password, http.StatusOK)
+					testhelpers.CheckHealthAuth(GinkgoT(), healthHttpClient, healthURL.String(), conf.Health.BasicAuth.Username, conf.Health.BasicAuth.Password, http.StatusOK)
 				})
 			})
 		})