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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ require (
github.com/felixge/httpsnoop v1.0.4
github.com/go-jose/go-jose/v4 v4.1.4
github.com/google/uuid v1.6.0
github.com/imgoci/go-simplestreams v0.2.0
github.com/jackc/pgx/v5 v5.9.2
github.com/meigma/authkit v0.3.0
github.com/meigma/go-simplestreams v0.1.0
github.com/minio/minio-go/v7 v7.1.0
github.com/pressly/goose/v3 v3.27.1
github.com/prometheus/client_golang v1.23.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
github.com/imgoci/go-simplestreams v0.2.0 h1:EyoiZDfqPL+Z95ORS4syE7rD+MWgC2UyWwsJ/9gaGlc=
github.com/imgoci/go-simplestreams v0.2.0/go.mod h1:GiFaiJ69sNBOTKa5F0hyUIv+AaARUYhFQ/ElQC3UowE=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
Expand Down Expand Up @@ -130,8 +132,6 @@ github.com/mdelapenya/tlscert v0.2.0 h1:7H81W6Z/4weDvZBNOfQte5GpIMo0lGYEeWbkGp5L
github.com/mdelapenya/tlscert v0.2.0/go.mod h1:O4njj3ELLnJjGdkN7M/vIVCpZ+Cf0L6muqOG4tLSl8o=
github.com/meigma/authkit v0.3.0 h1:oyfzV+l6B1gDHfCx4zg97L0Km92GKVQ3hwKsjLrIHZU=
github.com/meigma/authkit v0.3.0/go.mod h1:1BYKxIGBuofA5fnjUipx4VexecXykoclytwB7ODouFY=
github.com/meigma/go-simplestreams v0.1.0 h1:yHKFUyRK4rPWO1Z5wDMAWymeRXAFFSiWQTsVUK73j90=
github.com/meigma/go-simplestreams v0.1.0/go.mod h1:HruoU+2tMlDEkWoOgJ7uJ/JkbjymEjlSY7f7NMBwOMw=
github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY=
github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg=
github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI=
Expand Down
6 changes: 3 additions & 3 deletions internal/integration/release_flow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"testing"
"time"

simplestreams "github.com/meigma/go-simplestreams"
"github.com/meigma/go-simplestreams/adapters/httpmirror"
incusschema "github.com/meigma/go-simplestreams/schema/incus"
simplestreams "github.com/imgoci/go-simplestreams"
"github.com/imgoci/go-simplestreams/adapters/httpmirror"
incusschema "github.com/imgoci/go-simplestreams/schema/incus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
2 changes: 1 addition & 1 deletion internal/materialization/incus/indexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"

"github.com/google/uuid"
simplestreams "github.com/meigma/go-simplestreams"
simplestreams "github.com/imgoci/go-simplestreams"

"github.com/meigma/imgsrv/internal/cas"
"github.com/meigma/imgsrv/internal/catalog"
Expand Down
4 changes: 2 additions & 2 deletions internal/materialization/incus/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"time"

"github.com/google/uuid"
simplestreams "github.com/meigma/go-simplestreams"
incusschema "github.com/meigma/go-simplestreams/schema/incus"
simplestreams "github.com/imgoci/go-simplestreams"
incusschema "github.com/imgoci/go-simplestreams/schema/incus"

"github.com/meigma/imgsrv/internal/catalog"
safelog "github.com/meigma/imgsrv/internal/logging"
Expand Down
4 changes: 2 additions & 2 deletions internal/materialization/incus/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"time"

"github.com/google/uuid"
simplestreams "github.com/meigma/go-simplestreams"
incusschema "github.com/meigma/go-simplestreams/schema/incus"
simplestreams "github.com/imgoci/go-simplestreams"
incusschema "github.com/imgoci/go-simplestreams/schema/incus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

Expand Down
Loading