From 970e340f4a7b51e6cfe5333dfb00b52166eeebf9 Mon Sep 17 00:00:00 2001
From: Alan Moran <bonzofenix@gmail.com>
Date: Mon, 30 Sep 2024 10:56:44 +0200
Subject: [PATCH] Change type of mta resource for logs

---
 src/acceptance/helpers/helpers_test.go | 14 --------------
 src/autoscaler/build-extension-file.sh |  4 ++++
 src/autoscaler/helpers/logger.go       | 13 +++++++++----
 src/autoscaler/mta.tpl.yaml            |  3 ++-
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 src/acceptance/helpers/helpers_test.go

diff --git a/src/acceptance/helpers/helpers_test.go b/src/acceptance/helpers/helpers_test.go
deleted file mode 100644
index f428822df3..0000000000
--- a/src/acceptance/helpers/helpers_test.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package helpers_test
-
-import (
-	"acceptance/config"
-	"acceptance/helpers"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestServicePlans_urlIsCorrect(t *testing.T) {
-	url := helpers.ServicePlansUrl(&config.Config{ServiceName: "autoscaler", ServiceBroker: "autoscaler"}, "GUID_UUID")
-	assert.Equal(t, url, "/v3/service_plans?available=true&fields%5Bservice_offering.service_broker%5D=name%2Cguid&include=service_offering&per_page=5000&service_broker_names=autoscaler&service_offering_names=autoscaler&space_guids=GUID_UUID")
-}
diff --git a/src/autoscaler/build-extension-file.sh b/src/autoscaler/build-extension-file.sh
index a35b1805a3..a1adb01176 100755
--- a/src/autoscaler/build-extension-file.sh
+++ b/src/autoscaler/build-extension-file.sh
@@ -39,6 +39,10 @@ _schema-version: 3.3.0
 
 modules:
   - name: metricsforwarder
+    requires:
+    - name: config
+    - name: policydb
+    - name: syslog-client
     parameters:
       routes:
       - route: ${METRICSFORWARDER_APPNAME}.\${default-domain}
diff --git a/src/autoscaler/helpers/logger.go b/src/autoscaler/helpers/logger.go
index 942e08dc5c..f6531cfff5 100644
--- a/src/autoscaler/helpers/logger.go
+++ b/src/autoscaler/helpers/logger.go
@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"os"
 
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/configutil"
 	"code.cloudfoundry.org/lager/v3"
 )
 
@@ -20,11 +21,15 @@ func InitLoggerFromConfig(conf *LoggingConfig, name string) lager.Logger {
 
 	logger := lager.NewLogger(name)
 
-	redactedSink := createRedactedSink(logLevel)
-	logger.RegisterSink(redactedSink)
+	vcapConfig, _ := configutil.NewVCAPConfigurationReader()
 
-	plaintextFormatSink := createPlaintextSink()
-	logger.RegisterSink(plaintextFormatSink)
+	if vcapConfig.IsRunningOnCF() {
+		plaintextFormatSink := createPlaintextSink()
+		logger.RegisterSink(plaintextFormatSink)
+	} else {
+		redactedSink := createRedactedSink(logLevel)
+		logger.RegisterSink(redactedSink)
+	}
 
 	return logger
 }
diff --git a/src/autoscaler/mta.tpl.yaml b/src/autoscaler/mta.tpl.yaml
index 7dba14ba0b..cf451a89d0 100644
--- a/src/autoscaler/mta.tpl.yaml
+++ b/src/autoscaler/mta.tpl.yaml
@@ -47,8 +47,9 @@ resources:
     - syslog-client
 - name: app-autoscaler-application-logs
   active: false
-  type: application-logs
+  type: org.cloudfoundry.managed-service
   parameters:
+    service: null
     service-broker: null
     service-plan: standard
   parameters-metadata: