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
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,8 @@ jobs:
with:
go-version: "^1.26.0"

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff
- name: Go dependencies
run: go mod download

- name: Install frontend dependencies
run: |
Expand Down
54 changes: 0 additions & 54 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,6 @@ jobs:
with:
go-version: "^1.26.0"

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Install frontend dependencies
run: |
cd frontend
Expand Down Expand Up @@ -118,15 +109,6 @@ jobs:
with:
go-version: "^1.26.0"

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Install frontend dependencies
run: |
cd frontend
Expand Down Expand Up @@ -165,15 +147,6 @@ jobs:
with:
ref: nightly

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -232,15 +205,6 @@ jobs:
with:
ref: nightly

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -299,15 +263,6 @@ jobs:
with:
ref: nightly

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -366,15 +321,6 @@ jobs:
with:
ref: nightly

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down
54 changes: 0 additions & 54 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@ jobs:
with:
go-version: "^1.26.0"

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Install frontend dependencies
run: |
cd frontend
Expand Down Expand Up @@ -91,15 +82,6 @@ jobs:
with:
go-version: "^1.26.0"

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Install frontend dependencies
run: |
cd frontend
Expand Down Expand Up @@ -135,15 +117,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v6

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -199,15 +172,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v6

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -263,15 +227,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v6

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down Expand Up @@ -327,15 +282,6 @@ jobs:
- name: Checkout
uses: actions/checkout@v6

- name: Initialize submodules
run: |
git submodule init
git submodule update

- name: Apply patches
run: |
git apply --directory paerser/ patches/nested_maps.diff

- name: Docker meta
id: meta
uses: docker/metadata-action@v6
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

21 changes: 2 additions & 19 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,9 @@ git clone https://github.com/steveiliop56/tinyauth
cd tinyauth
```

## Initialize Submodules
## Installing Dependencies

The project uses Git submodules for some dependencies, so you need to initialize them with:

```sh
git submodule init
git submodule update
```

## Apply patches

Some of the dependencies must be patched in order to work correctly with the project, you can apply the patches by running:

```sh
git apply --directory paerser/ patches/nested_maps.diff
```

## Installing Requirements

While development occurs within Docker, installing the requirements locally is recommended to avoid import errors. Install the Go dependencies:
While development occurs within Docker, installing the dependencies locally is recommended to avoid import errors. Install the Go dependencies:

```sh
go mod tidy
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ ARG BUILD_TIMESTAMP

WORKDIR /tinyauth

COPY ./paerser ./paerser

COPY go.mod ./
COPY go.sum ./

Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ FROM golang:1.26-alpine3.23

WORKDIR /tinyauth

COPY ./paerser ./paerser

COPY go.mod ./
COPY go.sum ./

Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.distroless
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ ARG BUILD_TIMESTAMP

WORKDIR /tinyauth

COPY ./paerser ./paerser

COPY go.mod ./
COPY go.sum ./

Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/create_oidc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/google/uuid"
"github.com/steveiliop56/tinyauth/internal/utils"
"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
)

func createOidcClientCmd() *cli.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/create_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"charm.land/huh/v2"
"github.com/steveiliop56/tinyauth/internal/utils/tlog"
"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
"golang.org/x/crypto/bcrypt"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/generate_totp.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"charm.land/huh/v2"
"github.com/mdp/qrterminal/v3"
"github.com/pquerna/otp/totp"
"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
)

type GenerateTotpConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/healthcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/steveiliop56/tinyauth/internal/utils/tlog"
"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
)

type healthzResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/tinyauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/steveiliop56/tinyauth/internal/utils/tlog"

"github.com/rs/zerolog/log"
"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/verify_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"charm.land/huh/v2"
"github.com/pquerna/otp/totp"
"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
"golang.org/x/crypto/bcrypt"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/tinyauth/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/steveiliop56/tinyauth/internal/config"

"github.com/traefik/paerser/cli"
"github.com/tinyauthapp/paerser/cli"
)

func versionCmd() *cli.Command {
Expand Down
12 changes: 5 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/steveiliop56/tinyauth

go 1.26.0

replace github.com/traefik/paerser v0.2.2 => ./paerser

require (
charm.land/huh/v2 v2.0.3
github.com/cenkalti/backoff/v5 v5.0.3
Expand All @@ -18,7 +16,7 @@ require (
github.com/pquerna/otp v1.5.0
github.com/rs/zerolog v1.35.0
github.com/stretchr/testify v1.11.1
github.com/traefik/paerser v0.2.2
github.com/tinyauthapp/paerser v0.0.0-20260410140347-85c3740d6298
Comment thread
steveiliop56 marked this conversation as resolved.
github.com/weppos/publicsuffix-go v0.50.3
golang.org/x/crypto v0.49.0
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
Expand All @@ -31,11 +29,12 @@ require (
charm.land/bubbles/v2 v2.0.0 // indirect
charm.land/bubbletea/v2 v2.0.2 // indirect
charm.land/lipgloss/v2 v2.0.1 // indirect
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/go-ntlmssp v0.1.0 // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/BurntSushi/toml v1.6.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/boombuler/barcode v1.0.2 // indirect
Expand Down Expand Up @@ -76,7 +75,6 @@ require (
github.com/goccy/go-yaml v1.19.2 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
Expand Down
Loading
Loading