add policy cache test

Author: deads2k

pkg/authorization/cache/policy_cache.go

@@ -123,7 +123,9 @@ func (c *PolicyCache) ListPolicyBindings(ctx kapi.Context, labels, fields labels
 		return nil, err
 	}
 
-	ret := &authorizationapi.PolicyBindingList{}
+	ret := &authorizationapi.PolicyBindingList{
+		Items: make([]authorizationapi.PolicyBinding, 0, len(bindings)),
+	}
 	for i := range bindings {
 		ret.Items = append(ret.Items, *bindings[i].(*authorizationapi.PolicyBinding))
 	}

pkg/authorization/registry/test/policy.go

@@ -34,16 +34,21 @@ func (r *PolicyRegistry) ListPolicies(ctx kapi.Context, labels, fields klabels.S
 	}
 
 	namespace := kapi.NamespaceValue(ctx)
-	if len(namespace) == 0 {
-		return nil, errors.New("invalid request.  Namespace parameter required.")
-	}
-
 	list := make([]authorizationapi.Policy, 0)
-	if namespacedPolicies, ok := r.Policies[namespace]; ok {
-		for _, curr := range namespacedPolicies {
-			list = append(list, curr)
+
+	if namespace == kapi.NamespaceAll {
+		for _, curr := range r.Policies {
+			for _, policy := range curr {
+				list = append(list, policy)
+			}
 		}
 
+	} else {
+		if namespacedPolicies, ok := r.Policies[namespace]; ok {
+			for _, curr := range namespacedPolicies {
+				list = append(list, curr)
+			}
+		}
 	}
 
 	return &authorizationapi.PolicyList{

pkg/authorization/registry/test/policybinding.go

@@ -34,16 +34,21 @@ func (r *PolicyBindingRegistry) ListPolicyBindings(ctx kapi.Context, labels, fie
 	}
 
 	namespace := kapi.NamespaceValue(ctx)
-	if len(namespace) == 0 {
-		return nil, errors.New("invalid request.  Namespace parameter required.")
-	}
-
 	list := make([]authorizationapi.PolicyBinding, 0)
-	if namespacedBindings, ok := r.PolicyBindings[namespace]; ok {
-		for _, curr := range namespacedBindings {
-			list = append(list, curr)
+
+	if namespace == kapi.NamespaceAll {
+		for _, curr := range r.PolicyBindings {
+			for _, binding := range curr {
+				list = append(list, binding)
+			}
 		}
 
+	} else {
+		if namespacedBindings, ok := r.PolicyBindings[namespace]; ok {
+			for _, curr := range namespacedBindings {
+				list = append(list, curr)
+			}
+		}
 	}
 
 	return &authorizationapi.PolicyBindingList{

test/integration/policy_cache_test.go

@@ -0,0 +1,97 @@
+package integration
+
+import (
+	"testing"
+	"time"
+
+	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+
+	authorizationapi "github.com/openshift/origin/pkg/authorization/api"
+	policycache "github.com/openshift/origin/pkg/authorization/cache"
+	testregistry "github.com/openshift/origin/pkg/authorization/registry/test"
+)
+
+func TestPolicyGet(t *testing.T) {
+	policyRegistry := testregistry.NewPolicyRegistry(testPolicies(), nil)
+	bindingRegistry := testregistry.NewPolicyBindingRegistry(testBindings(), nil)
+
+	policyCache := policycache.NewPolicyCache(bindingRegistry, policyRegistry)
+	policyCache.Run(1 * time.Second)
+
+	time.Sleep(50 * time.Millisecond)
+
+	ctx := kapi.WithNamespace(kapi.NewContext(), "mallet")
+	policy, err := policyCache.GetPolicy(ctx, authorizationapi.PolicyName)
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	if policy == nil {
+		t.Errorf("Missing policy")
+	}
+
+	bindings, err := policyCache.ListPolicyBindings(ctx, labels.Everything(), labels.Everything())
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+	}
+	if len(bindings.Items) != 1 {
+		t.Errorf("Unexpected bindings: %#v", bindings)
+	}
+}
+
+func testPolicies() []authorizationapi.Policy {
+	return []authorizationapi.Policy{
+		{
+			ObjectMeta: kapi.ObjectMeta{
+				Name:      authorizationapi.PolicyName,
+				Namespace: "mallet",
+			},
+			Roles: map[string]authorizationapi.Role{},
+		}}
+}
+func testBindings() []authorizationapi.PolicyBinding {
+	return []authorizationapi.PolicyBinding{
+		{
+			ObjectMeta: kapi.ObjectMeta{
+				Name:      "mallet",
+				Namespace: "mallet",
+			},
+			RoleBindings: map[string]authorizationapi.RoleBinding{
+				"projectAdmins": {
+					ObjectMeta: kapi.ObjectMeta{
+						Name:      "projectAdmins",
+						Namespace: "mallet",
+					},
+					RoleRef: kapi.ObjectReference{
+						Name:      "admin",
+						Namespace: "mallet",
+					},
+					Users: util.NewStringSet("Matthew"),
+				},
+				"viewers": {
+					ObjectMeta: kapi.ObjectMeta{
+						Name:      "viewers",
+						Namespace: "mallet",
+					},
+					RoleRef: kapi.ObjectReference{
+						Name:      "view",
+						Namespace: "mallet",
+					},
+					Users: util.NewStringSet("Victor"),
+				},
+				"editors": {
+					ObjectMeta: kapi.ObjectMeta{
+						Name:      "editors",
+						Namespace: "mallet",
+					},
+					RoleRef: kapi.ObjectReference{
+						Name:      "edit",
+						Namespace: "mallet",
+					},
+					Users: util.NewStringSet("Edgar"),
+				},
+			},
+		},
+	}
+}