Compare commits
2
Commits
main
...
6e24aa1106
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e24aa1106 | ||
|
|
a836bc5f80 |
+3
-6
@@ -1,11 +1,8 @@
|
|||||||
.git
|
# .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.
|
||||||
.env
|
.env
|
||||||
bin/
|
bin/
|
||||||
.editorconfig
|
|
||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
*.test
|
*.test
|
||||||
LICENSE
|
|
||||||
CONVENTIONS.md
|
|
||||||
REPO_POLICIES.md
|
|
||||||
README.md
|
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ RUN go mod download
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
RUN make test
|
RUN make test
|
||||||
|
# Takes the version from `git describe` on the .git copied in above.
|
||||||
RUN make build
|
RUN make build
|
||||||
|
|
||||||
# Runtime stage
|
# Runtime stage
|
||||||
|
|||||||
@@ -226,6 +226,10 @@ 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
|
setup and every other form to pass the CSRF origin check. Behind a
|
||||||
TLS-terminating reverse proxy, drop that line.
|
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
|
### Deploying with Docker Compose
|
||||||
|
|
||||||
[`docker-compose.yml`](docker-compose.yml) builds the image from this repo and
|
[`docker-compose.yml`](docker-compose.yml) builds the image from this repo and
|
||||||
|
|||||||
@@ -20,6 +20,15 @@ regress.
|
|||||||
|
|
||||||
# Completed Steps
|
# 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: 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
|
- 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
|
`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
|
it listen away from the port mapping and healthcheck; the README's Compose
|
||||||
|
|||||||
+3
-1
@@ -52,6 +52,8 @@ func main() {
|
|||||||
handlers.New,
|
handlers.New,
|
||||||
server.New,
|
server.New,
|
||||||
),
|
),
|
||||||
fx.Invoke(func(*server.Server) {}),
|
fx.Invoke(func(log *logger.Logger, _ *server.Server) {
|
||||||
|
log.Identify()
|
||||||
|
}),
|
||||||
).Run()
|
).Run()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const (
|
|||||||
// recentDeploymentsLimit is the number of recent deployments to show.
|
// recentDeploymentsLimit is the number of recent deployments to show.
|
||||||
recentDeploymentsLimit = 5
|
recentDeploymentsLimit = 5
|
||||||
// deploymentsHistoryLimit is the number of deployments to show in history.
|
// deploymentsHistoryLimit is the number of deployments to show in history.
|
||||||
deploymentsHistoryLimit = 50
|
deploymentsHistoryLimit = 10
|
||||||
)
|
)
|
||||||
|
|
||||||
// redirectToApp issues a SeeOther redirect to the page for the given
|
// redirectToApp issues a SeeOther redirect to the page for the given
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/go-chi/chi/v5"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
@@ -1148,6 +1149,73 @@ func TestHandleCancelDeployReturns404ForUnknownApp(t *testing.T) {
|
|||||||
assert.Equal(t, http.StatusNotFound, recorder.Code)
|
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) {
|
func TestHandleWebhookReturns404ForUnknownSecret(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user