From fc6a724e3e443c0b7891aa67920d8bc75d88d005 Mon Sep 17 00:00:00 2001
From: Alan Moran <bonzofenix@gmail.com>
Date: Thu, 17 Oct 2024 14:30:44 +0200
Subject: [PATCH] Update publicapi routes

---
 ci/autoscaler/scripts/vars.source.sh   | 11 -----------
 src/autoscaler/Makefile                |  2 +-
 src/autoscaler/build-extension-file.sh | 11 +++++++++--
 src/autoscaler/mta.tpl.yaml            |  4 ++--
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/ci/autoscaler/scripts/vars.source.sh b/ci/autoscaler/scripts/vars.source.sh
index b7b925a2ac..b1f58cfeb7 100644
--- a/ci/autoscaler/scripts/vars.source.sh
+++ b/ci/autoscaler/scripts/vars.source.sh
@@ -67,17 +67,6 @@ export SYSTEM_DOMAIN="${SYSTEM_DOMAIN:-"autoscaler.app-runtime-interfaces.ci.clo
 debug "SYSTEM_DOMAIN: ${SYSTEM_DOMAIN}"
 system_domain="${SYSTEM_DOMAIN}"
 
-# Configure cloudfoundry app variables
-export METRICSFORWARDER_APPNAME="${METRICSFORWARDER_APPNAME:-"${DEPLOYMENT_NAME}-metricsforwarder"}"
-debug "METRICSFORWARDER_APPNAME: ${METRICSFORWARDER_APPNAME}"
-log "set up vars: METRICSFORWRDER_APPNAME=${METRICSFORWARDER_APPNAME}"
-metricsforwarder_appname="${METRICSFORWARDER_APPNAME}"
-
-export METRICSFORWARDER_HOST="${METRICSFORWARDER_HOST:-"${METRICSFORWARDER_APPNAME}.${SYSTEM_DOMAIN}"}"
-debug "METRICSFORWARDER_HOST: ${METRICSFORWARDER_HOST}"
-log "set up vars: METRICSFORWARDER_HOST=${METRICSFORWARDER_HOST}"
-metricsforwarder_host="${METRICSFORWARDER_HOST}"
-
 BBL_STATE_PATH="${BBL_STATE_PATH:-$( realpath -e "${root_dir}/../app-autoscaler-env-bbl-state/bbl-state" 2> /dev/null || echo "${root_dir}/../bbl-state/bbl-state" )}"
 BBL_STATE_PATH="$(realpath -e "${BBL_STATE_PATH}" || echo "ERR_invalid_state_path" )"
 export BBL_STATE_PATH
diff --git a/src/autoscaler/Makefile b/src/autoscaler/Makefile
index 3c2194810b..6bd8864afc 100644
--- a/src/autoscaler/Makefile
+++ b/src/autoscaler/Makefile
@@ -177,7 +177,7 @@ mta-build: mta-build-clean
 	sed -i 's/VERSION/$(VERSION)/g' mta.yaml
 	mkdir -p $(DEST)
 	mbt build
-	@mv mta_archives/com.github.cloudfoundry.app-autoscaler-release_$(VERSION).mtar $(DEST)/app-autoscaler-release-v$(VERSION).mtar
+	@mv ${PWD}/mta_archives/com.github.cloudfoundry.app-autoscaler-release_$(VERSION).mtar $(DEST)/app-autoscaler-release-v$(VERSION).mtar
 
 mta-build-clean:
 	rm -rf mta_archives
diff --git a/src/autoscaler/build-extension-file.sh b/src/autoscaler/build-extension-file.sh
index 90ec9f1644..7d13b98124 100755
--- a/src/autoscaler/build-extension-file.sh
+++ b/src/autoscaler/build-extension-file.sh
@@ -20,7 +20,10 @@ export POSTGRES_ADDRESS="${DEPLOYMENT_NAME}-postgres.tcp.${SYSTEM_DOMAIN}"
 export POSTGRES_EXTERNAL_PORT="${PR_NUMBER:-5432}"
 
 export METRICSFORWARDER_HEALTH_PASSWORD="$(credhub get -n /bosh-autoscaler/${DEPLOYMENT_NAME}/autoscaler_metricsforwarder_health_password --quiet)"
-export METRICSFORWARDER_APPNAME="${METRICSFORWARDER_APPNAME:-"${DEPLOYMENT_NAME}-metricsforwarder"}"
+
+export METRICSFORWARDER_HOST="${METRICSFORWARDER_HOST:-"${DEPLOYMENT_NAME}-metricsforwarder"}"
+export PUBLICAPISERVER_HOST="${PUBLICAPISERVER_HOST:-"${DEPLOYMENT_NAME}"}"
+export SERVICEBROKER_HOST="${SERVICEBROKER_HOST:-"${DEPLOYMENT_NAME}servicebroker"}"
 
 export POLICY_DB_PASSWORD="$(credhub get -n /bosh-autoscaler/${DEPLOYMENT_NAME}/database_password --quiet)"
 export POLICY_DB_SERVER_CA="$(credhub get -n /bosh-autoscaler/${DEPLOYMENT_NAME}/postgres_server --key ca --quiet )"
@@ -45,10 +48,14 @@ modules:
     - name: syslog-client
     parameters:
       routes:
-      - route: ${METRICSFORWARDER_APPNAME}.\${default-domain}
+      - route: ${METRICSFORWARDER_HOST}.\${default-domain}
+
   - name: publicapiserver
     parameters:
       instances: 0
+      routes:
+      - route: ${PUBLICAPISERVER_HOST}.\${default-domain}
+      - route: ${SERVICEBROKER_HOST}.\${default-domain}
 
 resources:
 - name: metricsforwarder-config
diff --git a/src/autoscaler/mta.tpl.yaml b/src/autoscaler/mta.tpl.yaml
index 608f4e72ac..9f7f46dd74 100644
--- a/src/autoscaler/mta.tpl.yaml
+++ b/src/autoscaler/mta.tpl.yaml
@@ -27,7 +27,7 @@ modules:
     build-parameters:
       builder: custom
       commands:
-      - make vendor
+      - make clean vendor
   - name: publicapiserver
     type: go
     path: .
@@ -46,7 +46,7 @@ modules:
     build-parameters:
       builder: custom
       commands:
-      - make vendor
+      - make clean vendor
 
 resources:
 - name: metricsforwarder-config