feat: add secrets / config to a verbs metadata #2999
Merged
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
stuartwdouglas
requested review from
a team,
tomdaffurn and
wesbillman
and removed request for
a team
alecthomas
approved these changes
Oct 4, 2024
| @@ -130,6 +130,7 @@ func genErrorf(pos token.Pos, format string, args ...any) error { | |||
|
|
|||
| var tmpl = template.Must(template.New("proto"). | |||
| Parse(` | |||
| // THIS FILE IS GENERATED; DO NOT MODIFY | |||
internal/schema/metadataconfig.go
Outdated
| func (m *MetadataConfig) Position() Position { return m.Pos } | ||
| func (m *MetadataConfig) String() string { | ||
| out := &strings.Builder{} | ||
| fmt.Fprint(out, "+calls ") |
There was a problem hiding this comment.
Suggested change
| fmt.Fprint(out, "+calls ") | |
| fmt.Fprint(out, "+config ") |
There was a problem hiding this comment.
Ugh, sorry, this PR is mostly just copypasta from from the calls metadata.
internal/schema/metadataconfig.go
Outdated
| out := &strings.Builder{} | ||
| fmt.Fprint(out, "+calls ") | ||
| w := 6 | ||
| for i, call := range m.Config { |
internal/schema/metadatasecrets.go
Outdated
| func (m *MetadataSecrets) Position() Position { return m.Pos } | ||
| func (m *MetadataSecrets) String() string { | ||
| out := &strings.Builder{} | ||
| fmt.Fprint(out, "+calls ") |
There was a problem hiding this comment.
Suggested change
| fmt.Fprint(out, "+calls ") | |
| fmt.Fprint(out, "+secrets ") |
internal/schema/metadatasecrets.go
Outdated
| type MetadataSecrets struct { | ||
| Pos Position `parser:"" protobuf:"1,optional"` | ||
|
|
||
| Secrets []*Ref `parser:"'+' 'config' @@ (',' @@)*" protobuf:"2"` |
There was a problem hiding this comment.
Suggested change
| Secrets []*Ref `parser:"'+' 'config' @@ (',' @@)*" protobuf:"2"` | |
| Secrets []*Ref `parser:"'+' 'secrets' @@ (',' @@)*" protobuf:"2"` |
internal/schema/metadatasecrets.go
Outdated
| out := &strings.Builder{} | ||
| fmt.Fprint(out, "+calls ") | ||
| w := 6 | ||
| for i, call := range m.Secrets { |
| @@ -341,8 +341,11 @@ func ValidateModule(module *Module) error { | |||
|
|
|||
| case *Data: | |||
| for _, md := range n.Metadata { | |||
| if md, ok := md.(*MetadataCalls); ok { | |||
| switch md.(type) { | |||
| case *MetadataCalls, *MetadataSecrets, *MetadataConfig: | |||
There was a problem hiding this comment.
I'm wondering if we should have some kind of mapping for this instead...a map of which metadata types are valid on which schema node types.
There was a problem hiding this comment.
Yea, there are definitely gaps in the current logic, I don't think it is high priority though.
stuartwdouglas
force-pushed
the
stuartwdouglas/1083
branch
from
58e9ed0 to
b9b0718
Compare
alecthomas
reviewed
Oct 4, 2024
| func (m *MetadataSecrets) Position() Position { return m.Pos } | ||
| func (m *MetadataSecrets) String() string { | ||
| out := &strings.Builder{} | ||
| fmt.Fprint(out, "+secrets ") |
There was a problem hiding this comment.
I forgot to say, there are tests that should be updated to exercise this parsing, in particular TestParserRoundtrip et al and TestProtoRoundTrip.
stuartwdouglas
force-pushed
the
stuartwdouglas/1083
branch
from
b9b0718 to
8e83519
Compare
stuartwdouglas
force-pushed
the
stuartwdouglas/1083
branch
from
27df487 to
3986925
Compare
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.
fixes: #1083
This just adds them for JVM languages for now, as the go implementation will change when they move to an injection model.