chore: address comments

ratify-project · Apr 9, 2024 · 810c93e · 810c93e
1 parent 2061199
commit 810c93e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/httpserver/server.go b/httpserver/server.go
@@ -178,13 +178,13 @@ func (server *Server) registerHandlers() error {
 	if err != nil {
 		return err
 	}
-	server.register(http.MethodPost, verifyPath, processTimeout(server.verify, server.GetExecutor(context.Background()).GetVerifyRequestTimeout(), false))
+	server.register(http.MethodPost, verifyPath, processTimeout(server.verify, server.GetExecutor(server.Context).GetVerifyRequestTimeout(), false))
 
 	mutatePath, err := url.JoinPath(ServerRootURL, "mutate")
 	if err != nil {
 		return err
 	}
-	server.register(http.MethodPost, mutatePath, processTimeout(server.mutate, server.GetExecutor(context.Background()).GetMutationRequestTimeout(), true))
+	server.register(http.MethodPost, mutatePath, processTimeout(server.mutate, server.GetExecutor(server.Context).GetMutationRequestTimeout(), true))
 
 	return nil
 }

diff --git a/pkg/controllers/verifier_controller.go b/pkg/controllers/verifier_controller.go
@@ -118,6 +118,7 @@ func verifierAddOrReplace(spec configv1beta1.VerifierSpec, objectName string, na
 		logrus.Error(err, "unable to create verifier from verifier config")
 		return err
 	}
+	// TODO: pass the actual namespace once multi-tenancy is supported.
 	VerifierMap.AddVerifier(constants.EmptyNamespace, objectName, referenceVerifier)
 	logrus.Infof("verifier '%v' added to verifier map", referenceVerifier.Name())
 

diff --git a/pkg/customresources/verifiers/api.go b/pkg/customresources/verifiers/api.go
@@ -19,8 +19,8 @@ import (
 	vr "github.com/deislabs/ratify/pkg/verifier"
 )
 
-// Verifiers is an interface that defines the methods for managing verifiers across different scopes.
-type Verifiers interface {
+// VerifierManager is an interface that defines the methods for managing verifiers across different scopes.
+type VerifierManager interface {
 	// GetVerifiers returns verifiers under the given scope.
 	GetVerifiers(scope string) []vr.ReferenceVerifier
 

diff --git a/pkg/customresources/verifiers/verifiers.go b/pkg/customresources/verifiers/verifiers.go
@@ -19,7 +19,7 @@ import (
 	vr "github.com/deislabs/ratify/pkg/verifier"
 )
 
-// ActiveVerifiers implements Verifiers interface.
+// ActiveVerifiers implements VerifierManger interface.
 type ActiveVerifiers struct {
 	// TODO: Implement concurrent safety using sync.Map
 	// The structure of the map is as follows:
@@ -32,12 +32,13 @@ type ActiveVerifiers struct {
 	//     "verifier2": verifier2
 	//   }
 	// }
-	NamespacedVerifiers map[string]map[string]vr.ReferenceVerifier
+	// Note: Scope is utilized for organizing and isolating verifiers. In a Kubernetes (K8s) environment, the scope can be either a namespace or an empty string ("") for cluster-wide verifiers.
+	ScopedVerifiers map[string]map[string]vr.ReferenceVerifier
 }
 
-func NewActiveVerifiers() Verifiers {
+func NewActiveVerifiers() VerifierManager {
 	return &ActiveVerifiers{
-		NamespacedVerifiers: make(map[string]map[string]vr.ReferenceVerifier),
+		ScopedVerifiers: make(map[string]map[string]vr.ReferenceVerifier),
 	}
 }
 
@@ -46,7 +47,7 @@ func NewActiveVerifiers() Verifiers {
 // TODO: Current implementation fetches verifiers for all namespaces including cluster-wide ones. Will support actual namespace based verifiers in future.
 func (v *ActiveVerifiers) GetVerifiers(_ string) []vr.ReferenceVerifier {
 	verifiers := []vr.ReferenceVerifier{}
-	for _, namespacedVerifiers := range v.NamespacedVerifiers {
+	for _, namespacedVerifiers := range v.ScopedVerifiers {
 		for _, verifier := range namespacedVerifiers {
 			verifiers = append(verifiers, verifier)
 		}
@@ -55,14 +56,14 @@ func (v *ActiveVerifiers) GetVerifiers(_ string) []vr.ReferenceVerifier {
 }
 
 func (v *ActiveVerifiers) AddVerifier(scope, verifierName string, verifier vr.ReferenceVerifier) {
-	if _, ok := v.NamespacedVerifiers[scope]; !ok {
-		v.NamespacedVerifiers[scope] = make(map[string]vr.ReferenceVerifier)
+	if _, ok := v.ScopedVerifiers[scope]; !ok {
+		v.ScopedVerifiers[scope] = make(map[string]vr.ReferenceVerifier)
 	}
-	v.NamespacedVerifiers[scope][verifierName] = verifier
+	v.ScopedVerifiers[scope][verifierName] = verifier
 }
 
 func (v *ActiveVerifiers) DeleteVerifier(scope, verifierName string) {
-	if verifiers, ok := v.NamespacedVerifiers[scope]; ok {
+	if verifiers, ok := v.ScopedVerifiers[scope]; ok {
 		delete(verifiers, verifierName)
 	}
 }
@@ -73,7 +74,7 @@ func (v *ActiveVerifiers) IsEmpty() bool {
 
 func (v *ActiveVerifiers) GetVerifierCount() int {
 	count := 0
-	for _, verifiers := range v.NamespacedVerifiers {
+	for _, verifiers := range v.ScopedVerifiers {
 		count += len(verifiers)
 	}
 	return count