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.

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

Add flow API support #2094

Merged
merged 26 commits into from
Sep 16, 2022
Merged

Add flow API support #2094

merged 26 commits into from
Sep 16, 2022

Conversation

mattdurham
Copy link
Collaborator

@mattdurham mattdurham commented Aug 30, 2022

PR Description

This adds the initial support for the flow API, necessary for the UI portion.

Fixes #2007.

@mattdurham mattdurham marked this pull request as ready for review August 30, 2022 18:56
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I gave this a first pass, but I need more time to carefully review json_walker.go. It feels like there's more opportunities for it to reuse logic from river/internal/value and I want to take the time to find them so we don't have to spend too much time maintaining the json conversion.

cmd/agent/flow_run.go Outdated Show resolved Hide resolved
cmd/agent/flow_run.go Outdated Show resolved Hide resolved
pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/flow/flow.go Show resolved Hide resolved
pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
pkg/river/json_walker.go Outdated Show resolved Hide resolved
@mattdurham
Copy link
Collaborator Author

Rewrote / changed pretty much the whole thing, its more code but I think much clearer on what is happening.

Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! This is looking much better.

pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/flow/flow_http.go Outdated Show resolved Hide resolved
pkg/flow/flow_http.go Outdated Show resolved Hide resolved
pkg/river/encoding/json.go Outdated Show resolved Hide resolved
pkg/river/encoding/map.go Outdated Show resolved Hide resolved
pkg/river/encoding/array.go Outdated Show resolved Hide resolved
pkg/river/internal/rivertags/rivertags.go Outdated Show resolved Hide resolved
pkg/river/encoding/json.go Outdated Show resolved Hide resolved
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Getting much closer! I think this is my final round of comments.

pkg/flow/internal/controller/component.go Outdated Show resolved Hide resolved
pkg/flow/internal/dag/dag.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
pkg/river/encoding/array_test.go Outdated Show resolved Hide resolved
pkg/river/encoding/block.go Outdated Show resolved Hide resolved
pkg/river/encoding/block.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Show resolved Hide resolved
pkg/river/encoding/block.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
pkg/flow/internal/controller/loader.go Outdated Show resolved Hide resolved
pkg/river/encoding/array.go Outdated Show resolved Hide resolved
pkg/river/encoding/attribute.go Show resolved Hide resolved
pkg/river/encoding/encoding.go Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
@rfratto
Copy link
Member

rfratto commented Sep 13, 2022

(The CI is failing because of changes to the Makefile; you'll need to rebase on top of latest main)

pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/river/encoding/attribute.go Outdated Show resolved Hide resolved
pkg/river/encoding/block.go Outdated Show resolved Hide resolved
pkg/river/encoding/encoding.go Outdated Show resolved Hide resolved
web/api/api.go Outdated Show resolved Hide resolved
Copy link
Member

@rfratto rfratto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after final comments. Nice work!

pkg/flow/flow.go Outdated Show resolved Hide resolved
pkg/river/encoding/attribute.go Outdated Show resolved Hide resolved
pkg/river/token/builder/builder.go Outdated Show resolved Hide resolved
pkg/river/encoding/block.go Outdated Show resolved Hide resolved
pkg/river/encoding/block.go Outdated Show resolved Hide resolved
web/api/api.go Outdated Show resolved Hide resolved
web/api/api.go Outdated Show resolved Hide resolved
web/api/api.go Outdated Show resolved Hide resolved
web/api/api.go Outdated Show resolved Hide resolved
web/api/api.go Outdated Show resolved Hide resolved
mattdurham and others added 6 commits September 16, 2022 09:02
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
Co-authored-by: Robert Fratto <robertfratto@gmail.com>
@mattdurham mattdurham enabled auto-merge (squash) September 16, 2022 13:54
@mattdurham mattdurham merged commit d44f096 into main Sep 16, 2022
@mattdurham mattdurham deleted the flow_api_pr branch September 16, 2022 13:55
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Mar 18, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 18, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flow: Compress /debug/graph and /debug/config endpoints
2 participants