diff --git a/.agola/config.yml b/.agola/config.yml index f78f343..6f1b23f 100644 --- a/.agola/config.yml +++ b/.agola/config.yml @@ -1,7 +1,20 @@ version: v0 runs: - - name: Build + - name: Test and lint tasks: + - name: Checkout code + runtime: + type: pod + containers: + - image: docker.io/alpine/git + steps: + - clone: + - save_to_workspace: + contents: + - source_dir: . + dest_dir: . + paths: + - '**' - name: Test runtime: type: pod @@ -12,10 +25,31 @@ runs: - image: code.icb4dc0.de/prskr/ci-images/dind:latest privileged: true steps: - - clone: + - restore_workspace: + dest_dir: . - run: name: Install Go tools command: go install gotest.tools/gotestsum@latest - run: name: run all tests command: gotestsum -f pkgname-and-test-fails -- -race -shuffle=on ./... + depends: + - Checkout code + + - name: Lint code + runtime: + type: pod + arch: amd64 + containers: + - image: docker.io/golangci/golangci-lint + environment: + GO111MODULE: "on" + CGO_ENABLED: "0" + steps: + - restore_workspace: + dest_dir: . + - run: + name: Run golangci-lint + command: golangci-lint run -v + depends: + - Checkout code diff --git a/.golangci.yml b/.golangci.yml index fc15637..f98f2e6 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,7 +5,7 @@ linters-settings: lines: 100 statements: 50 gci: - local-prefixes: code.1533b4dc0.de/prskr/nurse + local-prefixes: code.icb4dc0.de/prskr/nurse goconst: min-len: 2 min-occurrences: 2 @@ -61,7 +61,6 @@ linters: disable-all: true enable: - contextcheck - - deadcode - dogsled - dupl - errcheck @@ -83,23 +82,21 @@ linters: - gosec # - gosimple - govet - - ifshort - importas - ineffassign - - ireturn - lll - misspell - nakedret - nestif - nilnil - noctx + - nolintlint - nosprintfhostport - paralleltest - prealloc - predeclared - promlinter # - staticcheck - - structcheck # - stylecheck - tenv - testpackage @@ -107,9 +104,8 @@ linters: - typecheck - unconvert - unparam - - varcheck - whitespace - # - unused + - unused - wastedassign issues: @@ -122,9 +118,6 @@ issues: - gocognit - gomnd - govet - - path: magefiles/ - linters: - - deadcode run: skip-files: diff --git a/api/check_handler.go b/api/check_handler.go index 2b169d6..1e0c6f4 100644 --- a/api/check_handler.go +++ b/api/check_handler.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "code.1533b4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/check" ) var _ http.Handler = (*CheckHandler)(nil) diff --git a/api/mux.go b/api/mux.go index beb4685..70e08df 100644 --- a/api/mux.go +++ b/api/mux.go @@ -5,8 +5,8 @@ import ( "go.uber.org/zap" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" ) func PrepareMux(instance *config.Nurse, modLookup check.ModuleLookup, srvLookup config.ServerLookup) (http.Handler, error) { diff --git a/check/api.go b/check/api.go index 32da261..aa33974 100644 --- a/check/api.go +++ b/check/api.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" ) var ( diff --git a/check/collection.go b/check/collection.go index e472cef..ebfa11d 100644 --- a/check/collection.go +++ b/check/collection.go @@ -3,8 +3,8 @@ package check import ( "golang.org/x/sync/errgroup" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" ) var _ SystemChecker = Collection(nil) diff --git a/check/endpoint.go b/check/endpoint.go index 9690057..10ededb 100644 --- a/check/endpoint.go +++ b/check/endpoint.go @@ -1,8 +1,8 @@ package check import ( - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" ) func CheckForScript(script []grammar.Check, lkp ModuleLookup, srvLookup config.ServerLookup) (Collection, error) { diff --git a/check/modules.go b/check/modules.go index f9e0465..0327b27 100644 --- a/check/modules.go +++ b/check/modules.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" ) type ( diff --git a/config/endpoints.go b/config/endpoints.go index 77211f3..67a5482 100644 --- a/config/endpoints.go +++ b/config/endpoints.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/grammar" ) type Route string diff --git a/config/env_test.go b/config/env_test.go index 980f353..18b0d93 100644 --- a/config/env_test.go +++ b/config/env_test.go @@ -6,7 +6,7 @@ import ( "github.com/maxatome/go-testdeep/td" - "code.1533b4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/config" ) //nolint:paralleltest // not possible with env setup diff --git a/config/options.go b/config/options.go index 2310799..a1cd2d3 100644 --- a/config/options.go +++ b/config/options.go @@ -30,7 +30,6 @@ func WithServersFromEnv() Option { }) } -//nolint:ireturn // required for interface implementation func WithEndpointsFromEnv() Option { return OptionFunc(func(n Nurse) (Nurse, error) { envEndpoints, err := EndpointsFromEnv() @@ -53,7 +52,6 @@ func WithEndpointsFromEnv() Option { }) } -//nolint:ireturn // required for interface implementation func WithValuesFrom(other Nurse) Option { return OptionFunc(func(n Nurse) (Nurse, error) { return n.Merge(other), nil diff --git a/config/server_test.go b/config/server_test.go index dabf430..5abf1a0 100644 --- a/config/server_test.go +++ b/config/server_test.go @@ -5,8 +5,8 @@ import ( "github.com/maxatome/go-testdeep/td" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/internal/values" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/internal/values" ) func TestParseFromURL(t *testing.T) { diff --git a/go.mod b/go.mod index 5631698..17e17f4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module code.1533b4dc0.de/prskr/nurse +module code.icb4dc0.de/prskr/nurse go 1.19 diff --git a/go.sum b/go.sum index f530a43..709ca58 100644 --- a/go.sum +++ b/go.sum @@ -454,10 +454,6 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgx/v5 v5.0.0-beta.2 h1:qDodMLREJ41Gv3cxNOtz5HlayH1IAv0q2pHQHJIgHf0= -github.com/jackc/pgx/v5 v5.0.0-beta.2/go.mod h1:QJ8xU09HYKHOccHeisi/6sXeRG4dd3AxuV7cmKET4WA= -github.com/jackc/pgx/v5 v5.0.0-beta.3 h1:/fvyxKQQVrEgD6elYv2Fa0L16ytVn8Ll18k1XQ/yaGw= -github.com/jackc/pgx/v5 v5.0.0-beta.3/go.mod h1:QJ8xU09HYKHOccHeisi/6sXeRG4dd3AxuV7cmKET4WA= github.com/jackc/pgx/v5 v5.0.0-beta.5 h1:7H5vxAbAN3zpEif3dpdsXvbhfIUb2NVIogwoMNZjlPg= github.com/jackc/pgx/v5 v5.0.0-beta.5/go.mod h1:h6/rDxQ5OUUxMEeTJYC3HZ/6Rh6uPVD0zLsdODEcwps= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -772,8 +768,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw= -golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0 h1:17k44ji3KFYG94XS5QEFC8pyuOlMh3IoR+vkmTZmJJs= golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -855,8 +849,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A= golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/grammar/param_test.go b/grammar/param_test.go index f3b2553..8626efe 100644 --- a/grammar/param_test.go +++ b/grammar/param_test.go @@ -3,8 +3,8 @@ package grammar_test import ( "testing" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/internal/values" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/internal/values" ) func TestParam_AsString(t *testing.T) { diff --git a/grammar/parser_test.go b/grammar/parser_test.go index 8f18bc4..ba11363 100644 --- a/grammar/parser_test.go +++ b/grammar/parser_test.go @@ -5,8 +5,8 @@ import ( "github.com/maxatome/go-testdeep/td" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/internal/values" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/internal/values" ) var wantParsedScript = td.Struct(new(grammar.Script), td.StructFields{ diff --git a/main.go b/main.go index ef74419..2221edd 100644 --- a/main.go +++ b/main.go @@ -9,10 +9,10 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "code.1533b4dc0.de/prskr/nurse/api" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/protocols/redis" + "code.icb4dc0.de/prskr/nurse/api" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/protocols/redis" ) var ( diff --git a/protocols/http/checks.go b/protocols/http/checks.go index f7c6f5d..aac6e68 100644 --- a/protocols/http/checks.go +++ b/protocols/http/checks.go @@ -3,7 +3,7 @@ package http import ( "net/http" - "code.1533b4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/check" ) func Module() *check.Module { diff --git a/protocols/http/checks_test.go b/protocols/http/checks_test.go index b916274..d03aabc 100644 --- a/protocols/http/checks_test.go +++ b/protocols/http/checks_test.go @@ -12,9 +12,9 @@ import ( "github.com/maxatome/go-testdeep/td" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/grammar" - httpcheck "code.1533b4dc0.de/prskr/nurse/protocols/http" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/grammar" + httpcheck "code.icb4dc0.de/prskr/nurse/protocols/http" ) func TestChecks_Execute(t *testing.T) { diff --git a/protocols/http/get.go b/protocols/http/get.go index b1132f7..f742f90 100644 --- a/protocols/http/get.go +++ b/protocols/http/get.go @@ -5,10 +5,10 @@ import ( "io" "net/http" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) type ClientInjectable interface { diff --git a/protocols/http/json_validation.go b/protocols/http/json_validation.go index 383d815..23c539b 100644 --- a/protocols/http/json_validation.go +++ b/protocols/http/json_validation.go @@ -7,8 +7,8 @@ import ( "github.com/valyala/bytebufferpool" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var _ validation.FromCall[*http.Response] = (*JSONPathValidator)(nil) diff --git a/protocols/http/status_validation.go b/protocols/http/status_validation.go index 460bc83..1ac9f70 100644 --- a/protocols/http/status_validation.go +++ b/protocols/http/status_validation.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var _ validation.FromCall[*http.Response] = (*StatusValidator)(nil) diff --git a/protocols/http/validation.go b/protocols/http/validation.go index 296fdab..654d9a6 100644 --- a/protocols/http/validation.go +++ b/protocols/http/validation.go @@ -3,7 +3,7 @@ package http import ( "net/http" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/validation" ) var registry = validation.NewRegistry[*http.Response]() diff --git a/protocols/redis/checks.go b/protocols/redis/checks.go index b7ab24c..6191c70 100644 --- a/protocols/redis/checks.go +++ b/protocols/redis/checks.go @@ -1,7 +1,7 @@ package redis import ( - "code.1533b4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/check" ) func Module() *check.Module { diff --git a/protocols/redis/checks_test.go b/protocols/redis/checks_test.go index 8b808b5..acf0123 100644 --- a/protocols/redis/checks_test.go +++ b/protocols/redis/checks_test.go @@ -11,10 +11,10 @@ import ( "github.com/google/uuid" "github.com/maxatome/go-testdeep/td" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/protocols/redis" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/protocols/redis" ) func TestChecks_Execute(t *testing.T) { diff --git a/protocols/redis/client.go b/protocols/redis/client.go index 285c403..6c5ed21 100644 --- a/protocols/redis/client.go +++ b/protocols/redis/client.go @@ -6,11 +6,10 @@ import ( "github.com/go-redis/redis/v8" "github.com/mitchellh/mapstructure" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" ) -//nolint:ireturn // no other choice func clientFromParam(p grammar.Param, srvLookup config.ServerLookup) (redis.UniversalClient, error) { if srvName, err := p.AsString(); err != nil { return nil, err @@ -23,7 +22,6 @@ func clientFromParam(p grammar.Param, srvLookup config.ServerLookup) (redis.Univ } } -//nolint:ireturn // no other choice func ClientForServer(srv *config.Server) (redis.UniversalClient, error) { opts := &redis.UniversalOptions{ Addrs: srv.Hosts, diff --git a/protocols/redis/container_test.go b/protocols/redis/container_test.go index 0ecfbd9..570186e 100644 --- a/protocols/redis/container_test.go +++ b/protocols/redis/container_test.go @@ -9,7 +9,7 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "code.1533b4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/config" ) func PrepareRedisContainer(tb testing.TB) *config.Server { diff --git a/protocols/redis/get.go b/protocols/redis/get.go index d278446..7fdf8ba 100644 --- a/protocols/redis/get.go +++ b/protocols/redis/get.go @@ -5,10 +5,10 @@ import ( "github.com/go-redis/redis/v8" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var _ check.SystemChecker = (*GetCheck)(nil) diff --git a/protocols/redis/ping.go b/protocols/redis/ping.go index a36999a..9cb12ff 100644 --- a/protocols/redis/ping.go +++ b/protocols/redis/ping.go @@ -6,10 +6,10 @@ import ( "github.com/go-redis/redis/v8" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var _ check.SystemChecker = (*PingCheck)(nil) diff --git a/protocols/redis/validation.go b/protocols/redis/validation.go index 3d237c3..018e2ff 100644 --- a/protocols/redis/validation.go +++ b/protocols/redis/validation.go @@ -5,8 +5,8 @@ import ( "github.com/go-redis/redis/v8" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var ( diff --git a/protocols/sql/checks.go b/protocols/sql/checks.go index 7c49eb8..943b430 100644 --- a/protocols/sql/checks.go +++ b/protocols/sql/checks.go @@ -1,6 +1,6 @@ package sql -import "code.1533b4dc0.de/prskr/nurse/check" +import "code.icb4dc0.de/prskr/nurse/check" func Module() *check.Module { m, err := check.NewModule( diff --git a/protocols/sql/checks_test.go b/protocols/sql/checks_test.go index b590b35..fd712a4 100644 --- a/protocols/sql/checks_test.go +++ b/protocols/sql/checks_test.go @@ -10,10 +10,10 @@ import ( "github.com/maxatome/go-testdeep/td" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" - sqlchk "code.1533b4dc0.de/prskr/nurse/protocols/sql" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" + sqlchk "code.icb4dc0.de/prskr/nurse/protocols/sql" ) func TestChecks_Execute(t *testing.T) { diff --git a/protocols/sql/container_test.go b/protocols/sql/container_test.go index 1b21395..96c616d 100644 --- a/protocols/sql/container_test.go +++ b/protocols/sql/container_test.go @@ -9,8 +9,8 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/internal/values" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/internal/values" ) const ( diff --git a/protocols/sql/db.go b/protocols/sql/db.go index 0497a43..eea34ef 100644 --- a/protocols/sql/db.go +++ b/protocols/sql/db.go @@ -4,8 +4,8 @@ import ( "database/sql" "fmt" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" ) func dbFromParam(p grammar.Param, srvLookup config.ServerLookup) (*sql.DB, error) { diff --git a/protocols/sql/rows.go b/protocols/sql/rows.go index c6bf7b5..a643bb9 100644 --- a/protocols/sql/rows.go +++ b/protocols/sql/rows.go @@ -4,8 +4,8 @@ import ( "database/sql" "fmt" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var _ validation.FromCall[*sql.Rows] = (*RowsValidator)(nil) diff --git a/protocols/sql/select.go b/protocols/sql/select.go index d600b4c..e02a70f 100644 --- a/protocols/sql/select.go +++ b/protocols/sql/select.go @@ -6,10 +6,10 @@ import ( "go.uber.org/multierr" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/config" - "code.1533b4dc0.de/prskr/nurse/grammar" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/config" + "code.icb4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/validation" ) var _ check.SystemChecker = (*SelectCheck)(nil) diff --git a/protocols/sql/validation.go b/protocols/sql/validation.go index 09111ed..49890c6 100644 --- a/protocols/sql/validation.go +++ b/protocols/sql/validation.go @@ -6,7 +6,7 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/jackc/pgx/v5/stdlib" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/validation" ) var registry = validation.NewRegistry[*sql.Rows]() diff --git a/validation/jsonpath_test.go b/validation/jsonpath_test.go index 49af352..4f89afb 100644 --- a/validation/jsonpath_test.go +++ b/validation/jsonpath_test.go @@ -3,7 +3,7 @@ package validation_test import ( "testing" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/validation" ) type jsonPathValidator_EqualsTestCase[V validation.Value] struct { diff --git a/validation/jsonval_test.go b/validation/jsonval_test.go index 3bf20bf..0669696 100644 --- a/validation/jsonval_test.go +++ b/validation/jsonval_test.go @@ -3,7 +3,7 @@ package validation_test import ( "testing" - "code.1533b4dc0.de/prskr/nurse/validation" + "code.icb4dc0.de/prskr/nurse/validation" ) type testCase interface { diff --git a/validation/registry.go b/validation/registry.go index 1548296..a220db3 100644 --- a/validation/registry.go +++ b/validation/registry.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - "code.1533b4dc0.de/prskr/nurse/check" - "code.1533b4dc0.de/prskr/nurse/grammar" + "code.icb4dc0.de/prskr/nurse/check" + "code.icb4dc0.de/prskr/nurse/grammar" ) type (