Skip to content

Commit

Permalink
fix: static checks
Browse files Browse the repository at this point in the history 
Signed-off-by: Jose Maria Alvarez <[email protected]>
  • Loading branch information
Jose Maria Alvarez committed Aug 1, 2023
1 parent 9312364 commit 5dfb46b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
14 changes: 7 additions & 7 deletions pkg/scalers/gcp_cloud_tasks_scaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type cloudTaskMetadata struct {
activationValue float64

queueName string
projectId string
projectID string
gcpAuthorization *gcpAuthorizationMetadata
scalerIndex int
}
Expand All @@ -44,7 +44,7 @@ func NewCloudTasksScaler(config *ScalerConfig) (Scaler, error) {

logger := InitializeLogger(config, "gcp_cloud_tasks_scaler")

meta, err := parseCloudTasksMetadata(config, logger)
meta, err := parseCloudTasksMetadata(config)
if err != nil {
return nil, fmt.Errorf("error parsing Cloud Tasks metadata: %w", err)
}
Expand All @@ -56,9 +56,9 @@ func NewCloudTasksScaler(config *ScalerConfig) (Scaler, error) {
}, nil
}

func parseCloudTasksMetadata(config *ScalerConfig, logger logr.Logger) (*cloudTaskMetadata, error) {
func parseCloudTasksMetadata(config *ScalerConfig) (*cloudTaskMetadata, error) {

meta := cloudTaskMetadata{}
meta := cloudTaskMetadata{value: cloudTaskDefaultValue}

value, valuePresent := config.TriggerMetadata["value"]

Expand Down Expand Up @@ -89,12 +89,12 @@ func parseCloudTasksMetadata(config *ScalerConfig, logger logr.Logger) (*cloudTa
meta.activationValue = activationValue
}

if val, ok := config.TriggerMetadata["projectId"]; ok {
if val, ok := config.TriggerMetadata["projectID"]; ok {
if val == "" {
return nil, fmt.Errorf("no project id given")
}

meta.projectId = val
meta.projectID = val
} else {
return nil, fmt.Errorf("no project id given")
}
Expand Down Expand Up @@ -181,5 +181,5 @@ func (s *cloudTasksScaler) getMetrics(ctx context.Context, metricType string) (f

// Cloud Tasks metrics are collected every 60 seconds so no need to aggregate them.
// See: https://cloud.google.com/monitoring/api/metrics_gcp#gcp-cloudtasks
return s.client.GetMetrics(ctx, filter, s.metadata.projectId, nil)
return s.client.GetMetrics(ctx, filter, s.metadata.projectID, nil)
}
22 changes: 11 additions & 11 deletions pkg/scalers/gcp_cloud_tasks_scaler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ type gcpCloudTasksMetricIdentifier struct {
var testCloudTasksMetadata = []parseCloudTasksMetadataTestData{
{map[string]string{}, map[string]string{}, true},
// all properly formed
{nil, map[string]string{"queueName": "myQueue", "value": "7", "credentialsFromEnv": "SAMPLE_CREDS", "projectId": "myproject", "activationValue": "5"}, false},
{nil, map[string]string{"queueName": "myQueue", "value": "7", "credentialsFromEnv": "SAMPLE_CREDS", "projectID": "myproject", "activationValue": "5"}, false},
// missing subscriptionName
{nil, map[string]string{"queueName": "", "value": "7", "projectId": "myproject", "credentialsFromEnv": "SAMPLE_CREDS"}, true},
{nil, map[string]string{"queueName": "", "value": "7", "projectID": "myproject", "credentialsFromEnv": "SAMPLE_CREDS"}, true},
// missing credentials
{nil, map[string]string{"queueName": "myQueue", "value": "7", "projectId": "myproject", "credentialsFromEnv": ""}, true},
{nil, map[string]string{"queueName": "myQueue", "value": "7", "projectID": "myproject", "credentialsFromEnv": ""}, true},
// malformed subscriptionSize
{nil, map[string]string{"queueName": "myQueue", "value": "AA", "projectId": "myproject", "credentialsFromEnv": "SAMPLE_CREDS"}, true},
{nil, map[string]string{"queueName": "myQueue", "value": "AA", "projectID": "myproject", "credentialsFromEnv": "SAMPLE_CREDS"}, true},
// malformed mode
{nil, map[string]string{"queueName": "", "mode": "AA", "value": "7", "projectId": "myproject", "credentialsFromEnv": "SAMPLE_CREDS"}, true},
{nil, map[string]string{"queueName": "", "mode": "AA", "value": "7", "projectID": "myproject", "credentialsFromEnv": "SAMPLE_CREDS"}, true},
// malformed activationTargetValue
{nil, map[string]string{"queueName": "myQueue", "value": "7", "credentialsFromEnv": "SAMPLE_CREDS", "projectId": "myproject", "activationValue": "AA"}, true},
{nil, map[string]string{"queueName": "myQueue", "value": "7", "credentialsFromEnv": "SAMPLE_CREDS", "projectID": "myproject", "activationValue": "AA"}, true},
// Credentials from AuthParams
{map[string]string{"GoogleApplicationCredentials": "Creds"}, map[string]string{"queueName": "myQueue", "value": "7", "projectId": "myproject"}, false},
{map[string]string{"GoogleApplicationCredentials": "Creds"}, map[string]string{"queueName": "myQueue", "value": "7", "projectID": "myproject"}, false},
// Credentials from AuthParams with empty creds
{map[string]string{"GoogleApplicationCredentials": ""}, map[string]string{"queueName": "myQueue", "subscriptionSize": "7", "projectId": "myproject"}, true},
{map[string]string{"GoogleApplicationCredentials": ""}, map[string]string{"queueName": "myQueue", "subscriptionSize": "7", "projectID": "myproject"}, true},
// properly formed float value and activationTargetValue
{nil, map[string]string{"queueName": "mysubscription", "value": "7.1", "credentialsFromEnv": "SAMPLE_CREDS", "activationValue": "2.1", "projectId": "myproject"}, false},
{nil, map[string]string{"queueName": "mysubscription", "value": "7.1", "credentialsFromEnv": "SAMPLE_CREDS", "activationValue": "2.1", "projectID": "myproject"}, false},
}

var gcpCloudTasksMetricIdentifiers = []gcpCloudTasksMetricIdentifier{
Expand All @@ -52,7 +52,7 @@ var gcpCloudTasksMetricIdentifiers = []gcpCloudTasksMetricIdentifier{

func TestCloudTasksParseMetadata(t *testing.T) {
for _, testData := range testCloudTasksMetadata {
_, err := parseCloudTasksMetadata(&ScalerConfig{AuthParams: testData.authParams, TriggerMetadata: testData.metadata, ResolvedEnv: testCloudTasksResolvedEnv}, logr.Discard())
_, err := parseCloudTasksMetadata(&ScalerConfig{AuthParams: testData.authParams, TriggerMetadata: testData.metadata, ResolvedEnv: testCloudTasksResolvedEnv})
if err != nil && !testData.isError {
t.Error("Expected success but got error", err)
}
Expand All @@ -64,7 +64,7 @@ func TestCloudTasksParseMetadata(t *testing.T) {

func TestGcpCloudTasksGetMetricSpecForScaling(t *testing.T) {
for _, testData := range gcpCloudTasksMetricIdentifiers {
meta, err := parseCloudTasksMetadata(&ScalerConfig{TriggerMetadata: testData.metadataTestData.metadata, ResolvedEnv: testCloudTasksResolvedEnv, ScalerIndex: testData.scalerIndex}, logr.Discard())
meta, err := parseCloudTasksMetadata(&ScalerConfig{TriggerMetadata: testData.metadataTestData.metadata, ResolvedEnv: testCloudTasksResolvedEnv, ScalerIndex: testData.scalerIndex})
if err != nil {
t.Fatal("Could not parse metadata:", err)
}
Expand Down

0 comments on commit 5dfb46b

Please sign in to comment.