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.

Sign up for GitHub

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

Give driver a map of handler names to client.TargetHandler #185

Merged
merged 13 commits into from
Jan 25, 2022
Merged

Give driver a map of handler names to client.TargetHandler #185

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b949017
Give driver a map of handler names to client.TargetHandler
davis-haba Jan 19, 2022
a0d1944
re-add error_map.go to client
davis-haba Jan 20, 2022
dcf7841
cleanup - remove error_map and targethandler from client
davis-haba Jan 21, 2022
5b20fc7
organize imports in local.go
davis-haba Jan 21, 2022
cc7e4e0
move local.driver.errors to separate package
davis-haba Jan 21, 2022
643520a
Move error_map.go to new errors package. Fix tests.
davis-haba Jan 21, 2022
c869488
Merge branch 'master' of https://github.com/open-policy-agent/framewo…
davis-haba Jan 21, 2022
b7bb131
gofmt and goimports client package
davis-haba Jan 21, 2022
9b38a81
name import for pkg/client/errors clienterrors in local/local_unit_te…
davis-haba Jan 21, 2022
36ff009
call all imports of pkg/client/errors clienterrors for consistency
davis-haba Jan 21, 2022
c74f80c
no newline after clienterrors import
davis-haba Jan 21, 2022
bf47424
sort imports in client.go
davis-haba Jan 24, 2022
930e2b6
sort inports in validate.go and client_test.go
davis-haba Jan 24, 2022
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
27 changes: 14 additions & 13 deletions constraint/pkg/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"errors"
"fmt"
clienterrors "github.com/open-policy-agent/frameworks/constraint/pkg/client/errors"
"path"
"sort"
"strings"
Expand Down Expand Up @@ -57,7 +58,7 @@ func createDataPath(target, subpath string) string {
// partial results can be analyzed.
func (c *Client) AddData(ctx context.Context, data interface{}) (*types.Responses, error) {
resp := types.NewResponses()
errMap := make(ErrorMap)
errMap := make(clienterrors.ErrorMap)
for target, h := range c.targets {
handled, relPath, processedData, err := h.ProcessData(data)
if err != nil {
Expand All @@ -84,7 +85,7 @@ func (c *Client) AddData(ctx context.Context, data interface{}) (*types.Response
// partial results can be analyzed.
func (c *Client) RemoveData(ctx context.Context, data interface{}) (*types.Responses, error) {
resp := types.NewResponses()
errMap := make(ErrorMap)
errMap := make(clienterrors.ErrorMap)
for target, h := range c.targets {
handled, relPath, _, err := h.ProcessData(data)
if err != nil {
Expand Down Expand Up @@ -124,7 +125,7 @@ func (c *Client) validateTargets(templ *templates.ConstraintTemplate) (*template
knownTargets := c.knownTargets()

return nil, nil, fmt.Errorf("%w: target %q not recognized, known targets %v",
local.ErrInvalidConstraintTemplate, targetSpec.Target, knownTargets)
clienterrors.ErrInvalidConstraintTemplate, targetSpec.Target, knownTargets)
}

return targetSpec, targetHandler, nil
Expand Down Expand Up @@ -157,7 +158,7 @@ func (a *rawCTArtifacts) Key() templateKey {
// complex tasks like rewriting Rego. Provides minimal validation.
func (c *Client) createRawTemplateArtifacts(templ *templates.ConstraintTemplate) (*rawCTArtifacts, error) {
if templ.GetName() == "" {
return nil, fmt.Errorf("%w: missing name", local.ErrInvalidConstraintTemplate)
return nil, fmt.Errorf("%w: missing name", clienterrors.ErrInvalidConstraintTemplate)
}

return &rawCTArtifacts{template: templ}, nil
Expand Down Expand Up @@ -210,7 +211,7 @@ func (c *Client) createBasicTemplateArtifacts(templ *templates.ConstraintTemplat
}

if err = crds.ValidateCRD(crd); err != nil {
return nil, fmt.Errorf("%w: %v", local.ErrInvalidConstraintTemplate, err)
return nil, fmt.Errorf("%w: %v", clienterrors.ErrInvalidConstraintTemplate, err)
}

entryPointPath := createTemplatePath(targetHandler.GetName(), templ.Spec.CRD.Spec.Names.Kind)
Expand All @@ -229,7 +230,7 @@ func (c *Client) createBasicTemplateArtifacts(templ *templates.ConstraintTemplat
func (c *Client) CreateCRD(templ *templates.ConstraintTemplate) (*apiextensions.CustomResourceDefinition, error) {
if templ == nil {
return nil, fmt.Errorf("%w: got nil ConstraintTemplate",
local.ErrInvalidConstraintTemplate)
clienterrors.ErrInvalidConstraintTemplate)
}

artifacts, err := c.createBasicTemplateArtifacts(templ)
Expand All @@ -243,12 +244,12 @@ func (c *Client) ValidateConstraintTemplateBasic(templ *templates.ConstraintTemp
kind := templ.Spec.CRD.Spec.Names.Kind
if kind == "" {
return nil, nil, fmt.Errorf("%w: ConstraintTemplate %q does not specify CRD Kind",
local.ErrInvalidConstraintTemplate, templ.GetName())
clienterrors.ErrInvalidConstraintTemplate, templ.GetName())
}

if !strings.EqualFold(templ.ObjectMeta.Name, kind) {
return nil, nil, fmt.Errorf("%w: the ConstraintTemplate's name %q is not equal to the lowercase of CRD's Kind: %q",
local.ErrInvalidConstraintTemplate, templ.ObjectMeta.Name, strings.ToLower(kind))
clienterrors.ErrInvalidConstraintTemplate, templ.ObjectMeta.Name, strings.ToLower(kind))
}

targetSpec, targetHandler, err := c.validateTargets(templ)
Expand All @@ -261,7 +262,7 @@ func (c *Client) ValidateConstraintTemplateBasic(templ *templates.ConstraintTemp
func (c *Client) ValidateConstraintTemplate(templ *templates.ConstraintTemplate) error {
if templ == nil {
return fmt.Errorf(`%w: ConstraintTemplate is nil`,
local.ErrInvalidConstraintTemplate)
clienterrors.ErrInvalidConstraintTemplate)
}
if _, _, err := c.ValidateConstraintTemplateBasic(templ); err != nil {
return err
Expand Down Expand Up @@ -469,7 +470,7 @@ func (c *Client) AddConstraint(ctx context.Context, constraint *unstructured.Uns
defer c.mtx.Unlock()

resp := types.NewResponses()
errMap := make(ErrorMap)
errMap := make(clienterrors.ErrorMap)
entry, err := c.getTemplateEntry(constraint, false)
if err != nil {
return resp, err
Expand Down Expand Up @@ -526,7 +527,7 @@ func (c *Client) RemoveConstraint(ctx context.Context, constraint *unstructured.

func (c *Client) removeConstraintNoLock(ctx context.Context, constraint *unstructured.Unstructured) (*types.Responses, error) {
resp := types.NewResponses()
errMap := make(ErrorMap)
errMap := make(clienterrors.ErrorMap)
entry, err := c.getTemplateEntry(constraint, false)
if err != nil {
return resp, err
Expand Down Expand Up @@ -694,7 +695,7 @@ func (c *Client) Review(ctx context.Context, obj interface{}, opts ...QueryOpt)
opt(cfg)
}
responses := types.NewResponses()
errMap := make(ErrorMap)
errMap := make(clienterrors.ErrorMap)
TargetLoop:
for name, target := range c.targets {
handled, review, err := target.HandleReview(obj)
Expand Down Expand Up @@ -736,7 +737,7 @@ func (c *Client) Audit(ctx context.Context, opts ...QueryOpt) (*types.Responses,
opt(cfg)
}
responses := types.NewResponses()
errMap := make(ErrorMap)
errMap := make(clienterrors.ErrorMap)
TargetLoop:
for name, target := range c.targets {
// Short-circuiting question applies here as well
Expand Down
Loading