resolve golint issue

NickChungSUSE · Oct 13, 2024 · aa54630 · aa54630
1 parent 3386b11
commit aa54630
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 31 deletions.
diff --git a/controller/access/access.go b/controller/access/access.go
@@ -451,7 +451,7 @@ func getRestRolePermitValues(roleName, domain string) map[string]rwPermit {
 		}
 		for _, option := range PermissionOptions {
 			// need to check fed/nv_resource permissions as well
-			permit, _ := rolePermits[option.ID]
+			permit := rolePermits[option.ID]
 			optionReadValue, optionWriteValue := option.Value, option.Value
 			if domain == AccessDomainGlobal {
 				optionReadValue &= share.PERMS_FED_READ
@@ -521,7 +521,7 @@ func getDomainPermissions(domain string, roles []string, extraPermits []share.Nv
 				} else {
 					for id, rw := range rolePermits {
 						if rw.read || rw.write {
-							rwFound, _ := allPermits[id]
+							rwFound := allPermits[id]
 							allPermits[id] = rwPermit{read: rwFound.read || rw.read, write: rwFound.write || rw.write}
 						}
 					}
@@ -544,7 +544,7 @@ func getDomainPermissions(domain string, roles []string, extraPermits []share.Nv
 	}
 	for _, permit := range GetTopLevelPermitsList(scope, dExtraPermits) { // iterate thru []*api.RESTRolePermission from extra permissions
 		if permit.Read || permit.Write {
-			rw, _ := allPermits[permit.ID]
+			rw := allPermits[permit.ID]
 			allPermits[permit.ID] = rwPermit{read: rw.read || permit.Read, write: rw.write || permit.Write}
 		}
 	}
@@ -584,7 +584,7 @@ func GetUserPermissions(role string, roleDomains map[string][]string, extraPermi
 		}
 		for _, domain := range domains {
 			if domain != AccessDomainGlobal {
-				roles, _ := domainRoles[domain]
+				roles := domainRoles[domain]
 				domainRoles[domain] = append(roles, role)
 				allDomains[domain] = nil
 			}
@@ -599,7 +599,7 @@ func GetUserPermissions(role string, roleDomains map[string][]string, extraPermi
 		}
 		for _, domain := range permitsDomains.Domains {
 			if domain != AccessDomainGlobal {
-				permits, _ := domainPermits[domain]
+				permits := domainPermits[domain]
 				domainPermits[domain] = append(permits, permitsDomains.Permits)
 				allDomains[domain] = nil
 			}
@@ -609,8 +609,8 @@ func GetUserPermissions(role string, roleDomains map[string][]string, extraPermi
 	// 2-3. merge #2-1 & #2-2 to get the top-level permissions list for each domain
 	dPermitsList := make(map[string][]*api.RESTRolePermission, len(allDomains)) // domain -> list of permissions
 	for domain := range allDomains {
-		roles, _ := domainRoles[domain]
-		extraPermits, _ := domainPermits[domain]
+		roles := domainRoles[domain]
+		extraPermits := domainPermits[domain]
 		if permitsList := getDomainPermissions(domain, roles, extraPermits); len(permitsList) > 0 {
 			dPermitsList[domain] = permitsList
 		}
@@ -672,7 +672,7 @@ func getRequiredPermissions(r *http.Request) (int8, uint32) {
 			}
 		}
 	}
-	requiredPermissions, _ := apiPermissions[apiCategoryID]
+	requiredPermissions := apiPermissions[apiCategoryID]
 
 	return apiCategoryID, requiredPermissions
 }

diff --git a/controller/rest/auth.go b/controller/rest/auth.go
@@ -2929,9 +2929,7 @@ func _setFedJointPrivateKey(id string, key *rsa.PrivateKey) {
 	if key != nil {
 		jointClustersKeyCache[id] = key
 	} else {
-		if _, exist := jointClustersKeyCache[id]; exist {
-			delete(jointClustersKeyCache, id)
-		}
+		delete(jointClustersKeyCache, id)
 	}
 }
 

diff --git a/controller/rest/crdvalidatewebhook.go b/controller/rest/crdvalidatewebhook.go
@@ -305,7 +305,7 @@ func (q *tCrdRequestsMgr) crdQueueProc() {
 					crdHandler.mdName = req.Name
 				} else {
 					errCount = 1
-					errMsg = fmt.Sprintf("CRD Rule format error")
+					errMsg = "CRD Rule format error"
 				}
 			case "CREATE", "UPDATE":
 				if crdSecRule, err = resource.CreateNvCrdObject(rscType); crdSecRule != nil {
@@ -327,7 +327,7 @@ func (q *tCrdRequestsMgr) crdQueueProc() {
 				}
 				if err != nil {
 					errCount = 1
-					errMsg = fmt.Sprintf("CRD Rule format error")
+					errMsg = "CRD Rule format error"
 				} else {
 					if crdHandler.mdName != "" && rscType != "" {
 						if obj, err := global.ORCH.GetResource(rscType, req.Namespace, crdHandler.mdName); err == nil {

diff --git a/controller/rest/dlp_rule.go b/controller/rest/dlp_rule.go
@@ -1310,9 +1310,7 @@ func deleteDlpSensor(w http.ResponseWriter, name string, reviewType share.TRevie
 		defsensor.PreRuleList = make(map[string][]*share.CLUSDlpRule)
 	}
 	for _, rn := range dlpsensor.RuleListNames {
-		if _, foundInAll := defsensor.RuleList[rn]; foundInAll {
-			delete(defsensor.RuleList, rn)
-		}
+		delete(defsensor.RuleList, rn)
 	}
 	clusHelper.PutDlpSensorTxn(txn, defsensor)
 	clusHelper.DeleteDlpSensorTxn(txn, name)

diff --git a/controller/rest/federation.go b/controller/rest/federation.go
@@ -986,9 +986,7 @@ func revertMappedFedRoles(groupRoleMappings []*share.GroupRoleMapping) {
 			groupRoleMapping.GlobalRole = api.UserRoleReader
 		}
 		if groupRoleMapping.RoleDomains != nil {
-			if _, ok := groupRoleMapping.RoleDomains[groupRoleMapping.GlobalRole]; ok {
-				delete(groupRoleMapping.RoleDomains, groupRoleMapping.GlobalRole)
-			}
+			delete(groupRoleMapping.RoleDomains, groupRoleMapping.GlobalRole)
 		}
 	}
 }

diff --git a/controller/rest/rest.go b/controller/rest/rest.go
@@ -1002,12 +1002,10 @@ func restEventLog(r *http.Request, body []byte, login *loginSession, fields rest
 		clog.RESTBody = string(body[:size])
 	}
 
-	if fields != nil {
-		for key, value := range fields {
-			switch key {
-			case restLogFieldMsg:
-				clog.Msg = value
-			}
+	for key, value := range fields {
+		switch key {
+		case restLogFieldMsg:
+			clog.Msg = value
 		}
 	}
 

diff --git a/controller/rest/server.go b/controller/rest/server.go
@@ -263,9 +263,7 @@ func checkGroupRolesMapping(oldSettings, newSettings []*share.GroupRoleMapping,
 
 			// if a groups is mapped to a role for global domain, it's implicitly mapped to that same role for all domains. So remove unnecessary domain role mapping entry
 			if mappedRoles.RoleDomains != nil {
-				if _, ok := mappedRoles.RoleDomains[mappedRoles.GlobalRole]; ok {
-					delete(mappedRoles.RoleDomains, mappedRoles.GlobalRole)
-				}
+				delete(mappedRoles.RoleDomains, mappedRoles.GlobalRole)
 			}
 
 			mappedDomainRole := make(map[string]string, 0) // for each group, each domain can only be mapped to one role

diff --git a/controller/rest/waf_rule.go b/controller/rest/waf_rule.go
@@ -983,9 +983,7 @@ func deleteWafSensor(w http.ResponseWriter, name string, reviewType share.TRevie
 		defsensor.PreRuleList = make(map[string][]*share.CLUSWafRule)
 	}
 	for _, rn := range wafsensor.RuleListNames {
-		if _, foundInAll := defsensor.RuleList[rn]; foundInAll {
-			delete(defsensor.RuleList, rn)
-		}
+		delete(defsensor.RuleList, rn)
 	}
 	clusHelper.PutWafSensorTxn(txn, defsensor)
 	clusHelper.DeleteWafSensorTxn(txn, name)