Minor code review and fix CHANGELOG category

Signed-off-by: dttung2905 <ttdao.2015@accountancy.smu.edu.sg>
kedacore · Feb 9, 2023 · c40049d · c40049d
1 parent 55271af
commit c40049d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -92,11 +92,19 @@ New deprecation(s):
 ### Other
 
 - **General**: Bump Golang to 1.19 ([#4094](https://github.com/kedacore/keda/issues/4094))
+<<<<<<< HEAD
 - **General:** Check that ScaledObject name is specified as part of a query for getting metrics ([#4088](https://github.com/kedacore/keda/pull/4088))
 - **General:** Compare error with `errors.Is` ([#4004](https://github.com/kedacore/keda/pull/4004))
 - **General:** Pass deep copy object to scalers cache from the ScaledObject controller ([#4207](https://github.com/kedacore/keda/issues/4207))
 - **General:** Review CodeQL rules and enable it on PRs ([#4032](https://github.com/kedacore/keda/pull/4032))
 - **Azure Scalers:** Add Azure Pod Identity && Workload Identity e2e tests ([#3896](https://github.com/kedacore/keda/pull/3896))
+=======
+- **General**: Check that ScaledObject name is specified as part of a query for getting metrics ([#4088](https://github.com/kedacore/keda/pull/4088))
+- **General**: Compare error with `errors.Is` ([#4004](https://github.com/kedacore/keda/pull/4004))
+- **General**: Improve test coverage in `pkg/util` ([#3871](https://github.com/kedacore/keda/issues/3871))
+- **General**: Pass deep copy object to scalers cache from the ScaledObject controller ([#4207](https://github.com/kedacore/keda/issues/4207))
+- **General**: Review CodeQL rules and enable it on PRs ([#4032](https://github.com/kedacore/keda/pull/4032))
+>>>>>>> 5045eb06 (Minor code review and fix CHANGELOG category)
 - **RabbitMQ Scaler:** Move from `streadway/amqp` to `rabbitmq/amqp091-go` ([#4004](https://github.com/kedacore/keda/pull/4039))
 
 ## v2.9.3

diff --git a/pkg/util/nomalize_string_test.go b/pkg/util/nomalize_string_test.go
@@ -5,7 +5,6 @@ import (
 )
 
 func TestNormalizeString(t *testing.T) {
-
 	testCases := []struct {
 		name     string
 		input    string
@@ -53,7 +52,6 @@ func TestNormalizeString(t *testing.T) {
 			if outputString != test.expected {
 				t.Errorf("Expected %s but got %s", test.expected, outputString)
 			}
-
 		})
 	}
 }
diff --git a/pkg/util/tls_config_test.go b/pkg/util/tls_config_test.go
@@ -98,7 +98,6 @@ JR68ifUcDhEs2/af5oAaJsw=
 func testingKey(s string) string { return strings.ReplaceAll(s, "TESTING KEY", "PRIVATE KEY") }
 
 func TestNewTLSConfig_WithoutPassword(t *testing.T) {
-
 	testCases := []struct {
 		name   string
 		cert   string
@@ -137,14 +136,10 @@ func TestNewTLSConfig_WithoutPassword(t *testing.T) {
 	}
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-
 			config, err := NewTLSConfig(test.cert, test.key, test.CACert)
 			if err != nil {
 				t.Errorf("Should have no error %s", err)
 			}
-			if config == nil {
-				t.Errorf("Config should not be nil")
-			}
 			cert, err := x509.ParseCertificate(config.Certificates[0].Certificate[0])
 			if err != nil {
 				t.Errorf("Bad certificate")
@@ -165,7 +160,6 @@ func TestNewTLSConfig_WithoutPassword(t *testing.T) {
 	}
 }
 func TestNewTLSConfig_WithPassword(t *testing.T) {
-
 	testCases := []struct {
 		name     string
 		cert     string
@@ -209,7 +203,6 @@ func TestNewTLSConfig_WithPassword(t *testing.T) {
 	}
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-
 			config, err := NewTLSConfigWithPassword(test.cert, test.key, test.password, test.CACert)
 			if err != nil {
 				t.Errorf("Should have no error: %s", err)