pavel/box
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove stupid

Browse source
This commit is contained in:
pavel 2026-05-14 23:51:33 +02:00
commit 4cfc6be322
7 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/app/db.go
View file

@ -23,7 +23,6 @@ func (a *App) migrate(ctx context.Context) error {
repo_private BOOLEAN NOT NULL DEFAULT true, repo_private BOOLEAN NOT NULL DEFAULT true,
service_name TEXT NOT NULL, service_name TEXT NOT NULL,
route_host TEXT NOT NULL DEFAULT '', route_host TEXT NOT NULL DEFAULT '',
target_port INT NOT NULL DEFAULT 8000,
deploy_token TEXT NOT NULL DEFAULT '', deploy_token TEXT NOT NULL DEFAULT '',
provision_state TEXT NOT NULL DEFAULT 'provisioned', provision_state TEXT NOT NULL DEFAULT 'provisioned',
provision_error TEXT NOT NULL DEFAULT '', provision_error TEXT NOT NULL DEFAULT '',
@ -48,7 +47,6 @@ func (a *App) migrate(ctx context.Context) error {
} }
alter := []string{ alter := []string{
`ALTER TABLE projects ADD COLUMN IF NOT EXISTS route_host TEXT NOT NULL DEFAULT '';`, `ALTER TABLE projects ADD COLUMN IF NOT EXISTS route_host TEXT NOT NULL DEFAULT '';`,
`ALTER TABLE projects ADD COLUMN IF NOT EXISTS target_port INT NOT NULL DEFAULT 8000;`,
`ALTER TABLE projects ADD COLUMN IF NOT EXISTS workspace_id BIGINT REFERENCES workspaces(id) ON DELETE RESTRICT;`, `ALTER TABLE projects ADD COLUMN IF NOT EXISTS workspace_id BIGINT REFERENCES workspaces(id) ON DELETE RESTRICT;`,
`ALTER TABLE projects ADD COLUMN IF NOT EXISTS deploy_token TEXT NOT NULL DEFAULT '';`, `ALTER TABLE projects ADD COLUMN IF NOT EXISTS deploy_token TEXT NOT NULL DEFAULT '';`,
`ALTER TABLE projects ADD COLUMN IF NOT EXISTS repo_private BOOLEAN NOT NULL DEFAULT true;`, `ALTER TABLE projects ADD COLUMN IF NOT EXISTS repo_private BOOLEAN NOT NULL DEFAULT true;`,
@ -63,6 +61,9 @@ func (a *App) migrate(ctx context.Context) error {
return err return err
} }
} }
if _, err := a.db.ExecContext(ctx, `ALTER TABLE projects DROP COLUMN IF EXISTS target_port;`); err != nil {
return err
}
rows, err := a.db.QueryContext(ctx, `SELECT id FROM projects WHERE deploy_token=''`) rows, err := a.db.QueryContext(ctx, `SELECT id FROM projects WHERE deploy_token=''`)
if err != nil { if err != nil {
return err return err

4
internal/app/deploy_service.go
View file

@ -57,9 +57,9 @@ func (a *App) handleDeployWebhook(w http.ResponseWriter, r *http.Request) {
func (a *App) getProjectForWebhook(ctx context.Context, projectID int64, token string) (Project, error) { func (a *App) getProjectForWebhook(ctx context.Context, projectID int64, token string) (Project, error) {
var p Project var p Project
err := a.db.QueryRowContext(ctx, `SELECT p.id, p.user_id, p.name, p.slug, p.description, p.repo_url, p.service_name, p.route_host, p.target_port, p.workspace_id, w.name, w.unix_user, p.deploy_token, p.created_at err := a.db.QueryRowContext(ctx, `SELECT p.id, p.user_id, p.name, p.slug, p.description, p.repo_url, p.service_name, p.route_host, p.workspace_id, w.name, w.unix_user, p.deploy_token, p.created_at
FROM projects p JOIN workspaces w ON w.id=p.workspace_id WHERE p.id=$1 AND p.deploy_token=$2`, projectID, token). FROM projects p JOIN workspaces w ON w.id=p.workspace_id WHERE p.id=$1 AND p.deploy_token=$2`, projectID, token).
Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.ServiceName, &p.RouteHost, &p.TargetPort, &p.WorkspaceID, &p.Workspace, &p.UnixUser, &p.DeployToken, &p.CreatedAt) Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.ServiceName, &p.RouteHost, &p.WorkspaceID, &p.Workspace, &p.UnixUser, &p.DeployToken, &p.CreatedAt)
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
return Project{}, errors.New("project not found") return Project{}, errors.New("project not found")

16
internal/app/project_service.go
View file

@ -9,7 +9,7 @@ import (
) )
func (a *App) listProjects(ctx context.Context, userID string) ([]Project, error) { func (a *App) listProjects(ctx context.Context, userID string) ([]Project, error) {
rows, err := a.db.QueryContext(ctx, `SELECT p.id, p.user_id, p.name, p.slug, p.description, p.repo_url, p.repo_private, p.service_name, p.route_host, p.target_port, p.workspace_id, w.name, w.unix_user, p.deploy_token, p.provision_state, p.provision_error, p.db_name, p.db_user, p.db_password, p.created_at rows, err := a.db.QueryContext(ctx, `SELECT p.id, p.user_id, p.name, p.slug, p.description, p.repo_url, p.repo_private, p.service_name, p.route_host, p.workspace_id, w.name, w.unix_user, p.deploy_token, p.provision_state, p.provision_error, p.db_name, p.db_user, p.db_password, p.created_at
FROM projects p FROM projects p
JOIN workspaces w ON w.id = p.workspace_id JOIN workspaces w ON w.id = p.workspace_id
WHERE p.user_id=$1 ORDER BY p.created_at DESC`, userID) WHERE p.user_id=$1 ORDER BY p.created_at DESC`, userID)
@ -20,7 +20,7 @@ func (a *App) listProjects(ctx context.Context, userID string) ([]Project, error
var out []Project var out []Project
for rows.Next() { for rows.Next() {
var p Project var p Project
if err := rows.Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.RepoPrivate, &p.ServiceName, &p.RouteHost, &p.TargetPort, &p.WorkspaceID, &p.Workspace, &p.UnixUser, &p.DeployToken, &p.ProvisionState, &p.ProvisionError, &p.DBName, &p.DBUser, &p.DBPassword, &p.CreatedAt); err != nil { if err := rows.Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.RepoPrivate, &p.ServiceName, &p.RouteHost, &p.WorkspaceID, &p.Workspace, &p.UnixUser, &p.DeployToken, &p.ProvisionState, &p.ProvisionError, &p.DBName, &p.DBUser, &p.DBPassword, &p.CreatedAt); err != nil {
return nil, err return nil, err
} }
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken) p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken)
@ -30,7 +30,7 @@ func (a *App) listProjects(ctx context.Context, userID string) ([]Project, error
return out, rows.Err() return out, rows.Err()
} }
func (a *App) createProject(ctx context.Context, user User, workspaceID int64, name, description string, private bool, existingRepoURL string, targetPort int) (Project, error) { func (a *App) createProject(ctx context.Context, user User, workspaceID int64, name, description string, private bool, existingRepoURL string) (Project, error) {
slug := slugify(name) slug := slugify(name)
if slug == "" { if slug == "" {
return Project{}, errors.New("project name must include letters or numbers") return Project{}, errors.New("project name must include letters or numbers")
@ -55,9 +55,9 @@ func (a *App) createProject(ctx context.Context, user User, workspaceID int64, n
} }
defer tx.Rollback() defer tx.Rollback()
err = tx.QueryRowContext(ctx, `INSERT INTO projects (user_id, workspace_id, name, slug, description, repo_url, repo_private, service_name, route_host, target_port, deploy_token, provision_state, provision_error) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,'pending','') RETURNING id, user_id, name, slug, description, repo_url, repo_private, service_name, route_host, target_port, workspace_id, deploy_token, provision_state, provision_error, db_name, db_user, db_password, created_at`, err = tx.QueryRowContext(ctx, `INSERT INTO projects (user_id, workspace_id, name, slug, description, repo_url, repo_private, service_name, route_host, deploy_token, provision_state, provision_error) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,'pending','') RETURNING id, user_id, name, slug, description, repo_url, repo_private, service_name, route_host, workspace_id, deploy_token, provision_state, provision_error, db_name, db_user, db_password, created_at`,
user.Username, workspaceID, name, slug, description, repoURL, private, serviceName, routeHost, targetPort, deployToken, user.Username, workspaceID, name, slug, description, repoURL, private, serviceName, routeHost, deployToken,
).Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.RepoPrivate, &p.ServiceName, &p.RouteHost, &p.TargetPort, &p.WorkspaceID, &p.DeployToken, &p.ProvisionState, &p.ProvisionError, &p.DBName, &p.DBUser, &p.DBPassword, &p.CreatedAt) ).Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.RepoPrivate, &p.ServiceName, &p.RouteHost, &p.WorkspaceID, &p.DeployToken, &p.ProvisionState, &p.ProvisionError, &p.DBName, &p.DBUser, &p.DBPassword, &p.CreatedAt)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "duplicate key") { if strings.Contains(err.Error(), "duplicate key") {
return Project{}, errors.New("project with this name already exists") return Project{}, errors.New("project with this name already exists")
@ -144,9 +144,9 @@ func (a *App) provisionProject(ctx context.Context, p *Project) error {
func (a *App) getProject(ctx context.Context, userID string, projectID int64) (Project, error) { func (a *App) getProject(ctx context.Context, userID string, projectID int64) (Project, error) {
var p Project var p Project
err := a.db.QueryRowContext(ctx, `SELECT p.id, p.user_id, p.name, p.slug, p.description, p.repo_url, p.repo_private, p.service_name, p.route_host, p.target_port, p.workspace_id, w.name, w.unix_user, p.deploy_token, p.provision_state, p.provision_error, p.db_name, p.db_user, p.db_password, p.created_at err := a.db.QueryRowContext(ctx, `SELECT p.id, p.user_id, p.name, p.slug, p.description, p.repo_url, p.repo_private, p.service_name, p.route_host, p.workspace_id, w.name, w.unix_user, p.deploy_token, p.provision_state, p.provision_error, p.db_name, p.db_user, p.db_password, p.created_at
FROM projects p JOIN workspaces w ON w.id=p.workspace_id WHERE p.user_id=$1 AND p.id=$2`, userID, projectID). FROM projects p JOIN workspaces w ON w.id=p.workspace_id WHERE p.user_id=$1 AND p.id=$2`, userID, projectID).
Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.RepoPrivate, &p.ServiceName, &p.RouteHost, &p.TargetPort, &p.WorkspaceID, &p.Workspace, &p.UnixUser, &p.DeployToken, &p.ProvisionState, &p.ProvisionError, &p.DBName, &p.DBUser, &p.DBPassword, &p.CreatedAt) Scan(&p.ID, &p.UserID, &p.Name, &p.Slug, &p.Description, &p.RepoURL, &p.RepoPrivate, &p.ServiceName, &p.RouteHost, &p.WorkspaceID, &p.Workspace, &p.UnixUser, &p.DeployToken, &p.ProvisionState, &p.ProvisionError, &p.DBName, &p.DBUser, &p.DBPassword, &p.CreatedAt)
if err != nil { if err != nil {
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
return Project{}, errors.New("project not found") return Project{}, errors.New("project not found")

10
internal/app/routes_handlers.go
View file

@ -79,7 +79,6 @@ func (a *App) handleProjects(w http.ResponseWriter, r *http.Request, user User)
Description string `json:"description"` Description string `json:"description"`
RepoPrivate bool `json:"repo_private"` RepoPrivate bool `json:"repo_private"`
RepoURL string `json:"repo_url"` RepoURL string `json:"repo_url"`
TargetPort int `json:"target_port"`
WorkspaceID int64 `json:"workspace_id"` WorkspaceID int64 `json:"workspace_id"`
} }
if err := json.NewDecoder(r.Body).Decode(&req); err != nil { if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
@ -99,14 +98,7 @@ func (a *App) handleProjects(w http.ResponseWriter, r *http.Request, user User)
http.Error(w, "repo_url must be a valid repo URL (https://..., ssh://..., or git@...)", http.StatusBadRequest) http.Error(w, "repo_url must be a valid repo URL (https://..., ssh://..., or git@...)", http.StatusBadRequest)
return return
} }
if req.TargetPort == 0 { project, err := a.createProject(r.Context(), user, req.WorkspaceID, req.Name, req.Description, req.RepoPrivate, req.RepoURL)
req.TargetPort = 8000
}
if req.TargetPort < 1 || req.TargetPort > 65535 {
http.Error(w, "target_port must be 1-65535", http.StatusBadRequest)
return
}
project, err := a.createProject(r.Context(), user, req.WorkspaceID, req.Name, req.Description, req.RepoPrivate, req.RepoURL, req.TargetPort)
if err != nil { if err != nil {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
return return

1
internal/app/types.go
View file

@ -55,7 +55,6 @@ type Project struct {
ServiceName string `json:"service_name"` ServiceName string `json:"service_name"`
RouteHost string `json:"route_host"` RouteHost string `json:"route_host"`
AppURL string `json:"app_url"` AppURL string `json:"app_url"`
TargetPort int `json:"target_port"`
WorkspaceID int64 `json:"workspace_id"` WorkspaceID int64 `json:"workspace_id"`
Workspace string `json:"workspace"` Workspace string `json:"workspace"`
UnixUser string `json:"unix_user"` UnixUser string `json:"unix_user"`

5
web/app.js
View file

@ -53,7 +53,7 @@ function renderProjects() {
<h3>${escapeHtml(p.name)}</h3> <h3>${escapeHtml(p.name)}</h3>
<p class="meta">workspace: ${escapeHtml(p.workspace)} (${escapeHtml(p.unix_user)})</p> <p class="meta">workspace: ${escapeHtml(p.workspace)} (${escapeHtml(p.unix_user)})</p>
<p class="meta">slug: ${escapeHtml(p.slug)} | service: ${escapeHtml(p.service_name)}</p> <p class="meta">slug: ${escapeHtml(p.slug)} | service: ${escapeHtml(p.service_name)}</p>
<p class="meta">app target: 127.0.0.1:${escapeHtml(p.target_port)} | route host: ${escapeHtml(p.route_host || 'not set')}</p> <p class="meta">route host: ${escapeHtml(p.route_host || 'not set')}</p>
<p class="meta">app url: ${p.app_url ? `<a class="link" href="${escapeHtml(p.app_url)}" target="_blank" rel="noreferrer">${escapeHtml(p.app_url)}</a>` : 'not set'}</p> <p class="meta">app url: ${p.app_url ? `<a class="link" href="${escapeHtml(p.app_url)}" target="_blank" rel="noreferrer">${escapeHtml(p.app_url)}</a>` : 'not set'}</p>
<p class="meta">deploy webhook: <code>${escapeHtml(p.webhook_url || 'n/a')}</code></p> <p class="meta">deploy webhook: <code>${escapeHtml(p.webhook_url || 'n/a')}</code></p>
<p class="meta">provisioning: ${escapeHtml(p.provision_state || 'unknown')}${p.provision_error ? ` | error: ${escapeHtml(p.provision_error)}` : ''}</p> <p class="meta">provisioning: ${escapeHtml(p.provision_state || 'unknown')}${p.provision_error ? ` | error: ${escapeHtml(p.provision_error)}` : ''}</p>
@ -156,8 +156,7 @@ async function createProject(e) {
name: form.name.value, name: form.name.value,
description: form.description.value, description: form.description.value,
repo_url: form.repo_url.value.trim(), repo_url: form.repo_url.value.trim(),
repo_private: form.repo_private.checked, repo_private: form.repo_private.checked
target_port: Number(form.target_port.value || 8000)
}; };
const msg = document.getElementById('createMsg'); const msg = document.getElementById('createMsg');
msg.textContent = 'Creating project...'; msg.textContent = 'Creating project...';

1
web/index.html
View file

@ -34,7 +34,6 @@
<label>Name<input name="name" required placeholder="analytics-api" /></label> <label>Name<input name="name" required placeholder="analytics-api" /></label>
<label>Description<textarea name="description" placeholder="optional"></textarea></label> <label>Description<textarea name="description" placeholder="optional"></textarea></label>
<label>Existing Repo URL (optional)<input name="repo_url" placeholder="https://forgejo.example.com/org/repo" /></label> <label>Existing Repo URL (optional)<input name="repo_url" placeholder="https://forgejo.example.com/org/repo" /></label>
<label>Target Port<input name="target_port" type="number" min="1" max="65535" value="8000" required /></label>
<label class="inline"><input type="checkbox" name="repo_private" checked />Private Forgejo repo</label> <label class="inline"><input type="checkbox" name="repo_private" checked />Private Forgejo repo</label>
<button type="submit">Create Project</button> <button type="submit">Create Project</button>
</form> </form>