chore: clean up api-public #2922
Open
Conversation
This file contains hidden or 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
…en disconnected/reconnecting
|
The latest updates on your projects. Learn more about Vercel for GitHub.
1 Skipped Deployment
|
|
Claude encountered an error —— View job I'll analyze this and get back to you. |
Merged
commit: |
MasterPtato
force-pushed
the
09-15-chore_clean_up_api-public
branch
from
bb798a4 to
e92e865
Compare
|
Claude encountered an error —— View job I'll analyze this and get back to you. |
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
Comment on lines
+36
to
+63
| pub async fn list(ctx: ApiCtx, path: ListPath, query: ListQuery) -> Result<ListResponse> { | ||
| let namespace = ctx | ||
| .op(namespace::ops::resolve_for_name_global::Input { | ||
| name: query.namespace.clone(), | ||
| }) | ||
| .await? | ||
| .ok_or_else(|| namespace::errors::Namespace::NotFound.build())?; | ||
|
|
||
| if query.runner_name.is_empty() { | ||
| let runner_configs = ctx | ||
| .op(namespace::ops::runner_config::get_local::Input { | ||
| runners: query | ||
| .runner_name | ||
| .iter() | ||
| .map(|name| (namespace.namespace_id, name.clone())) | ||
| .collect(), | ||
| }) | ||
| .await?; | ||
|
|
||
| Ok(ListResponse { | ||
| // TODO: Implement ComposeSchema for FakeMap so we don't have to reallocate | ||
| runner_configs: runner_configs | ||
| .into_iter() | ||
| .map(|c| (c.name, c.config)) | ||
| .collect(), | ||
| pagination: Pagination { cursor: None }, | ||
| }) | ||
| } else { |
There was a problem hiding this comment.
There appears to be a logic error in the conditional. The code checks if query.runner_name.is_empty() but then proceeds to use query.runner_name inside that block to fetch specific runner configs. This logic should be inverted - if query.runner_name is NOT empty, then get those specific configs, otherwise list all configs with pagination.
The current implementation will attempt to map over an empty collection when the condition is true, which won't produce the expected results.
Suggested change
| pub async fn list(ctx: ApiCtx, path: ListPath, query: ListQuery) -> Result<ListResponse> { | |
| let namespace = ctx | |
| .op(namespace::ops::resolve_for_name_global::Input { | |
| name: query.namespace.clone(), | |
| }) | |
| .await? | |
| .ok_or_else(|| namespace::errors::Namespace::NotFound.build())?; | |
| if query.runner_name.is_empty() { | |
| let runner_configs = ctx | |
| .op(namespace::ops::runner_config::get_local::Input { | |
| runners: query | |
| .runner_name | |
| .iter() | |
| .map(|name| (namespace.namespace_id, name.clone())) | |
| .collect(), | |
| }) | |
| .await?; | |
| Ok(ListResponse { | |
| // TODO: Implement ComposeSchema for FakeMap so we don't have to reallocate | |
| runner_configs: runner_configs | |
| .into_iter() | |
| .map(|c| (c.name, c.config)) | |
| .collect(), | |
| pagination: Pagination { cursor: None }, | |
| }) | |
| } else { | |
| pub async fn list(ctx: ApiCtx, path: ListPath, query: ListQuery) -> Result<ListResponse> { | |
| let namespace = ctx | |
| .op(namespace::ops::resolve_for_name_global::Input { | |
| name: query.namespace.clone(), | |
| }) | |
| .await? | |
| .ok_or_else(|| namespace::errors::Namespace::NotFound.build())?; | |
| if !query.runner_name.is_empty() { | |
| let runner_configs = ctx | |
| .op(namespace::ops::runner_config::get_local::Input { | |
| runners: query | |
| .runner_name | |
| .iter() | |
| .map(|name| (namespace.namespace_id, name.clone())) | |
| .collect(), | |
| }) | |
| .await?; | |
| Ok(ListResponse { | |
| // TODO: Implement ComposeSchema for FakeMap so we don't have to reallocate | |
| runner_configs: runner_configs | |
| .into_iter() | |
| .map(|c| (c.name, c.config)) | |
| .collect(), | |
| pagination: Pagination { cursor: None }, | |
| }) | |
| } else { |
Spotted by Diamond
Is this helpful? React 👍 or 👎 to let us know.
|
@MasterPtato i'll let you figure out how to resolve these conflicts, very confused here |
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.
No description provided.