ast: Adding capability feature for the rego.v1 import
#6375
Conversation
Resolves: open-policy-agent#6366 Signed-off-by: Johan Fylling <johan.dev@fylling.se>
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
✅ Deploy Preview for openpolicyagent ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
rego/rego.go
Outdated
| @@ -1837,6 +1837,7 @@ func (r *Rego) loadFiles(ctx context.Context, txn storage.Transaction, m metrics | |||
| defer m.Timer(metrics.RegoLoadFiles).Stop() | |||
|
|
|||
| result, err := loader.NewFileLoader(). | |||
| WithCapabilities(r.capabilities). | |||
There was a problem hiding this comment.
Previously, the parser didn't have access to the capabilities file passed in via e.g. opa eval --capabilities. So effectively, there was no way of turning off individual future keywords.
I'm pondering breaking this out into its own bug report and PR 🤔 .
There was a problem hiding this comment.
A new PR or a separate commit should work.
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
builtin_metadata.json
Outdated
| @@ -342,6 +342,7 @@ | |||
| "v0.57.0", | |||
| "v0.57.1", | |||
| "v0.58.0", | |||
| "v0.59.0", | |||
There was a problem hiding this comment.
I'm not sure what ramifications making this update now has .. but this change and adding capabilities/v0.59.0.json is necessary for the new tests to pass.
Does anyone know if this will mess anything up, and/or if there is an alternative?
There was a problem hiding this comment.
Looks like we're using published git tags for building the releases.yaml file used for iterating versions in the docs. So this might be safe after all, at least when it concerns docs ..
There was a problem hiding this comment.
Do you have an idea if this has any impact when we cut the actual v0.59.0 release? I would imagine the release scripts would just overwrite this but I'm not sure. Als it's a bit weird we have published v0.59.0 artifacts w/o an actual release but that's ok I guess.
There was a problem hiding this comment.
Looking at the web deployment preview of #6346, it doesn't look like this will break the documentation.
There was a problem hiding this comment.
Running the release-patch make target on this branch also has no unexpected ill effects. So I think we're good to go here :) .
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
docs/content/deployments.md
Outdated
| @@ -449,6 +449,18 @@ Note that the metaschemas [http://json-schema.org/draft-04/schema](http://json-s | |||
|
|
|||
| Similarly, the `allow_net` capability restricts what hosts the `http.send` built-in function may send requests to, and what hosts the `net.lookup_ip_addr` built-in function may resolve IP addresses for. | |||
|
|
|||
| ### Features | |||
There was a problem hiding this comment.
Additional information is added to this section in #6346.
| "Minor": 59, | ||
| "Patch": 0, | ||
| "PreRelease": "", | ||
| "Metadata": "" |
There was a problem hiding this comment.
What's metadata here? Seem like it would be good to have a description of what this means, but perhaps this is used for something else?
There was a problem hiding this comment.
Don't know, to be honest. This is generated by
opa/internal/cmd/genversionindex/main.go
Line 60 in 16fccc9
ast/parser.go
Outdated
| @@ -2561,6 +2561,11 @@ func (p *Parser) futureImport(imp *Import, allowedFutureKeywords map[string]toke | |||
| } | |||
|
|
|||
| func (p *Parser) regoV1Import(imp *Import) { | |||
| if !p.po.Capabilities.ContainsFeature(FeatureRegoV1Import) { | |||
| p.errorf(imp.Path.Location, "Invalid import, `%s` is not supported by current capabilities", regoV1CompatibleRef) | |||
There was a problem hiding this comment.
Nit: Invalid -> invalid to stay consistent with the error format.
Signed-off-by: Johan Fylling <johan.dev@fylling.se>
johanfylling
dismissed stale reviews from ashutosh-narkar and anderseknert
via
699cac5
Conflicts: ast/capabilities.go ast/capabilities_test.go capabilities.json capabilities/v0.59.0.json docs/content/deployments.md
Resolves: #6366