Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly handle errors in policy listing #15762

Merged
merged 1 commit into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/authorization/registry/clusterpolicy/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ func NewSimulatedRegistry(clusterRegistry Registry) policy.Registry {

func (s *simulatedStorage) ListPolicies(ctx apirequest.Context, options *metainternal.ListOptions) (*authorizationapi.PolicyList, error) {
ret, err := s.clusterRegistry.ListClusterPolicies(ctx, options)
if err != nil {
return nil, err
}
return authorizationapi.ToPolicyList(ret), err
}

Expand All @@ -113,6 +116,9 @@ func (s *simulatedStorage) UpdatePolicy(ctx apirequest.Context, policy *authoriz

func (s *simulatedStorage) GetPolicy(ctx apirequest.Context, name string, options *metav1.GetOptions) (*authorizationapi.Policy, error) {
ret, err := s.clusterRegistry.GetClusterPolicy(ctx, name, options)
if err != nil {
return nil, err
}
return authorizationapi.ToPolicy(ret), err
}

Expand Down
6 changes: 6 additions & 0 deletions pkg/authorization/registry/clusterpolicybinding/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ func NewSimulatedRegistry(clusterRegistry Registry) policybinding.Registry {

func (s *simulatedStorage) ListPolicyBindings(ctx apirequest.Context, options *metainternal.ListOptions) (*authorizationapi.PolicyBindingList, error) {
ret, err := s.clusterRegistry.ListClusterPolicyBindings(ctx, options)
if err != nil {
return nil, err
}
return authorizationapi.ToPolicyBindingList(ret), err
}

Expand All @@ -113,6 +116,9 @@ func (s *simulatedStorage) UpdatePolicyBinding(ctx apirequest.Context, policyBin

func (s *simulatedStorage) GetPolicyBinding(ctx apirequest.Context, name string, options *metav1.GetOptions) (*authorizationapi.PolicyBinding, error) {
ret, err := s.clusterRegistry.GetClusterPolicyBinding(ctx, name, options)
if err != nil {
return nil, err
}
return authorizationapi.ToPolicyBinding(ret), err
}

Expand Down