diff --git a/go.mod b/go.mod index 691ce9cb83d..ff937787930 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/google/uuid v1.6.0 github.com/onsi/gomega v1.34.2 github.com/open-policy-agent/cert-controller v0.11.0 - github.com/open-policy-agent/frameworks/constraint v0.0.0-20241101234656-e78c8abd754a + github.com/open-policy-agent/frameworks/constraint v0.0.0-20250115145356-9e57a5775c15 github.com/open-policy-agent/opa v0.68.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.5 diff --git a/go.sum b/go.sum index fa4960f19ce..f0a1937df06 100644 --- a/go.sum +++ b/go.sum @@ -290,8 +290,8 @@ github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/open-policy-agent/cert-controller v0.11.0 h1:zXaXeaS4eRAZXhUH5SxWqky681Y2KWjQv/z3X8iMcaQ= github.com/open-policy-agent/cert-controller v0.11.0/go.mod h1:456gr2XKHzxDOjxJZUST5rLIX8olrHkBUymy49FZzps= -github.com/open-policy-agent/frameworks/constraint v0.0.0-20241101234656-e78c8abd754a h1:gQtOJ50XFyL2Xh3lDD9zP4KQ2PY4mZKQ9hDcWc81Sp8= -github.com/open-policy-agent/frameworks/constraint v0.0.0-20241101234656-e78c8abd754a/go.mod h1:tI7nc6H6os2UYZRvSm9Y7bq4oMoXqhwA0WfnqKpoAgc= +github.com/open-policy-agent/frameworks/constraint v0.0.0-20250115145356-9e57a5775c15 h1:SQ2x7uLL/mNlagJ8HQuBThinn6Ys600+nxXeGzqzOds= +github.com/open-policy-agent/frameworks/constraint v0.0.0-20250115145356-9e57a5775c15/go.mod h1:tI7nc6H6os2UYZRvSm9Y7bq4oMoXqhwA0WfnqKpoAgc= github.com/open-policy-agent/opa v0.68.0 h1:Jl3U2vXRjwk7JrHmS19U3HZO5qxQRinQbJ2eCJYSqJQ= github.com/open-policy-agent/opa v0.68.0/go.mod h1:5E5SvaPwTpwt2WM177I9Z3eT7qUpmOGjk1ZdHs+TZ4w= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= diff --git a/vendor/github.com/open-policy-agent/frameworks/constraint/pkg/client/client.go b/vendor/github.com/open-policy-agent/frameworks/constraint/pkg/client/client.go index 809c675cb0b..307279fc753 100644 --- a/vendor/github.com/open-policy-agent/frameworks/constraint/pkg/client/client.go +++ b/vendor/github.com/open-policy-agent/frameworks/constraint/pkg/client/client.go @@ -623,6 +623,10 @@ func (c *Client) RemoveData(ctx context.Context, data interface{}) (*types.Respo return resp, &errMap } +func (c *Client) actionKey(constraint *unstructured.Unstructured) string { + return fmt.Sprintf("%s.%s", constraint.GetKind(), constraint.GetName()) +} + // Review makes sure the provided object satisfies constraints applicable for specific enforcement points. // On error, the responses return value will still be populated so that // partial results can be analyzed. @@ -689,8 +693,8 @@ func (c *Client) Review(ctx context.Context, obj interface{}, opts ...reviews.Re for _, matchResult := range matchingConstraints { if matchResult.error == nil { targetConstraints = append(targetConstraints, matchResult.constraint) - targetScopedEnforcementActions[matchResult.constraint.GetName()] = matchResult.scopedEnforcementActions - targetEnforcementAction[matchResult.constraint.GetName()] = matchResult.enforcementAction + targetScopedEnforcementActions[c.actionKey(matchResult.constraint)] = matchResult.scopedEnforcementActions + targetEnforcementAction[c.actionKey(matchResult.constraint)] = matchResult.enforcementAction } else { autorejections[target] = append(autorejections[target], matchResult) } @@ -711,10 +715,10 @@ func (c *Client) Review(ctx context.Context, obj interface{}, opts ...reviews.Re } for i := range resp.Results { - if val, ok := scopedEnforcementActionsByTarget[target][resp.Results[i].Constraint.GetName()]; ok { + if val, ok := scopedEnforcementActionsByTarget[target][c.actionKey(resp.Results[i].Constraint)]; ok { resp.Results[i].ScopedEnforcementActions = val } - if val, ok := enforcementActionByTarget[target][resp.Results[i].Constraint.GetName()]; ok { + if val, ok := enforcementActionByTarget[target][c.actionKey(resp.Results[i].Constraint)]; ok { resp.Results[i].EnforcementAction = val } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 7b310624d41..9cf4daaa453 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -424,7 +424,7 @@ github.com/onsi/gomega/types # github.com/open-policy-agent/cert-controller v0.11.0 ## explicit; go 1.22.0 github.com/open-policy-agent/cert-controller/pkg/rotator -# github.com/open-policy-agent/frameworks/constraint v0.0.0-20241101234656-e78c8abd754a +# github.com/open-policy-agent/frameworks/constraint v0.0.0-20250115145356-9e57a5775c15 ## explicit; go 1.22.0 github.com/open-policy-agent/frameworks/constraint/deploy github.com/open-policy-agent/frameworks/constraint/pkg/apis