opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOISSUE - Update dependencies (#2061)

Browse Source 
Signed-off-by: Dusan Borovcanin <borovcanindusan1@gmail.com>
This commit is contained in:
Dušan Borovčanin
2024-01-23 13:09:07 +01:00
committed by GitHub
parent d95283d314
commit 79ef28a9ce
49 changed files with 418 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/check-license.yaml
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
- name: Check License Header
run: |
CHECK=$(grep -rcL --exclude-dir={.git,build} \
CHECK=$(grep -rcL --exclude-dir={.git,build,**vernemq**} \
--exclude=\*.{crt,key,pem,zed,hcl,md,json,csv,mod,sum,tmpl,args} \
--exclude={CODEOWNERS,LICENSE,MAINTAINERS} \
--regexp "Copyright (c) Abstract Machines" .)
auth/postgres/setup_test.go
+14 -6
View File
@@ -18,6 +18,7 @@ import (
"github.com/absmach/magistrala/internal/postgres"
"github.com/jmoiron/sqlx"
dockertest "github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
"go.opentelemetry.io/otel"
)
@@ -33,12 +34,19 @@ func TestMain(m *testing.M) {
log.Fatalf("Could not connect to docker: %s", err)
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("postgres", "13.3-alpine", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
bootstrap/events/producer/setup_test.go
+8 -1
View File
@@ -12,6 +12,7 @@ import (
"github.com/go-redis/redis/v8"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var (
@@ -25,7 +26,13 @@ func TestMain(m *testing.M) {
log.Fatalf("Could not connect to docker: %s", err)
}
container, err := pool.Run("redis", "7.2.0-alpine", nil)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "redis",
Tag: "7.2.4-alpine",
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
bootstrap/postgres/setup_test.go
+16 -7
View File
@@ -5,6 +5,7 @@ package postgres_test
import (
"fmt"
"log"
"os"
"testing"
@@ -13,6 +14,7 @@ import (
mglog "github.com/absmach/magistrala/logger"
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var (
@@ -26,14 +28,21 @@ func TestMain(m *testing.M) {
testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("postgres", "13.3-alpine", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
port := container.GetPort("5432/tcp")
certs/postgres/setup_test.go
+16 -7
View File
@@ -6,6 +6,7 @@ package postgres_test
import (
"database/sql"
"fmt"
"log"
"os"
"testing"
@@ -14,6 +15,7 @@ import (
mglog "github.com/absmach/magistrala/logger"
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var (
@@ -28,14 +30,21 @@ func TestMain(m *testing.M) {
return
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("postgres", "13.3-alpine", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
port := container.GetPort("5432/tcp")
consumers/notifiers/postgres/setup_test.go
+14 -6
View File
@@ -17,6 +17,7 @@ import (
_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var (
@@ -30,12 +31,19 @@ func TestMain(m *testing.M) {
log.Fatalf("Could not connect to docker: %s", err)
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("postgres", "13.3-alpine", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
consumers/writers/cassandra/setup_test.go
+10 -2
View File
@@ -5,6 +5,7 @@ package cassandra_test
import (
"fmt"
"log"
"os"
"testing"
@@ -12,6 +13,7 @@ import (
mglog "github.com/absmach/magistrala/logger"
"github.com/gocql/gocql"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var logger, _ = mglog.New(os.Stdout, "info")
@@ -22,9 +24,15 @@ func TestMain(m *testing.M) {
logger.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
container, err := pool.Run("cassandra", "3.11.10", []string{})
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "cassandra",
Tag: "3.11.16",
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
logger.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
port := container.GetPort("9042/tcp")
consumers/writers/influxdb/setup_test.go
+21 -15
View File
@@ -15,6 +15,7 @@ import (
influxdata "github.com/influxdata/influxdb-client-go/v2"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
const (
@@ -27,8 +28,8 @@ const (
dbFluxEnabled = "true"
dbBindAddress = ":8088"
port = "8086/tcp"
broker = "influxdb"
brokerVersion = "2.2-alpine"
db = "influxdb"
dbVersion = "2.7-alpine"
poolMaxWait = 120 * time.Second
)
@@ -40,21 +41,26 @@ func TestMain(m *testing.M) {
testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
cfg := []string{
fmt.Sprintf("DOCKER_INFLUXDB_INIT_MODE=%s", dbInitMode),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_USERNAME=%s", dbAdmin),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_PASSWORD=%s", dbPass),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ORG=%s", dbOrg),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_BUCKET=%s", dbBucket),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=%s", dbToken),
fmt.Sprintf("INFLUXDB_HTTP_FLUX_ENABLED=%s", dbFluxEnabled),
fmt.Sprintf("INFLUXDB_BIND_ADDRESS=%s", dbBindAddress),
}
container, err := pool.Run(broker, brokerVersion, cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: db,
Tag: dbVersion,
Env: []string{
fmt.Sprintf("DOCKER_INFLUXDB_INIT_MODE=%s", dbInitMode),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_USERNAME=%s", dbAdmin),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_PASSWORD=%s", dbPass),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ORG=%s", dbOrg),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_BUCKET=%s", dbBucket),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=%s", dbToken),
fmt.Sprintf("INFLUXDB_HTTP_FLUX_ENABLED=%s", dbFluxEnabled),
fmt.Sprintf("INFLUXDB_BIND_ADDRESS=%s", dbBindAddress),
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
handleInterrupt(m, pool, container)
address = fmt.Sprintf("%s:%s", "http://localhost", container.GetPort(port))
consumers/writers/mongodb/setup_test.go
+13 -6
View File
@@ -6,10 +6,12 @@ package mongodb_test
import (
"context"
"fmt"
"log"
"os"
"testing"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
)
@@ -20,13 +22,18 @@ func TestMain(m *testing.M) {
testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
cfg := []string{
"MONGO_INITDB_DATABASE=test",
}
container, err := pool.Run("mongo", "4.4.6", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "mongo",
Tag: "7.0.5",
Env: []string{
"MONGO_INITDB_DATABASE=test",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
port = container.GetPort("27017/tcp")
consumers/writers/postgres/setup_test.go
+14 -6
View File
@@ -15,6 +15,7 @@ import (
pgclient "github.com/absmach/magistrala/internal/clients/postgres"
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var db *sqlx.DB
@@ -25,12 +26,19 @@ func TestMain(m *testing.M) {
log.Fatalf("Could not connect to docker: %s", err)
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("postgres", "13.3-alpine", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
consumers/writers/timescale/setup_test.go
+14 -6
View File
@@ -15,6 +15,7 @@ import (
pgclient "github.com/absmach/magistrala/internal/clients/postgres"
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var db *sqlx.DB
@@ -25,12 +26,19 @@ func TestMain(m *testing.M) {
log.Fatalf("Could not connect to docker: %s", err)
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("timescale/timescaledb", "2.4.0-pg12", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "timescale/timescaledb",
Tag: "2.13.1-pg16",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
docker/addons/bootstrap/docker-compose.yml
+1 -1
View File
@@ -17,7 +17,7 @@ volumes:
services:
bootstrap-db:
image: postgres:13.3-alpine
image: postgres:16.1-alpine
container_name: magistrala-bootstrap-db
restart: on-failure
environment:
docker/addons/cassandra-writer/docker-compose.yml
+2 -2
View File
@@ -16,7 +16,7 @@ volumes:
services:
cassandra:
image: cassandra:3.11.10
image: cassandra:3.11.16
container_name: magistrala-cassandra
restart: on-failure
networks:
@@ -27,7 +27,7 @@ services:
- magistrala-cassandra-volume:/var/lib/cassandra
cassandra-init-keyspace:
image: cassandra:3.11.10
image: cassandra:3.11.16
depends_on:
- cassandra
restart: on-failure
docker/addons/certs/docker-compose.yml
+1 -1
View File
@@ -17,7 +17,7 @@ volumes:
services:
certs-db:
image: postgres:13.3-alpine
image: postgres:16.1-alpine
container_name: magistrala-certs-db
restart: on-failure
environment:
docker/addons/influxdb-writer/docker-compose.yml
+1 -1
View File
@@ -16,7 +16,7 @@ volumes:
services:
influxdb:
image: influxdb:2.5
image: influxdb:2.7-alpine
container_name: magistrala-influxdb
restart: on-failure
environment:
docker/addons/lora-adapter/docker-compose.yml
+1 -1
View File
@@ -13,7 +13,7 @@ networks:
services:
lora-redis:
image: redis:7.2.0-alpine
image: redis:7.2.4-alpine
container_name: magistrala-lora-redis
restart: on-failure
networks:
docker/addons/mongodb-writer/docker-compose.yml
+1 -1
View File
@@ -19,7 +19,7 @@ volumes:
services:
mongodb:
image: mongo:4.4.6
image: mongo:7.0.5
container_name: magistrala-mongodb
restart: on-failure
environment:
docker/addons/opcua-adapter/docker-compose.yml
+1 -1
View File
@@ -17,7 +17,7 @@ volumes:
services:
opcua-redis:
image: redis:7.2.0-alpine
image: redis:7.2.4-alpine
container_name: magistrala-opcua-redis
restart: on-failure
networks:
docker/addons/postgres-writer/docker-compose.yml
+1 -1
View File
@@ -18,7 +18,7 @@ volumes:
services:
postgres:
image: postgres:13.3-alpine
image: postgres:16.1-alpine
container_name: magistrala-postgres
restart: on-failure
environment:
docker/addons/prometheus/docker-compose.yml
+2 -2
View File
@@ -17,7 +17,7 @@ volumes:
services:
promethues:
image: prom/prometheus:v2.42.0
image: prom/prometheus:v2.49.1
container_name: magistrala-prometheus
restart: on-failure
ports:
@@ -31,7 +31,7 @@ services:
- magistrala-prometheus-volume:/prometheus
grafana:
image: grafana/grafana:9.4.7
image: grafana/grafana:10.2.3
container_name: magistrala-grafana
depends_on:
- promethues
docker/addons/smpp-notifier/docker-compose.yml
+1 -1
View File
@@ -16,7 +16,7 @@ volumes:
services:
smpp-notifier-db:
image: postgres:10.2-alpine
image: postgres:16.1-alpine
container_name: magistrala-smpp-notifier-db
restart: on-failure
environment:
docker/addons/smtp-notifier/docker-compose.yml
+1 -1
View File
@@ -16,7 +16,7 @@ volumes:
services:
smtp-notifier-db:
image: postgres:10.2-alpine
image: postgres:16.1-alpine
container_name: magistrala-smtp-notifier-db
restart: on-failure
environment:
docker/addons/timescale-writer/docker-compose.yml
+1 -1
View File
@@ -18,7 +18,7 @@ volumes:
services:
timescale:
image: timescale/timescaledb:2.4.0-pg12
image: timescale/timescaledb:2.13.1-pg16
container_name: magistrala-timescale
restart: on-failure
environment:
docker/addons/twins/docker-compose.yml
+1 -1
View File
@@ -17,7 +17,7 @@ volumes:
services:
twins-redis:
image: redis:7.2.0-alpine
image: redis:7.2.4-alpine
container_name: magistrala-twins-redis
restart: on-failure
networks:
docker/addons/vault/docker-compose.yml
+1 -1
View File
@@ -18,7 +18,7 @@ volumes:
services:
vault:
image: vault:1.12.2
image: hashicorp/vault:1.15.4
container_name: magistrala-vault
ports:
- ${MG_VAULT_PORT}:8200
docker/brokers/nats.yml
+1 -1
View File
@@ -3,7 +3,7 @@
services:
broker:
image: nats:2.9.21-alpine
image: nats:2.10.9-alpine
command: "--config=/etc/nats/nats.conf"
volumes:
- ./../nats/:/etc/nats
docker/brokers/rabbitmq.yml
+1 -1
View File
@@ -3,7 +3,7 @@
services:
broker:
image: rabbitmq:3.9.20-management-alpine
image: rabbitmq:3.12.12-management-alpine
environment:
RABBITMQ_ERLANG_COOKIE: ${MG_RABBITMQ_COOKIE}
RABBITMQ_DEFAULT_USER: ${MG_RABBITMQ_USER}
docker/docker-compose.yml
+10 -10
View File
@@ -27,7 +27,7 @@ include:
services:
spicedb:
image: "authzed/spicedb"
image: "authzed/spicedb:v1.29.0"
container_name: magistrala-spicedb
command: "serve"
restart: "always"
@@ -45,7 +45,7 @@ services:
- spicedb-migrate
spicedb-migrate:
image: "authzed/spicedb"
image: "authzed/spicedb:v1.29.0"
container_name: magistrala-spicedb-migrate
command: "migrate head"
restart: "on-failure"
@@ -58,7 +58,7 @@ services:
- spicedb-db
spicedb-db:
image: "postgres:15.3-alpine"
image: "postgres:16.1-alpine"
container_name: magistrala-spicedb-db
networks:
- magistrala-base-net
@@ -72,7 +72,7 @@ services:
- magistrala-spicedb-db-volume:/var/lib/postgresql/data
auth-db:
image: postgres:13.3-alpine
image: postgres:16.1-alpine
container_name: magistrala-auth-db
restart: on-failure
ports:
@@ -161,7 +161,7 @@ services:
create_host_path: true
invitations-db:
image: postgres:15.3-alpine
image: postgres:16.1-alpine
container_name: magistrala-invitations-db
restart: on-failure
command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
@@ -232,7 +232,7 @@ services:
create_host_path: true
nginx:
image: nginx:1.23.3-alpine
image: nginx:1.25.0-alpine
container_name: magistrala-nginx
restart: on-failure
volumes:
@@ -261,7 +261,7 @@ services:
- ws-adapter
things-db:
image: postgres:13.3-alpine
image: postgres:16.1-alpine
container_name: magistrala-things-db
restart: on-failure
command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
@@ -278,7 +278,7 @@ services:
- magistrala-things-db-volume:/var/lib/postgresql/data
things-redis:
image: redis:6.2.2-alpine
image: redis:7.2.4-alpine
container_name: magistrala-things-redis
restart: on-failure
networks:
@@ -373,7 +373,7 @@ services:
create_host_path: true
users-db:
image: postgres:15.1-alpine
image: postgres:16.1-alpine
container_name: magistrala-users-db
restart: on-failure
command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
@@ -458,7 +458,7 @@ services:
create_host_path: true
jaeger:
image: jaegertracing/all-in-one:1.38.0
image: jaegertracing/all-in-one:1.53.0
container_name: magistrala-jaeger
environment:
COLLECTOR_OTLP_ENABLED: ${MG_JAEGER_COLLECTOR_OTLP_ENABLED}
docker/es/docker-compose.yml
+1 -1
View File
@@ -6,7 +6,7 @@ volumes:
services:
es-redis:
image: redis:7.2.0-alpine
image: redis:7.2.4-alpine
container_name: magistrala-es-redis
restart: on-failure
networks:
go.mod
+50 -99
View File
@@ -3,7 +3,7 @@ module github.com/absmach/magistrala
go 1.21
require (
github.com/0x6flab/namegenerator v1.1.0
github.com/0x6flab/namegenerator v1.2.0
github.com/absmach/callhome v0.0.0-20240117170159-c5f5cccd21fd
github.com/absmach/mproxy v0.4.2
github.com/absmach/senml v1.0.5
@@ -13,9 +13,9 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1
github.com/docker/docker v24.0.7+incompatible
github.com/eclipse/paho.mqtt.golang v1.4.3
github.com/fatih/color v1.15.0
github.com/fatih/color v1.16.0
github.com/fiorix/go-smpp v0.0.0-20210403173735-2894b96e70ba
github.com/go-chi/chi/v5 v5.0.10
github.com/go-chi/chi/v5 v5.0.11
github.com/go-kit/kit v0.13.0
github.com/go-redis/redis/v8 v8.11.5
github.com/gocql/gocql v1.6.0
@@ -25,131 +25,98 @@ require (
github.com/gorilla/websocket v1.5.1
github.com/hashicorp/vault/api v1.10.0
github.com/hokaccha/go-prettyjson v0.0.0-20211117102719-0474bc63780f
github.com/influxdata/influxdb-client-go/v2 v2.12.3
github.com/influxdata/influxdb-client-go/v2 v2.13.0
github.com/ivanpirog/coloredcobra v1.0.1
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
github.com/jackc/pgtype v1.14.0
github.com/jackc/pgx/v5 v5.4.3
github.com/jackc/pgtype v1.14.1
github.com/jackc/pgx/v5 v5.5.2
github.com/jmoiron/sqlx v1.3.5
github.com/lestrrat-go/jwx/v2 v2.0.16
github.com/lestrrat-go/jwx/v2 v2.0.19
github.com/mitchellh/mapstructure v1.5.0
github.com/nats-io/nats.go v1.31.0
github.com/nats-io/nats.go v1.32.0
github.com/oklog/ulid/v2 v2.1.0
github.com/ory/dockertest/v3 v3.10.0
github.com/pelletier/go-toml v1.9.5
github.com/plgd-dev/go-coap/v2 v2.6.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_golang v1.18.0
github.com/rabbitmq/amqp091-go v1.9.0
github.com/rubenv/sql-migrate v1.5.2
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.17.0
github.com/rubenv/sql-migrate v1.6.1
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.8.4
go.mongodb.org/mongo-driver v1.12.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0
go.opentelemetry.io/otel v1.20.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0
go.opentelemetry.io/otel/sdk v1.20.0
go.opentelemetry.io/otel/trace v1.20.0
go.mongodb.org/mongo-driver v1.13.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0
go.opentelemetry.io/otel v1.22.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0
go.opentelemetry.io/otel/sdk v1.22.0
go.opentelemetry.io/otel/trace v1.22.0
golang.org/x/crypto v0.18.0
golang.org/x/net v0.20.0
golang.org/x/sync v0.6.0
gonum.org/v1/gonum v0.14.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
)
require (
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/BurntSushi/toml v1.3.2 // indirect
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
github.com/CloudyKit/jet/v6 v6.2.0 // indirect
github.com/Joker/jade v1.1.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
github.com/andybalholm/brotli v1.0.6 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bitly/go-hostpool v0.1.0 // indirect
github.com/bytedance/sonic v1.10.2 // indirect
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/deepmap/oapi-codegen v1.16.2 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/docker/cli v24.0.7+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dsnet/golib/memfile v1.0.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/flosch/pongo2/v4 v4.0.2 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.9.1 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.1 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.15.5 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.5 // indirect
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
github.com/iris-contrib/schema v0.0.6 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jzelinskie/stringz v0.0.2 // indirect
github.com/kataras/blocks v0.0.8 // indirect
github.com/kataras/golog v0.1.9 // indirect
github.com/kataras/iris/v12 v12.2.7 // indirect
github.com/kataras/pio v0.0.12 // indirect
github.com/kataras/sitemap v0.0.6 // indirect
github.com/kataras/tunnel v0.0.4 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/labstack/echo/v4 v4.11.2 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jzelinskie/stringz v0.0.3 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/httprc v1.0.4 // indirect
@@ -157,53 +124,39 @@ require (
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/lib/pq v1.10.9 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailgun/raymond/v2 v2.0.48 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/microcosm-cc/bluemonday v1.0.26 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/montanaflynn/stats v0.7.1 // indirect
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nkeys v0.4.7 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/oapi-codegen/runtime v1.1.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.10 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pion/dtls/v2 v2.2.9 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/transport/v2 v2.2.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/common v0.46.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/schollz/closestmatch v2.1.0+incompatible // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.1 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tdewolff/minify/v2 v2.20.5 // indirect
github.com/tdewolff/parse/v2 v2.7.3 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
@@ -212,21 +165,19 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/yosssi/ace v0.0.5 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.opentelemetry.io/otel/metric v1.20.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.5.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
go.sum
+114 -593
View File
File diff suppressed because it is too large Load Diff
internal/groups/postgres/setup_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "15.1-alpine",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
invitations/postgres/setup_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "15.1-alpine",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
pkg/clients/postgres/setup_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "15.1-alpine",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
pkg/events/nats/setup_test.go
+1 -1
View File
@@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
container, err = pool.RunWithOptions(&dockertest.RunOptions{
Name: "test-nats-events",
Repository: "nats",
Tag: "2.9.21-alpine",
Tag: "2.10.9-alpine",
Cmd: []string{"-DVV", "-js"},
})
if err != nil {
pkg/events/rabbitmq/setup_test.go
+1 -1
View File
@@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
opts := dockertest.RunOptions{
Name: "test-rabbitmq-events",
Repository: "rabbitmq",
Tag: "3.9.20",
Tag: "3.12.12",
}
container, err = pool.RunWithOptions(&opts)
if err != nil {
pkg/events/redis/setup_test.go
+1 -2
View File
@@ -35,7 +35,7 @@ func TestMain(m *testing.M) {
opts := dockertest.RunOptions{
Name: "tests-redis-events",
Repository: "redis",
Tag: "7.2.0-alpine",
Tag: "7.2.4-alpine",
}
container, err = pool.RunWithOptions(&opts)
if err != nil {
@@ -48,7 +48,6 @@ func TestMain(m *testing.M) {
ropts, err := redis.ParseURL(redisURL)
if err != nil {
log.Fatalf("Could not parse redis URL: %s", err)
}
if err := pool.Retry(func() error {
pkg/messaging/mqtt/setup_test.go
+1 -1
View File
@@ -31,7 +31,7 @@ const (
qos = 2
port = "1883/tcp"
broker = "eclipse-mosquitto"
brokerVersion = "1.6.13"
brokerVersion = "2.0.18"
brokerTimeout = 30 * time.Second
poolMaxWait = 120 * time.Second
)
pkg/messaging/nats/setup_test.go
+1 -1
View File
@@ -31,7 +31,7 @@ func TestMain(m *testing.M) {
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "nats",
Tag: "2.9.21-alpine",
Tag: "2.10.9-alpine",
Cmd: []string{"-DVV", "-js"},
})
if err != nil {
pkg/messaging/rabbitmq/setup_test.go
+1 -1
View File
@@ -24,7 +24,7 @@ import (
const (
port = "5672/tcp"
brokerName = "rabbitmq"
brokerVersion = "3.12.10-alpine"
brokerVersion = "3.12.12-alpine"
)
var (
readers/api/transport.go
-1
View File
@@ -162,7 +162,6 @@ func decodeList(_ context.Context, r *http.Request) (interface{}, error) {
To: to,
},
}
return req, nil
}
readers/cassandra/setup_test.go
+10 -2
View File
@@ -5,6 +5,7 @@ package cassandra_test
import (
"fmt"
"log"
"os"
"testing"
@@ -12,6 +13,7 @@ import (
mglog "github.com/absmach/magistrala/logger"
"github.com/gocql/gocql"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var logger, _ = mglog.New(os.Stdout, "info")
@@ -22,9 +24,15 @@ func TestMain(m *testing.M) {
logger.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
container, err := pool.Run("cassandra", "3.11.10", []string{})
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "cassandra",
Tag: "3.11.16",
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
logger.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
port := container.GetPort("9042/tcp")
readers/influxdb/setup_test.go
+21 -14
View File
@@ -16,6 +16,7 @@ import (
mglog "github.com/absmach/magistrala/logger"
influxdata "github.com/influxdata/influxdb-client-go/v2"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var (
@@ -33,8 +34,8 @@ const (
dbFluxEnabled = "true"
dbBindAddress = ":8088"
port = "8086/tcp"
broker = "influxdb"
brokerVersion = "2.2-alpine"
db = "influxdb"
dbVersion = "2.7-alpine"
poolMaxWait = 120 * time.Second
)
@@ -44,19 +45,25 @@ func TestMain(m *testing.M) {
testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
cfg := []string{
fmt.Sprintf("DOCKER_INFLUXDB_INIT_MODE=%s", dbInitMode),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_USERNAME=%s", dbAdmin),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_PASSWORD=%s", dbPass),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ORG=%s", dbOrg),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_BUCKET=%s", dbBucket),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=%s", dbToken),
fmt.Sprintf("INFLUXDB_HTTP_FLUX_ENABLED=%s", dbFluxEnabled),
fmt.Sprintf("INFLUXDB_BIND_ADDRESS=%s", dbBindAddress),
}
container, err := pool.Run(broker, brokerVersion, cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: db,
Tag: dbVersion,
Env: []string{
fmt.Sprintf("DOCKER_INFLUXDB_INIT_MODE=%s", dbInitMode),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_USERNAME=%s", dbAdmin),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_PASSWORD=%s", dbPass),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ORG=%s", dbOrg),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_BUCKET=%s", dbBucket),
fmt.Sprintf("DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=%s", dbToken),
fmt.Sprintf("INFLUXDB_HTTP_FLUX_ENABLED=%s", dbFluxEnabled),
fmt.Sprintf("INFLUXDB_BIND_ADDRESS=%s", dbBindAddress),
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
handleInterrupt(m, pool, container)
readers/mongodb/setup_test.go
+13 -6
View File
@@ -6,11 +6,13 @@ package mongodb_test
import (
"context"
"fmt"
"log"
"os"
"testing"
mglog "github.com/absmach/magistrala/logger"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
)
@@ -23,13 +25,18 @@ func TestMain(m *testing.M) {
testLog.Error(fmt.Sprintf("Could not connect to docker: %s", err))
}
cfg := []string{
"MONGO_INITDB_DATABASE=test",
}
container, err := pool.Run("mongo", "4.4.3-bionic", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "mongo",
Tag: "6.0.13",
Env: []string{
"MONGO_INITDB_DATABASE=test",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
log.Fatalf("Could not start container: %s", err)
}
port = container.GetPort("27017/tcp")
readers/postgres/setup_test.go
+14 -7
View File
@@ -15,6 +15,7 @@ import (
_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var db *sqlx.DB
@@ -24,13 +25,19 @@ func TestMain(m *testing.M) {
if err != nil {
log.Fatalf("Could not connect to docker: %s", err)
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("postgres", "13.3-alpine", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
readers/timescale/setup_test.go
+14 -6
View File
@@ -15,6 +15,7 @@ import (
_ "github.com/jackc/pgx/v5/stdlib" // required for SQL access
"github.com/jmoiron/sqlx"
"github.com/ory/dockertest/v3"
"github.com/ory/dockertest/v3/docker"
)
var db *sqlx.DB
@@ -25,12 +26,19 @@ func TestMain(m *testing.M) {
log.Fatalf("Could not connect to docker: %s", err)
}
cfg := []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
}
container, err := pool.Run("timescale/timescaledb", "2.4.0-pg12", cfg)
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "timescale/timescaledb",
Tag: "2.13.1-pg16",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
"POSTGRES_DB=test",
"listen_addresses = '*'",
},
}, func(config *docker.HostConfig) {
config.AutoRemove = true
config.RestartPolicy = docker.RestartPolicy{Name: "no"}
})
if err != nil {
log.Fatalf("Could not start container: %s", err)
}
things/postgres/setup_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "15.1-alpine",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",
twins/mongodb/setup_test.go
+1 -1
View File
@@ -26,7 +26,7 @@ func TestMain(m *testing.M) {
"MONGO_INITDB_DATABASE=test",
}
container, err := pool.Run("mongo", "4.4.3-bionic", cfg)
container, err := pool.Run("mongo", "7.0.5", cfg)
if err != nil {
testLog.Error(fmt.Sprintf("Could not start container: %s", err))
}
users/postgres/setup_test.go
+1 -1
View File
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
container, err := pool.RunWithOptions(&dockertest.RunOptions{
Repository: "postgres",
Tag: "15.1-alpine",
Tag: "16.1-alpine",
Env: []string{
"POSTGRES_USER=test",
"POSTGRES_PASSWORD=test",