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.

Sign up for GitHub

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

Fixing error message for custom entrypoint #101

Merged
merged 1 commit into from
Jan 25, 2022
+6 −6
Merged

Fixing error message for custom entrypoint #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions skycfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,8 @@ func WithEntryPoint(name string) ExecOption {
})
}

// Main executes main() from the top-level Skycfg config module, which is
// expected to return either None or a list of Protobuf messages.
// Main executes main() or a custom entry point function from the top-level Skycfg config
// module, which is expected to return either None or a list of Protobuf messages.
func (c *Config) Main(ctx context.Context, opts ...ExecOption) ([]proto.Message, error) {
parsedOpts := &execOptions{
vars: &starlark.Dict{},
Expand All @@ -394,11 +394,11 @@ func (c *Config) Main(ctx context.Context, opts ...ExecOption) ([]proto.Message,
}
mainVal, ok := c.locals[parsedOpts.funcName]
if !ok {
return nil, fmt.Errorf("no `main' function found in %q", c.filename)
return nil, fmt.Errorf("no %q function found in %q", parsedOpts.funcName, c.filename)
}
main, ok := mainVal.(starlark.Callable)
if !ok {
return nil, fmt.Errorf("`main' must be a function (got a %s)", mainVal.Type())
return nil, fmt.Errorf("%q must be a function (got a %s)", parsedOpts.funcName, mainVal.Type())
}

thread := &starlark.Thread{
Expand All @@ -421,14 +421,14 @@ func (c *Config) Main(ctx context.Context, opts ...ExecOption) ([]proto.Message,
if _, isNone := mainVal.(starlark.NoneType); isNone {
return nil, nil
}
return nil, fmt.Errorf("`main' didn't return a list (got a %s)", mainVal.Type())
return nil, fmt.Errorf("%q didn't return a list (got a %s)", parsedOpts.funcName, mainVal.Type())
}
var msgs []proto.Message
for ii := 0; ii < mainList.Len(); ii++ {
maybeMsg := mainList.Index(ii)
msg, ok := AsProtoMessage(maybeMsg)
if !ok {
return nil, fmt.Errorf("`main' returned something that's not a protobuf (a %s)", maybeMsg.Type())
return nil, fmt.Errorf("%q returned something that's not a protobuf (a %s)", parsedOpts.funcName, maybeMsg.Type())
}
msgs = append(msgs, msg)
}
Expand Down