Handle password value correctly; add tests. (kedacore#1939)

Signed-off-by: Trevor Dolby <tdolby@uk.ibm.com>
Signed-off-by: nilayasiktoprak <nilayasiktoprak@gmail.com>

CHANGELOG.md

@@ -30,6 +30,8 @@
 - Fix READY and ACTIVE fields of ScaledJob to show status when we run `kubectl get sj` ([#1855](https://github.com/kedacore/keda/pull/1855))
 - Don't panic when HashiCorp Vault path doesn't exist ([#1864](https://github.com/kedacore/keda/pull/1864))
 - Allow influxdb `authToken`, `serverURL`, and `organizationName` to be sourced from `(Cluster)TriggerAuthentication` ([#1904](https://github.com/kedacore/keda/pull/1904))
+- IBM MQ scaler password handling fix ([#1939](https://github.com/kedacore/keda/pull/1939))
+
 ### Breaking Changes
 
 - TODO ([#XXX](https://github.com/kedacore/keda/pull/XXX))

pkg/scalers/ibmmq_scaler.go

@@ -134,10 +134,10 @@ func parseIBMMQMetadata(config *ScalerConfig) (*IBMMQMetadata, error) {
  default:
  return nil, fmt.Errorf("no username given")
  }
- value, booleanValue := config.AuthParams["password"] // booleanValue reports whether the type assertion succeeded or not
+ pwdValue, booleanValue := config.AuthParams["password"] // booleanValue reports whether the type assertion succeeded or not
  switch {
- case booleanValue && value != "":
- meta.password = val
+ case booleanValue && pwdValue != "":
+ meta.password = pwdValue
  case config.TriggerMetadata["passwordFromEnv"] != "":
  meta.password = config.ResolvedEnv[config.TriggerMetadata["passwordFromEnv"]]
  default:

pkg/scalers/ibmmq_scaler_test.go

@@ -61,9 +61,10 @@ var testIBMMQMetadata = []parseIBMMQMetadataTestData{
 
 // Test MQ Connection metadata is parsed correctly
 // should error on missing required field
+// and verify that the password field is handled correctly.
 func TestIBMMQParseMetadata(t *testing.T) {
  for _, testData := range testIBMMQMetadata {
- _, err := parseIBMMQMetadata(&ScalerConfig{ResolvedEnv: sampleIBMMQResolvedEnv, TriggerMetadata: testData.metadata, AuthParams: testData.authParams})
+ metadata, err := parseIBMMQMetadata(&ScalerConfig{ResolvedEnv: sampleIBMMQResolvedEnv, TriggerMetadata: testData.metadata, AuthParams: testData.authParams})
  if err != nil && !testData.isError {
  t.Error("Expected success but got error", err)
  fmt.Println(testData)
@@ -72,6 +73,10 @@ func TestIBMMQParseMetadata(t *testing.T) {
  t.Error("Expected error but got success")
  fmt.Println(testData)
  }
+ if metadata != nil && metadata.password != "" && metadata.password != testData.authParams["password"] {
+ t.Error("Expected password from configuration but found something else: ", metadata.password)
+ fmt.Println(testData)
+ }
  }
 }