From 324cc7c91a016540ce355da51e541b55f3af2928 Mon Sep 17 00:00:00 2001
From: Roy Hadad <roy@datree.io>
Date: Sun, 9 Jul 2023 18:21:20 +0300
Subject: [PATCH] handle errors

---
 Makefile                          | 4 ++--
 internal/startup/startup.go       | 5 ++++-
 pkg/services/validationService.go | 9 +++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 65a4b04f..2256508a 100644
--- a/Makefile
+++ b/Makefile
@@ -66,8 +66,8 @@ helm-install-staging:
 	--set image.repository="datree/webhook-staging" \
 	--set image.tag="latest" \
 	--set securityContext.seccompProfile=null \
-    --set securityContext.runAsUser=null \
-    --set datree.labelKubeSystem=false \
+	--set securityContext.runAsUser=null \
+	--set datree.labelKubeSystem=false \
 	--debug && \
 	make change-ping-uninstall-url-to-production
 
diff --git a/internal/startup/startup.go b/internal/startup/startup.go
index 4c4944cf..7fcf14bc 100644
--- a/internal/startup/startup.go
+++ b/internal/startup/startup.go
@@ -44,7 +44,6 @@ func Start() {
 	basicCliClient := clients.NewCliServiceClient(deploymentConfig.URL, basicNetworkValidator, state)
 	errorReporter := errorReporter.NewErrorReporter(basicCliClient, state)
 	internalLogger := logger.New("", errorReporter)
-	openshiftServiceInstance, err := openshiftService.NewOpenshiftService()
 
 	defer func() {
 		if panicErr := recover(); panicErr != nil {
@@ -54,6 +53,10 @@ func Start() {
 		}
 	}()
 
+	openshiftServiceInstance, err := openshiftService.NewOpenshiftService()
+	if err != nil {
+		panic(err) // should never happen
+	}
 	k8sClientInstance, err := k8sClient.NewK8sClient()
 	var leaderElectionLeaseGetter v1.LeasesGetter = nil
 	if err == nil && k8sClientInstance != nil {
diff --git a/pkg/services/validationService.go b/pkg/services/validationService.go
index 79f3b4a3..1ec9b84c 100644
--- a/pkg/services/validationService.go
+++ b/pkg/services/validationService.go
@@ -70,6 +70,11 @@ func (vs *ValidationService) Validate(admissionReviewReq *admission.AdmissionRev
 	cliEvaluationId := -1
 	var err error
 
+	res, err := vs.OpenshiftService.GetGroupsUserBelongsTo("roy@datree.io")
+	fmt.Println("@@@@@@@@@@@@1")
+	fmt.Println(res, err)
+	fmt.Println("@@@@@@@@@@@@")
+
 	ciContext := ciContext.Extract()
 
 	clusterK8sVersion := vs.State.GetK8sVersion()
@@ -411,11 +416,11 @@ func (vs *ValidationService) shouldBypassByPermissions(userInfo authenticationv1
 		userName = openShiftRequester
 
 		// override groups
-		groupsFromOpenshiftClient, err := vs.OpenshiftService.GetGroupsUserBelongsTo(openShiftRequester)
+		groupsFromOpenshiftService, err := vs.OpenshiftService.GetGroupsUserBelongsTo(openShiftRequester)
 		if err != nil {
 			vs.Logger.LogError(fmt.Sprintf("Failed to get groups for user %s from openshift service: %s", openShiftRequester, err.Error()))
 		} else {
-			groups = groupsFromOpenshiftClient
+			groups = groupsFromOpenshiftService
 		}
 	}