diff --git a/.hgconf b/.hgconf index 27128e5c0b240884f85a28ea13ce2d00e44fd5a4_LmhnY29uZg==..254cf17968c18e1633460c4ece0a0fe2d54b3f1e_LmhnY29uZg== 100644 --- a/.hgconf +++ b/.hgconf @@ -1,4 +0,0 @@ -[go-orusapi] -pulluri = ssh://hg@orus.io/orus-io/go-orusapi -layout = dependencies/go-orusapi -track = 231b83d1d99623c3511a56047cf760bff1a1cad5 diff --git a/Makefile b/Makefile index 27128e5c0b240884f85a28ea13ce2d00e44fd5a4_TWFrZWZpbGU=..254cf17968c18e1633460c4ece0a0fe2d54b3f1e_TWFrZWZpbGU= 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,3 @@ -ifeq ($(wildcard dependencies/go-orusapi),) -$(error Run hg cfensureconf to clone the dependencies) -endif - VERSIONTAG = dev VCSCOMMIT = $(shell hg id --id) @@ -115,7 +111,7 @@ test-short: ## Run the short version of the tests go test -short ./... -build/rednerd: $(shell find dependencies cmd) +build/rednerd: mkdir -p build $(GOBUILD) -o build/rednerd ./cmd/rednerd diff --git a/go.mod b/go.mod index 27128e5c0b240884f85a28ea13ce2d00e44fd5a4_Z28ubW9k..254cf17968c18e1633460c4ece0a0fe2d54b3f1e_Z28ubW9k 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ github.com/prometheus/client_golang v1.19.1 github.com/rs/zerolog v1.33.0 github.com/steinfletcher/apitest v1.5.16 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 github.com/yuin/goldmark v1.7.2 golang.org/x/crypto v0.35.0 golang.org/x/net v0.33.0 @@ -35,7 +35,7 @@ gopkg.in/dgrijalva/jwt-go.v3 v3.2.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gotest.tools v2.2.0+incompatible - orus.io/orus-io/go-orusapi v0.0.0 + orus.io/orus-io/go-orusapi v0.0.0-20250328171932-0d32d65dcb85 ) require ( @@ -43,5 +43,4 @@ github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/docker/go-units v0.5.0 // indirect @@ -47,4 +46,5 @@ github.com/docker/go-units v0.5.0 // indirect + github.com/fatih/structtag v1.2.0 // indirect github.com/go-openapi/analysis v0.23.0 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect @@ -81,4 +81,4 @@ gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace orus.io/orus-io/go-orusapi => ./dependencies/go-orusapi +tool orus.io/orus-io/go-orusapi/tools/generate_db_helpers diff --git a/go.sum b/go.sum index 27128e5c0b240884f85a28ea13ce2d00e44fd5a4_Z28uc3Vt..254cf17968c18e1633460c4ece0a0fe2d54b3f1e_Z28uc3Vt 100644 --- a/go.sum +++ b/go.sum @@ -46,6 +46,8 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= +github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= github.com/getsentry/sentry-go v0.28.1 h1:zzaSm/vHmGllRM6Tpx1492r0YDzauArdBfkJRtY6P5k= github.com/getsentry/sentry-go v0.28.1/go.mod h1:1fQZ+7l7eeJ3wYi82q5Hg8GqAPgefRq+FP/QhafYVgg= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= @@ -296,8 +298,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.7.2 h1:NjGd7lO7zrUn/A7eKwn5PEOt4ONYGqpxSEeZuduvgxc= github.com/yuin/goldmark v1.7.2/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= @@ -447,3 +449,5 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +orus.io/orus-io/go-orusapi v0.0.0-20250328171932-0d32d65dcb85 h1:B5yqDS734oxGJ/Z/DZirDX+54fpqxVBMnR57Dg6wGm0= +orus.io/orus-io/go-orusapi v0.0.0-20250328171932-0d32d65dcb85/go.mod h1:sV60F0mHPcYGpqWZLDwIf7UwRUg+StRMuZBy7S3cOek= diff --git a/rendering/template_registry_test.go b/rendering/template_registry_test.go index 27128e5c0b240884f85a28ea13ce2d00e44fd5a4_cmVuZGVyaW5nL3RlbXBsYXRlX3JlZ2lzdHJ5X3Rlc3QuZ28=..254cf17968c18e1633460c4ece0a0fe2d54b3f1e_cmVuZGVyaW5nL3RlbXBsYXRlX3JlZ2lzdHJ5X3Rlc3QuZ28= 100644 --- a/rendering/template_registry_test.go +++ b/rendering/template_registry_test.go @@ -1,4 +1,4 @@ -package rendering +package rendering //nolint:testpackage import ( "testing"