Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphael
raphael committed Jul 3, 2024
1 parent 42cb425 commit c338ddb
Show file tree
Hide file tree
Showing 13 changed files with 64 additions and 64 deletions.
10 changes: 5 additions & 5 deletions codegen/example/testdata/server-no-server.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func main() {
addr := "http://localhost:80"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -75,7 +75,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -88,7 +88,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -99,7 +99,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -109,7 +109,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
}

// Wait for signal.
Expand Down
10 changes: 5 additions & 5 deletions codegen/example/testdata/server-same-api-service-name.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func main() {
addr := "http://localhost:80"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -75,7 +75,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -88,7 +88,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -99,7 +99,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -109,7 +109,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
}

// Wait for signal.
Expand Down
6 changes: 3 additions & 3 deletions codegen/example/testdata/server-sercice-for-only-grpc.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -75,7 +75,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -85,7 +85,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
}

// Wait for signal.
Expand Down
10 changes: 5 additions & 5 deletions codegen/example/testdata/server-server-hosting-multiple-services.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func main() {
addr := "http://example:8090"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -81,7 +81,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -94,7 +94,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -105,7 +105,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -115,7 +115,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: dev)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: dev)\n", *hostF))
}

// Wait for signal.
Expand Down
10 changes: 5 additions & 5 deletions codegen/example/testdata/server-server-hosting-service-subset.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func main() {
addr := "http://example:8090"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -75,7 +75,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -88,7 +88,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -99,7 +99,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -109,7 +109,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: dev)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: dev)\n", *hostF))
}

// Wait for signal.
Expand Down
6 changes: 3 additions & 3 deletions codegen/example/testdata/server-server-hosting-service-with-file-server.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func main() {
addr := "http://localhost:80"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -55,7 +55,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -65,7 +65,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: svc)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: svc)\n", *hostF))
}

// Wait for signal.
Expand Down
10 changes: 5 additions & 5 deletions codegen/example/testdata/server-service-for-http-and-part-of-grpc.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func main() {
addr := "http://localhost:80"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -81,7 +81,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -94,7 +94,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -105,7 +105,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -115,7 +115,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
}

// Wait for signal.
Expand Down
6 changes: 3 additions & 3 deletions codegen/example/testdata/server-service-for-only-http.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func main() {
addr := "http://localhost:80"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -74,7 +74,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -84,7 +84,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: localhost)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: localhost)\n", *hostF))
}

// Wait for signal.
Expand Down
10 changes: 5 additions & 5 deletions codegen/example/testdata/server-service-name-with-spaces.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func main() {
addr := "http://localhost:80"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "https"
Expand All @@ -75,7 +75,7 @@ func main() {
if *httpPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *httpPortF)
} else if u.Port() == "" {
Expand All @@ -88,7 +88,7 @@ func main() {
addr := "grpc://localhost:8080"
u, err := url.Parse(addr)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", addr, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", addr)
}
if *secureF {
u.Scheme = "grpcs"
Expand All @@ -99,7 +99,7 @@ func main() {
if *grpcPortF != "" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
log.Fatalf(ctx, "invalid URL %#v: %s\n", u.Host, err)
log.Fatalf(ctx, err, "invalid URL %#v\n", u.Host)
}
u.Host = net.JoinHostPort(h, *grpcPortF)
} else if u.Port() == "" {
Expand All @@ -109,7 +109,7 @@ func main() {
}

default:
log.Fatalf(ctx, "invalid host argument: %q (valid hosts: svc)\n", *hostF)
log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: svc)\n", *hostF))
}

// Wait for signal.
Expand Down
Loading

0 comments on commit c338ddb

Please sign in to comment.