diff --git a/backend/cmd/api/main.go b/backend/cmd/api/main.go index 6036814..7fcd875 100644 --- a/backend/cmd/api/main.go +++ b/backend/cmd/api/main.go @@ -39,14 +39,20 @@ func run() error { mux := http.NewServeMux() platform.RegisterRoutes(mux, pool) - srv := platform.NewServer(":8080", mux) + // PORT is set by hosting platforms (Render); locally it falls back to 8080. + addr, err := platform.ListenAddr(os.Getenv("PORT")) + if err != nil { + return err + } + + srv := platform.NewServer(addr, mux) ln, err := net.Listen("tcp", srv.Addr) if err != nil { return fmt.Errorf("listen on %s: %w", srv.Addr, err) } - log.Println("Aktenlens API running on http://localhost:8080") + log.Printf("Aktenlens API listening on %s", ln.Addr()) return platform.Serve(ctx, srv, ln) } diff --git a/backend/internal/platform/config.go b/backend/internal/platform/config.go new file mode 100644 index 0000000..084f7da --- /dev/null +++ b/backend/internal/platform/config.go @@ -0,0 +1,32 @@ +package platform + +import ( + "errors" + "fmt" + "strconv" +) + +// defaultPort is used when PORT is not set, which is the normal case in +// local development. Hosting platforms like Render set PORT themselves. +const defaultPort = "8080" + +// ErrInvalidPort is returned when PORT is set but is not a usable port number. +var ErrInvalidPort = errors.New("PORT must be a number between 1 and 65535") + +// ListenAddr turns the value of the PORT environment variable into an address +// for net.Listen (for example ":8080"). An empty value means the default port. +// The value comes from outside the program, so it is validated here and the +// API refuses to start if it is wrong. +func ListenAddr(port string) (string, error) { + if port == "" { + port = defaultPort + } + + n, err := strconv.Atoi(port) + if err != nil || n < 1 || n > 65535 { + return "", fmt.Errorf("%w (got %q)", ErrInvalidPort, port) + } + + // Itoa normalizes the number (for example "08080" becomes "8080"). + return ":" + strconv.Itoa(n), nil +} diff --git a/backend/internal/platform/config_test.go b/backend/internal/platform/config_test.go new file mode 100644 index 0000000..aae1c09 --- /dev/null +++ b/backend/internal/platform/config_test.go @@ -0,0 +1,44 @@ +package platform + +import ( + "errors" + "testing" +) + +func TestListenAddr(t *testing.T) { + tests := []struct { + name string + port string + want string + wantErr bool + }{ + {"empty uses the default", "", ":8080", false}, + {"valid port", "10000", ":10000", false}, + {"lowest valid port", "1", ":1", false}, + {"highest valid port", "65535", ":65535", false}, + {"not a number", "abc", "", true}, + {"zero", "0", "", true}, + {"negative", "-1", "", true}, + {"too big", "65536", "", true}, + {"has a host part", "127.0.0.1:8080", "", true}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := ListenAddr(tt.port) + + if tt.wantErr { + if !errors.Is(err, ErrInvalidPort) { + t.Fatalf("expected ErrInvalidPort, got %v", err) + } + return + } + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + if got != tt.want { + t.Errorf("ListenAddr(%q) = %q, want %q", tt.port, got, tt.want) + } + }) + } +}