Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: lint

on:
workflow_dispatch:
push:
branches:
- main
pull_request:

jobs:
golangci-lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Go environment
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with:
go-version: "stable"
- name: Run golangci-lint
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
with:
args: --timeout=30m

govulncheck:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Go environment
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with:
go-version: "stable"
- name: Run govulncheck
shell: bash
run: |
go install golang.org/x/vuln/cmd/govulncheck@latest
govulncheck ./...
actionlint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Go environment
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with:
go-version: "stable"
- name: Install ShellCheck
env:
SHELLCHECK_VER: v0.11.0
run: |
baseurl=https://github.com/koalaman/shellcheck/releases/download
curl -fsSLO "${baseurl}/${SHELLCHECK_VER}/shellcheck-${SHELLCHECK_VER}.linux.x86_64.tar.xz"
tar -xf "shellcheck-${SHELLCHECK_VER}.linux.x86_64.tar.xz"
sudo mv "./shellcheck-${SHELLCHECK_VER}/shellcheck" "${{ github.action_path }}/shellcheck"
rm -rf "shellcheck-${SHELLCHECK_VER}" "shellcheck-${SHELLCHECK_VER}.linux.x86_64.tar.xz"
- name: Run Actionlint
shell: bash
run: |
go install github.com/rhysd/actionlint/cmd/actionlint@latest
actionlint
28 changes: 28 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: test

on:
workflow_dispatch:
push:
branches:
- main
pull_request:

jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Setup Go environment
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
with:
go-version: "stable"
- name: Run Unit Tests
run: go test -v ./server/...
- name: Run E2E Tests
run: |
go build -o fifo ./server
./fifo >logs 2>&1 &
sleep 1
trap 'kill $!; cat logs' EXIT
go test -v ./client/...
23 changes: 17 additions & 6 deletions server/fifio.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,14 @@ func (m *fifoManager) run(ctx context.Context) {
}
}

func newFifoManager(db *gorm.DB, clock clock.WithDelayedExecution, log *slog.Logger) *fifoManager {
db.AutoMigrate(
func newFifoManager(db *gorm.DB, clock clock.WithDelayedExecution, log *slog.Logger) (*fifoManager, error) {
if err := db.AutoMigrate(
&fifo{},
&ticket{},
)
); err != nil {
log.Error("db migration failed", "err", err)
return nil, fmt.Errorf("db migration failed: %w", err)
}
fm := &fifoManager{
log: log,
db: db,
Expand All @@ -239,7 +242,7 @@ func newFifoManager(db *gorm.DB, clock clock.WithDelayedExecution, log *slog.Log
pullRate: 5 * time.Minute,
}
go fm.run(context.Background())
return fm
return fm, nil
}

func (m *fifoManager) registerHandlers(mux *http.ServeMux) {
Expand Down Expand Up @@ -310,7 +313,11 @@ func (m *fifoManager) new(w http.ResponseWriter, r *http.Request) {
return
}

encode(w, 200, api.FifoNewResponse{UUID: fifo.UUID})
if err := encode(w, 200, api.FifoNewResponse{UUID: fifo.UUID}); err != nil {
log.Error("encoding response failed", "err", err)
http.Error(w, "encoding response failed", http.StatusInternalServerError)
return
}
}

func (m *fifoManager) ticket(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -390,7 +397,11 @@ func (m *fifoManager) ticket(w http.ResponseWriter, r *http.Request) {
}

log.Info("ticket created", "ticket", tick.UUID.String())
encode(w, 200, api.FifoTicketResponse{TicketID: tick.UUID})
if err := encode(w, 200, api.FifoTicketResponse{TicketID: tick.UUID}); err != nil {
log.Error("encoding response failed", "err", err)
http.Error(w, "encoding response failed", http.StatusInternalServerError)
return
}
}

func (m *fifoManager) wait(w http.ResponseWriter, r *http.Request) {
Expand Down
3 changes: 2 additions & 1 deletion server/fifo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ func newTestFifoManager(t *testing.T, db *gorm.DB, mock sqlmock.Sqlmock, c clock
mock.ExpectExec("CREATE TABLE `tickets`").
WillReturnResult(sqlmock.NewResult(0, 0))

mgr := newFifoManager(db, c, slog.Default())
mgr, err := newFifoManager(db, c, slog.Default())
require.NoError(err)
require.NoError(mock.ExpectationsWereMet())

return mgr
Expand Down
6 changes: 5 additions & 1 deletion server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ func main() {
}

mux := http.NewServeMux()
fm := newFifoManager(db, clock.RealClock{}, log)
fm, err := newFifoManager(db, clock.RealClock{}, log)
if err != nil {
log.Error("fatal", "err", fmt.Errorf("creating fifo manager: %w", err))
os.Exit(1)
}
fm.registerHandlers(mux)

if err := http.ListenAndServe(":8080", mux); err != nil {
Expand Down
Loading