Clean up fields and fix test

Signed-off-by: Michael Marshall <[email protected]>
kedacore · Nov 10, 2022 · d238070 · d238070
1 parent 7d902b4
commit d238070
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/pkg/scalers/pulsar_scaler.go b/pkg/scalers/pulsar_scaler.go
@@ -28,7 +28,6 @@ type pulsarScaler struct {
 type pulsarMetadata struct {
 	adminURL                      string
 	topic                         string
-	isPartitionedTopic            bool
 	subscription                  string
 	msgBacklogThreshold           int64
 	activationMsgBacklogThreshold int64
@@ -143,10 +142,8 @@ func parsePulsarMetadata(config *ScalerConfig) (pulsarMetadata, error) {
 
 	topic := strings.ReplaceAll(meta.topic, "persistent://", "")
 	if config.TriggerMetadata["isPartitionedTopic"] == stringTrue {
-		meta.isPartitionedTopic = true
 		meta.statsURL = meta.adminURL + "/admin/v2/persistent/" + topic + "/partitioned-stats"
 	} else {
-		meta.isPartitionedTopic = false
 		meta.statsURL = meta.adminURL + "/admin/v2/persistent/" + topic + "/stats"
 	}
 

diff --git a/pkg/scalers/pulsar_scaler_test.go b/pkg/scalers/pulsar_scaler_test.go
@@ -95,16 +95,10 @@ func TestParsePulsarMetadata(t *testing.T) {
 
 		if !testData.isError {
 			if testData.isPartitionedTopic {
-				if !meta.isPartitionedTopic {
-					t.Errorf("Expected isPartitionedTopic %t but got %t\n", testData.isPartitionedTopic, meta.isPartitionedTopic)
-				}
 				if !strings.HasSuffix(meta.statsURL, "/partitioned-stats") {
 					t.Errorf("Expected statsURL to end with /partitioned-stats but got %s\n", meta.statsURL)
 				}
 			} else {
-				if meta.isPartitionedTopic {
-					t.Errorf("Expected isPartitionedTopic %t but got %t\n", testData.isPartitionedTopic, meta.isPartitionedTopic)
-				}
 				if !strings.HasSuffix(meta.statsURL, "/stats") {
 					t.Errorf("Expected statsURL to end with /stats but got %s\n", meta.statsURL)
 				}

diff --git a/tests/scalers/pulsar/helper/helper.go b/tests/scalers/pulsar/helper/helper.go
@@ -139,14 +139,14 @@ spec:
   cooldownPeriod: 30 # Optional. Default: 300 seconds
   maxReplicaCount: {{.MaxReplicaCount}}
   minReplicaCount: {{.MinReplicaCount}}
-  isPartitionedTopic: {{ if .NumPartitions }} "true" {{else}} "false" {{end}}
   triggers:
     - type: pulsar
       metadata:
         msgBacklog: "{{.MsgBacklog}}"
         activationMsgBacklogThreshold: "5"
         adminURL: http://{{.TestName}}.{{.TestName}}:8080
         topic:  persistent://public/default/keda
+        isPartitionedTopic: {{ if .NumPartitions }} "true" {{else}} "false" {{end}}
         subscription: keda
           `