Move codegen to a separate crate and use improved transform #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: clux <[email protected]>
Signed-off-by: kazk <[email protected]>
Signed-off-by: kazk <[email protected]>
Signed-off-by: kazk <[email protected]>
kazk
commented
Oct 27, 2021
Comment on lines
+28
to
+30
| // TODO `Option<Vec<Subresource>>` | ||
| /// Any subresources. | ||
| pub subresources: Vec<Subresource>, |
There was a problem hiding this comment.
if !subresources.empty() vs if let Some(subresources). Can change empty array to null in transform.jq later if we want.
There was a problem hiding this comment.
yeah, vector probably is fine here 👍
kazk
commented
Oct 27, 2021
| fs::read_to_string(&path).with_context(|| format!("read {}", path.as_ref().display())) | ||
| } | ||
|
|
||
| fn main() -> Result<()> { |
There was a problem hiding this comment.
Moved the file to the standard location.
kazk
commented
Oct 27, 2021
| @@ -0,0 +1,48 @@ | |||
| pub mod api { | |||
There was a problem hiding this comment.
Moved the file that was left in src/lib.rs and commented out the include!s.
kazk
commented
Oct 27, 2021
| for m in f.message_type { | ||
| if let Some(name) = m.name { | ||
| let path = format!("{}.{}", pkg, name); | ||
| if let Some(resource) = resources.get(&path) { |
There was a problem hiding this comment.
It's much easier to load resource info.
Basically a copy of `list-resources.jq` without `verbs` as a map. Should be easier to use for codegen. Signed-off-by: kazk <[email protected]>
Signed-off-by: kazk <[email protected]>
Signed-off-by: kazk <[email protected]>
Signed-off-by: kazk <[email protected]>
clux
approved these changes
Oct 27, 2021
17 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@clux Decided to push to a new branch just in case I messed something up while rebasing. This is #1 cleaned up + loading the new
transformed.jsonin codegen. Should be much easier for us to work from here.With the new
transform.jq, Pod looks like this:{ "api.core.v1.Pod": { "name": "pods", "namespaced": true, "apiGroupVersion": "v1", "group": "", "version": "v1", "kind": "Pod", "proto": "api.core.v1.Pod", "rust": "api::core::v1::Pod", "metadata": "apimachinery::pkg::apis::meta::v1::ObjectMeta", "spec": "api::core::v1::PodSpec", "status": "api::core::v1::PodStatus", "condition": "api::core::v1::PodCondition", "scopedVerbs": { "all": [ "list" ], "namespaced": [ "create", "delete", "deletecollection", "get", "list", "patch", "update" ] }, "paths": [ "/api/v1/pods", "/api/v1/namespaces/{namespace}/pods", "/api/v1/namespaces/{namespace}/pods/{name}" ], "subresources": [ { "name": "attach", "scopedVerbs": { "namespaced": [ "connect" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/attach" ] }, { "name": "binding", "scopedVerbs": { "namespaced": [ "create" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/binding" ] }, { "name": "ephemeralcontainers", "scopedVerbs": { "namespaced": [ "get", "patch", "update" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/ephemeralcontainers" ] }, { "name": "eviction", "scopedVerbs": { "namespaced": [ "create" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/eviction" ] }, { "name": "exec", "scopedVerbs": { "namespaced": [ "connect" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/exec" ] }, { "name": "log", "scopedVerbs": { "namespaced": [ "get" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/log" ] }, { "name": "portforward", "scopedVerbs": { "namespaced": [ "connect" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/portforward" ] }, { "name": "proxy", "scopedVerbs": { "namespaced": [ "connect" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/proxy", "/api/v1/namespaces/{namespace}/pods/{name}/proxy/{path}" ] }, { "name": "status", "scopedVerbs": { "namespaced": [ "get", "patch", "update" ] }, "paths": [ "/api/v1/namespaces/{namespace}/pods/{name}/status" ] } ] } }apiVersionmetadatatype forMetadatatraitspectype forHasSpectraitstatustype forHasStatustraitconditiontype forHasConditionstraitnamespacedis true if resource can be namespaced. It can still haveallverbs likelist.