Fix checkmarx issues (#128)

kyma-project · Sep 4, 2023 · 225ce74 · 225ce74
1 parent 17f2651
commit 225ce74
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 34 deletions.
diff --git a/e2e/cleanup/cleanup_test.go b/e2e/cleanup/cleanup_test.go
@@ -49,14 +49,12 @@ func TestMain(m *testing.M) {
 	var err error
 	logger, err = SetupLogger()
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	clientSet, k8sClient, err = GetK8sClients()
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// Delete the NATS CR.
@@ -70,8 +68,7 @@ func TestMain(m *testing.M) {
 		return errDel
 	})
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// Run the tests and exit.

diff --git a/e2e/natsserver/natsserver_test.go b/e2e/natsserver/natsserver_test.go
@@ -40,8 +40,7 @@ func TestMain(m *testing.M) {
 	var err error
 	logger, err = SetupLogger()
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// Run the tests and exit.

diff --git a/e2e/setup/setup_test.go b/e2e/setup/setup_test.go
@@ -51,15 +51,12 @@ func TestMain(m *testing.M) {
 	var err error
 	logger, err = SetupLogger()
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
-
+		logger.Fatal(err.Error())
 	}
 
 	clientSet, k8sClient, err = GetK8sClients()
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	ctx := context.TODO()
@@ -69,8 +66,7 @@ func TestMain(m *testing.M) {
 		return client.IgnoreAlreadyExists(k8sClient.Create(ctx, Namespace()))
 	})
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// Wait for NATS-manager deployment to get ready.
@@ -84,8 +80,7 @@ func TestMain(m *testing.M) {
 		)
 	}
 	if err := waitForNATSManagerDeploymentReady(managerImage); err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// Create the NATS CR used for testing.
@@ -100,17 +95,15 @@ func TestMain(m *testing.M) {
 		return errNATS
 	})
 	if err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// wait for an interval for reconciliation to update status.
 	time.Sleep(interval)
 
 	// Wait for NATS CR to get ready.
 	if err := waitForNATSCRReady(); err != nil {
-		logger.Error(err.Error())
-		panic(err)
+		logger.Fatal(err.Error())
 	}
 
 	// Run the tests and exit.

diff --git a/internal/controller/nats/integrationtests/controller/integration_test.go b/internal/controller/nats/integrationtests/controller/integration_test.go
@@ -2,6 +2,7 @@ package controller_test
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"testing"
 	"time"
@@ -34,15 +35,15 @@ func TestMain(m *testing.M) {
 	var err error
 	testEnvironment, err = integration.NewTestEnvironment(projectRootDir, false, nil)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	// run tests
 	code := m.Run()
 
 	// tear down test env
 	if err = testEnvironment.TearDown(); err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	os.Exit(code)

diff --git a/internal/controller/nats/integrationtests/controllersinglecr/integration_test.go b/internal/controller/nats/integrationtests/controllersinglecr/integration_test.go
@@ -2,6 +2,7 @@ package controller_test
 
 import (
 	"fmt"
+	"log"
 	"os"
 	"testing"
 
@@ -34,15 +35,15 @@ func TestMain(m *testing.M) {
 	var err error
 	testEnvironment, err = integration.NewTestEnvironment(projectRootDir, false, givenAllowedNATS)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	// run tests
 	code := m.Run()
 
 	// tear down test env
 	if err = testEnvironment.TearDown(); err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	os.Exit(code)

diff --git a/internal/controller/nats/integrationtests/validation/integration_test.go b/internal/controller/nats/integrationtests/validation/integration_test.go
@@ -1,6 +1,7 @@
 package validation_test
 
 import (
+	"log"
 	"os"
 	"testing"
 
@@ -52,15 +53,15 @@ func TestMain(m *testing.M) {
 	var err error
 	testEnvironment, err = integration.NewTestEnvironment(projectRootDir, true, nil)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	// run tests
 	code := m.Run()
 
 	// tear down test env
 	if err = testEnvironment.TearDown(); err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	os.Exit(code)

diff --git a/testutils/integration/integration.go b/testutils/integration/integration.go
@@ -166,7 +166,7 @@ func NewTestEnvironment(projectRootDir string, celValidationEnabled bool,
 		mgrCtx, cancelCtx = context.WithCancel(ctrl.SetupSignalHandler())
 		err = ctrlMgr.Start(mgrCtx)
 		if err != nil {
-			panic(err)
+			log.Fatal(err)
 		}
 	}()
 
@@ -235,12 +235,12 @@ func (env TestEnvironment) EnsureK8sResourceUpdated(t *testing.T, obj client.Obj
 func (env TestEnvironment) UpdatedNATSInK8s(nats *natsv1alpha1.NATS, options ...testutils.NATSOption) error {
 	natsOnK8s, err := env.GetNATSFromK8s(nats.Name, nats.Namespace)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 
 	for _, o := range options {
 		if er := o(&natsOnK8s); er != nil {
-			panic(er)
+			log.Fatal(err)
 		}
 	}
 

diff --git a/testutils/utils.go b/testutils/utils.go
@@ -2,6 +2,7 @@ package testutils
 
 import (
 	"fmt"
+	"log"
 	"math/rand"
 	"time"
 
@@ -95,7 +96,7 @@ func NewNATSStatefulSetUnStruct(opts ...Option) *unstructured.Unstructured {
 
 	for _, opt := range opts {
 		if err := opt(obj); err != nil {
-			panic(err)
+			log.Fatal(err)
 		}
 	}
 	return obj
@@ -115,7 +116,7 @@ func NewSecretUnStruct(opts ...Option) *unstructured.Unstructured {
 
 	for _, opt := range opts {
 		if err := opt(obj); err != nil {
-			panic(err)
+			log.Fatal(err)
 		}
 	}
 	return obj
@@ -126,7 +127,7 @@ func NewSecret(opts ...Option) *apiv1.Secret {
 	err := runtime.DefaultUnstructuredConverter.FromUnstructured(
 		NewSecretUnStruct(opts...).UnstructuredContent(), &sampleSecret)
 	if err != nil {
-		panic(err)
+		log.Fatal(err)
 	}
 	return &sampleSecret
 }
@@ -150,7 +151,7 @@ func NewNATSCR(opts ...NATSOption) *v1alpha1.NATS {
 
 	for _, opt := range opts {
 		if err := opt(nats); err != nil {
-			panic(err)
+			log.Fatal(err)
 		}
 	}