Remove unnecessary optional when default

Signed-off-by: Rick Brouwer <[email protected]>
rickbrouwer · Nov 28, 2024 · e3823e7 · e3823e7
1 parent 618fd6e
commit e3823e7
Show file tree

Hide file tree

Showing 16 changed files with 121 additions and 121 deletions.
diff --git a/pkg/scalers/activemq_scaler.go b/pkg/scalers/activemq_scaler.go
@@ -42,8 +42,8 @@ type activeMQMetadata struct {
 	CorsHeader string `keda:"name=corsHeader, order=triggerMetadata, optional"`
 
 	RestAPITemplate           string `keda:"name=restAPITemplate,           order=triggerMetadata, optional"`
-	TargetQueueSize           int64  `keda:"name=targetQueueSize,           order=triggerMetadata, optional, default=10"`
-	ActivationTargetQueueSize int64  `keda:"name=activationTargetQueueSize, order=triggerMetadata, optional, default=0"`
+	TargetQueueSize           int64  `keda:"name=targetQueueSize,           order=triggerMetadata, default=10"`
+	ActivationTargetQueueSize int64  `keda:"name=activationTargetQueueSize, order=triggerMetadata, default=0"`
 }
 
 func (a *activeMQMetadata) Validate() error {

diff --git a/pkg/scalers/artemis_scaler.go b/pkg/scalers/artemis_scaler.go
@@ -27,16 +27,16 @@ type artemisScaler struct {
 //revive:disable:var-naming breaking change on restApiTemplate, wouldn't bring any benefit to users
 type artemisMetadata struct {
 	TriggerIndex          int
-	ManagementEndpoint    string `keda:"name=managementEndpoint, order=triggerMetadata, optional"`
-	QueueName             string `keda:"name=queueName, order=triggerMetadata, optional"`
-	BrokerName            string `keda:"name=brokerName, order=triggerMetadata, optional"`
-	BrokerAddress         string `keda:"name=brokerAddress, order=triggerMetadata, optional"`
-	Username              string `keda:"name=username, order=authParams;triggerMetadata;resolvedEnv"`
-	Password              string `keda:"name=password, order=authParams;triggerMetadata;resolvedEnv"`
-	RestAPITemplate       string `keda:"name=restApiTemplate, order=triggerMetadata, optional"`
-	QueueLength           int64  `keda:"name=queueLength, order=triggerMetadata, optional, default=10"`
-	ActivationQueueLength int64  `keda:"name=activationQueueLength, order=triggerMetadata, optional, default=10"`
-	CorsHeader            string `keda:"name=corsHeader, order=triggerMetadata, optional"`
+	ManagementEndpoint    string `keda:"name=managementEndpoint,    order=triggerMetadata, optional"`
+	QueueName             string `keda:"name=queueName,             order=triggerMetadata, optional"`
+	BrokerName            string `keda:"name=brokerName,            order=triggerMetadata, optional"`
+	BrokerAddress         string `keda:"name=brokerAddress,         order=triggerMetadata, optional"`
+	Username              string `keda:"name=username,              order=authParams;triggerMetadata;resolvedEnv"`
+	Password              string `keda:"name=password,              order=authParams;triggerMetadata;resolvedEnv"`
+	RestAPITemplate       string `keda:"name=restApiTemplate,       order=triggerMetadata, optional"`
+	QueueLength           int64  `keda:"name=queueLength,           order=triggerMetadata, default=10"`
+	ActivationQueueLength int64  `keda:"name=activationQueueLength, order=triggerMetadata, default=10"`
+	CorsHeader            string `keda:"name=corsHeader,            order=triggerMetadata, optional"`
 }
 
 //revive:enable:var-naming

diff --git a/pkg/scalers/aws_cloudwatch_scaler.go b/pkg/scalers/aws_cloudwatch_scaler.go
@@ -28,24 +28,24 @@ type awsCloudwatchMetadata struct {
 	awsAuthorization awsutils.AuthorizationMetadata
 
 	triggerIndex   int
-	Namespace      string   `keda:"name=namespace, order=triggerMetadata, optional"`
-	MetricsName    string   `keda:"name=metricName, order=triggerMetadata, optional"`
-	DimensionName  []string `keda:"name=dimensionName, order=triggerMetadata, optional, separator=;"`
+	Namespace      string   `keda:"name=namespace,      order=triggerMetadata, optional"`
+	MetricsName    string   `keda:"name=metricName,     order=triggerMetadata, optional"`
+	DimensionName  []string `keda:"name=dimensionName,  order=triggerMetadata, optional, separator=;"`
 	DimensionValue []string `keda:"name=dimensionValue, order=triggerMetadata, optional, separator=;"`
-	Expression     string   `keda:"name=expression, order=triggerMetadata, optional"`
+	Expression     string   `keda:"name=expression,     order=triggerMetadata, optional"`
 
-	TargetMetricValue           float64 `keda:"name=targetMetricValue, order=triggerMetadata"`
+	TargetMetricValue           float64 `keda:"name=targetMetricValue,           order=triggerMetadata"`
 	ActivationTargetMetricValue float64 `keda:"name=activationTargetMetricValue, order=triggerMetadata, optional"`
-	MinMetricValue              float64 `keda:"name=minMetricValue, order=triggerMetadata"`
-	IgnoreNullValues            bool    `keda:"name=ignoreNullValues, order=triggerMetadata, optional, default=true"`
+	MinMetricValue              float64 `keda:"name=minMetricValue,              order=triggerMetadata"`
+	IgnoreNullValues            bool    `keda:"name=ignoreNullValues,            order=triggerMetadata, default=true"`
 
-	MetricCollectionTime int64  `keda:"name=metricCollectionTime, order=triggerMetadata, optional, default=300"`
-	MetricStat           string `keda:"name=metricStat, order=triggerMetadata, optional, default=Average"`
-	MetricUnit           string `keda:"name=metricUnit, order=triggerMetadata, optional"` // Need to check the metric unit
-	MetricStatPeriod     int64  `keda:"name=metricStatPeriod, order=triggerMetadata, optional, default=300"`
-	MetricEndTimeOffset  int64  `keda:"name=metricEndTimeOffset, order=triggerMetadata, optional, default=0"`
+	MetricCollectionTime int64  `keda:"name=metricCollectionTime, order=triggerMetadata, default=300"`
+	MetricStat           string `keda:"name=metricStat,           order=triggerMetadata, default=Average"`
+	MetricUnit           string `keda:"name=metricUnit,           order=triggerMetadata, optional"` // Need to check the metric unit
+	MetricStatPeriod     int64  `keda:"name=metricStatPeriod,     order=triggerMetadata, default=300"`
+	MetricEndTimeOffset  int64  `keda:"name=metricEndTimeOffset,  order=triggerMetadata, default=0"`
 
-	AwsRegion   string `keda:"name=awsRegion, order=triggerMetadata"`
+	AwsRegion   string `keda:"name=awsRegion,   order=triggerMetadata"`
 	AwsEndpoint string `keda:"name=awsEndpoint, order=triggerMetadata, optional"`
 }
 

diff --git a/pkg/scalers/beanstalkd_scaler.go b/pkg/scalers/beanstalkd_scaler.go
@@ -34,12 +34,12 @@ type BeanstalkdScaler struct {
 }
 
 type BeanstalkdMetadata struct {
-	Server          string  `keda:"name=server, order=triggerMetadata"`
-	Tube            string  `keda:"name=tube, order=triggerMetadata"`
-	Value           float64 `keda:"name=value, order=triggerMetadata"`
+	Server          string  `keda:"name=server,          order=triggerMetadata"`
+	Tube            string  `keda:"name=tube,            order=triggerMetadata"`
+	Value           float64 `keda:"name=value,           order=triggerMetadata"`
 	ActivationValue float64 `keda:"name=activationValue, order=triggerMetadata, optional"`
-	IncludeDelayed  bool    `keda:"name=includeDelayed, order=triggerMetadata, optional"`
-	Timeout         uint    `keda:"name=timeout, order=triggerMetadata, optional, default=30"`
+	IncludeDelayed  bool    `keda:"name=includeDelayed,  order=triggerMetadata, optional"`
+	Timeout         uint    `keda:"name=timeout,         order=triggerMetadata, default=30"`
 	TriggerIndex    int
 }
 

diff --git a/pkg/scalers/cassandra_scaler.go b/pkg/scalers/cassandra_scaler.go
@@ -28,7 +28,7 @@ type cassandraScaler struct {
 type cassandraMetadata struct {
 	Username                   string `keda:"name=username,                   order=triggerMetadata"`
 	Password                   string `keda:"name=password,                   order=authParams"`
-	TLS                        string `keda:"name=tls,                        order=authParams, enum=enable;disable, default=disable, optional"`
+	TLS                        string `keda:"name=tls,                        order=authParams, enum=enable;disable, default=disable"`
 	Cert                       string `keda:"name=cert,                       order=authParams, optional"`
 	Key                        string `keda:"name=key,                        order=authParams, optional"`
 	CA                         string `keda:"name=ca,                         order=authParams, optional"`

diff --git a/pkg/scalers/couchdb_scaler.go b/pkg/scalers/couchdb_scaler.go
@@ -24,15 +24,15 @@ type couchDBScaler struct {
 }
 
 type couchDBMetadata struct {
-	ConnectionString     string `keda:"name=connectionString,order=authParams;triggerMetadata;resolvedEnv,optional"`
-	Host                 string `keda:"name=host,order=authParams;triggerMetadata,optional"`
-	Port                 string `keda:"name=port,order=authParams;triggerMetadata,optional"`
-	Username             string `keda:"name=username,order=authParams;triggerMetadata,optional"`
-	Password             string `keda:"name=password,order=authParams;triggerMetadata;resolvedEnv,optional"`
-	DBName               string `keda:"name=dbName,order=authParams;triggerMetadata,optional"`
-	Query                string `keda:"name=query,order=triggerMetadata,optional"`
-	QueryValue           int64  `keda:"name=queryValue,order=triggerMetadata,optional"`
-	ActivationQueryValue int64  `keda:"name=activationQueryValue,order=triggerMetadata,default=0,optional"`
+	ConnectionString     string `keda:"name=connectionString,     order=authParams;triggerMetadata;resolvedEnv,optional"`
+	Host                 string `keda:"name=host,                 order=authParams;triggerMetadata,optional"`
+	Port                 string `keda:"name=port,                 order=authParams;triggerMetadata,optional"`
+	Username             string `keda:"name=username,             order=authParams;triggerMetadata,optional"`
+	Password             string `keda:"name=password,             order=authParams;triggerMetadata;resolvedEnv,optional"`
+	DBName               string `keda:"name=dbName,               order=authParams;triggerMetadata,optional"`
+	Query                string `keda:"name=query,                order=triggerMetadata,optional"`
+	QueryValue           int64  `keda:"name=queryValue,           order=triggerMetadata,optional"`
+	ActivationQueryValue int64  `keda:"name=activationQueryValue, order=triggerMetadata,default=0"`
 	TriggerIndex         int
 }
 

diff --git a/pkg/scalers/etcd_scaler.go b/pkg/scalers/etcd_scaler.go
@@ -39,21 +39,21 @@ type etcdScaler struct {
 type etcdMetadata struct {
 	triggerIndex int
 
-	Endpoints                   []string `keda:"name=endpoints, order=triggerMetadata"`
-	WatchKey                    string   `keda:"name=watchKey, order=triggerMetadata"`
-	Value                       float64  `keda:"name=value, order=triggerMetadata"`
-	ActivationValue             float64  `keda:"name=activationValue, order=triggerMetadata, optional, default=0"`
-	WatchProgressNotifyInterval int      `keda:"name=watchProgressNotifyInterval, order=triggerMetadata, optional, default=600"`
+	Endpoints                   []string `keda:"name=endpoints,                   order=triggerMetadata"`
+	WatchKey                    string   `keda:"name=watchKey,                    order=triggerMetadata"`
+	Value                       float64  `keda:"name=value,                       order=triggerMetadata"`
+	ActivationValue             float64  `keda:"name=activationValue,             order=triggerMetadata, default=0"`
+	WatchProgressNotifyInterval int      `keda:"name=watchProgressNotifyInterval, order=triggerMetadata, default=600"`
 
 	Username string `keda:"name=username,order=authParams;resolvedEnv, optional"`
 	Password string `keda:"name=password,order=authParams;resolvedEnv, optional"`
 
 	// TLS
-	EnableTLS   string `keda:"name=tls, order=authParams, optional, default=disable"`
-	Cert        string `keda:"name=cert, order=authParams, optional"`
-	Key         string `keda:"name=key, order=authParams, optional"`
+	EnableTLS   string `keda:"name=tls,         order=authParams, default=disable"`
+	Cert        string `keda:"name=cert,        order=authParams, optional"`
+	Key         string `keda:"name=key,         order=authParams, optional"`
 	KeyPassword string `keda:"name=keyPassword, order=authParams, optional"`
-	Ca          string `keda:"name=ca, order=authParams, optional"`
+	Ca          string `keda:"name=ca,          order=authParams, optional"`
 }
 
 func (meta *etcdMetadata) Validate() error {

diff --git a/pkg/scalers/mongo_scaler.go b/pkg/scalers/mongo_scaler.go
@@ -28,17 +28,17 @@ type mongoDBScaler struct {
 }
 
 type mongoDBMetadata struct {
-	ConnectionString     string `keda:"name=connectionString,order=authParams;triggerMetadata;resolvedEnv,optional"`
-	Scheme               string `keda:"name=scheme,order=authParams;triggerMetadata,default=mongodb,optional"`
-	Host                 string `keda:"name=host,order=authParams;triggerMetadata,optional"`
-	Port                 string `keda:"name=port,order=authParams;triggerMetadata,optional"`
-	Username             string `keda:"name=username,order=authParams;triggerMetadata,optional"`
-	Password             string `keda:"name=password,order=authParams;triggerMetadata;resolvedEnv,optional"`
-	DBName               string `keda:"name=dbName,order=authParams;triggerMetadata"`
-	Collection           string `keda:"name=collection,order=triggerMetadata"`
-	Query                string `keda:"name=query,order=triggerMetadata"`
-	QueryValue           int64  `keda:"name=queryValue,order=triggerMetadata"`
-	ActivationQueryValue int64  `keda:"name=activationQueryValue,order=triggerMetadata,default=0"`
+	ConnectionString     string `keda:"name=connectionString,     order=authParams;triggerMetadata;resolvedEnv,optional"`
+	Scheme               string `keda:"name=scheme,               order=authParams;triggerMetadata,default=mongodb"`
+	Host                 string `keda:"name=host,                 order=authParams;triggerMetadata,optional"`
+	Port                 string `keda:"name=port,                 order=authParams;triggerMetadata,optional"`
+	Username             string `keda:"name=username,             order=authParams;triggerMetadata,optional"`
+	Password             string `keda:"name=password,             order=authParams;triggerMetadata;resolvedEnv,optional"`
+	DBName               string `keda:"name=dbName,               order=authParams;triggerMetadata"`
+	Collection           string `keda:"name=collection,           order=triggerMetadata"`
+	Query                string `keda:"name=query,                order=triggerMetadata"`
+	QueryValue           int64  `keda:"name=queryValue,           order=triggerMetadata"`
+	ActivationQueryValue int64  `keda:"name=activationQueryValue, order=triggerMetadata,default=0"`
 	TriggerIndex         int
 }
 

diff --git a/pkg/scalers/postgresql_scaler.go b/pkg/scalers/postgresql_scaler.go
@@ -41,18 +41,18 @@ type postgreSQLScaler struct {
 }
 
 type postgreSQLMetadata struct {
-	TargetQueryValue           float64 `keda:"name=targetQueryValue, order=triggerMetadata, optional"`
+	TargetQueryValue           float64 `keda:"name=targetQueryValue,           order=triggerMetadata, optional"`
 	ActivationTargetQueryValue float64 `keda:"name=activationTargetQueryValue, order=triggerMetadata, optional"`
-	Connection                 string  `keda:"name=connection, order=authParams;resolvedEnv, optional"`
-	Query                      string  `keda:"name=query, order=triggerMetadata"`
+	Connection                 string  `keda:"name=connection,                 order=authParams;resolvedEnv, optional"`
+	Query                      string  `keda:"name=query,                      order=triggerMetadata"`
 	triggerIndex               int
 	azureAuthContext           azureAuthContext
 
-	Host     string `keda:"name=host, order=authParams;triggerMetadata, optional"`
-	Port     string `keda:"name=port, order=authParams;triggerMetadata, optional"`
+	Host     string `keda:"name=host,     order=authParams;triggerMetadata, optional"`
+	Port     string `keda:"name=port,     order=authParams;triggerMetadata, optional"`
 	UserName string `keda:"name=userName, order=authParams;triggerMetadata, optional"`
-	DBName   string `keda:"name=dbName, order=authParams;triggerMetadata, optional"`
-	SslMode  string `keda:"name=sslmode, order=authParams;triggerMetadata, optional"`
+	DBName   string `keda:"name=dbName,   order=authParams;triggerMetadata, optional"`
+	SslMode  string `keda:"name=sslmode,  order=authParams;triggerMetadata, optional"`
 
 	Password string `keda:"name=password, order=authParams;resolvedEnv, optional"`
 }

diff --git a/pkg/scalers/prometheus_scaler.go b/pkg/scalers/prometheus_scaler.go
@@ -47,7 +47,7 @@ type prometheusMetadata struct {
 	ActivationThreshold float64                `keda:"name=activationThreshold, order=triggerMetadata, optional"`
 	Namespace           string                 `keda:"name=namespace,           order=triggerMetadata, optional"`
 	CustomHeaders       map[string]string      `keda:"name=customHeaders,       order=triggerMetadata, optional"`
-	IgnoreNullValues    bool                   `keda:"name=ignoreNullValues,    order=triggerMetadata, optional, default=true"`
+	IgnoreNullValues    bool                   `keda:"name=ignoreNullValues,    order=triggerMetadata, default=true"`
 	UnsafeSSL           bool                   `keda:"name=unsafeSsl,           order=triggerMetadata, optional"`
 }