remove custom metrics authentication details from the binding configs

cloudfoundry · Oct 22, 2024 · 979581a · 979581a
1 parent 1cd4ac9
commit 979581a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/src/acceptance/assets/file/policy/policy-with-configuration.json b/src/acceptance/assets/file/policy/policy-with-configuration.json
@@ -1,9 +1,6 @@
 {
   "configuration": {
     "custom_metrics": {
-      "auth": {
-        "credential_type": ""
-      },
       "metric_submission_strategy": {
         "allow_from": "bound_app"
       }

diff --git a/src/autoscaler/api/broker/broker.go b/src/autoscaler/api/broker/broker.go
@@ -513,7 +513,7 @@ func (b *Broker) Bind(ctx context.Context, instanceID string, bindingID string,
 	}
 	// set the default custom metrics strategy if not provided
 	if bindingConfiguration.GetCustomMetricsStrategy() == "" {
-		bindingConfiguration.SetDefaultCustomMetricsStrategy(models.CustomMetricsSameApp)
+		bindingConfiguration.SetCustomMetricsStrategy(models.CustomMetricsSameApp)
 	}
 	logger.Info("binding-configuration", lager.Data{"bindingConfiguration": bindingConfiguration})
 
@@ -712,7 +712,7 @@ func (b *Broker) GetBinding(ctx context.Context, instanceID string, bindingID st
 		return result, err
 	}
 	bindingConfig := &models.BindingConfig{}
-	bindingConfig.SetDefaultCustomMetricsStrategy(serviceBinding.CustomMetricsStrategy)
+	bindingConfig.SetCustomMetricsStrategy(serviceBinding.CustomMetricsStrategy)
 
 	policy, err := b.policydb.GetAppPolicy(ctx, serviceBinding.AppID)
 	if err != nil {

diff --git a/src/autoscaler/api/broker/broker_test.go b/src/autoscaler/api/broker/broker_test.go
@@ -189,7 +189,6 @@ var _ = Describe("Broker", func() {
 			Context("with configuration and policy", func() {
 				BeforeEach(func() {
 					bindingConfig = &models.BindingConfig{Configuration: models.Configuration{CustomMetrics: models.CustomMetricsConfig{
-						Auth:                     models.Auth{},
 						MetricSubmissionStrategy: models.MetricsSubmissionStrategy{AllowFrom: "bound_app"},
 					},
 					}}
@@ -210,7 +209,6 @@ var _ = Describe("Broker", func() {
 			Context("with configuration only", func() {
 				BeforeEach(func() {
 					bindingConfig = &models.BindingConfig{Configuration: models.Configuration{CustomMetrics: models.CustomMetricsConfig{
-						Auth:                     models.Auth{},
 						MetricSubmissionStrategy: models.MetricsSubmissionStrategy{AllowFrom: "bound_app"},
 					},
 					}}

diff --git a/src/autoscaler/models/binding_configs.go b/src/autoscaler/models/binding_configs.go
@@ -28,13 +28,9 @@ type Configuration struct {
 }
 
 type CustomMetricsConfig struct {
-	Auth                     Auth                      `json:"auth,omitempty"`
 	MetricSubmissionStrategy MetricsSubmissionStrategy `json:"metric_submission_strategy"`
 }
 
-type Auth struct {
-	CredentialType string `json:"credential_type"`
-}
 type MetricsSubmissionStrategy struct {
 	AllowFrom string `json:"allow_from"`
 }
@@ -43,6 +39,6 @@ func (b *BindingConfig) GetCustomMetricsStrategy() string {
 	return b.Configuration.CustomMetrics.MetricSubmissionStrategy.AllowFrom
 }
 
-func (b *BindingConfig) SetDefaultCustomMetricsStrategy(allowFrom string) {
+func (b *BindingConfig) SetCustomMetricsStrategy(allowFrom string) {
 	b.Configuration.CustomMetrics.MetricSubmissionStrategy.AllowFrom = allowFrom
 }