From c338ddb1cefca50e3fc28906cb283d9477aa988e Mon Sep 17 00:00:00 2001 From: Raphael Simon Date: Tue, 2 Jul 2024 22:39:58 -0700 Subject: [PATCH] Fix tests --- .../example/testdata/server-no-server.golden | 10 +++++----- .../server-same-api-service-name.golden | 10 +++++----- .../server-sercice-for-only-grpc.golden | 6 +++--- ...ver-server-hosting-multiple-services.golden | 10 +++++----- ...server-server-hosting-service-subset.golden | 10 +++++----- ...ver-hosting-service-with-file-server.golden | 6 +++--- ...er-service-for-http-and-part-of-grpc.golden | 10 +++++----- .../server-service-for-only-http.golden | 6 +++--- .../server-service-name-with-spaces.golden | 10 +++++----- ...server-multiple-hosts-with-variables.golden | 12 ++++++------ .../server-single-server-multiple-hosts.golden | 10 +++++----- ...le-server-single-host-with-variables.golden | 10 +++++----- .../server-single-server-single-host.golden | 18 +++++++++--------- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/codegen/example/testdata/server-no-server.golden b/codegen/example/testdata/server-no-server.golden index 203682e150..097881aaca 100644 --- a/codegen/example/testdata/server-no-server.golden +++ b/codegen/example/testdata/server-no-server.golden @@ -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" @@ -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() == "" { @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-same-api-service-name.golden b/codegen/example/testdata/server-same-api-service-name.golden index f10a89ed9e..c9039e1525 100644 --- a/codegen/example/testdata/server-same-api-service-name.golden +++ b/codegen/example/testdata/server-same-api-service-name.golden @@ -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" @@ -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() == "" { @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-sercice-for-only-grpc.golden b/codegen/example/testdata/server-sercice-for-only-grpc.golden index 066f1130e7..0bdea12962 100644 --- a/codegen/example/testdata/server-sercice-for-only-grpc.golden +++ b/codegen/example/testdata/server-sercice-for-only-grpc.golden @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-server-hosting-multiple-services.golden b/codegen/example/testdata/server-server-hosting-multiple-services.golden index d24ffcee06..fb2c9f997b 100644 --- a/codegen/example/testdata/server-server-hosting-multiple-services.golden +++ b/codegen/example/testdata/server-server-hosting-multiple-services.golden @@ -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" @@ -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() == "" { @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-server-hosting-service-subset.golden b/codegen/example/testdata/server-server-hosting-service-subset.golden index 8f8acec3cd..03b9901ab7 100644 --- a/codegen/example/testdata/server-server-hosting-service-subset.golden +++ b/codegen/example/testdata/server-server-hosting-service-subset.golden @@ -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" @@ -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() == "" { @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-server-hosting-service-with-file-server.golden b/codegen/example/testdata/server-server-hosting-service-with-file-server.golden index 2e62b9eb34..35ce69cd35 100644 --- a/codegen/example/testdata/server-server-hosting-service-with-file-server.golden +++ b/codegen/example/testdata/server-server-hosting-service-with-file-server.golden @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-service-for-http-and-part-of-grpc.golden b/codegen/example/testdata/server-service-for-http-and-part-of-grpc.golden index 06abe18c71..6ec133cc4f 100644 --- a/codegen/example/testdata/server-service-for-http-and-part-of-grpc.golden +++ b/codegen/example/testdata/server-service-for-http-and-part-of-grpc.golden @@ -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" @@ -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() == "" { @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-service-for-only-http.golden b/codegen/example/testdata/server-service-for-only-http.golden index b75f9bd6b6..581673275d 100644 --- a/codegen/example/testdata/server-service-for-only-http.golden +++ b/codegen/example/testdata/server-service-for-only-http.golden @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-service-name-with-spaces.golden b/codegen/example/testdata/server-service-name-with-spaces.golden index 75af0e5c18..b7a92773e4 100644 --- a/codegen/example/testdata/server-service-name-with-spaces.golden +++ b/codegen/example/testdata/server-service-name-with-spaces.golden @@ -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" @@ -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() == "" { @@ -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" @@ -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() == "" { @@ -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. diff --git a/codegen/example/testdata/server-single-server-multiple-hosts-with-variables.golden b/codegen/example/testdata/server-single-server-multiple-hosts-with-variables.golden index eba9a19300..74f9b9d734 100644 --- a/codegen/example/testdata/server-single-server-multiple-hosts-with-variables.golden +++ b/codegen/example/testdata/server-single-server-multiple-hosts-with-variables.golden @@ -74,12 +74,12 @@ func main() { } } if !versionSeen { - log.Fatalf(ctx, "invalid value for URL 'version' variable: %q (valid values: v1,v2)\n", *versionF) + log.Fatal(ctx, fmt.Errorf("invalid value for URL 'version' variable: %q (valid values: v1,v2)\n", *versionF)) } addr = strings.Replace(addr, "{version}", *versionF, -1) 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" @@ -90,7 +90,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() == "" { @@ -106,7 +106,7 @@ func main() { addr = strings.Replace(addr, "{port}", *portF, -1) 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" @@ -117,7 +117,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() == "" { @@ -127,7 +127,7 @@ func main() { } default: - log.Fatalf(ctx, "invalid host argument: %q (valid hosts: dev|stage)\n", *hostF) + log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: dev|stage)\n", *hostF)) } // Wait for signal. diff --git a/codegen/example/testdata/server-single-server-multiple-hosts.golden b/codegen/example/testdata/server-single-server-multiple-hosts.golden index 5ad3ad26de..5762fccd5e 100644 --- a/codegen/example/testdata/server-single-server-multiple-hosts.golden +++ b/codegen/example/testdata/server-single-server-multiple-hosts.golden @@ -63,7 +63,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" @@ -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() == "" { @@ -88,7 +88,7 @@ func main() { addr := "https://example" 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" @@ -99,7 +99,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() == "" { @@ -109,7 +109,7 @@ func main() { } default: - log.Fatalf(ctx, "invalid host argument: %q (valid hosts: dev|stage)\n", *hostF) + log.Fatal(ctx, fmt.Errorf("invalid host argument: %q (valid hosts: dev|stage)\n", *hostF)) } // Wait for signal. diff --git a/codegen/example/testdata/server-single-server-single-host-with-variables.golden b/codegen/example/testdata/server-single-server-single-host-with-variables.golden index 200b7918f0..27e7481582 100644 --- a/codegen/example/testdata/server-single-server-single-host-with-variables.golden +++ b/codegen/example/testdata/server-single-server-single-host-with-variables.golden @@ -81,7 +81,7 @@ func main() { addr = strings.Replace(addr, "{bool}", *bool_F, -1) 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" @@ -92,7 +92,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() == "" { @@ -114,7 +114,7 @@ func main() { addr = strings.Replace(addr, "{bool}", *bool_F, -1) 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" @@ -125,7 +125,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() == "" { @@ -135,7 +135,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. diff --git a/codegen/example/testdata/server-single-server-single-host.golden b/codegen/example/testdata/server-single-server-single-host.golden index f921b9a035..7ff7872562 100644 --- a/codegen/example/testdata/server-single-server-single-host.golden +++ b/codegen/example/testdata/server-single-server-single-host.golden @@ -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" @@ -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() == "" { @@ -88,7 +88,7 @@ func main() { addr := "https://example: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" @@ -99,7 +99,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() == "" { @@ -112,7 +112,7 @@ func main() { addr := "grpc://example: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" @@ -123,7 +123,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() == "" { @@ -136,7 +136,7 @@ func main() { addr := "http://[::1]: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 = "https" @@ -147,7 +147,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() == "" { @@ -157,7 +157,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.