Merge next into main: every setting upaas reads in the README, UPAAS_PORT in the Compose file (#232)

Reviewed-on: #232

.dockerignore

@@ -1,8 +1,11 @@
-# .git is sent so that `make build` in the Dockerfile can stamp the commit into
-# upaas. List no tracked file here: git would see it as deleted in the build and
-# the version would end in -dirty.
+.git
 .env
 bin/
+.editorconfig
 .vscode/
 .idea/
 *.test
+LICENSE
+CONVENTIONS.md
+REPO_POLICIES.md
+README.md

Dockerfile

@@ -31,7 +31,6 @@ RUN go mod download
 COPY . .
 
 RUN make test
-# Takes the version from `git describe` on the .git copied in above.
 RUN make build
 
 # Runtime stage

README.md

@@ -226,10 +226,6 @@ This recipe serves plain HTTP, so `UPAAS_PLAINTEXT_HTTP=true` is required for
 setup and every other form to pass the CSRF origin check. Behind a
 TLS-terminating reverse proxy, drop that line.
 
-The image shows the commit it was built from (the `git describe` output) in the
-page footer, the startup log and `/health`. Build it from a git clone: without
-the `.git` directory it shows `dev`.
-
 ### Deploying with Docker Compose
 
 [`docker-compose.yml`](docker-compose.yml) builds the image from this repo and

TODO.md

@@ -20,18 +20,6 @@ regress.
 
 # Completed Steps
 
-- 2026-09-29: An image built from the `Dockerfile` now shows the commit it was
-  built from (the `git describe` output) in the footer and `/health` instead of
-  `dev`: `.dockerignore` no longer leaves out `.git`, nor any tracked file,
-  which git would count as deleted and mark `-dirty`. upaas now also logs its
-  version at startup; the logger's `Identify()` was never called (#236).
-
-- 2026-09-29: The app page shows the app's branch as a label in its title, next
-  to the status badge, instead of after the repository under it (#240).
-
-- 2026-09-29: An app's deployments page now lists only its 10 most recent
-  deployments, newest first, instead of 50 (#238).
-
 - 2026-09-29: `docker-compose.yml` now sets `UPAAS_PORT` to 8080 as well as
   `PORT`, since upaas reads `UPAAS_PORT` first and a `UPAAS_PORT` in `.env` made
   it listen away from the port mapping and healthcheck; the README's Compose

cmd/upaasd/main.go

@@ -52,8 +52,6 @@ func main() {
 			handlers.New,
 			server.New,
 		),
-		fx.Invoke(func(log *logger.Logger, _ *server.Server) {
-			log.Identify()
-		}),
+		fx.Invoke(func(*server.Server) {}),
 	).Run()
 }

internal/handlers/app.go

@@ -28,7 +28,7 @@ const (
 	// recentDeploymentsLimit is the number of recent deployments to show.
 	recentDeploymentsLimit = 5
 	// deploymentsHistoryLimit is the number of deployments to show in history.
-	deploymentsHistoryLimit = 10
+	deploymentsHistoryLimit = 50
 )
 
 // redirectToApp issues a SeeOther redirect to the page for the given

internal/handlers/app_branch_test.go

@@ -1,46 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"sneak.berlin/go/upaas/internal/service/app"
-)
-
-// TestAppPageTitleShowsBranch checks that an app's branch can be read from
-// the app page title, next to the status badge, without opening the edit page.
-func TestAppPageTitleShowsBranch(t *testing.T) {
-	t.Parallel()
-
-	testCtx := setupTestHandlers(t)
-
-	createdApp, err := testCtx.appSvc.CreateApp(t.Context(), app.CreateAppInput{
-		Name:    "branch-shown-app",
-		RepoURL: "git@example.com:user/branch-shown-app.git",
-		Branch:  "staging",
-	})
-	require.NoError(t, err)
-
-	request := httptest.NewRequestWithContext(
-		t.Context(), http.MethodGet, "/apps/"+createdApp.ID, nil,
-	)
-	request = addChiURLParams(request, map[string]string{"id": createdApp.ID})
-	recorder := httptest.NewRecorder()
-
-	testCtx.handlers.HandleAppDetail().ServeHTTP(recorder, request)
-
-	require.Equal(t, http.StatusOK, recorder.Code)
-
-	// The title row runs from the app name heading to the end of its div.
-	_, afterHeading, found := strings.Cut(recorder.Body.String(), "<h1")
-	require.True(t, found, "app page has no heading")
-
-	titleRow, _, _ := strings.Cut(afterHeading, "</div>")
-	assert.Contains(t, titleRow, `x-text="statusLabel"`)
-	assert.Contains(t, titleRow, ">staging</span>")
-}

