diff --git a/.github/workflows/full-test-suite.yml b/.github/workflows/full-test-suite.yml index 1ab05ce..5078be8 100644 --- a/.github/workflows/full-test-suite.yml +++ b/.github/workflows/full-test-suite.yml @@ -21,5 +21,5 @@ jobs: run: make build - name: Run Unit tests run: make unittest -# - name: Run Integration tests -# run: make test + - name: Run Integration tests + run: make test diff --git a/Makefile b/Makefile index 310580e..db07f55 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,11 @@ format: run: go run main.go -# TODO: Uncomment once integration-tests are added -#test: -# go test -v -count=1 -p=1 ./integration_tests/... -# -#test-one: -# go test -v -race -count=1 --run $(TEST_FUNC) ./integration_tests/... +test: + go test -v -count=1 -p=1 ./internal/tests/integration... + +test-one: + go test -v -race -count=1 --run $(TEST_FUNC) ./internal/tests/integration... unittest: go test -race -count=1 ./internal/... diff --git a/config/config.go b/config/config.go index 433c5f9..08eaeaa 100644 --- a/config/config.go +++ b/config/config.go @@ -16,6 +16,7 @@ type Config struct { RequestLimitPerMin int64 // Field for the request limit RequestWindowSec float64 // Field for the time window in float64 AllowedOrigins []string // Field for the allowed origins + IsTestEnv bool } // LoadConfig loads the application configuration from environment variables or defaults @@ -31,6 +32,7 @@ func LoadConfig() *Config { RequestLimitPerMin: getEnvInt("REQUEST_LIMIT_PER_MIN", 1000), // Default request limit RequestWindowSec: getEnvFloat64("REQUEST_WINDOW_SEC", 60), // Default request window in float64 AllowedOrigins: getEnvArray("ALLOWED_ORIGINS", []string{"http://localhost:3000"}), // Default allowed origins + IsTestEnv: getEnvBool("IS_TEST_ENVIRONMENT", false), // Default test env } } @@ -71,6 +73,15 @@ func getEnvArray(key string, fallback []string) []string { return fallback } +func getEnvBool(key string, fallback bool) bool { + if value, exists := os.LookupEnv(key); exists { + if boolValue, err := strconv.ParseBool(value); err == nil { + return boolValue + } + } + return fallback +} + // splitString splits a string by comma and returns a slice of strings func splitString(s string) []string { var array []string diff --git a/go.mod b/go.mod index 5502661..c95fc69 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,53 @@ require ( ) require ( + dario.cat/mergo v1.0.0 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/containerd/containerd v1.7.18 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/containerd/platforms v0.2.1 // indirect + github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/docker v27.1.1+incompatible // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/klauspost/compress v1.17.4 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect + github.com/moby/patternmatcher v0.6.0 // indirect + github.com/moby/sys/sequential v0.5.0 // indirect + github.com/moby/sys/user v0.1.0 // indirect + github.com/moby/term v0.5.0 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/shirou/gopsutil/v3 v3.23.12 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/testcontainers/testcontainers-go v0.33.0 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect + github.com/yusufpapurcu/wmi v1.2.3 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/sys v0.21.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 36368eb..2d7d869 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,161 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao= +github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= +github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= +github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E= +github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= +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/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dicedb/go-dice v0.0.0-20240820180649-d97f15fca831 h1:Cqyj9WCtoobN6++bFbDSe27q94SPwJD9Z0wmu+SDRuk= github.com/dicedb/go-dice v0.0.0-20240820180649-d97f15fca831/go.mod h1:8+VZrr14c2LW8fW4tWZ8Bv3P2lfvlg+PpsSn5cWWuiQ= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= +github.com/docker/docker v27.1.1+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/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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +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/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +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/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= +github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +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/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= +github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= +github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= +github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= +github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg= +github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +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.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= +github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +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.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw= +github.com/testcontainers/testcontainers-go v0.33.0/go.mod h1:W80YpTa8D5C3Yy16icheD01UTDu+LmXIA2Keo+jWtT8= +github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= +github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +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.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +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/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-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/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.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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/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 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= 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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/tests/integration/commands/commands_test.go b/internal/tests/integration/commands/commands_test.go new file mode 100644 index 0000000..89a943a --- /dev/null +++ b/internal/tests/integration/commands/commands_test.go @@ -0,0 +1,37 @@ +package commands + +import ( + "context" + "log" + "os" + setup_test "server/internal/tests/integration/setup" + "testing" +) + +func TestMain(m *testing.M) { + ctx := context.Background() + diceDBC, err := setup_test.InitializeDiceDBContainer(ctx) + if err != nil { + log.Fatal(err) + } + defer func() { + err := diceDBC.Cleanup(ctx) + if err != nil { + log.Fatal(err) + } + }() + + // testcontainers-go maps container port to a random host port generated at runtime. + // Hence, we get the mapped port and update the DICEDB_ADDR environment variable. + port, err := diceDBC.Container.MappedPort(ctx, "7379") + if err != nil { + log.Fatalf("failed to get container port mapping: %v", err) + } + diceDBAddr := "localhost:" + port.Port() + os.Setenv("DICEDB_ADDR", diceDBAddr) + + os.Setenv("IS_TEST_ENVIRONMENT", "true") + + code := m.Run() + os.Exit(code) +} diff --git a/internal/tests/integration/commands/hget_test.go b/internal/tests/integration/commands/hget_test.go new file mode 100644 index 0000000..b5205c5 --- /dev/null +++ b/internal/tests/integration/commands/hget_test.go @@ -0,0 +1,89 @@ +package commands + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestHGet(t *testing.T) { + exec, err := NewHTTPCommandExecutor() + if err != nil { + t.Fatal(err) + } + + defer exec.FlushDB() + + testCases := []TestCase{ + { + Name: "HGET with a non-existent key", + Commands: []HTTPCommand{ + {Command: "HGET", Body: []string{"user", "name"}}, + }, + Result: []TestCaseResult{ + {Expected: "(nil)"}, + }, + }, + { + Name: "HGET with a valid field in the key", + Commands: []HTTPCommand{ + {Command: "HSET", Body: []string{"user", "name", "John Doe", "age", "30"}}, + {Command: "HGET", Body: []string{"user", "name"}}, + }, + Result: []TestCaseResult{ + {Expected: "2"}, + {Expected: "John Doe"}, + }, + }, + { + Name: "HGET with an invalid field in the key", + Commands: []HTTPCommand{ + {Command: "HSET", Body: []string{"user1", "name", "John Doe", "age", "30"}}, + {Command: "HGET", Body: []string{"user1", "gender"}}, + }, + Result: []TestCaseResult{ + {Expected: "2"}, + {Expected: "(nil)"}, + }, + }, + { + Name: "HGET with an invalid key", + Commands: []HTTPCommand{ + {Command: "SET", Body: []string{"user2", "John Doe"}}, + {Command: "HGET", Body: []string{"user2", "name"}}, + }, + Result: []TestCaseResult{ + {Expected: "OK"}, + {ErrorExpected: true, Expected: "(error) WRONGTYPE Operation against a key holding the wrong kind of value"}, + }, + }, + { + Name: "HGET with invalid number of arguments", + Commands: []HTTPCommand{ + {Command: "HGET", Body: []string{"user2", "name", "age"}}, + }, + Result: []TestCaseResult{ + {ErrorExpected: true, Expected: "(error) ERR wrong number of arguments for 'hget' command"}, + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.Name, func(t *testing.T) { + for i, cmd := range tc.Commands { + response, err := exec.FireCommand(cmd) + if err != nil { + t.Logf("error in executing command: %s - %v", cmd.Command, err) + } + + result := tc.Result[i] + if result.ErrorExpected { + assert.NotNil(t, err) + assert.Equal(t, result.Expected, err.Error()) + } else { + assert.Equal(t, result.Expected, response) + } + } + }) + } +} diff --git a/internal/tests/integration/commands/hgetall_test.go b/internal/tests/integration/commands/hgetall_test.go new file mode 100644 index 0000000..cd99f11 --- /dev/null +++ b/internal/tests/integration/commands/hgetall_test.go @@ -0,0 +1,78 @@ +package commands + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestHGetAll(t *testing.T) { + exec, err := NewHTTPCommandExecutor() + if err != nil { + t.Fatal(err) + } + + defer exec.FlushDB() + + testCases := []TestCase{ + { + Name: "HGETALL with a non-existent key", + Commands: []HTTPCommand{ + {Command: "HGETALL", Body: []string{"user", "name"}}, + }, + Result: []TestCaseResult{ + {Expected: ""}, + }, + }, + { + Name: "HGETALL with a valid key", + Commands: []HTTPCommand{ + {Command: "HSET", Body: []string{"user", "name", "John Doe"}}, + {Command: "HGETALL", Body: []string{"user"}}, + }, + Result: []TestCaseResult{ + {Expected: "1"}, + {Expected: "1) \"name\"\n2) \"John Doe\"\n"}, + }, + }, + { + Name: "HGETALL with an invalid key", + Commands: []HTTPCommand{ + {Command: "SET", Body: []string{"user1", "John Doe"}}, + {Command: "HGETALL", Body: []string{"user1"}}, + }, + Result: []TestCaseResult{ + {Expected: "OK"}, + {ErrorExpected: true, Expected: "(error) WRONGTYPE Operation against a key holding the wrong kind of value"}, + }, + }, + { + Name: "HGETALL with invalid number of arguments", + Commands: []HTTPCommand{ + {Command: "HGETALL", Body: []string{"user", "name"}}, + }, + Result: []TestCaseResult{ + {ErrorExpected: true, Expected: "(error) ERR wrong number of arguments for 'hgetall' command"}, + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.Name, func(t *testing.T) { + for i, cmd := range tc.Commands { + response, err := exec.FireCommand(cmd) + if err != nil { + t.Logf("error in executing command: %s - %v", cmd.Command, err) + } + + result := tc.Result[i] + if result.ErrorExpected { + assert.NotNil(t, err) + assert.Equal(t, result.Expected, err.Error()) + } else { + assert.Equal(t, result.Expected, response) + } + } + }) + } +} diff --git a/internal/tests/integration/commands/hset_test.go b/internal/tests/integration/commands/hset_test.go new file mode 100644 index 0000000..3f5ef24 --- /dev/null +++ b/internal/tests/integration/commands/hset_test.go @@ -0,0 +1,76 @@ +package commands + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestHSet(t *testing.T) { + exec, err := NewHTTPCommandExecutor() + if err != nil { + t.Fatal(err) + } + + testCases := []TestCase{ + { + Name: "HSET with simple key value pairs in the hash", + Commands: []HTTPCommand{ + {Command: "HSET", Body: []string{"user", "name", "John Doe", "age", "30"}}, + }, + Result: []TestCaseResult{ + {Expected: "2"}, + }, + }, + { + Name: "HSET update one key and set a new key", + Commands: []HTTPCommand{ + {Command: "HSET", Body: []string{"user1", "name", "John Doe", "age", "30"}}, + {Command: "HSET", Body: []string{"user1", "name", "John Loe", "gender", "Male"}}, + }, + Result: []TestCaseResult{ + {Expected: "2"}, + {Expected: "1"}, + }, + }, + { + Name: "HSET with invalid number of arguments", + Commands: []HTTPCommand{ + {Command: "HSET", Body: []string{"user", "name", "John Loe", "gender"}}, + }, + Result: []TestCaseResult{ + {ErrorExpected: true, Expected: "(error) ERR wrong number of arguments for 'HSET' command"}, + }, + }, + { + Name: "HSET with invalid key", + Commands: []HTTPCommand{ + {Command: "SET", Body: []string{"user2", "John Doe"}}, + {Command: "HSET", Body: []string{"user2", "name", "John Doe"}}, + }, + Result: []TestCaseResult{ + {Expected: "OK"}, + {ErrorExpected: true, Expected: "(error) WRONGTYPE Operation against a key holding the wrong kind of value"}, + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.Name, func(t *testing.T) { + for i, cmd := range tc.Commands { + response, err := exec.FireCommand(cmd) + if err != nil { + t.Logf("error in executing command: %s - %v", cmd.Command, err) + } + + result := tc.Result[i] + if result.ErrorExpected { + assert.NotNil(t, err) + assert.Equal(t, result.Expected, err.Error()) + } else { + assert.Equal(t, result.Expected, response) + } + } + }) + } +} diff --git a/internal/tests/integration/commands/setup.go b/internal/tests/integration/commands/setup.go new file mode 100644 index 0000000..9945b21 --- /dev/null +++ b/internal/tests/integration/commands/setup.go @@ -0,0 +1,104 @@ +package commands + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "fmt" + "net/http" + "net/http/httptest" + "server/config" + "server/internal/db" + "server/internal/server" +) + +type HTTPCommand struct { + Command string + Body []string +} + +type CommandExecutor interface { + FireCommand(cmd string) interface{} +} + +type HTTPCommandExecutor struct { + httpServer *server.HTTPServer +} + +type TestCaseResult struct { + Expected string + ErrorExpected bool +} + +type TestCase struct { + Name string + Commands []HTTPCommand + Result []TestCaseResult +} + +func NewHTTPCommandExecutor() (*HTTPCommandExecutor, error) { + configValue := config.LoadConfig() + diceClient, err := db.InitDiceClient(configValue) + if err != nil { + return nil, fmt.Errorf("failed to initialize DiceDB client: %v", err) + } + + httpServer := &server.HTTPServer{ + DiceClient: diceClient, + } + + return &HTTPCommandExecutor{ + httpServer, + }, nil +} + +func (hce *HTTPCommandExecutor) FireCommand(httpCommand HTTPCommand) (resp string, err error) { + body, err := json.Marshal(httpCommand.Body) + if err != nil { + return "", fmt.Errorf("error while marshaling reqBody: %v", err) + } + + ctx := context.Background() + req, err := http.NewRequestWithContext(ctx, "POST", "/shell/exec/"+httpCommand.Command, bytes.NewReader(body)) + if err != nil { + return "", fmt.Errorf("error creating new http request %v", err) + } + + rr := httptest.NewRecorder() + handler := http.HandlerFunc(hce.httpServer.CliHandler) + handler.ServeHTTP(rr, req) + if status := rr.Code; status != http.StatusOK { + var cmdErr struct { + Error string `json:"error"` + } + err = json.Unmarshal(rr.Body.Bytes(), &cmdErr) + if err != nil { + return "", fmt.Errorf("failed to parse error: %s - %v", rr.Body.String(), err) + } + + return "", errors.New(cmdErr.Error) + } + + var cmdResp struct { + Data string `json:"data"` + } + err = json.Unmarshal(rr.Body.Bytes(), &cmdResp) + if err != nil { + return "", fmt.Errorf("failed to parse command executor response: %s - %v", rr.Body.String(), err) + } + + return cmdResp.Data, nil +} + +func (hce *HTTPCommandExecutor) FlushDB() error { + flushCmd := HTTPCommand{ + Command: "FLUSHDB", + } + + _, err := hce.FireCommand(flushCmd) + if err != nil { + return fmt.Errorf("error in flushing DB: %v", err) + } + return nil +} diff --git a/internal/tests/integration/setup/setup_dicedb_container.go b/internal/tests/integration/setup/setup_dicedb_container.go new file mode 100644 index 0000000..364e62a --- /dev/null +++ b/internal/tests/integration/setup/setup_dicedb_container.go @@ -0,0 +1,40 @@ +package setup_test + +import ( + "context" + "fmt" + + "github.com/testcontainers/testcontainers-go" + "github.com/testcontainers/testcontainers-go/wait" +) + +type DiceDBContainer struct { + Container testcontainers.Container +} + +func InitializeDiceDBContainer(ctx context.Context) (*DiceDBContainer, error) { + req := testcontainers.ContainerRequest{ + Image: "dicedb/dicedb:latest", + ExposedPorts: []string{"7379/tcp"}, + WaitingFor: wait.ForLog("HTTP Server running"), + } + diceDBContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ + ContainerRequest: req, + Started: true, + }) + if err != nil { + return nil, fmt.Errorf("failed to start diceDB container: %v", err) + } + + return &DiceDBContainer{ + Container: diceDBContainer, + }, nil +} + +func (dbc *DiceDBContainer) Cleanup(ctx context.Context) error { + err := dbc.Container.Terminate(ctx) + if err != nil { + return fmt.Errorf("could not terminate container: %v", err) + } + return nil +} diff --git a/util/helpers.go b/util/helpers.go index fc306d6..3ce7f74 100644 --- a/util/helpers.go +++ b/util/helpers.go @@ -8,6 +8,7 @@ import ( "log/slog" "net/http" "net/http/httptest" + "server/config" "server/internal/middleware" db "server/internal/tests/dbmocks" "server/util/cmds" @@ -52,8 +53,9 @@ func ParseHTTPRequest(r *http.Request) (*cmds.CommandRequest, error) { return nil, errors.New("invalid command") } + configValue := config.LoadConfig() // Check if the command is blocklisted - if err := BlockListedCommand(command); err != nil { + if err := BlockListedCommand(command); err != nil && !configValue.IsTestEnv { return nil, err }