From db6ba503ec8dcde76d6aa1e7979857df18dff732 Mon Sep 17 00:00:00 2001 From: Vighnesh Shenoy Date: Fri, 19 Aug 2022 16:11:36 +0530 Subject: [PATCH] e2e: Make order of applying / deleting templates consistent. (#3535) Signed-off-by: Vighnesh Shenoy Signed-off-by: Vighnesh Shenoy --- tests/README.md | 11 +++---- tests/helper/helper.go | 27 +++++++++------ .../custom_hpa_name/custom_hpa_name_test.go | 9 ++--- .../idle_replicas/idle_replicas_test.go | 12 +++---- .../min_replica_sj/min_replica_sj_test.go | 12 +++---- .../pause_scaling/pause_scaling_test.go | 12 +++---- .../restore_original/restore_original_test.go | 9 +++-- .../subresource_scale_test.go | 13 ++++---- .../value_metric_type_test.go | 9 +++-- tests/scalers/activemq/activemq_test.go | 20 +++++------ tests/scalers/artemis/artemis_test.go | 26 +++++++-------- .../aws_cloudwatch/aws_cloudwatch_test.go | 13 ++++---- .../aws_cloudwatch_expression_test.go | 13 ++++---- .../scalers/aws_dynamodb/aws_dynamodb_test.go | 33 ++++++++++--------- .../aws_dynamodb_streams_test.go | 15 ++++----- .../aws_kinesis_stream_test.go | 27 ++++++++------- .../aws_sqs_queue/aws_sqs_queue_test.go | 27 ++++++++------- .../azure_application_insights_test.go | 15 ++++----- tests/scalers/azure_blob/azure_blob_test.go | 12 +++---- .../azure_data_explorer_test.go | 15 ++++----- .../azure_log_analytics_test.go | 15 ++++----- .../azure_pipelines/azure_pipelines_test.go | 12 +++---- tests/scalers/azure_queue/azure_queue_test.go | 12 +++---- .../azure_service_bus_queue_test.go | 25 +++++++------- .../azure_service_bus_topic_test.go | 13 ++++---- tests/scalers/cassandra/cassandra_test.go | 20 +++++------ tests/scalers/cpu/cpu_test.go | 14 ++++---- tests/scalers/cron/cron_test.go | 10 +++--- tests/scalers/datadog/datadog_test.go | 20 +++++------ .../elasticsearch/elasticsearch_test.go | 18 +++++----- .../external_scaler_sj_test.go | 12 +++---- .../external_scaler_so_test.go | 14 ++++---- tests/scalers/gcp_pubsub/gcp_pubsub_test.go | 15 ++++----- .../gcp_stackdriver/gcp_stackdriver_test.go | 15 ++++----- tests/scalers/gcp_storage/gcp_storage_test.go | 15 ++++----- tests/scalers/graphite/graphite_test.go | 27 +++++++-------- tests/scalers/influxdb/influxdb_test.go | 22 ++++++------- tests/scalers/kafka/kafka_test.go | 8 ++--- .../kubernetes_workload_test.go | 18 +++++----- tests/scalers/memory/memory_test.go | 16 ++++----- tests/scalers/metrics_api/metrics_api_test.go | 18 +++++----- tests/scalers/mongodb/mongodb_test.go | 13 ++++---- tests/scalers/mssql/mssql_test.go | 28 +++++++--------- tests/scalers/mysql/mysql_test.go | 16 ++++----- tests/scalers/nats_jetstream/nats_helper.go | 19 +++-------- .../nats_jetstream/nats_jetstream_test.go | 16 ++++----- tests/scalers/new_relic/new_relic_test.go | 18 +++++----- .../openstack_swift/openstack_swift_test.go | 14 ++++---- tests/scalers/postgresql/postgresql_test.go | 28 +++++++--------- tests/scalers/predictkube/predictkube_test.go | 24 ++++++-------- tests/scalers/prometheus/prometheus_helper.go | 16 ++++----- tests/scalers/prometheus/prometheus_test.go | 20 +++++------ tests/scalers/pulsar/pulsar_test.go | 10 +++--- .../rabbitmq_queue_amqp_test.go | 10 +++--- .../rabbitmq_queue_http_test.go | 10 +++--- .../rabbitmq_queue_http_regex_test.go | 10 +++--- .../rabbitmq_queue_http_regex_vhost_test.go | 10 +++--- tests/scalers/redis/helper/helper.go | 22 ++++++------- .../redis_cluster_lists_test.go | 20 +++++------ .../redis_cluster_streams_test.go | 17 ++++------ .../redis_sentinel_lists_test.go | 21 +++++------- .../redis_sentinel_streams_test.go | 17 ++++------ .../redis_standalone_lists_test.go | 20 +++++------ .../redis_standalone_streams_test.go | 17 ++++------ tests/scalers/selenium/selenium_test.go | 30 ++++++++--------- tests/scalers/solace/solace_test.go | 14 ++++---- tests/scalers/stan/stan_test.go | 20 +++++------ .../azure_keyvault/azure_keyvault_test.go | 15 ++++----- .../azure_workload_identity_test.go | 20 ++++++----- ...re_workload_identity_user_assigned_test.go | 22 +++++++------ .../hashicorp_vault/hashicorp_vault_test.go | 28 +++++++--------- .../trigger_auth_secret_test.go | 15 ++++----- 72 files changed, 570 insertions(+), 659 deletions(-) diff --git a/tests/README.md b/tests/README.md index f397b60beac..ea6e0f2b042 100644 --- a/tests/README.md +++ b/tests/README.md @@ -130,10 +130,6 @@ type templateData struct { ... } -// templateValues consists of templates and their names -type templateValues map[string] string - - func TestScaler(t *testing.T) { setupTest(t) @@ -158,12 +154,15 @@ func setupTest(t *testing.T) { assert.NoErrorf(t, err, "error while installing redis - %s", err) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ // Populate fields required in YAML templates ... ... - }, templateValues{"deploymentTemplate":deploymentTemplate, "scaledObjectTemplate":scaledObjectTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/helper/helper.go b/tests/helper/helper.go index f64c6b5f708..61a3a93bdc0 100644 --- a/tests/helper/helper.go +++ b/tests/helper/helper.go @@ -399,6 +399,10 @@ func KubernetesScaleDeployment(t *testing.T, kc *kubernetes.Clientset, name stri } } +type Template struct { + Name, Config string +} + func KubectlApplyWithTemplate(t *testing.T, data interface{}, templateName string, config string) { t.Logf("Applying template: %s", templateName) @@ -420,9 +424,10 @@ func KubectlApplyWithTemplate(t *testing.T, data interface{}, templateName strin assert.NoErrorf(t, err, "cannot close temp file - %s", err) } -func KubectlApplyMultipleWithTemplate(t *testing.T, data interface{}, configs map[string]string) { - for templateName, config := range configs { - KubectlApplyWithTemplate(t, data, templateName, config) +// Apply templates in order of slice +func KubectlApplyMultipleWithTemplate(t *testing.T, data interface{}, templates []Template) { + for _, tmpl := range templates { + KubectlApplyWithTemplate(t, data, tmpl.Name, tmpl.Config) } } @@ -447,19 +452,21 @@ func KubectlDeleteWithTemplate(t *testing.T, data interface{}, templateName, con assert.NoErrorf(t, err, "cannot close temp file - %s", err) } -func KubectlDeleteMultipleWithTemplate(t *testing.T, data interface{}, configs map[string]string) { - for templateName, config := range configs { - KubectlDeleteWithTemplate(t, data, templateName, config) +// Delete templates in reverse order of slice +func KubectlDeleteMultipleWithTemplate(t *testing.T, data interface{}, templates []Template) { + for idx := len(templates) - 1; idx >= 0; idx-- { + tmpl := templates[idx] + KubectlDeleteWithTemplate(t, data, tmpl.Name, tmpl.Config) } } -func CreateKubernetesResources(t *testing.T, kc *kubernetes.Clientset, nsName string, data interface{}, configs map[string]string) { +func CreateKubernetesResources(t *testing.T, kc *kubernetes.Clientset, nsName string, data interface{}, templates []Template) { CreateNamespace(t, kc, nsName) - KubectlApplyMultipleWithTemplate(t, data, configs) + KubectlApplyMultipleWithTemplate(t, data, templates) } -func DeleteKubernetesResources(t *testing.T, kc *kubernetes.Clientset, nsName string, data interface{}, configs map[string]string) { - KubectlDeleteMultipleWithTemplate(t, data, configs) +func DeleteKubernetesResources(t *testing.T, kc *kubernetes.Clientset, nsName string, data interface{}, templates []Template) { + KubectlDeleteMultipleWithTemplate(t, data, templates) DeleteNamespace(t, kc, nsName) deleted := WaitForNamespaceDeletion(t, kc, nsName) assert.Truef(t, deleted, "%s namespace not deleted", nsName) diff --git a/tests/internals/custom_hpa_name/custom_hpa_name_test.go b/tests/internals/custom_hpa_name/custom_hpa_name_test.go index 2b81e0ff5d8..2073a4e4762 100644 --- a/tests/internals/custom_hpa_name/custom_hpa_name_test.go +++ b/tests/internals/custom_hpa_name/custom_hpa_name_test.go @@ -24,8 +24,6 @@ type templateData struct { CustomHpaName string } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -128,7 +126,10 @@ func test(t *testing.T, testName string, firstHpaName string, firstSOTemplate st // Create kubernetes resources kc := GetKubernetesClient(t) data := getTemplateData(testNamespace, deploymentName, scaledObjectName, customHpaName) - templates := templateValues{"deploymentTemplate": deploymentTemplate, "firstSOTemplate": firstSOTemplate} + templates := []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "firstSOTemplate", Config: firstSOTemplate}, + } CreateKubernetesResources(t, kc, testNamespace, data, templates) @@ -137,7 +138,7 @@ func test(t *testing.T, testName string, firstHpaName string, firstSOTemplate st assert.Equal(t, firstHpaName, hpa.Name) t.Log("--- change hpa name ---") - templatesCustomName := templateValues{"secondSOTemplate": secondSOTemplate} + templatesCustomName := []Template{{Name: "secondSOTemplate", Config: secondSOTemplate}} KubectlApplyMultipleWithTemplate(t, data, templatesCustomName) t.Logf("--- validate new hpa is with %s name ---", secondHpaDescription) diff --git a/tests/internals/idle_replicas/idle_replicas_test.go b/tests/internals/idle_replicas/idle_replicas_test.go index 5adb6381805..347cbbf7fff 100644 --- a/tests/internals/idle_replicas/idle_replicas_test.go +++ b/tests/internals/idle_replicas/idle_replicas_test.go @@ -30,7 +30,6 @@ type templateData struct { ScaledObjectName string MonitoredDeploymentName string } -type templateValues map[string]string const ( monitoredDeploymentTemplate = ` @@ -125,16 +124,17 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, MonitoredDeploymentName: monitoredDeploymentName, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/internals/min_replica_sj/min_replica_sj_test.go b/tests/internals/min_replica_sj/min_replica_sj_test.go index f2bd3582046..d8c7b2416d2 100644 --- a/tests/internals/min_replica_sj/min_replica_sj_test.go +++ b/tests/internals/min_replica_sj/min_replica_sj_test.go @@ -37,7 +37,6 @@ type templateData struct { MetricThreshold, MetricValue int MinReplicaCount, MaxReplicaCount int } -type templateValues map[string]string const ( serviceTemplate = ` @@ -173,7 +172,7 @@ func testMinReplicaCountWithMetricValueGreaterMaxReplicaCountScalesOnlyToMaxRepl "job count should be %d after %d iterations", data.MaxReplicaCount, iterationCount) } -func getTemplateData(minReplicaCount int, maxReplicaCount int, metricValue int) (templateData, templateValues) { +func getTemplateData(minReplicaCount int, maxReplicaCount int, metricValue int) (templateData, []Template) { return templateData{ TestNamespace: testNamespace, ServiceName: serviceName, @@ -183,8 +182,9 @@ func getTemplateData(minReplicaCount int, maxReplicaCount int, metricValue int) MetricValue: metricValue, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "scalerTemplate": scalerTemplate, - "serviceTemplate": serviceTemplate, - "scaledJobTemplate": scaledJobTemplate} + }, []Template{ + {Name: "scalerTemplate", Config: scalerTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "scaledJobTemplate", Config: scaledJobTemplate}, + } } diff --git a/tests/internals/pause_scaling/pause_scaling_test.go b/tests/internals/pause_scaling/pause_scaling_test.go index 5a9bf2dc5a5..eeba7a239cc 100644 --- a/tests/internals/pause_scaling/pause_scaling_test.go +++ b/tests/internals/pause_scaling/pause_scaling_test.go @@ -35,7 +35,6 @@ type templateData struct { MonitoredDeploymentName string PausedReplicaCount int } -type templateValues map[string]string const ( monitoredDeploymentTemplate = ` @@ -151,17 +150,18 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, MonitoredDeploymentName: monitoredDeploymentName, PausedReplicaCount: 0, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, - "scaledObjectAnnotatedTemplate": scaledObjectAnnotatedTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, + {Name: "scaledObjectAnnotatedTemplate", Config: scaledObjectAnnotatedTemplate}, + } } func testPauseAt0(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/internals/restore_original/restore_original_test.go b/tests/internals/restore_original/restore_original_test.go index c015400b0f6..c2020435c8a 100644 --- a/tests/internals/restore_original/restore_original_test.go +++ b/tests/internals/restore_original/restore_original_test.go @@ -30,7 +30,6 @@ type templateData struct { ScaledObjectName string MonitoredDeploymentName string } -type templateValues map[string]string const ( monitoredDeploymentTemplate = ` @@ -123,15 +122,15 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, MonitoredDeploymentName: monitoredDeploymentName, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, } } diff --git a/tests/internals/subresource_scale/subresource_scale_test.go b/tests/internals/subresource_scale/subresource_scale_test.go index 97f9003bc97..937368ca647 100644 --- a/tests/internals/subresource_scale/subresource_scale_test.go +++ b/tests/internals/subresource_scale/subresource_scale_test.go @@ -35,8 +35,6 @@ type templateData struct { ScaledObjectName string } -type templateValues map[string]string - const ( monitoredDeploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -181,16 +179,17 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be 0 after 1 minute") } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, MonitoredDeploymentName: monitoredDeploymentName, ArgoRolloutName: argoRolloutName, ScaledObjectName: scaledObjectName, - }, templateValues{ - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, - "argoRolloutTemplate": argoRolloutTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, + {Name: "argoRolloutTemplate", Config: argoRolloutTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func waitForArgoRolloutReplicaCount(t *testing.T, name, namespace string, target int) bool { diff --git a/tests/internals/value_metric_type/value_metric_type_test.go b/tests/internals/value_metric_type/value_metric_type_test.go index f1d5488280a..ff707142d39 100644 --- a/tests/internals/value_metric_type/value_metric_type_test.go +++ b/tests/internals/value_metric_type/value_metric_type_test.go @@ -31,7 +31,6 @@ type templateData struct { MonitoredDeploymentName string MetricType string } -type templateValues map[string]string const ( monitoredDeploymentTemplate = ` @@ -126,15 +125,15 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, MonitoredDeploymentName: monitoredDeploymentName, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, } } diff --git a/tests/scalers/activemq/activemq_test.go b/tests/scalers/activemq/activemq_test.go index 3c6b5c43938..f72d21e1814 100644 --- a/tests/scalers/activemq/activemq_test.go +++ b/tests/scalers/activemq/activemq_test.go @@ -53,8 +53,6 @@ type templateData struct { ActiveMQDestination string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -514,7 +512,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %d after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -525,13 +523,13 @@ func getTemplateData() (templateData, map[string]string) { ActiveMQConf: activemqConf, ActiveMQHome: activemqHome, ActiveMQDestination: activemqDestination, - }, templateValues{ - "secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "activemqServiceTemplate": activemqServiceTemplate, - "activemqConfigTemplate": activemqConfigTemplate, - "activemqSteatefulTemplate": activemqSteatefulTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "activemqServiceTemplate", Config: activemqServiceTemplate}, + {Name: "activemqConfigTemplate", Config: activemqConfigTemplate}, + {Name: "activemqSteatefulTemplate", Config: activemqSteatefulTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/artemis/artemis_test.go b/tests/scalers/artemis/artemis_test.go index 7b5b5070255..0bf6c57689a 100644 --- a/tests/scalers/artemis/artemis_test.go +++ b/tests/scalers/artemis/artemis_test.go @@ -42,8 +42,6 @@ type templateData struct { ArtemisUserBase64 string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -324,16 +322,14 @@ func TestArtemisScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"triggerJobTemplate": producerJob} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "triggerJobTemplate", producerJob) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"triggerJobTemplate": producerJob} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "triggerJobTemplate", producerJob) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -346,7 +342,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %d after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -354,13 +350,13 @@ func getTemplateData() (templateData, map[string]string) { SecretName: secretName, ArtemisPasswordBase64: base64.StdEncoding.EncodeToString([]byte(artemisPassword)), ArtemisUserBase64: base64.StdEncoding.EncodeToString([]byte(artemisUser)), - }, templateValues{ - "secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "artemisServiceTemplate": artemisServiceTemplate, - "artemisConfigTemplate": artemisConfigTemplate, - "artemisDeploymentTemplate": artemisDeploymentTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "artemisServiceTemplate", Config: artemisServiceTemplate}, + {Name: "artemisConfigTemplate", Config: artemisConfigTemplate}, + {Name: "artemisDeploymentTemplate", Config: artemisDeploymentTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/aws_cloudwatch/aws_cloudwatch_test.go b/tests/scalers/aws_cloudwatch/aws_cloudwatch_test.go index 35fbd1d871e..cbf76ab5cdf 100644 --- a/tests/scalers/aws_cloudwatch/aws_cloudwatch_test.go +++ b/tests/scalers/aws_cloudwatch/aws_cloudwatch_test.go @@ -41,7 +41,6 @@ type templateData struct { CloudWatchMetricDimensionName string CloudWatchMetricDimensionValue string } -type templateValues map[string]string const ( secretTemplate = `apiVersion: v1 @@ -221,7 +220,7 @@ func createCloudWatchClient() *cloudwatch.CloudWatch { }) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -234,8 +233,10 @@ func getTemplateData() (templateData, templateValues) { CloudWatchMetricNamespace: cloudwatchMetricNamespace, CloudWatchMetricDimensionName: cloudwatchMetricDimensionName, CloudWatchMetricDimensionValue: cloudwatchMetricDimensionValue, - }, templateValues{"secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/aws_cloudwatch_expression/aws_cloudwatch_expression_test.go b/tests/scalers/aws_cloudwatch_expression/aws_cloudwatch_expression_test.go index ff44b372e8f..5e4f4846636 100644 --- a/tests/scalers/aws_cloudwatch_expression/aws_cloudwatch_expression_test.go +++ b/tests/scalers/aws_cloudwatch_expression/aws_cloudwatch_expression_test.go @@ -40,7 +40,6 @@ type templateData struct { CloudWatchMetricNamespace string CloudwatchMetricExpression string } -type templateValues map[string]string const ( secretTemplate = `apiVersion: v1 @@ -220,7 +219,7 @@ func createCloudWatchClient() *cloudwatch.CloudWatch { }) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -232,8 +231,10 @@ func getTemplateData() (templateData, templateValues) { CloudWatchMetricName: cloudwatchMetricName, CloudWatchMetricNamespace: cloudwatchMetricNamespace, CloudwatchMetricExpression: cloudwatchMetricExpression, - }, templateValues{"secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/aws_dynamodb/aws_dynamodb_test.go b/tests/scalers/aws_dynamodb/aws_dynamodb_test.go index 8981738e7eb..4744e466ebd 100644 --- a/tests/scalers/aws_dynamodb/aws_dynamodb_test.go +++ b/tests/scalers/aws_dynamodb/aws_dynamodb_test.go @@ -44,8 +44,6 @@ type templateData struct { ExpressionAttributeValues string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -266,18 +264,23 @@ func createDynamoDBClient() *dynamodb.DynamoDB { }) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ - TestNamespace: testNamespace, - DeploymentName: deploymentName, - ScaledObjectName: scaledObjectName, - SecretName: secretName, - AwsAccessKeyID: base64.StdEncoding.EncodeToString([]byte(awsAccessKeyID)), - AwsSecretAccessKey: base64.StdEncoding.EncodeToString([]byte(awsSecretAccessKey)), - AwsRegion: awsRegion, - DynamoDBTableName: dynamoDBTableName, - ExpressionAttributeNames: expressionAttributeNames, - KeyConditionExpression: keyConditionExpression, - ExpressionAttributeValues: expressionAttributeValues, - }, templateValues{"secretTemplate": secretTemplate, "triggerAuthenticationTemplate": triggerAuthenticationTemplate, "deploymentTemplate": deploymentTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + DeploymentName: deploymentName, + ScaledObjectName: scaledObjectName, + SecretName: secretName, + AwsAccessKeyID: base64.StdEncoding.EncodeToString([]byte(awsAccessKeyID)), + AwsSecretAccessKey: base64.StdEncoding.EncodeToString([]byte(awsSecretAccessKey)), + AwsRegion: awsRegion, + DynamoDBTableName: dynamoDBTableName, + ExpressionAttributeNames: expressionAttributeNames, + KeyConditionExpression: keyConditionExpression, + ExpressionAttributeValues: expressionAttributeValues, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/aws_dynamodb_streams/aws_dynamodb_streams_test.go b/tests/scalers/aws_dynamodb_streams/aws_dynamodb_streams_test.go index 31cd177174e..fee129f9dc9 100644 --- a/tests/scalers/aws_dynamodb_streams/aws_dynamodb_streams_test.go +++ b/tests/scalers/aws_dynamodb_streams/aws_dynamodb_streams_test.go @@ -62,8 +62,6 @@ type templateData struct { ActivationShardCount int64 } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -247,7 +245,7 @@ func getDynamoDBStreamShardCount(dbs dynamodbstreamsiface.DynamoDBStreamsAPI, st return int64(len(des.StreamDescription.Shards)), nil } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64AwsAccessKey := base64.StdEncoding.EncodeToString([]byte(awsAccessKey)) base64AwsSecretKey := base64.StdEncoding.EncodeToString([]byte(awsSecretKey)) @@ -262,11 +260,12 @@ func getTemplateData() (templateData, templateValues) { ScaledObjectName: scaledObjectName, TableName: tableName, ShardCount: int64(shardCount), - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { diff --git a/tests/scalers/aws_kinesis_stream/aws_kinesis_stream_test.go b/tests/scalers/aws_kinesis_stream/aws_kinesis_stream_test.go index b8dcf129073..5fe20f6dcf2 100644 --- a/tests/scalers/aws_kinesis_stream/aws_kinesis_stream_test.go +++ b/tests/scalers/aws_kinesis_stream/aws_kinesis_stream_test.go @@ -40,8 +40,6 @@ type templateData struct { KinesisStream string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -239,15 +237,20 @@ func createKinesisClient() *kinesis.Kinesis { }) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ - TestNamespace: testNamespace, - DeploymentName: deploymentName, - ScaledObjectName: scaledObjectName, - SecretName: secretName, - AwsAccessKeyID: base64.StdEncoding.EncodeToString([]byte(awsAccessKeyID)), - AwsSecretAccessKey: base64.StdEncoding.EncodeToString([]byte(awsSecretAccessKey)), - AwsRegion: awsRegion, - KinesisStream: kinesisStreamName, - }, templateValues{"secretTemplate": secretTemplate, "triggerAuthenticationTemplate": triggerAuthenticationTemplate, "deploymentTemplate": deploymentTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + DeploymentName: deploymentName, + ScaledObjectName: scaledObjectName, + SecretName: secretName, + AwsAccessKeyID: base64.StdEncoding.EncodeToString([]byte(awsAccessKeyID)), + AwsSecretAccessKey: base64.StdEncoding.EncodeToString([]byte(awsSecretAccessKey)), + AwsRegion: awsRegion, + KinesisStream: kinesisStreamName, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/aws_sqs_queue/aws_sqs_queue_test.go b/tests/scalers/aws_sqs_queue/aws_sqs_queue_test.go index ed08f8a0a4a..6a81a322645 100644 --- a/tests/scalers/aws_sqs_queue/aws_sqs_queue_test.go +++ b/tests/scalers/aws_sqs_queue/aws_sqs_queue_test.go @@ -39,8 +39,6 @@ type templateData struct { SqsQueue string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -220,15 +218,20 @@ func createSqsClient() *sqs.SQS { }) } -func getTemplateData(sqsQueue string) (templateData, templateValues) { +func getTemplateData(sqsQueue string) (templateData, []Template) { return templateData{ - TestNamespace: testNamespace, - DeploymentName: deploymentName, - ScaledObjectName: scaledObjectName, - SecretName: secretName, - AwsAccessKeyID: base64.StdEncoding.EncodeToString([]byte(awsAccessKeyID)), - AwsSecretAccessKey: base64.StdEncoding.EncodeToString([]byte(awsSecretAccessKey)), - AwsRegion: awsRegion, - SqsQueue: sqsQueue, - }, templateValues{"secretTemplate": secretTemplate, "triggerAuthenticationTemplate": triggerAuthenticationTemplate, "deploymentTemplate": deploymentTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + DeploymentName: deploymentName, + ScaledObjectName: scaledObjectName, + SecretName: secretName, + AwsAccessKeyID: base64.StdEncoding.EncodeToString([]byte(awsAccessKeyID)), + AwsSecretAccessKey: base64.StdEncoding.EncodeToString([]byte(awsSecretAccessKey)), + AwsRegion: awsRegion, + SqsQueue: sqsQueue, + }, []Template{ + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/azure_application_insights/azure_application_insights_test.go b/tests/scalers/azure_application_insights/azure_application_insights_test.go index 7a3decbe105..7d232b06c51 100644 --- a/tests/scalers/azure_application_insights/azure_application_insights_test.go +++ b/tests/scalers/azure_application_insights/azure_application_insights_test.go @@ -60,8 +60,6 @@ type templateData struct { MaxReplicaCount string } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -216,7 +214,7 @@ func setMetricValue(client appinsights.TelemetryClient, value float64, stopCh <- } } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ClientSecret := base64.StdEncoding.EncodeToString([]byte(azureADSecret)) base64ClientID := base64.StdEncoding.EncodeToString([]byte(azureADClientID)) base64TenantID := base64.StdEncoding.EncodeToString([]byte(azureADTenantID)) @@ -236,9 +234,10 @@ func getTemplateData() (templateData, templateValues) { ApplicationInsightsRole: appInsightsRole, MinReplicaCount: fmt.Sprintf("%v", minReplicaCount), MaxReplicaCount: fmt.Sprintf("%v", maxReplicaCount), - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/azure_blob/azure_blob_test.go b/tests/scalers/azure_blob/azure_blob_test.go index 8931ad73667..adb35ccae83 100644 --- a/tests/scalers/azure_blob/azure_blob_test.go +++ b/tests/scalers/azure_blob/azure_blob_test.go @@ -47,7 +47,6 @@ type templateData struct { ScaledObjectName string ContainerName string } -type templateValues map[string]string const ( secretTemplate = ` @@ -168,7 +167,7 @@ func createContainer(t *testing.T) azblob.ContainerURL { return containerURL } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) return templateData{ @@ -178,10 +177,11 @@ func getTemplateData() (templateData, templateValues) { DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, ContainerName: containerName, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testActivation(t *testing.T, kc *kubernetes.Clientset, containerURL azblob.ContainerURL) { diff --git a/tests/scalers/azure_data_explorer/azure_data_explorer_test.go b/tests/scalers/azure_data_explorer/azure_data_explorer_test.go index 6599da396a9..f7601166d3e 100644 --- a/tests/scalers/azure_data_explorer/azure_data_explorer_test.go +++ b/tests/scalers/azure_data_explorer/azure_data_explorer_test.go @@ -57,8 +57,6 @@ type templateData struct { ScaleMetricValue int } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -160,8 +158,8 @@ func TestScaler(t *testing.T) { testScaleDown(t, kc, data) // cleanup - templates["triggerAuthTemplate"] = triggerAuthTemplate - templates["scaledObjectTemplate"] = scaledObjectTemplate + templates = append(templates, Template{Name: "triggerAuthTemplate", Config: triggerAuthTemplate}) + templates = append(templates, Template{Name: "scaledObjectTemplate", Config: scaledObjectTemplate}) DeleteKubernetesResources(t, kc, testNamespace, data, templates) } @@ -195,7 +193,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset, data templateData) { "replica count should be %d after 1 minute", scaleInReplicaCount) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ClientSecret := base64.StdEncoding.EncodeToString([]byte(azureADSecret)) return templateData{ @@ -210,7 +208,8 @@ func getTemplateData() (templateData, templateValues) { DataExplorerDB: dataExplorerDB, DataExplorerEndpoint: dataExplorerEndpoint, ScaleReplicaCount: scaleInReplicaCount, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + } } diff --git a/tests/scalers/azure_log_analytics/azure_log_analytics_test.go b/tests/scalers/azure_log_analytics/azure_log_analytics_test.go index 28a789e315e..677cce94c5f 100644 --- a/tests/scalers/azure_log_analytics/azure_log_analytics_test.go +++ b/tests/scalers/azure_log_analytics/azure_log_analytics_test.go @@ -49,8 +49,6 @@ type templateData struct { QueryX, QueryY int } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -149,8 +147,8 @@ func TestScaler(t *testing.T) { testScaleDown(t, kc, data) // cleanup - templates["triggerAuthTemplate"] = triggerAuthTemplate - templates["scaledObjectTemplate"] = scaledObjectTemplate + templates = append(templates, Template{Name: "triggerAuthTemplate", Config: triggerAuthTemplate}) + templates = append(templates, Template{Name: "scaledObjectTemplate", Config: scaledObjectTemplate}) DeleteKubernetesResources(t, kc, testNamespace, data, templates) } @@ -186,7 +184,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset, data templateData) { "replica count should be 0 after 1 minute") } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ClientSecret := base64.StdEncoding.EncodeToString([]byte(azureADSecret)) return templateData{ @@ -199,7 +197,8 @@ func getTemplateData() (templateData, templateValues) { AzureADSecret: base64ClientSecret, AzureADTenantID: azureADTenantID, LogAnalyticsWorkspaceID: logAnalyticsWorkspaceID, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + } } diff --git a/tests/scalers/azure_pipelines/azure_pipelines_test.go b/tests/scalers/azure_pipelines/azure_pipelines_test.go index 4866694e3b8..555fced1bb4 100644 --- a/tests/scalers/azure_pipelines/azure_pipelines_test.go +++ b/tests/scalers/azure_pipelines/azure_pipelines_test.go @@ -57,7 +57,6 @@ type templateData struct { PoolName string PoolID string } -type templateValues map[string]string const ( secretTemplate = ` @@ -268,7 +267,7 @@ func clearAllBuilds(t *testing.T, connection *azuredevops.Connection) { } } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64Pat := base64.StdEncoding.EncodeToString([]byte(personalAccessToken)) return templateData{ @@ -282,10 +281,11 @@ func getTemplateData() (templateData, templateValues) { URL: organizationURL, PoolName: poolName, PoolID: poolID, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "poolIdscaledObjectTemplate": poolIdscaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "poolIdscaledObjectTemplate", Config: poolIdscaledObjectTemplate}, + } } func testActivation(t *testing.T, kc *kubernetes.Clientset, connection *azuredevops.Connection) { diff --git a/tests/scalers/azure_queue/azure_queue_test.go b/tests/scalers/azure_queue/azure_queue_test.go index e3ecec1364e..fae562f6e7b 100644 --- a/tests/scalers/azure_queue/azure_queue_test.go +++ b/tests/scalers/azure_queue/azure_queue_test.go @@ -47,7 +47,6 @@ type templateData struct { ScaledObjectName string QueueName string } -type templateValues map[string]string const ( secretTemplate = ` @@ -160,7 +159,7 @@ func createQueue(t *testing.T) (azqueue.QueueURL, azqueue.MessagesURL) { return queueURL, messageURL } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) return templateData{ @@ -170,10 +169,11 @@ func getTemplateData() (templateData, templateValues) { DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, QueueName: queueName, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testActivation(t *testing.T, kc *kubernetes.Clientset, messageURL azqueue.MessagesURL) { diff --git a/tests/scalers/azure_service_bus_queue/azure_service_bus_queue_test.go b/tests/scalers/azure_service_bus_queue/azure_service_bus_queue_test.go index 9ed32c9ccda..6c07a5415ec 100644 --- a/tests/scalers/azure_service_bus_queue/azure_service_bus_queue_test.go +++ b/tests/scalers/azure_service_bus_queue/azure_service_bus_queue_test.go @@ -47,8 +47,6 @@ type templateData struct { QueueName string } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -178,18 +176,23 @@ func createQueue(t *testing.T, sbQueueManager *servicebus.QueueManager) { assert.NoErrorf(t, err, "cannot create service bus queue - %s", err) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) return templateData{ - TestNamespace: testNamespace, - SecretName: secretName, - Connection: base64ConnectionString, - DeploymentName: deploymentName, - TriggerAuthName: triggerAuthName, - ScaledObjectName: scaledObjectName, - QueueName: queueName, - }, templateValues{"secretTemplate": secretTemplate, "deploymentTemplate": deploymentTemplate, "triggerAuthTemplate": triggerAuthTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + SecretName: secretName, + Connection: base64ConnectionString, + DeploymentName: deploymentName, + TriggerAuthName: triggerAuthName, + ScaledObjectName: scaledObjectName, + QueueName: queueName, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testActivation(t *testing.T, kc *kubernetes.Clientset, sbQueue *servicebus.Queue) { diff --git a/tests/scalers/azure_service_bus_topic/azure_service_bus_topic_test.go b/tests/scalers/azure_service_bus_topic/azure_service_bus_topic_test.go index 52896516682..2f4fd90d4e0 100644 --- a/tests/scalers/azure_service_bus_topic/azure_service_bus_topic_test.go +++ b/tests/scalers/azure_service_bus_topic/azure_service_bus_topic_test.go @@ -48,7 +48,6 @@ type templateData struct { TopicName string SubscriptionName string } -type templateValues map[string]string const ( secretTemplate = ` @@ -191,7 +190,7 @@ func createTopicAndSubscription(t *testing.T, sbNamespace *servicebus.Namespace, assert.NoErrorf(t, err, "cannot create subscription for topic - %s", err) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) return templateData{ @@ -203,11 +202,11 @@ func getTemplateData() (templateData, templateValues) { ScaledObjectName: scaledObjectName, TopicName: topicName, SubscriptionName: subscriptionName, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/cassandra/cassandra_test.go b/tests/scalers/cassandra/cassandra_test.go index 815a82140c4..3cd16ac8225 100644 --- a/tests/scalers/cassandra/cassandra_test.go +++ b/tests/scalers/cassandra/cassandra_test.go @@ -53,8 +53,6 @@ type templateData struct { CassandraTableName string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -321,7 +319,7 @@ func getCassandraInsertCmd(insertDataTemplate string) (string, error) { return result, err } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -330,13 +328,13 @@ func getTemplateData() (templateData, map[string]string) { CassandraPasswordBase64: base64.StdEncoding.EncodeToString([]byte(cassandraPassword)), CassandraKeyspace: cassandraKeyspace, CassandraTableName: cassandraTableName, - }, templateValues{ - "secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "serviceTemplate": serviceTemplate, - "cassandraDeploymentTemplate": cassandraDeploymentTemplate, - "cassandraClientDeploymentTemplate": cassandraClientDeploymentTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "cassandraDeploymentTemplate", Config: cassandraDeploymentTemplate}, + {Name: "cassandraClientDeploymentTemplate", Config: cassandraClientDeploymentTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/cpu/cpu_test.go b/tests/scalers/cpu/cpu_test.go index dc8de83f7d8..5ccf896d0c9 100644 --- a/tests/scalers/cpu/cpu_test.go +++ b/tests/scalers/cpu/cpu_test.go @@ -26,8 +26,6 @@ type templateData struct { ScaledObjectName string } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -132,7 +130,7 @@ func TestCpuScaler(t *testing.T) { t.Log("--- testing scale up ---") t.Log("--- applying job ---") - templateTriggerJob := templateValues{"triggerJobTemplate": triggerJob} + templateTriggerJob := []Template{{Name: "triggerJobTemplate", Config: triggerJob}} KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 2, 180, 1), @@ -150,14 +148,14 @@ func TestCpuScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData(testNamespace string, deploymentName string, scaledObjectName string) (templateData, map[string]string) { +func getTemplateData(testNamespace string, deploymentName string, scaledObjectName string) (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "serviceTemplate": serviceTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/cron/cron_test.go b/tests/scalers/cron/cron_test.go index 6827caa023a..df96f3a11d9 100644 --- a/tests/scalers/cron/cron_test.go +++ b/tests/scalers/cron/cron_test.go @@ -37,8 +37,6 @@ type templateData struct { EndMin string } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -112,16 +110,16 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, StartMin: strconv.Itoa(start), EndMin: strconv.Itoa(end), - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/datadog/datadog_test.go b/tests/scalers/datadog/datadog_test.go index 5d01db3779f..ffb142dcecc 100644 --- a/tests/scalers/datadog/datadog_test.go +++ b/tests/scalers/datadog/datadog_test.go @@ -59,8 +59,6 @@ type templateData struct { MaxReplicaCount string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -310,7 +308,7 @@ func installDatadog(t *testing.T) { assert.NoErrorf(t, err, "cannot execute command - %s", err) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -326,13 +324,13 @@ func getTemplateData() (templateData, map[string]string) { KuberneteClusterName: kuberneteClusterName, MinReplicaCount: fmt.Sprintf("%v", minReplicaCount), MaxReplicaCount: fmt.Sprintf("%v", maxReplicaCount), - }, templateValues{ - "secretTemplate": secretTemplate, - "configTemplate": configTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "serviceTemplate": serviceTemplate, - "deploymentTemplate": deploymentTemplate, - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "configTemplate", Config: configTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/elasticsearch/elasticsearch_test.go b/tests/scalers/elasticsearch/elasticsearch_test.go index 3b6d43f3a0f..fd3640c4125 100644 --- a/tests/scalers/elasticsearch/elasticsearch_test.go +++ b/tests/scalers/elasticsearch/elasticsearch_test.go @@ -49,8 +49,6 @@ type templateData struct { SearchTemplateName string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -368,7 +366,7 @@ func getElasticsearchDoc() (interface{}, error) { return result, err } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -378,12 +376,12 @@ func getTemplateData() (templateData, map[string]string) { ElasticPasswordBase64: base64.StdEncoding.EncodeToString([]byte(password)), IndexName: indexName, SearchTemplateName: searchTemplateName, - }, templateValues{ - "secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "serviceTemplate": serviceTemplate, - "elasticsearchDeploymentTemplate": elasticsearchDeploymentTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "elasticsearchDeploymentTemplate", Config: elasticsearchDeploymentTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/external_scaler_sj/external_scaler_sj_test.go b/tests/scalers/external_scaler_sj/external_scaler_sj_test.go index 852cd41905b..25c83e0d347 100644 --- a/tests/scalers/external_scaler_sj/external_scaler_sj_test.go +++ b/tests/scalers/external_scaler_sj/external_scaler_sj_test.go @@ -35,7 +35,6 @@ type templateData struct { ScaledJobName string MetricThreshold, MetricValue int } -type templateValues map[string]string const ( serviceTemplate = ` @@ -131,7 +130,7 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, ServiceName: serviceName, @@ -139,10 +138,11 @@ func getTemplateData() (templateData, templateValues) { ScaledJobName: scaledJobName, MetricThreshold: 10, MetricValue: 0, - }, templateValues{ - "scalerTemplate": scalerTemplate, - "serviceTemplate": serviceTemplate, - "scaledJobTemplate": scaledJobTemplate} + }, []Template{ + {Name: "scalerTemplate", Config: scalerTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "scaledJobTemplate", Config: scaledJobTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { diff --git a/tests/scalers/external_scaler_so/external_scaler_so_test.go b/tests/scalers/external_scaler_so/external_scaler_so_test.go index ffef2610170..52d8f11e0c5 100644 --- a/tests/scalers/external_scaler_so/external_scaler_so_test.go +++ b/tests/scalers/external_scaler_so/external_scaler_so_test.go @@ -37,7 +37,6 @@ type templateData struct { ScaledObjectName string MetricThreshold, MetricValue int } -type templateValues map[string]string const ( serviceTemplate = ` @@ -147,7 +146,7 @@ func TestScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, ServiceName: serviceName, @@ -156,11 +155,12 @@ func getTemplateData() (templateData, templateValues) { ScaledObjectName: scaledObjectName, MetricThreshold: 10, MetricValue: 0, - }, templateValues{ - "scalerTemplate": scalerTemplate, - "serviceTemplate": serviceTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "scalerTemplate", Config: scalerTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { diff --git a/tests/scalers/gcp_pubsub/gcp_pubsub_test.go b/tests/scalers/gcp_pubsub/gcp_pubsub_test.go index a7e25de2bab..25f21bd715e 100644 --- a/tests/scalers/gcp_pubsub/gcp_pubsub_test.go +++ b/tests/scalers/gcp_pubsub/gcp_pubsub_test.go @@ -57,8 +57,6 @@ type templateData struct { ActivationThreshold int } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -236,7 +234,7 @@ func cleanupPubsub(t *testing.T) { _, _ = ExecuteCommand(fmt.Sprintf("%sgcloud pubsub topics delete %s", gsPrefix, topicID)) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64GcpCreds := base64.StdEncoding.EncodeToString([]byte(gcpKey)) return templateData{ @@ -249,11 +247,12 @@ func getTemplateData() (templateData, templateValues) { SubscriptionName: subscriptionName, MaxReplicaCount: maxReplicaCount, ActivationThreshold: activationThreshold, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, - "gcpSdkTemplate": gcpSdkTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + {Name: "gcpSdkTemplate", Config: gcpSdkTemplate}, + } } func publishMessages(t *testing.T, count int) { diff --git a/tests/scalers/gcp_stackdriver/gcp_stackdriver_test.go b/tests/scalers/gcp_stackdriver/gcp_stackdriver_test.go index ac48cf59876..9b8c1c2cf47 100644 --- a/tests/scalers/gcp_stackdriver/gcp_stackdriver_test.go +++ b/tests/scalers/gcp_stackdriver/gcp_stackdriver_test.go @@ -60,8 +60,6 @@ type templateData struct { ActivationThreshold int } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -242,7 +240,7 @@ func cleanupPubsub(t *testing.T) { _, _ = ExecuteCommand(fmt.Sprintf("%sgcloud pubsub topics delete %s", gsPrefix, topicID)) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64GcpCreds := base64.StdEncoding.EncodeToString([]byte(gcpKey)) return templateData{ @@ -257,11 +255,12 @@ func getTemplateData() (templateData, templateValues) { SubscriptionName: subscriptionName, MaxReplicaCount: maxReplicaCount, ActivationThreshold: activationThreshold, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, - "gcpSdkTemplate": gcpSdkTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + {Name: "gcpSdkTemplate", Config: gcpSdkTemplate}, + } } func publishMessages(t *testing.T, count int) { diff --git a/tests/scalers/gcp_storage/gcp_storage_test.go b/tests/scalers/gcp_storage/gcp_storage_test.go index ccdb84f4589..c9cbee67aa4 100644 --- a/tests/scalers/gcp_storage/gcp_storage_test.go +++ b/tests/scalers/gcp_storage/gcp_storage_test.go @@ -48,8 +48,6 @@ type templateData struct { ActivationThreshold int } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -203,7 +201,7 @@ func cleanupBucket(t *testing.T) { _, _ = ExecuteCommand(fmt.Sprintf("%sgsutil -m rm -r gs://%s", gsPrefix, bucketName)) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64GcpCreds := base64.StdEncoding.EncodeToString([]byte(gcpKey)) return templateData{ @@ -215,11 +213,12 @@ func getTemplateData() (templateData, templateValues) { BucketName: bucketName, MaxReplicaCount: maxReplicaCount, ActivationThreshold: activationThreshold, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, - "gcpSdkTemplate": gcpSdkTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + {Name: "gcpSdkTemplate", Config: gcpSdkTemplate}, + } } func uploadFiles(t *testing.T, prefix string, count int) { diff --git a/tests/scalers/graphite/graphite_test.go b/tests/scalers/graphite/graphite_test.go index 76b1a7dfaed..43b0a69ae40 100644 --- a/tests/scalers/graphite/graphite_test.go +++ b/tests/scalers/graphite/graphite_test.go @@ -38,8 +38,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -536,16 +534,14 @@ func TestGraphiteScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"lowLevelRequestsJobTemplate": lowLevelRequestsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "lowLevelRequestsJobTemplate", lowLevelRequestsJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"requestsJobTemplate": requestsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "requestsJobTemplate", requestsJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -553,26 +549,25 @@ func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { func testScaleDown(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale down ---") - templateTriggerJob := templateValues{"emptyRequestsJobTemplate": emptyRequestsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "emptyRequestsJobTemplate", emptyRequestsJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3), "replica count should be %d after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "graphiteStatsdConfigMapTemplate": graphiteStatsdConfigMapTemplate, - "graphiteConfigMapTemplate": graphiteConfigMapTemplate, - "graphiteServiceTemplate": graphiteServiceTemplate, - "graphiteStatefulSetTemplate": graphiteStatefulSetTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "graphiteStatsdConfigMapTemplate", Config: graphiteStatsdConfigMapTemplate}, + {Name: "graphiteConfigMapTemplate", Config: graphiteConfigMapTemplate}, + {Name: "graphiteServiceTemplate", Config: graphiteServiceTemplate}, + {Name: "graphiteStatefulSetTemplate", Config: graphiteStatefulSetTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/influxdb/influxdb_test.go b/tests/scalers/influxdb/influxdb_test.go index ac8d8576a8d..b14ba233d8d 100644 --- a/tests/scalers/influxdb/influxdb_test.go +++ b/tests/scalers/influxdb/influxdb_test.go @@ -51,8 +51,6 @@ type templateData struct { OrgName string } -type templateValues map[string]string - const ( influxdbStatefulsetTemplate = ` apiVersion: apps/v1 @@ -248,7 +246,7 @@ func TestScaler(t *testing.T) { kc := GetKubernetesClient(t) data, templates := getTemplateData() - CreateKubernetesResources(t, kc, testNamespace, data, templateValues{"influxdbStatefulsetTemplate": influxdbStatefulsetTemplate}) + CreateKubernetesResources(t, kc, testNamespace, data, []Template{{Name: "influxdbStatefulsetTemplate", Config: influxdbStatefulsetTemplate}}) assert.True(t, WaitForStatefulsetReplicaReadyCount(t, kc, influxdbStatefulsetName, testNamespace, 1, 60, 1), "replica count should be 0 after a minute") @@ -282,7 +280,7 @@ func runWriteJob(t *testing.T, kc *kubernetes.Clientset) templateData { return data } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, InfluxdbStatefulsetName: influxdbStatefulsetName, @@ -294,14 +292,14 @@ func getTemplateData() (templateData, templateValues) { BasicDeploymentIntName: basicDeploymentIntName, AuthToken: authToken, OrgName: orgName, - }, templateValues{ - "influxdbStatefulsetTemplate": influxdbStatefulsetTemplate, - "scaledObjectTemplateFloat": scaledObjectTemplateFloat, - "scaledObjectTemplateInt": scaledObjectTemplateInt, - "scaledObjectActivationTemplate": scaledObjectActivationTemplate, - "basicDeploymentFloatTemplate": basicDeploymentFloatTemplate, - "basicDeploymentIntTemplate": basicDeploymentIntTemplate, - "influxdbWriteJobTemplate": influxdbWriteJobTemplate, + }, []Template{ + {Name: "influxdbStatefulsetTemplate", Config: influxdbStatefulsetTemplate}, + {Name: "scaledObjectTemplateFloat", Config: scaledObjectTemplateFloat}, + {Name: "scaledObjectTemplateInt", Config: scaledObjectTemplateInt}, + {Name: "scaledObjectActivationTemplate", Config: scaledObjectActivationTemplate}, + {Name: "basicDeploymentFloatTemplate", Config: basicDeploymentFloatTemplate}, + {Name: "basicDeploymentIntTemplate", Config: basicDeploymentIntTemplate}, + {Name: "influxdbWriteJobTemplate", Config: influxdbWriteJobTemplate}, } } diff --git a/tests/scalers/kafka/kafka_test.go b/tests/scalers/kafka/kafka_test.go index 64a054bf457..8f717cc781e 100644 --- a/tests/scalers/kafka/kafka_test.go +++ b/tests/scalers/kafka/kafka_test.go @@ -57,8 +57,6 @@ type templateData struct { ScaleToZeroOnInvalid string } -type templateValues map[string]string - const ( singleDeploymentTemplate = ` apiVersion: apps/v1 @@ -463,7 +461,7 @@ func addCluster(t *testing.T, data templateData) { assert.NoErrorf(t, err, "cannot execute command - %s", err) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -475,7 +473,7 @@ func getTemplateData() (templateData, map[string]string) { Topic2Name: topic2, ResetPolicy: "", ScaledObjectName: scaledObjectName, - }, templateValues{ - "kafkaClientTemplate": kafkaClientTemplate, + }, []Template{ + {Name: "kafkaClientTemplate", Config: kafkaClientTemplate}, } } diff --git a/tests/scalers/kubernetes_workload/kubernetes_workload_test.go b/tests/scalers/kubernetes_workload/kubernetes_workload_test.go index 9551501d499..048a08a0e8f 100644 --- a/tests/scalers/kubernetes_workload/kubernetes_workload_test.go +++ b/tests/scalers/kubernetes_workload/kubernetes_workload_test.go @@ -31,8 +31,6 @@ type templateData struct { ScaledObjectName string } -type templateValues map[string]string - const ( monitoredDeploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -153,11 +151,15 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be 0 after 1 minute") } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ - TestNamespace: testNamespace, - MonitoredDeploymentName: monitoredDeploymentName, - SutDeploymentName: sutDeploymentName, - ScaledObjectName: scaledObjectName, - }, templateValues{"monitoredDeploymentTemplate": monitoredDeploymentTemplate, "sutDeploymentTemplate": sutDeploymentTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + MonitoredDeploymentName: monitoredDeploymentName, + SutDeploymentName: sutDeploymentName, + ScaledObjectName: scaledObjectName, + }, []Template{ + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, + {Name: "sutDeploymentTemplate", Config: sutDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/memory/memory_test.go b/tests/scalers/memory/memory_test.go index 8a18c6af3f7..2be6d8f9e62 100644 --- a/tests/scalers/memory/memory_test.go +++ b/tests/scalers/memory/memory_test.go @@ -27,8 +27,6 @@ type templateData struct { UtilizationValue int32 } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -101,7 +99,7 @@ func TestMemoryScaler(t *testing.T) { kc := GetKubernetesClient(t) data, templates := getTemplateData(testNamespace, deploymentName, scaledObjectName, scaleUpValue) - CreateKubernetesResources(t, kc, testNamespace, data, templateValues{"deploymentTemplate": deploymentTemplate}) + CreateKubernetesResources(t, kc, testNamespace, data, []Template{{Name: "deploymentTemplate", Config: deploymentTemplate}}) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 1, 60, 1), "Replica count should start out as 1") @@ -109,7 +107,7 @@ func TestMemoryScaler(t *testing.T) { t.Log("--- testing scale up ---") t.Log("--- applying scaled object with scaled up utilization ---") - KubectlApplyMultipleWithTemplate(t, data, templateValues{"scaledObjectTemplate": scaledObjectTemplate}) + KubectlApplyMultipleWithTemplate(t, data, []Template{{Name: "scaledObjectTemplate", Config: scaledObjectTemplate}}) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 2, 180, 1), "Replica count should scale up in next 3 minutes") @@ -118,7 +116,7 @@ func TestMemoryScaler(t *testing.T) { t.Log("--- applying scaled object with scaled down utilization ---") data, _ = getTemplateData(testNamespace, deploymentName, scaledObjectName, scaleDownValue) - KubectlApplyMultipleWithTemplate(t, data, templateValues{"scaledObjectTemplate": scaledObjectTemplate}) + KubectlApplyMultipleWithTemplate(t, data, []Template{{Name: "scaledObjectTemplate", Config: scaledObjectTemplate}}) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 1, 180, 1), "Replica count should be 1 in next 3 minutes") @@ -127,14 +125,14 @@ func TestMemoryScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func getTemplateData(testNamespace string, deploymentName string, scaledObjectName string, utilizationValue int32) (templateData, map[string]string) { +func getTemplateData(testNamespace string, deploymentName string, scaledObjectName string, utilizationValue int32) (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, ScaledObjectName: scaledObjectName, UtilizationValue: utilizationValue, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/metrics_api/metrics_api_test.go b/tests/scalers/metrics_api/metrics_api_test.go index 2e8fce18d44..3cdc214f7a0 100644 --- a/tests/scalers/metrics_api/metrics_api_test.go +++ b/tests/scalers/metrics_api/metrics_api_test.go @@ -48,8 +48,6 @@ type templateData struct { MaxReplicaCount string } -type templateValues map[string]string - const ( secretTemplate = `apiVersion: v1 kind: Secret @@ -233,7 +231,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset, data templateData) { "replica count should be %d after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -246,12 +244,12 @@ func getTemplateData() (templateData, map[string]string) { MinReplicaCount: fmt.Sprintf("%v", minReplicaCount), MaxReplicaCount: fmt.Sprintf("%v", maxReplicaCount), MetricValue: 0, - }, templateValues{ - "secretTemplate": secretTemplate, - "metricsServerdeploymentTemplate": metricsServerdeploymentTemplate, - "serviceTemplate": serviceTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "metricsServerdeploymentTemplate", Config: metricsServerdeploymentTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/mongodb/mongodb_test.go b/tests/scalers/mongodb/mongodb_test.go index fc23ce28c43..556a3dd74bd 100644 --- a/tests/scalers/mongodb/mongodb_test.go +++ b/tests/scalers/mongodb/mongodb_test.go @@ -47,8 +47,6 @@ type templateData struct { Database, Collection string } -type templateValues map[string]string - const ( mongoTemplate = ` apiVersion: apps/v1 @@ -174,7 +172,7 @@ func TestScaler(t *testing.T) { cleanupMongo(t, kc) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { connectionString := fmt.Sprintf("mongodb://%s:%s@mongodb-svc.%s.svc.cluster.local:27017/%s", mongoUser, mongoPassword, mongoNamespace, mongoDBName) base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) @@ -189,10 +187,11 @@ func getTemplateData() (templateData, templateValues) { Collection: mongoCollection, Connection: connectionString, Base64Connection: base64ConnectionString, - }, templateValues{ - "secretTemplate": secretTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledJobTemplate": scaledJobTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledJobTemplate", Config: scaledJobTemplate}, + } } func setupMongo(t *testing.T, kc *kubernetes.Clientset) string { diff --git a/tests/scalers/mssql/mssql_test.go b/tests/scalers/mssql/mssql_test.go index 070b8f90b5c..776c96043c8 100644 --- a/tests/scalers/mssql/mssql_test.go +++ b/tests/scalers/mssql/mssql_test.go @@ -53,8 +53,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -284,8 +282,7 @@ func TestMssqlScaler(t *testing.T) { // insert 10 records in the table -> activation should not happen (activationTargetValue = 15) func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"insertRecordsJobTemplate1": insertRecordsJobTemplate1} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate1", insertRecordsJobTemplate1) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } @@ -293,8 +290,7 @@ func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { // insert another 10 records in the table, which in total is 20 -> should be scaled up func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertRecordsJobTemplate2": insertRecordsJobTemplate2} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate2", insertRecordsJobTemplate2) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -322,18 +318,18 @@ var data = templateData{ MssqlConnectionString: mssqlConnectionString, } -func getMssqlTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "mssqlStatefulSetTemplate": mssqlStatefulSetTemplate, - "mssqlServiceTemplate": mssqlServiceTemplate, +func getMssqlTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "mssqlStatefulSetTemplate", Config: mssqlStatefulSetTemplate}, + {Name: "mssqlServiceTemplate", Config: mssqlServiceTemplate}, } } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/mysql/mysql_test.go b/tests/scalers/mysql/mysql_test.go index 324e3f91452..071bd583e02 100644 --- a/tests/scalers/mysql/mysql_test.go +++ b/tests/scalers/mysql/mysql_test.go @@ -48,8 +48,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -246,7 +244,7 @@ func TestMySQLScaler(t *testing.T) { DeleteKubernetesResources(t, kc, testNamespace, data, templates) } -func setupMySQL(t *testing.T, kc *kubernetes.Clientset, data templateData, templates templateValues) { +func setupMySQL(t *testing.T, kc *kubernetes.Clientset, data templateData, templates []Template) { // Deploy mysql KubectlApplyWithTemplate(t, data, "mysqlDeploymentTemplate", mysqlDeploymentTemplate) KubectlApplyWithTemplate(t, data, "mysqlServiceTemplate", mysqlServiceTemplate) @@ -297,7 +295,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "Replica count should be 0 after 5 minutes") } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64MySQLConnectionString := base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s@tcp(mysql.%s.svc.cluster.local:3306)/%s", mySQLUsername, mySQLPassword, testNamespace, mySQLDatabase))) return templateData{ TestNamespace: testNamespace, @@ -310,10 +308,10 @@ func getTemplateData() (templateData, templateValues) { MySQLRootPassword: mySQLRootPassword, MySQLConnectionString: base64MySQLConnectionString, ItemsToWrite: 0, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "secretTemplate": secretTemplate, - "scaledObjectTemplate": scaledObjectTemplate, - "triggerAuthTemplate": triggerAuthTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, } } diff --git a/tests/scalers/nats_jetstream/nats_helper.go b/tests/scalers/nats_jetstream/nats_helper.go index 7f5b39e13c3..b3c03375282 100644 --- a/tests/scalers/nats_jetstream/nats_helper.go +++ b/tests/scalers/nats_jetstream/nats_helper.go @@ -11,8 +11,6 @@ import ( "github.com/kedacore/keda/v2/tests/helper" ) -type templateValues map[string]string - type templateData struct { NatsNamespace string TestNamespace string @@ -196,10 +194,7 @@ func InstallServerWithJetStream(t *testing.T, kc *k8s.Clientset, namespace strin NatsNamespace: namespace, } - natsServerTemplateValue := templateValues{ - "natsServerTemplate": natsServerTemplate, - } - helper.KubectlApplyMultipleWithTemplate(t, data, natsServerTemplateValue) + helper.KubectlApplyWithTemplate(t, data, "natsServerTemplate", natsServerTemplate) } // RemoveServer will remove the NATS server and delete the namespace. @@ -207,10 +202,8 @@ func RemoveServer(t *testing.T, kc *k8s.Clientset, namespace string) { data := templateData{ NatsNamespace: namespace, } - natsServerTemplateValue := templateValues{ - "natsServerTemplate": natsServerTemplate, - } - helper.KubectlApplyMultipleWithTemplate(t, data, natsServerTemplateValue) + + helper.KubectlDeleteWithTemplate(t, data, "natsServerTemplate", natsServerTemplate) helper.DeleteNamespace(t, kc, namespace) } @@ -220,8 +213,6 @@ func InstallStreamAndConsumer(t *testing.T, kc *k8s.Clientset, namespace, natsAd TestNamespace: namespace, NatsAddress: natsAddress, } - streamAndConsumerJob := templateValues{ - "streamAndConsumerTemplate": streamAndConsumerTemplate, - } - helper.KubectlApplyMultipleWithTemplate(t, data, streamAndConsumerJob) + + helper.KubectlApplyWithTemplate(t, data, "streamAndConsumerTemplate", streamAndConsumerTemplate) } diff --git a/tests/scalers/nats_jetstream/nats_jetstream_test.go b/tests/scalers/nats_jetstream/nats_jetstream_test.go index 52f68216a80..98d17742d77 100644 --- a/tests/scalers/nats_jetstream/nats_jetstream_test.go +++ b/tests/scalers/nats_jetstream/nats_jetstream_test.go @@ -40,8 +40,6 @@ type templateData struct { NumberOfMessages int } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -142,15 +140,15 @@ spec: ` ) -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, NatsAddress: natsAddress, NatsServerMonitoringEndpoint: natsServerMonitoringEndpoint, NumberOfMessages: messagePublishCount, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } @@ -183,17 +181,15 @@ func TestNATSJetStreamScaler(t *testing.T) { func testActivation(t *testing.T, kc *k8s.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"activationPublishJobTemplate": activationPublishJobTemplate} data.NumberOfMessages = 10 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "activationPublishJobTemplate", activationPublishJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *k8s.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerDeployment := templateValues{"publishJobTemplate": publishJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerDeployment) + KubectlApplyWithTemplate(t, data, "publishJobTemplate", publishJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) diff --git a/tests/scalers/new_relic/new_relic_test.go b/tests/scalers/new_relic/new_relic_test.go index 077ff9bcb1e..60e01b9e025 100644 --- a/tests/scalers/new_relic/new_relic_test.go +++ b/tests/scalers/new_relic/new_relic_test.go @@ -59,7 +59,6 @@ type templateData struct { MinReplicaCount string MaxReplicaCount string } -type templateValues map[string]string const ( secretTemplate = `apiVersion: v1 @@ -272,7 +271,7 @@ func installNewRelic(t *testing.T) { assert.NoErrorf(t, err, "cannot execute command - %s", err) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -288,11 +287,12 @@ func getTemplateData() (templateData, templateValues) { DeploymentReplicas: fmt.Sprintf("%v", deploymentReplicas), NewRelicAccountID: newRelicAccountID, NewRelicAPIKey: base64.StdEncoding.EncodeToString([]byte(newRelicAPIKey)), - }, templateValues{ - "secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "serviceTemplate": serviceTemplate, - "monitoredDeploymentTemplate": monitoredDeploymentTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, + {Name: "monitoredDeploymentTemplate", Config: monitoredDeploymentTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } diff --git a/tests/scalers/openstack_swift/openstack_swift_test.go b/tests/scalers/openstack_swift/openstack_swift_test.go index d3b682e581c..73ae58b63c9 100644 --- a/tests/scalers/openstack_swift/openstack_swift_test.go +++ b/tests/scalers/openstack_swift/openstack_swift_test.go @@ -68,8 +68,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -206,7 +204,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset, client *gophercloud.S "replica count should be %d after 5 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -220,10 +218,10 @@ func getTemplateData() (templateData, map[string]string) { Container: containerName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "secretTemplate": secretTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/postgresql/postgresql_test.go b/tests/scalers/postgresql/postgresql_test.go index 798a6f7ab39..cf98f420f4b 100644 --- a/tests/scalers/postgresql/postgresql_test.go +++ b/tests/scalers/postgresql/postgresql_test.go @@ -54,8 +54,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -282,16 +280,14 @@ func TestPostreSQLScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"lowLevelRecordsJobTemplate": lowLevelRecordsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "lowLevelRecordsJobTemplate", lowLevelRecordsJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertRecordsJobTemplate": insertRecordsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate", insertRecordsJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -319,18 +315,18 @@ var data = templateData{ PostgreSQLConnectionStringBase64: base64.StdEncoding.EncodeToString([]byte(postgreSQLConnectionString)), } -func getPostgreSQLTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "postgreSQLStatefulSetTemplate": postgreSQLStatefulSetTemplate, - "postgreSQLServiceTemplate": postgreSQLServiceTemplate, +func getPostgreSQLTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "postgreSQLStatefulSetTemplate", Config: postgreSQLStatefulSetTemplate}, + {Name: "postgreSQLServiceTemplate", Config: postgreSQLServiceTemplate}, } } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/predictkube/predictkube_test.go b/tests/scalers/predictkube/predictkube_test.go index f937d5532a2..4202a49766f 100644 --- a/tests/scalers/predictkube/predictkube_test.go +++ b/tests/scalers/predictkube/predictkube_test.go @@ -51,8 +51,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -235,16 +233,14 @@ func TestScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"generateLoadJobTemplate": generateLightLoadJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "generateLoadJobTemplate", generateLightLoadJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerDeployment := templateValues{"generateLoadJobTemplate": generateHeavyLoadJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerDeployment) + KubectlApplyWithTemplate(t, data, "generateLoadJobTemplate", generateHeavyLoadJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -256,7 +252,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %d after 5 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -268,12 +264,12 @@ func getTemplateData() (templateData, map[string]string) { PrometheusServerName: prometheusServerName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "monitoredAppDeploymentTemplate": monitoredAppDeploymentTemplate, - "monitoredAppServiceTemplate": monitoredAppServiceTemplate, - "secretTemplate": secretTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredAppDeploymentTemplate", Config: monitoredAppDeploymentTemplate}, + {Name: "monitoredAppServiceTemplate", Config: monitoredAppServiceTemplate}, + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/prometheus/prometheus_helper.go b/tests/scalers/prometheus/prometheus_helper.go index 9c398f05838..81fb705f8ba 100644 --- a/tests/scalers/prometheus/prometheus_helper.go +++ b/tests/scalers/prometheus/prometheus_helper.go @@ -12,21 +12,19 @@ import ( "github.com/kedacore/keda/v2/tests/helper" ) -type templateValues map[string]string - type templateData struct { Namespace string PrometheusServerName string } var ( - prometheusTemplates = templateValues{ - "prometheusServerServiceAccountTemplate": prometheusServerServiceAccountTemplate, - "standaloneRedisServiceTemplate": prometheusServerConfigMapTemplate, - "prometheusServerClusterRoleTemplate": prometheusServerClusterRoleTemplate, - "prometheusServerClusterRoleBindingTemplate": prometheusServerClusterRoleBindingTemplate, - "prometheusServerDeploymentTemplate": prometheusServerDeploymentTemplate, - "prometheusServerServiceTemplate": prometheusServerServiceTemplate, + prometheusTemplates = []helper.Template{ + {Name: "prometheusServerServiceAccountTemplate", Config: prometheusServerServiceAccountTemplate}, + {Name: "standaloneRedisServiceTemplate", Config: prometheusServerConfigMapTemplate}, + {Name: "prometheusServerClusterRoleTemplate", Config: prometheusServerClusterRoleTemplate}, + {Name: "prometheusServerClusterRoleBindingTemplate", Config: prometheusServerClusterRoleBindingTemplate}, + {Name: "prometheusServerDeploymentTemplate", Config: prometheusServerDeploymentTemplate}, + {Name: "prometheusServerServiceTemplate", Config: prometheusServerServiceTemplate}, } ) diff --git a/tests/scalers/prometheus/prometheus_test.go b/tests/scalers/prometheus/prometheus_test.go index 8a1bcb66628..d5e9261b60c 100644 --- a/tests/scalers/prometheus/prometheus_test.go +++ b/tests/scalers/prometheus/prometheus_test.go @@ -44,8 +44,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -234,16 +232,14 @@ func TestPrometheusScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"generateLowLevelLoadJobTemplate": generateLowLevelLoadJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "generateLowLevelLoadJobTemplate", generateLowLevelLoadJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerDeployment := templateValues{"generateLoadJobTemplate": generateLoadJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerDeployment) + KubectlApplyWithTemplate(t, data, "generateLoadJobTemplate", generateLoadJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -255,7 +251,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %d after 5 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -265,10 +261,10 @@ func getTemplateData() (templateData, map[string]string) { PrometheusServerName: prometheusServerName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "deploymentTemplate": deploymentTemplate, - "monitoredAppDeploymentTemplate": monitoredAppDeploymentTemplate, - "monitoredAppServiceTemplate": monitoredAppServiceTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "monitoredAppDeploymentTemplate", Config: monitoredAppDeploymentTemplate}, + {Name: "monitoredAppServiceTemplate", Config: monitoredAppServiceTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/pulsar/pulsar_test.go b/tests/scalers/pulsar/pulsar_test.go index 36982adfeef..ba3f751261b 100644 --- a/tests/scalers/pulsar/pulsar_test.go +++ b/tests/scalers/pulsar/pulsar_test.go @@ -177,9 +177,7 @@ spec: app: pulsar ` -type templateValues map[string]string - -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, StatefulSetName: statefulSetName, @@ -190,9 +188,9 @@ func getTemplateData() (templateData, templateValues) { MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, MsgBacklog: msgBacklog, - }, templateValues{ - "statefulsetTemplate": statefulsetTemplate, - "serviceTemplate": serviceTemplate, + }, []Template{ + {Name: "statefulsetTemplate", Config: statefulsetTemplate}, + {Name: "serviceTemplate", Config: serviceTemplate}, } } diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go index 2f4891ab36e..76b04bc4a6c 100644 --- a/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go +++ b/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go @@ -70,7 +70,6 @@ type templateData struct { QueueName string Connection, Base64Connection string } -type templateValues map[string]string func TestScaler(t *testing.T) { // setup @@ -96,7 +95,7 @@ func TestScaler(t *testing.T) { RMQUninstall(t, kc, rmqNamespace, user, password, vhost) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -105,9 +104,10 @@ func getTemplateData() (templateData, templateValues) { QueueName: queueName, Connection: connectionString, Base64Connection: base64.StdEncoding.EncodeToString([]byte(connectionString)), - }, templateValues{ - "deploymentTemplate": RMQTargetDeploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: RMQTargetDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaling(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go index 5274c40b7fe..21908729ca1 100644 --- a/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go +++ b/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go @@ -71,7 +71,6 @@ type templateData struct { QueueName string Connection, Base64Connection string } -type templateValues map[string]string func TestScaler(t *testing.T) { // setup @@ -95,7 +94,7 @@ func TestScaler(t *testing.T) { RMQUninstall(t, kc, rmqNamespace, user, password, vhost) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -104,9 +103,10 @@ func getTemplateData() (templateData, templateValues) { QueueName: queueName, Connection: connectionString, Base64Connection: base64.StdEncoding.EncodeToString([]byte(httpConnectionString)), - }, templateValues{ - "deploymentTemplate": RMQTargetDeploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: RMQTargetDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaling(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go index e0c1136017c..47bce5a2c6e 100644 --- a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go +++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go @@ -74,7 +74,6 @@ type templateData struct { QueueName string Connection, Base64Connection string } -type templateValues map[string]string func TestScaler(t *testing.T) { // setup @@ -98,7 +97,7 @@ func TestScaler(t *testing.T) { RMQUninstall(t, kc, rmqNamespace, user, password, vhost) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -107,9 +106,10 @@ func getTemplateData() (templateData, templateValues) { QueueName: queueRegex, Connection: connectionString, Base64Connection: base64.StdEncoding.EncodeToString([]byte(httpConnectionString)), - }, templateValues{ - "deploymentTemplate": RMQTargetDeploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: RMQTargetDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaling(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go index d736af5462c..7201be96158 100644 --- a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go +++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go @@ -79,7 +79,6 @@ type templateData struct { QueueName string Connection, Base64Connection string } -type templateValues map[string]string func TestScaler(t *testing.T) { // setup @@ -106,7 +105,7 @@ func TestScaler(t *testing.T) { RMQUninstall(t, kc, rmqNamespace, user, password, vhost) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -115,9 +114,10 @@ func getTemplateData() (templateData, templateValues) { QueueName: queueRegex, Connection: connectionString, Base64Connection: base64.StdEncoding.EncodeToString([]byte(httpConnectionString)), - }, templateValues{ - "deploymentTemplate": RMQTargetDeploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "deploymentTemplate", Config: RMQTargetDeploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaling(t *testing.T, kc *kubernetes.Clientset) { diff --git a/tests/scalers/redis/helper/helper.go b/tests/scalers/redis/helper/helper.go index ff846d37f80..08752042b15 100644 --- a/tests/scalers/redis/helper/helper.go +++ b/tests/scalers/redis/helper/helper.go @@ -13,8 +13,6 @@ import ( "github.com/kedacore/keda/v2/tests/helper" ) -type templateValues map[string]string - type templateData struct { Namespace string RedisName string @@ -22,18 +20,18 @@ type templateData struct { } var ( - redisStandaloneTemplates = templateValues{ - "standaloneRedisTemplate": standaloneRedisTemplate, - "standaloneRedisServiceTemplate": standaloneRedisServiceTemplate, + redisStandaloneTemplates = []helper.Template{ + {Name: "standaloneRedisTemplate", Config: standaloneRedisTemplate}, + {Name: "standaloneRedisServiceTemplate", Config: standaloneRedisServiceTemplate}, } - redisClusterTemplates = templateValues{ - "clusterRedisSecretTemplate": clusterRedisSecretTemplate, - "clusterRedisConfig1Template": clusterRedisConfig1Template, - "clusterRedisConfig2Template": clusterRedisConfig2Template, - "clusterRedisHeadlessServiceTemplate": clusterRedisHeadlessServiceTemplate, - "clusterRedisServiceTemplate": clusterRedisServiceTemplate, - "clusterRedisStatefulSetTemplate": clusterRedisStatefulSetTemplate, + redisClusterTemplates = []helper.Template{ + {Name: "clusterRedisSecretTemplate", Config: clusterRedisSecretTemplate}, + {Name: "clusterRedisConfig1Template", Config: clusterRedisConfig1Template}, + {Name: "clusterRedisConfig2Template", Config: clusterRedisConfig2Template}, + {Name: "clusterRedisHeadlessServiceTemplate", Config: clusterRedisHeadlessServiceTemplate}, + {Name: "clusterRedisServiceTemplate", Config: clusterRedisServiceTemplate}, + {Name: "clusterRedisStatefulSetTemplate", Config: clusterRedisStatefulSetTemplate}, } ) diff --git a/tests/scalers/redis/redis_cluster_lists/redis_cluster_lists_test.go b/tests/scalers/redis/redis_cluster_lists/redis_cluster_lists_test.go index dd4482a6596..88f374fae91 100644 --- a/tests/scalers/redis/redis_cluster_lists/redis_cluster_lists_test.go +++ b/tests/scalers/redis/redis_cluster_lists/redis_cluster_lists_test.go @@ -55,8 +55,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -190,18 +188,16 @@ func TestScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} data.ItemsToWrite = 5 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} data.ItemsToWrite = 200 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -231,11 +227,11 @@ var data = templateData{ ItemsToWrite: 0, } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go b/tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go index e5cc088f1d3..cbf81c3eff9 100644 --- a/tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go +++ b/tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go @@ -53,8 +53,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -193,8 +191,7 @@ func TestScaler(t *testing.T) { func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -223,11 +220,11 @@ var data = templateData{ ItemsToWrite: 100, } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/redis/redis_sentinel_lists/redis_sentinel_lists_test.go b/tests/scalers/redis/redis_sentinel_lists/redis_sentinel_lists_test.go index a4843f31894..0f73e8a957a 100644 --- a/tests/scalers/redis/redis_sentinel_lists/redis_sentinel_lists_test.go +++ b/tests/scalers/redis/redis_sentinel_lists/redis_sentinel_lists_test.go @@ -55,8 +55,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -198,18 +196,15 @@ func TestScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} - data.ItemsToWrite = 5 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} data.ItemsToWrite = 200 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -239,11 +234,11 @@ var data = templateData{ ItemsToWrite: 0, } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go b/tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go index 54c28294168..0a6bc0bb5b6 100644 --- a/tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go +++ b/tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go @@ -53,8 +53,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -207,8 +205,7 @@ func TestScaler(t *testing.T) { func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -237,11 +234,11 @@ var data = templateData{ ItemsToWrite: 100, } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/redis/redis_standalone_lists/redis_standalone_lists_test.go b/tests/scalers/redis/redis_standalone_lists/redis_standalone_lists_test.go index db8a6270c8b..f1cd7ec86d4 100644 --- a/tests/scalers/redis/redis_standalone_lists/redis_standalone_lists_test.go +++ b/tests/scalers/redis/redis_standalone_lists/redis_standalone_lists_test.go @@ -54,8 +54,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -186,18 +184,16 @@ func TestScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} data.ItemsToWrite = 5 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} data.ItemsToWrite = 200 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -226,11 +222,11 @@ var data = templateData{ ItemsToWrite: 0, } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go b/tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go index 097c8225e05..b495a7bc56b 100644 --- a/tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go +++ b/tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go @@ -54,8 +54,6 @@ type templateData struct { ItemsToWrite int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -187,9 +185,8 @@ func TestScaler(t *testing.T) { func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertJobTemplate": insertJobTemplate} data.ItemsToWrite = 20 - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -218,11 +215,11 @@ var data = templateData{ ItemsToWrite: 0, } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/scalers/selenium/selenium_test.go b/tests/scalers/selenium/selenium_test.go index 0d5451bcb18..65a5f220587 100644 --- a/tests/scalers/selenium/selenium_test.go +++ b/tests/scalers/selenium/selenium_test.go @@ -52,8 +52,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( eventBusConfigTemplate = ` apiVersion: v1 @@ -520,7 +518,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %s after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, ChromeDeploymentName: chromeDeploymentName, @@ -533,18 +531,18 @@ func getTemplateData() (templateData, map[string]string) { ScaledObjectName: scaledObjectName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "eventBusConfigTemplate": eventBusConfigTemplate, - "hubDeploymentTemplate": hubDeploymentTemplate, - "hubServiceTemplate": hubServiceTemplate, - "chromeNodeServiceTemplate": chromeNodeServiceTemplate, - "chromeNodeDeploymentTemplate": chromeNodeDeploymentTemplate, - "chromeScaledObjectTemplate": chromeScaledObjectTemplate, - "firefoxNodeServiceTemplate": firefoxNodeServiceTemplate, - "firefoxNodeDeploymentTemplate": firefoxNodeDeploymentTemplate, - "firefoxScaledObjectTemplate": firefoxScaledObjectTemplate, - "edgeNodeServiceTemplate": edgeNodeServiceTemplate, - "edgeNodeDeploymentTemplate": edgeNodeDeploymentTemplate, - "edgeScaledObjectTemplate": edgeScaledObjectTemplate, + }, []Template{ + {Name: "eventBusConfigTemplate", Config: eventBusConfigTemplate}, + {Name: "hubDeploymentTemplate", Config: hubDeploymentTemplate}, + {Name: "hubServiceTemplate", Config: hubServiceTemplate}, + {Name: "chromeNodeServiceTemplate", Config: chromeNodeServiceTemplate}, + {Name: "chromeNodeDeploymentTemplate", Config: chromeNodeDeploymentTemplate}, + {Name: "chromeScaledObjectTemplate", Config: chromeScaledObjectTemplate}, + {Name: "firefoxNodeServiceTemplate", Config: firefoxNodeServiceTemplate}, + {Name: "firefoxNodeDeploymentTemplate", Config: firefoxNodeDeploymentTemplate}, + {Name: "firefoxScaledObjectTemplate", Config: firefoxScaledObjectTemplate}, + {Name: "edgeNodeServiceTemplate", Config: edgeNodeServiceTemplate}, + {Name: "edgeNodeDeploymentTemplate", Config: edgeNodeDeploymentTemplate}, + {Name: "edgeScaledObjectTemplate", Config: edgeScaledObjectTemplate}, } } diff --git a/tests/scalers/solace/solace_test.go b/tests/scalers/solace/solace_test.go index 6a1cb808bee..4688b9ee3b2 100644 --- a/tests/scalers/solace/solace_test.go +++ b/tests/scalers/solace/solace_test.go @@ -43,8 +43,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -224,7 +222,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %d after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -234,10 +232,10 @@ func getTemplateData() (templateData, map[string]string) { SecretName: secretName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "helperTemplate": helperTemplate, + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "helperTemplate", Config: helperTemplate}, } } diff --git a/tests/scalers/stan/stan_test.go b/tests/scalers/stan/stan_test.go index 4a3c150f211..e07fe82c5b0 100644 --- a/tests/scalers/stan/stan_test.go +++ b/tests/scalers/stan/stan_test.go @@ -41,8 +41,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = `apiVersion: apps/v1 kind: Deployment @@ -256,16 +254,14 @@ func TestStanScaler(t *testing.T) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"lowLevelPublishDeploymentTemplate": lowLevelPublishDeploymentTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "lowLevelPublishDeploymentTemplate", lowLevelPublishDeploymentTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerDeployment := templateValues{"publishDeploymentTemplate": publishDeploymentTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerDeployment) + KubectlApplyWithTemplate(t, data, "publishDeploymentTemplate", publishDeploymentTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -277,7 +273,7 @@ func testScaleDown(t *testing.T, kc *kubernetes.Clientset) { "replica count should be %d after 3 minutes", minReplicaCount) } -func getTemplateData() (templateData, map[string]string) { +func getTemplateData() (templateData, []Template) { return templateData{ TestNamespace: testNamespace, DeploymentName: deploymentName, @@ -286,10 +282,10 @@ func getTemplateData() (templateData, map[string]string) { StanServerName: stanServerName, MinReplicaCount: minReplicaCount, MaxReplicaCount: maxReplicaCount, - }, templateValues{ - "stanServiceTemplate": stanServiceTemplate, - "stanStatefulSetTemplate": stanStatefulSetTemplate, - "deploymentTemplate": deploymentTemplate, - "scaledObjectTemplate": scaledObjectTemplate, + }, []Template{ + {Name: "stanServiceTemplate", Config: stanServiceTemplate}, + {Name: "stanStatefulSetTemplate", Config: stanStatefulSetTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/secret-providers/azure_keyvault/azure_keyvault_test.go b/tests/secret-providers/azure_keyvault/azure_keyvault_test.go index 731aa714b77..f0e6543c026 100644 --- a/tests/secret-providers/azure_keyvault/azure_keyvault_test.go +++ b/tests/secret-providers/azure_keyvault/azure_keyvault_test.go @@ -58,8 +58,6 @@ type templateData struct { AzureADTenantID string } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -197,7 +195,7 @@ func createQueue(t *testing.T) (azqueue.QueueURL, azqueue.MessagesURL) { return queueURL, messageURL } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) base64ClientSecret := base64.StdEncoding.EncodeToString([]byte(azureADSecret)) @@ -213,11 +211,12 @@ func getTemplateData() (templateData, templateValues) { AzureADClientID: azureADClientID, AzureADSecret: base64ClientSecret, AzureADTenantID: azureADTenantID, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, messageURL azqueue.MessagesURL) { diff --git a/tests/secret-providers/azure_workload_identity/azure_workload_identity_test.go b/tests/secret-providers/azure_workload_identity/azure_workload_identity_test.go index fa0ab7bd44f..715278e8488 100644 --- a/tests/secret-providers/azure_workload_identity/azure_workload_identity_test.go +++ b/tests/secret-providers/azure_workload_identity/azure_workload_identity_test.go @@ -44,8 +44,6 @@ type templateData struct { QueueName string } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -162,14 +160,18 @@ func createQueue(t *testing.T, sbQueueManager *servicebus.QueueManager) { assert.NoErrorf(t, err, "cannot create service bus queue - %s", err) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ - TestNamespace: testNamespace, - DeploymentName: deploymentName, - TriggerAuthName: triggerAuthName, - ScaledObjectName: scaledObjectName, - QueueName: queueName, - }, templateValues{"deploymentTemplate": deploymentTemplate, "triggerAuthTemplate": triggerAuthTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + DeploymentName: deploymentName, + TriggerAuthName: triggerAuthName, + ScaledObjectName: scaledObjectName, + QueueName: queueName, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, sbQueue *servicebus.Queue) { diff --git a/tests/secret-providers/azure_workload_identity_user_assigned/azure_workload_identity_user_assigned_test.go b/tests/secret-providers/azure_workload_identity_user_assigned/azure_workload_identity_user_assigned_test.go index 7c881c7e110..ccb5c33a4e1 100644 --- a/tests/secret-providers/azure_workload_identity_user_assigned/azure_workload_identity_user_assigned_test.go +++ b/tests/secret-providers/azure_workload_identity_user_assigned/azure_workload_identity_user_assigned_test.go @@ -46,8 +46,6 @@ type templateData struct { QueueName string } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -178,15 +176,19 @@ func createQueue(t *testing.T, sbQueueManager *servicebus.QueueManager) { assert.NoErrorf(t, err, "cannot create service bus queue - %s", err) } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { return templateData{ - TestNamespace: testNamespace, - DeploymentName: deploymentName, - TriggerAuthName: triggerAuthName, - IdentityID: azureADClientID, - ScaledObjectName: scaledObjectName, - QueueName: queueName, - }, templateValues{"deploymentTemplate": deploymentTemplate, "triggerAuthTemplate": triggerAuthTemplate, "scaledObjectTemplate": scaledObjectTemplate} + TestNamespace: testNamespace, + DeploymentName: deploymentName, + TriggerAuthName: triggerAuthName, + IdentityID: azureADClientID, + ScaledObjectName: scaledObjectName, + QueueName: queueName, + }, []Template{ + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUpWithIncorrectIdentity(t *testing.T, kc *kubernetes.Clientset, sbQueue *servicebus.Queue) { diff --git a/tests/secret-providers/hashicorp_vault/hashicorp_vault_test.go b/tests/secret-providers/hashicorp_vault/hashicorp_vault_test.go index 35d5f345574..186f26000c3 100644 --- a/tests/secret-providers/hashicorp_vault/hashicorp_vault_test.go +++ b/tests/secret-providers/hashicorp_vault/hashicorp_vault_test.go @@ -57,8 +57,6 @@ type templateData struct { MaxReplicaCount int } -type templateValues map[string]string - const ( deploymentTemplate = ` apiVersion: apps/v1 @@ -335,16 +333,14 @@ func cleanupHashiCorpVault(t *testing.T, kc *kubernetes.Clientset) { func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing activation ---") - templateTriggerJob := templateValues{"lowLevelRecordsJobTemplate": lowLevelRecordsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "lowLevelRecordsJobTemplate", lowLevelRecordsJobTemplate) AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60) } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, data templateData) { t.Log("--- testing scale up ---") - templateTriggerJob := templateValues{"insertRecordsJobTemplate": insertRecordsJobTemplate} - KubectlApplyMultipleWithTemplate(t, data, templateTriggerJob) + KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate", insertRecordsJobTemplate) assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3), "replica count should be %d after 3 minutes", maxReplicaCount) @@ -373,18 +369,18 @@ var data = templateData{ VaultNamespace: vaultNamespace, } -func getPostgreSQLTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "postgreSQLStatefulSetTemplate": postgreSQLStatefulSetTemplate, - "postgreSQLServiceTemplate": postgreSQLServiceTemplate, +func getPostgreSQLTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "postgreSQLStatefulSetTemplate", Config: postgreSQLStatefulSetTemplate}, + {Name: "postgreSQLServiceTemplate", Config: postgreSQLServiceTemplate}, } } -func getTemplateData() (templateData, map[string]string) { - return data, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthenticationTemplate": triggerAuthenticationTemplate, - "scaledObjectTemplate": scaledObjectTemplate, +func getTemplateData() (templateData, []Template) { + return data, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, } } diff --git a/tests/secret-providers/trigger_auth_secret/trigger_auth_secret_test.go b/tests/secret-providers/trigger_auth_secret/trigger_auth_secret_test.go index 4e002e4b689..4d9bae2b668 100644 --- a/tests/secret-providers/trigger_auth_secret/trigger_auth_secret_test.go +++ b/tests/secret-providers/trigger_auth_secret/trigger_auth_secret_test.go @@ -50,8 +50,6 @@ type templateData struct { QueueName string } -type templateValues map[string]string - const ( secretTemplate = ` apiVersion: v1 @@ -175,7 +173,7 @@ func createQueue(t *testing.T) (azqueue.QueueURL, azqueue.MessagesURL) { return queueURL, messageURL } -func getTemplateData() (templateData, templateValues) { +func getTemplateData() (templateData, []Template) { base64ConnectionString := base64.StdEncoding.EncodeToString([]byte(connectionString)) return templateData{ @@ -186,11 +184,12 @@ func getTemplateData() (templateData, templateValues) { TriggerAuthName: triggerAuthName, ScaledObjectName: scaledObjectName, QueueName: queueName, - }, templateValues{ - "secretTemplate": secretTemplate, - "deploymentTemplate": deploymentTemplate, - "triggerAuthTemplate": triggerAuthTemplate, - "scaledObjectTemplate": scaledObjectTemplate} + }, []Template{ + {Name: "secretTemplate", Config: secretTemplate}, + {Name: "deploymentTemplate", Config: deploymentTemplate}, + {Name: "triggerAuthTemplate", Config: triggerAuthTemplate}, + {Name: "scaledObjectTemplate", Config: scaledObjectTemplate}, + } } func testScaleUp(t *testing.T, kc *kubernetes.Clientset, messageURL azqueue.MessagesURL) {