internal/handlers/handlers_test.go

@@ -8,7 +8,6 @@ import (
 	"strconv"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
@@ -1149,73 +1148,6 @@ func TestHandleCancelDeployReturns404ForUnknownApp(t *testing.T) {
 	assert.Equal(t, http.StatusNotFound, recorder.Code)
 }
 
-// TestHandleAppDeploymentsShowsTenNewest verifies the deployments page
-// lists only the 10 most recent deployments, newest first.
-func TestHandleAppDeploymentsShowsTenNewest(t *testing.T) {
-	t.Parallel()
-
-	testCtx := setupTestHandlers(t)
-	createdApp := createTestApp(t, testCtx, "deployments-page-app")
-
-	// Create 12 deployments, each started one minute after the one before.
-	firstStart := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
-
-	ids := make([]int64, 0, 12)
-
-	for idx := range 12 {
-		deployment := models.NewDeployment(testCtx.database)
-		deployment.AppID = createdApp.ID
-		deployment.Status = models.DeploymentStatusSuccess
-		require.NoError(t, deployment.Save(context.Background()))
-
-		_, err := testCtx.database.Exec(
-			context.Background(),
-			"UPDATE deployments SET started_at = ? WHERE id = ?",
-			firstStart.Add(time.Duration(idx)*time.Minute),
-			deployment.ID,
-		)
-		require.NoError(t, err)
-
-		ids = append(ids, deployment.ID)
-	}
-
-	request := httptest.NewRequestWithContext(
-		t.Context(),
-		http.MethodGet,
-		"/apps/"+createdApp.ID+"/deployments",
-		nil,
-	)
-	request = addChiURLParams(request, map[string]string{"id": createdApp.ID})
-	recorder := httptest.NewRecorder()
-
-	handler := testCtx.handlers.HandleAppDeployments()
-	handler.ServeHTTP(recorder, request)
-
-	require.Equal(t, http.StatusOK, recorder.Code)
-
-	body := recorder.Body.String()
-	card := func(id int64) string {
-		return `data-deployment-id="` + strconv.FormatInt(id, 10) + `"`
-	}
-
-	assert.Equal(t, 10, strings.Count(body, `data-deployment-id="`))
-
-	// The two oldest are left out.
-	assert.NotContains(t, body, card(ids[0]))
-	assert.NotContains(t, body, card(ids[1]))
-
-	// The ten newest are shown, newest first.
-	previous := -1
-
-	for idx := len(ids) - 1; idx >= 2; idx-- {
-		position := strings.Index(body, card(ids[idx]))
-		require.Greater(t, position, previous,
-			"deployment %d missing or out of order", ids[idx])
-
-		previous = position
-	}
-}
-
 func TestHandleWebhookReturns404ForUnknownSecret(t *testing.T) {
 	t.Parallel()
 

templates/app_detail.html

@@ -26,12 +26,11 @@
     <!-- Header -->
     <div class="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4 mb-8">
         <div>
-            <div class="flex flex-wrap items-center gap-3">
+            <div class="flex items-center gap-3">
                 <h1 class="text-2xl font-medium text-gray-900">{{.App.Name}}</h1>
                 <span x-bind:class="statusBadgeClass" x-text="statusLabel"></span>
-                <span class="badge-neutral font-mono break-all" title="Branch">{{.App.Branch}}</span>
             </div>
-            <p class="text-gray-500 font-mono text-sm mt-1">{{.App.RepoURL}}</p>
+            <p class="text-gray-500 font-mono text-sm mt-1">{{.App.RepoURL}}@{{.App.Branch}}</p>
         </div>
         <div class="flex gap-3">
             <a href="/apps/{{.App.ID}}/edit" class="btn-secondary">Edit</a>