Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions cmd/breaker-cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main

import (
"bytes"
"context"
"flag"
"fmt"
"go/types"
Expand Down Expand Up @@ -76,15 +75,14 @@ func main() {
Structs: []Struct{implementation},
}

reader, err := generate(context.Background(), pkg, *output)
reader, err := generate(pkg, *output)
if err != nil {
slog.Error("generate code", slog.Any("error", err))
os.Exit(1)
}

writer := os.Stdout
if *output != "" {
// TODO: Create the output directory if it does not exist.
if dir := filepath.Dir(*output); dir != "." {
if err = os.MkdirAll(dir, os.ModePerm); err != nil {
slog.Error("create output directory", slog.Any("error", err), slog.String("path", dir))
Expand Down Expand Up @@ -131,7 +129,12 @@ func extractResults(tuple *types.Tuple, qualifier types.Qualifier) []Param {
v := tuple.At(i)
name := v.Name()
if name == "" {
name = fmt.Sprintf("result%d", i)
typ := types.TypeString(v.Type(), qualifier)
if typ == "error" {
name = "err"
} else {
name = fmt.Sprintf("result%d", i)
}
}
results = append(results, Param{
Name: name,
Expand All @@ -149,7 +152,7 @@ func parseBreakerTemplate() (*template.Template, error) {
return tmpl, nil
}

func generate(ctx context.Context, pkg Package, filename string) (io.Reader, error) {
func generate(pkg Package, filename string) (io.Reader, error) {
tmpl, err := parseBreakerTemplate()
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion cmd/breaker-cli/template_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func TestTemplateValidationPipeline(t *testing.T) {
})

t.Run("generate_and_go_fix", func(t *testing.T) {
reader, err := generate(context.Background(), pkg, output)
reader, err := generate(pkg, output)
if err != nil {
t.Fatalf("generate: %v", err)
}
Expand Down
Loading