diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5f59c303..3ccdfec3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -26,24 +26,6 @@ jobs: - name: test run: go test -timeout 60s -race ./... - system-test: - name: System Test - runs-on: ubuntu-latest - steps: - - name: Check out code into the Go module directory - uses: actions/checkout@v6 - - - name: Start environment - run: docker compose -f "system_test/docker-compose.yml" up -d --build - - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version: "1.25" - - - name: run test - run: VOTE_SYSTEM_TEST=1 go test -timeout 60s ./system_test/ - docker: name: Docker runs-on: ubuntu-latest diff --git a/go.mod b/go.mod index 0d34d0ab..b90f1a21 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/OpenSlides/openslides-vote-service go 1.25.0 require ( - github.com/OpenSlides/openslides-go v0.0.0-20251127124526-36f2d434e2ad + github.com/OpenSlides/openslides-go v0.0.0-20251210153241-0ed1c585ad96 github.com/alecthomas/kong v1.13.0 github.com/gomodule/redigo v1.9.3 github.com/jackc/pgx/v5 v5.7.6 @@ -12,19 +12,18 @@ require ( ) require ( - dario.cat/mergo v1.0.1 // indirect + dario.cat/mergo v1.0.2 // indirect github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/containerd/continuity v0.4.5 // indirect - github.com/docker/cli v28.0.4+incompatible // indirect - github.com/docker/docker v28.0.4+incompatible // indirect - github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/cli v28.4.0+incompatible // indirect + github.com/docker/docker v28.4.0+incompatible // indirect + github.com/docker/go-connections v0.6.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/goccy/go-yaml v1.18.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect @@ -32,11 +31,11 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/sys/user v0.3.0 // indirect + github.com/moby/sys/user v0.4.0 // indirect github.com/moby/term v0.5.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.1 // indirect - github.com/opencontainers/runc v1.2.8 // indirect + github.com/opencontainers/runc v1.3.1 // indirect github.com/ostcar/topic v0.6.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect diff --git a/go.sum b/go.sum index cdd29a6f..948d0b63 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= -dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= +dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= @@ -8,8 +8,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/OpenSlides/openslides-go v0.0.0-20251127124526-36f2d434e2ad h1:a3994fLitWH+uRQxpT3R3aTZ9rmVLIH42QIInwIgx+A= -github.com/OpenSlides/openslides-go v0.0.0-20251127124526-36f2d434e2ad/go.mod h1:O6m+Yb4v77z0Ey73H46msYFa/VCRVT4uLrrFsNJZ5jQ= +github.com/OpenSlides/openslides-go v0.0.0-20251210153241-0ed1c585ad96 h1:d+bOibIfTbB4XLd+FaPNpQVgczqNtqiPTsxCZjNwPUw= +github.com/OpenSlides/openslides-go v0.0.0-20251210153241-0ed1c585ad96/go.mod h1:Cn/9+pAiazXhqPjaf10xnjREZ/njcHFO76wZVHxlBEA= github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/kong v1.13.0 h1:5e/7XC3ugvhP1DQBmTS+WuHtCbcv44hsohMgcvVxSrA= @@ -26,12 +26,12 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1ef64XEu4A= -github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok= -github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= -github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY0UUU4C9kY= +github.com/docker/cli v28.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk= +github.com/docker/docker v28.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94= +github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE= 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/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= @@ -40,8 +40,6 @@ github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9L github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/gomodule/redigo v1.9.3 h1:dNPSXeXv6HCq2jdyWfjgmhBdqnR6PRO3m/G05nvpPC8= @@ -60,8 +58,6 @@ github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk= github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -70,16 +66,16 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo= -github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= +github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs= +github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= -github.com/opencontainers/runc v1.2.8 h1:RnEICeDReapbZ5lZEgHvj7E9Q3Eex9toYmaGBsbvU5Q= -github.com/opencontainers/runc v1.2.8/go.mod h1:cC0YkmZcuvr+rtBZ6T7NBoVbMGNAdLa/21vIElJDOzI= +github.com/opencontainers/runc v1.3.1 h1:c/yY0oh2wK7tzDuD56REnSxyU8ubh8hoAIOLGLrm4SM= +github.com/opencontainers/runc v1.3.1/go.mod h1:9wbWt42gV+KRxKRVVugNP6D5+PQciRbenB4fLVsqGPs= github.com/ory/dockertest/v3 v3.12.0 h1:3oV9d0sDzlSQfHtIaB5k6ghUCVMVLpAY8hwrqoCyRCw= github.com/ory/dockertest/v3 v3.12.0/go.mod h1:aKNDTva3cp8dwOWwb9cWuX84aH5akkxXRvO7KCwWVjE= github.com/ostcar/topic v0.6.0 h1:wAQ6ugkU/a4w3l/c4aH/xJriU833K8weEornVszpsHo= @@ -108,43 +104,16 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/system_test/docker-compose.yml b/system_test/docker-compose.yml deleted file mode 100644 index 0c7a3b7b..00000000 --- a/system_test/docker-compose.yml +++ /dev/null @@ -1,41 +0,0 @@ -version: "3" -services: - postgres: - image: postgres:15 - environment: - - POSTGRES_USER=openslides - - POSTGRES_PASSWORD=openslides - - POSTGRES_DB=openslides - ports: - - 127.0.0.1:5432:5432 - - redis: - image: redis:alpine - command: redis-server --save "" - - vote: - build: - context: .. - environment: - - MESSAGE_BUS_HOST=redis - - CACHE_HOST=redis - - DATABASE_HOST=postgres - - VOTE_REDIS_HOST=redis - - VOTE_DATABASE_HOST=postgres - - VOTE_DEBUG_LOG=1 - - secrets: - - postgres_password - - auth_token_key - - auth_cookie_key - - ports: - - 127.0.0.1:9013:9013 - -secrets: - auth_token_key: - file: ./secrets/auth_token_key - auth_cookie_key: - file: ./secrets/auth_cookie_key - postgres_password: - file: ./secrets/postgres_password diff --git a/system_test/postgres_test.go b/system_test/postgres_test.go deleted file mode 100644 index b6eee635..00000000 --- a/system_test/postgres_test.go +++ /dev/null @@ -1,152 +0,0 @@ -package system_test - -import ( - "context" - "encoding/json" - "fmt" - "log" - "time" - - "github.com/OpenSlides/openslides-go/datastore/dskey" - "github.com/jackc/pgx/v5" -) - -const ( - dbUser = "openslides" - dbPassword = "openslides" - dbHost = "localhost" - dbPort = "5432" - dbName = "openslides" -) - -type postgresTestData struct { - pgxConfig *pgx.ConnConfig -} - -func newPostgresTestData(ctx context.Context) (p *postgresTestData, err error) { - addr := fmt.Sprintf( - `user=%s password='%s' host=%s port=%s dbname=%s`, - dbUser, - dbPassword, - dbHost, - dbPort, - dbName, - ) - config, err := pgx.ParseConfig(addr) - if err != nil { - return nil, fmt.Errorf("parse config: %w", err) - } - - ptd := postgresTestData{ - pgxConfig: config, - } - - defer func() { - if err != nil { - if err := ptd.Close(ctx); err != nil { - log.Printf("Closing postgres: %v", err) - } - } - }() - - if err := ptd.addSchema(ctx); err != nil { - return nil, fmt.Errorf("add schema: %w", err) - } - - return &ptd, nil -} - -func (p *postgresTestData) Close(ctx context.Context) error { - if err := p.dropData(ctx); err != nil { - return fmt.Errorf("remove old data: %w", err) - } - - return nil -} - -func (p *postgresTestData) conn(ctx context.Context) (*pgx.Conn, error) { - var conn *pgx.Conn - - for { - var err error - if p == nil { - return nil, fmt.Errorf("some error") - } - conn, err = pgx.ConnectConfig(ctx, p.pgxConfig) - if err == nil { - return conn, nil - } - - select { - case <-time.After(200 * time.Millisecond): - case <-ctx.Done(): - return nil, ctx.Err() - } - } -} - -func (p *postgresTestData) addSchema(ctx context.Context) error { - // Schema from datastore-repo - schema := ` - CREATE TABLE IF NOT EXISTS models ( - fqid VARCHAR(48) PRIMARY KEY, - data JSONB NOT NULL, - deleted BOOLEAN NOT NULL - );` - conn, err := p.conn(ctx) - if err != nil { - return fmt.Errorf("creating connection: %w", err) - } - defer conn.Close(ctx) - - if _, err := conn.Exec(ctx, schema); err != nil { - return fmt.Errorf("adding schema: %w", err) - } - return nil -} - -func (p *postgresTestData) addTestData(ctx context.Context, data map[dskey.Key][]byte) error { - objects := make(map[string]map[string]json.RawMessage) - for k, v := range data { - fqid := k.FQID() - if _, ok := objects[fqid]; !ok { - objects[fqid] = make(map[string]json.RawMessage) - } - objects[fqid][k.Field()] = v - } - - conn, err := p.conn(ctx) - if err != nil { - return fmt.Errorf("creating connection: %w", err) - } - defer conn.Close(ctx) - - for fqid, data := range objects { - encoded, err := json.Marshal(data) - if err != nil { - return fmt.Errorf("encode %v: %v", data, err) - } - - sql := fmt.Sprintf(`INSERT INTO models (fqid, data, deleted) VALUES ('%s', '%s', false);`, fqid, encoded) - if _, err := conn.Exec(ctx, sql); err != nil { - return fmt.Errorf("executing psql `%s`: %w", sql, err) - } - } - - return nil -} - -func (p *postgresTestData) dropData(ctx context.Context) error { - conn, err := p.conn(ctx) - if err != nil { - return fmt.Errorf("creating connection: %w", err) - } - defer conn.Close(ctx) - - sql := `TRUNCATE models;` - if _, err := conn.Exec(ctx, sql); err != nil { - return fmt.Errorf("executing psql `%s`: %w", sql, err) - } - - return nil -} diff --git a/system_test/secrets/auth_cookie_key b/system_test/secrets/auth_cookie_key deleted file mode 100644 index 8795d5bc..00000000 --- a/system_test/secrets/auth_cookie_key +++ /dev/null @@ -1 +0,0 @@ -openslides \ No newline at end of file diff --git a/system_test/secrets/auth_token_key b/system_test/secrets/auth_token_key deleted file mode 100644 index 8795d5bc..00000000 --- a/system_test/secrets/auth_token_key +++ /dev/null @@ -1 +0,0 @@ -openslides \ No newline at end of file diff --git a/system_test/secrets/postgres_password b/system_test/secrets/postgres_password deleted file mode 100644 index 8795d5bc..00000000 --- a/system_test/secrets/postgres_password +++ /dev/null @@ -1 +0,0 @@ -openslides \ No newline at end of file diff --git a/system_test/system_test.go b/system_test/system_test.go deleted file mode 100644 index 4ff47e3e..00000000 --- a/system_test/system_test.go +++ /dev/null @@ -1,229 +0,0 @@ -package system_test - -import ( - "context" - "fmt" - "io" - "net/http" - "os" - "strings" - "testing" - - "github.com/OpenSlides/openslides-go/auth/authtest" - "github.com/OpenSlides/openslides-go/datastore/dsmock" -) - -const ( - addr = "http://localhost:9013" -) - -func TestHealth(t *testing.T) { - skip(t) - - req, err := http.NewRequest("GET", addr+"/system/vote/health", nil) - if err != nil { - t.Fatalf("create request: %v", err) - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - t.Fatalf("send request: %v", err) - } - - if resp.StatusCode != 200 { - t.Errorf("Health request returned status %s", resp.Status) - } -} - -func TestStartVoteStopClear(t *testing.T) { - skip(t) - ctx := context.Background() - - db, err := newPostgresTestData(ctx) - if err != nil { - t.Fatalf("Create test DB: %v", err) - } - defer db.Close(ctx) - defer func() { - if err := clearVoteService(); err != nil { - t.Fatalf("clear vote service: %v", err) - } - }() - - if err := startPoll(ctx, db, 1); err != nil { - t.Fatalf("Start poll: %v", err) - } - - if err := vote(1, 1, strings.NewReader(`{"value":"Y"}`)); err != nil { - t.Fatalf("Vote: %v", err) - } - - stopBody, err := stopPoll(1) - if err != nil { - t.Fatalf("Stop poll: %v", err) - } - - expectBody := `{"votes":[{"request_user_id":1,"vote_user_id":1,"value":"Y","weight":"1.000000"}],"user_ids":[1]}` - if strings.TrimSpace(string(stopBody)) != expectBody { - t.Fatalf("Got != expect\n%s\n%s", stopBody, expectBody) - } - - if err := clearPoll(1); err != nil { - t.Fatalf("Clear poll: %v", err) - } -} - -func clearVoteService() error { - req, err := http.NewRequest("GET", fmt.Sprintf("%s/internal/vote/clear_all", addr), nil) - if err != nil { - return fmt.Errorf("create request: %w", err) - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - return fmt.Errorf("send request: %w", err) - } - - if resp.StatusCode != 200 { - body, err := io.ReadAll(resp.Body) - if err != nil { - body = []byte("can not read body") - } - return fmt.Errorf("got %s: %s", resp.Status, body) - } - - return nil -} - -func startPoll(ctx context.Context, db *postgresTestData, pollID int) error { - db.addTestData(ctx, dsmock.YAMLData(fmt.Sprintf(`--- - poll/%d: - meeting_id: 1 - type: named - state: started - backend: fast - pollmethod: Y - entitled_group_ids: [1] - global_yes: true - content_object_id: some_field/1 - sequential_number: 1 - onehundred_percent_base: base - title: myPoll - - group/1/meeting_user_ids: [10] - meeting_user/10: - user_id: 1 - meeting_id: 1 - group_ids: [1] - user/1: - is_present_in_meeting_ids: [1] - meeting_user_ids: [10] - meeting/1/id: 5 - `, - pollID))) - - req, err := http.NewRequest("GET", fmt.Sprintf("%s/internal/vote/start?id=%d", addr, pollID), nil) - if err != nil { - return fmt.Errorf("create request: %w", err) - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - return fmt.Errorf("send request: %w", err) - } - - if resp.StatusCode != 200 { - body, err := io.ReadAll(resp.Body) - if err != nil { - body = []byte("can not read body") - } - return fmt.Errorf("got %s: %s", resp.Status, body) - } - - return nil -} - -func vote(pollID, userID int, body io.Reader) error { - cookie, headerName, headerValue, err := authtest.ValidTokens([]byte("openslides"), []byte("openslides"), userID) - if err != nil { - return fmt.Errorf("creating user tokens: %w", err) - } - - req, err := http.NewRequest("GET", fmt.Sprintf("%s/system/vote?id=%d", addr, pollID), body) - if err != nil { - return fmt.Errorf("create request: %w", err) - } - - req.AddCookie(cookie) - req.Header.Add(headerName, headerValue) - - resp, err := http.DefaultClient.Do(req) - if err != nil { - return fmt.Errorf("send request: %w", err) - } - - if resp.StatusCode != 200 { - body, err := io.ReadAll(resp.Body) - if err != nil { - body = []byte("can not read body") - } - return fmt.Errorf("got %s: %s", resp.Status, body) - } - - return nil -} - -func stopPoll(pollID int) ([]byte, error) { - req, err := http.NewRequest("GET", fmt.Sprintf("%s/internal/vote/stop?id=%d", addr, pollID), nil) - if err != nil { - return nil, fmt.Errorf("create request: %w", err) - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - return nil, fmt.Errorf("send request: %w", err) - } - - if resp.StatusCode != 200 { - body, err := io.ReadAll(resp.Body) - if err != nil { - body = []byte("can not read body") - } - return nil, fmt.Errorf("got %s: %s", resp.Status, body) - } - - body, err := io.ReadAll(resp.Body) - if err != nil { - return nil, fmt.Errorf("reading body: %w", err) - } - - return body, nil -} - -func clearPoll(pollID int) error { - req, err := http.NewRequest("GET", fmt.Sprintf("%s/internal/vote/clear?id=%d", addr, pollID), nil) - if err != nil { - return fmt.Errorf("create request: %w", err) - } - - resp, err := http.DefaultClient.Do(req) - if err != nil { - return fmt.Errorf("send request: %w", err) - } - - if resp.StatusCode != 200 { - body, err := io.ReadAll(resp.Body) - if err != nil { - body = []byte("can not read body") - } - return fmt.Errorf("got %s: %s", resp.Status, body) - } - - return nil -} - -func skip(t *testing.T) { - if _, ok := os.LookupEnv("VOTE_SYSTEM_TEST"); !ok { - t.SkipNow() - } -} diff --git a/vote/flow.go b/vote/flow.go index ca9102c7..bd544845 100644 --- a/vote/flow.go +++ b/vote/flow.go @@ -11,7 +11,7 @@ import ( // Flow initializes a cached connection to postgres. func Flow(lookup environment.Environmenter, messageBus flow.Updater) (flow.Flow, error) { - postgres, err := datastore.NewFlowPostgres(lookup, messageBus) + postgres, err := datastore.NewFlowPostgres(lookup) if err != nil { return nil, fmt.Errorf("init postgres: %w", err) } diff --git a/vote/vote_preload_test.go b/vote/vote_preload_test.go index 5a6b7ce1..868e513b 100644 --- a/vote/vote_preload_test.go +++ b/vote/vote_preload_test.go @@ -215,15 +215,15 @@ func TestPreload(t *testing.T) { t.Fatalf("loadPoll returned: %v", err) } - dsCount.(*dsmock.Counter).Reset() + dsCount.Reset() if err := preload(ctx, dsfetch.New(ds), poll); err != nil { t.Errorf("preload returned: %v", err) } - if got := dsCount.(*dsmock.Counter).Count(); got != tt.expectCount { + if got := dsCount.Count(); got != tt.expectCount { buf := new(bytes.Buffer) - for _, req := range dsCount.(*dsmock.Counter).Requests() { + for _, req := range dsCount.Requests() { fmt.Fprintln(buf, req) } t.Errorf("preload send %d requests, expected %d:\n%s", got, tt.expectCount, buf) diff --git a/vote/vote_test.go b/vote/vote_test.go index 943e4c20..de464750 100644 --- a/vote/vote_test.go +++ b/vote/vote_test.go @@ -10,6 +10,7 @@ import ( "github.com/OpenSlides/openslides-go/datastore/cache" "github.com/OpenSlides/openslides-go/datastore/dsmock" + "github.com/OpenSlides/openslides-go/datastore/flow" "github.com/OpenSlides/openslides-vote-service/backend/memory" "github.com/OpenSlides/openslides-vote-service/vote" ) @@ -47,7 +48,7 @@ func TestVoteStart(t *testing.T) { user/1/is_present_in_meeting_ids: [1] meeting/5/id: 5 `), - dsmock.NewCounter, + func(g flow.Getter) flow.Getter { return dsmock.NewCounter(g) }, ) counter := ds.Middlewares()[0].(*dsmock.Counter) @@ -645,7 +646,7 @@ func TestVoteNoRequests(t *testing.T) { ctx := context.Background() ds := dsmock.NewFlow( dsmock.YAMLData(tt.data), - dsmock.NewCounter, + func(g flow.Getter) flow.Getter { return dsmock.NewCounter(g) }, ) counter := ds.Middlewares()[0].(*dsmock.Counter) cachedDS := cache.New(ds)