From a5b1f9ef087a1861446fea43ea9d8f31dea84903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= Date: Fri, 17 Jan 2025 21:03:31 -0800 Subject: [PATCH] Upgrade Go & dependencies --- .drone.yml | 8 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 18 +-- go.sum | 38 +++-- ntpdb/db.go | 2 +- ntpdb/models.go | 2 +- ntpdb/querier.go | 2 +- ntpdb/query.sql.go | 2 +- schema.sql | 313 ++++++++++++++++++++++++----------------- scripts/run-goreleaser | 2 +- 11 files changed, 225 insertions(+), 166 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1d0412e..ca1008c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,8 @@ steps: memory: 100MiB - name: test - image: golang:1.23.4 + image: golang:1.23 + pull: always volumes: - name: go path: /go @@ -32,7 +33,8 @@ steps: - go build ./... - name: goreleaser - image: golang:1.23.4 + image: golang:1.23 + pull: always resources: requests: cpu: 6000 @@ -81,6 +83,6 @@ volumes: --- kind: signature -hmac: f9c2145e25810c18afed02f1092a1910894c6924873f9d1d7fdc492ebe6e8555 +hmac: c3cf7118bd6e9a6310b792f9cb9a3a146416123528cf41d2e5ccb9c23786d02b ... diff --git a/Dockerfile b/Dockerfile index 28b058e..a896472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.21.0 +FROM alpine:3.21 RUN apk --no-cache upgrade RUN apk --no-cache add ca-certificates tzdata zsh jq tmux curl diff --git a/Makefile b/Makefile index 990e33b..2f9f6e3 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ generate: sqlc go generate ./... sqlc: - @which gowrap >& /dev/null || (echo "Run 'go install github.com/hexdigest/gowrap/cmd/gowrap@v1.3.2'" && exit 1) + @which gowrap >& /dev/null || (echo "Run 'go install github.com/hexdigest/gowrap/cmd/gowrap@v1.4.1'" && exit 1) @which mockery >& /dev/null || (echo "Run 'go install github.com/vektra/mockery/v2@v2.35.4'" && exit 1) sqlc compile sqlc generate diff --git a/go.mod b/go.mod index 7d93684..13a93b9 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.17.11 // indirect github.com/labstack/gommon v0.4.2 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/paulmach/orb v0.11.1 // indirect @@ -54,7 +54,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.61.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/remychantenay/slog-otel v1.3.2 // indirect github.com/samber/lo v1.47.0 // indirect @@ -85,15 +85,15 @@ require ( go.opentelemetry.io/otel/sdk v1.33.0 // indirect go.opentelemetry.io/otel/sdk/log v0.9.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.33.0 // indirect - go.opentelemetry.io/proto/otlp v1.4.0 // indirect - golang.org/x/crypto v0.31.0 // indirect + go.opentelemetry.io/proto/otlp v1.5.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.9.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect - google.golang.org/grpc v1.69.2 // indirect - google.golang.org/protobuf v1.36.1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect + google.golang.org/grpc v1.69.4 // indirect + google.golang.org/protobuf v1.36.3 // indirect ) diff --git a/go.sum b/go.sum index 4cc5f88..4e1f86e 100644 --- a/go.sum +++ b/go.sum @@ -72,9 +72,8 @@ github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaa github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= @@ -93,8 +92,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ= -github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/remychantenay/slog-otel v1.3.2 h1:ZBx8qnwfLJ6e18Vba4e9Xp9B7khTmpIwFsU1sAmActw= @@ -192,16 +191,16 @@ go.opentelemetry.io/otel/sdk/metric v1.33.0 h1:Gs5VK9/WUJhNXZgn8MR6ITatvAmKeIuCt go.opentelemetry.io/otel/sdk/metric v1.33.0/go.mod h1:dL5ykHZmm1B1nVRk9dDjChwDmt81MjVp3gLkQRwKf/Q= go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= -go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg= -go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= 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.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= 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/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= @@ -211,8 +210,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL 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/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= 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= @@ -225,7 +224,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= @@ -246,16 +244,16 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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= -google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d h1:H8tOf8XM88HvKqLTxe755haY6r1fqqzLbEnfrmLXlSA= -google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d/go.mod h1:2v7Z7gP2ZUOGsaFyxATQSRoBnKygqVq2Cwnvom7QiqY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d h1:xJJRGY7TJcvIlpSrN3K6LAWgNFUILlO+OMAqtg9aqnw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4= -google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= -google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA= +google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A= +google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= -google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= +google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/ntpdb/db.go b/ntpdb/db.go index 20120ef..83f30ed 100644 --- a/ntpdb/db.go +++ b/ntpdb/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.26.0 +// sqlc v1.27.0 package ntpdb diff --git a/ntpdb/models.go b/ntpdb/models.go index 44c039a..fc8f3f0 100644 --- a/ntpdb/models.go +++ b/ntpdb/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.26.0 +// sqlc v1.27.0 package ntpdb diff --git a/ntpdb/querier.go b/ntpdb/querier.go index 10973bc..bdb515d 100644 --- a/ntpdb/querier.go +++ b/ntpdb/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.26.0 +// sqlc v1.27.0 package ntpdb diff --git a/ntpdb/query.sql.go b/ntpdb/query.sql.go index ca61a93..c286430 100644 --- a/ntpdb/query.sql.go +++ b/ntpdb/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.26.0 +// sqlc v1.27.0 // source: query.sql package ntpdb diff --git a/schema.sql b/schema.sql index 82f8382..d68edb1 100644 --- a/schema.sql +++ b/schema.sql @@ -1,8 +1,9 @@ --- MariaDB dump 10.19 Distrib 10.11.6-MariaDB, for Linux (x86_64) +/*M!999999\- enable the sandbox mode */ +-- MariaDB dump 10.19-11.4.4-MariaDB, for Linux (x86_64) -- --- Host: ntp-db-mysql-master.ntpdb.svc.cluster.local Database: askntp +-- Host: ntpdb-haproxy.ntpdb.svc.cluster.local Database: askntp -- ------------------------------------------------------ --- Server version 5.7.35-38-log +-- Server version 8.0.40-31 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -13,7 +14,7 @@ /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; +/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */; -- -- Table structure for table `account_invites` @@ -23,12 +24,12 @@ DROP TABLE IF EXISTS `account_invites`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account_invites` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `account_id` int(10) unsigned NOT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `account_id` int unsigned NOT NULL, `email` varchar(255) NOT NULL, `status` enum('pending','accepted','expired') DEFAULT NULL, - `user_id` int(10) unsigned DEFAULT NULL, - `sent_by_id` int(10) unsigned NOT NULL, + `user_id` int unsigned DEFAULT NULL, + `sent_by_id` int unsigned NOT NULL, `code` varchar(25) NOT NULL, `expires_on` datetime NOT NULL, `created_on` datetime NOT NULL, @@ -41,7 +42,7 @@ CREATE TABLE `account_invites` ( CONSTRAINT `account_invites_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`), CONSTRAINT `account_invites_sent_by_fk` FOREIGN KEY (`sent_by_id`) REFERENCES `users` (`id`), CONSTRAINT `account_invites_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -52,13 +53,13 @@ DROP TABLE IF EXISTS `account_subscriptions`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account_subscriptions` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `account_id` int(10) unsigned NOT NULL, - `stripe_subscription_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `account_id` int unsigned NOT NULL, + `stripe_subscription_id` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL, `status` enum('incomplete','incomplete_expired','trialing','active','past_due','canceled','unpaid','ended') DEFAULT NULL, `name` varchar(255) NOT NULL, - `max_zones` int(10) unsigned NOT NULL, - `max_devices` int(10) unsigned NOT NULL, + `max_zones` int unsigned NOT NULL, + `max_devices` int unsigned NOT NULL, `created_on` datetime NOT NULL, `ended_on` datetime DEFAULT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, @@ -66,7 +67,7 @@ CREATE TABLE `account_subscriptions` ( UNIQUE KEY `stripe_subscription_id` (`stripe_subscription_id`), KEY `account_subscriptions_account_fk` (`account_id`), CONSTRAINT `account_subscriptions_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -77,13 +78,13 @@ DROP TABLE IF EXISTS `account_users`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `account_users` ( - `account_id` int(10) unsigned NOT NULL, - `user_id` int(10) unsigned NOT NULL, + `account_id` int unsigned NOT NULL, + `user_id` int unsigned NOT NULL, PRIMARY KEY (`account_id`,`user_id`), KEY `account_users_user_fk` (`user_id`), CONSTRAINT `account_users_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`), CONSTRAINT `account_users_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -94,7 +95,7 @@ DROP TABLE IF EXISTS `accounts`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `accounts` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `name` varchar(255) DEFAULT NULL, `organization_name` varchar(150) DEFAULT NULL, `organization_url` varchar(150) DEFAULT NULL, @@ -103,11 +104,11 @@ CREATE TABLE `accounts` ( `flags` varchar(4096) NOT NULL DEFAULT '{}', `created_on` datetime NOT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `stripe_customer_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL, + `stripe_customer_id` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `url_slug_idx` (`url_slug`), UNIQUE KEY `stripe_customer_id` (`stripe_customer_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -118,14 +119,20 @@ DROP TABLE IF EXISTS `api_keys`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `api_keys` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `account_id` int unsigned DEFAULT NULL, + `user_id` int unsigned DEFAULT NULL, `api_key` varchar(255) DEFAULT NULL, `grants` text, + `audience` text NOT NULL, + `token_lookup` varchar(16) NOT NULL, + `token_hashed` varchar(256) NOT NULL, + `last_seen` datetime DEFAULT NULL, `created_on` datetime NOT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `api_key` (`api_key`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -147,7 +154,7 @@ CREATE TABLE `combust_cache` ( PRIMARY KEY (`id`,`type`), KEY `expire_idx` (`expire`), KEY `purge_idx` (`purge_key`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -158,8 +165,8 @@ DROP TABLE IF EXISTS `combust_secrets`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `combust_secrets` ( - `secret_ts` int(10) unsigned NOT NULL, - `expires_ts` int(10) unsigned NOT NULL, + `secret_ts` int unsigned NOT NULL, + `expires_ts` int unsigned NOT NULL, `type` varchar(32) NOT NULL, `secret` char(32) DEFAULT NULL, PRIMARY KEY (`type`,`secret_ts`), @@ -175,14 +182,14 @@ DROP TABLE IF EXISTS `dns_roots`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `dns_roots` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `origin` varchar(255) NOT NULL, - `vendor_available` tinyint(4) NOT NULL DEFAULT '0', - `general_use` tinyint(4) NOT NULL DEFAULT '0', + `vendor_available` tinyint NOT NULL DEFAULT '0', + `general_use` tinyint NOT NULL DEFAULT '0', `ns_list` varchar(255) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `origin` (`origin`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -193,14 +200,14 @@ DROP TABLE IF EXISTS `log_scores`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `log_scores` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `monitor_id` int(10) unsigned DEFAULT NULL, - `server_id` int(10) unsigned NOT NULL, + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `monitor_id` int unsigned DEFAULT NULL, + `server_id` int unsigned NOT NULL, `ts` datetime NOT NULL, `score` double NOT NULL DEFAULT '0', `step` double NOT NULL DEFAULT '0', `offset` double DEFAULT NULL, - `rtt` mediumint(9) DEFAULT NULL, + `rtt` mediumint DEFAULT NULL, `attributes` text, PRIMARY KEY (`id`), KEY `log_scores_server_ts_idx` (`server_id`,`ts`), @@ -208,7 +215,7 @@ CREATE TABLE `log_scores` ( KEY `log_score_monitor_id_fk` (`monitor_id`), CONSTRAINT `log_score_monitor_id_fk` FOREIGN KEY (`monitor_id`) REFERENCES `monitors` (`id`), CONSTRAINT `log_scores_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -219,15 +226,15 @@ DROP TABLE IF EXISTS `log_scores_archive_status`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `log_scores_archive_status` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `archiver` varchar(255) NOT NULL, - `log_score_id` bigint(20) unsigned DEFAULT NULL, + `log_score_id` bigint unsigned DEFAULT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `archiver` (`archiver`), KEY `log_score_id` (`log_score_id`), CONSTRAINT `log_score_id` FOREIGN KEY (`log_score_id`) REFERENCES `log_scores` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -238,11 +245,11 @@ DROP TABLE IF EXISTS `logs`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `logs` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `account_id` int(10) unsigned DEFAULT NULL, - `server_id` int(10) unsigned DEFAULT NULL, - `user_id` int(10) unsigned DEFAULT NULL, - `vendor_zone_id` int(10) unsigned DEFAULT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `account_id` int unsigned DEFAULT NULL, + `server_id` int unsigned DEFAULT NULL, + `user_id` int unsigned DEFAULT NULL, + `vendor_zone_id` int unsigned DEFAULT NULL, `type` varchar(50) DEFAULT NULL, `message` text, `changes` text, @@ -256,7 +263,38 @@ CREATE TABLE `logs` ( CONSTRAINT `logs_vendor_zone_id` FOREIGN KEY (`vendor_zone_id`) REFERENCES `vendor_zones` (`id`) ON DELETE CASCADE, CONSTRAINT `server_logs_server_id` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE, CONSTRAINT `server_logs_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `monitor_registrations` +-- + +DROP TABLE IF EXISTS `monitor_registrations`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `monitor_registrations` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `monitor_id` int unsigned DEFAULT NULL, + `request_token` varchar(128) NOT NULL, + `verification_token` varchar(32) NOT NULL, + `ip4` varchar(15) NOT NULL DEFAULT '', + `ip6` varchar(39) NOT NULL DEFAULT '', + `name` varchar(256) NOT NULL DEFAULT '', + `location_code` varchar(5) NOT NULL DEFAULT '', + `account_id` int unsigned DEFAULT NULL, + `client` varchar(256) NOT NULL DEFAULT '', + `status` enum('pending','accepted','completed','rejected','cancelled') NOT NULL, + `last_seen` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `created_on` datetime NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `request_token` (`request_token`), + UNIQUE KEY `verification_token` (`verification_token`), + KEY `monitor_registrations_monitor_id_fk` (`monitor_id`), + KEY `monitor_registrations_account_fk` (`account_id`), + CONSTRAINT `monitor_registrations_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`), + CONSTRAINT `monitor_registrations_monitor_id_fk` FOREIGN KEY (`monitor_id`) REFERENCES `monitors` (`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -267,10 +305,10 @@ DROP TABLE IF EXISTS `monitors`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `monitors` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `type` enum('monitor','score') NOT NULL DEFAULT 'monitor', - `user_id` int(10) unsigned DEFAULT NULL, - `account_id` int(10) unsigned DEFAULT NULL, + `user_id` int unsigned DEFAULT NULL, + `account_id` int unsigned DEFAULT NULL, `name` varchar(30) NOT NULL, `location` varchar(255) NOT NULL DEFAULT '', `ip` varchar(40) DEFAULT NULL, @@ -286,13 +324,13 @@ CREATE TABLE `monitors` ( PRIMARY KEY (`id`), UNIQUE KEY `ip` (`ip`,`ip_version`), UNIQUE KEY `api_key` (`api_key`), - UNIQUE KEY `monitors_tls_name` (`tls_name`), + UNIQUE KEY `monitors_tls_name` (`tls_name`,`ip_version`), KEY `monitors_user_id` (`user_id`), KEY `monitors_account_fk` (`account_id`), KEY `type_status` (`type`,`status`), CONSTRAINT `monitors_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`), CONSTRAINT `monitors_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -324,10 +362,10 @@ DROP TABLE IF EXISTS `schema_revision`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `schema_revision` ( - `revision` smallint(5) unsigned NOT NULL DEFAULT '0', + `revision` smallint unsigned NOT NULL DEFAULT '0', `schema_name` varchar(30) NOT NULL, PRIMARY KEY (`schema_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -338,16 +376,16 @@ DROP TABLE IF EXISTS `scorer_status`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `scorer_status` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `scorer_id` int(10) unsigned NOT NULL, - `log_score_id` bigint(20) unsigned NOT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `scorer_id` int unsigned NOT NULL, + `log_score_id` bigint unsigned NOT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `scorer_log_score_id` (`log_score_id`), KEY `scores_status_monitor_id_fk` (`scorer_id`), CONSTRAINT `scorer_log_score_id` FOREIGN KEY (`log_score_id`) REFERENCES `log_scores` (`id`), CONSTRAINT `scores_status_monitor_id_fk` FOREIGN KEY (`scorer_id`) REFERENCES `monitors` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -358,13 +396,13 @@ DROP TABLE IF EXISTS `server_alerts`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_alerts` ( - `server_id` int(10) unsigned NOT NULL, + `server_id` int unsigned NOT NULL, `last_score` double NOT NULL, `first_email_time` datetime NOT NULL, `last_email_time` datetime DEFAULT NULL, PRIMARY KEY (`server_id`), CONSTRAINT `server_alerts_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -375,8 +413,8 @@ DROP TABLE IF EXISTS `server_notes`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_notes` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(10) unsigned NOT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `server_id` int unsigned NOT NULL, `name` varchar(255) NOT NULL DEFAULT '', `note` text NOT NULL, `created_on` datetime NOT NULL, @@ -385,7 +423,7 @@ CREATE TABLE `server_notes` ( UNIQUE KEY `server` (`server_id`,`name`), KEY `name` (`name`), CONSTRAINT `server_notes_ibfk_1` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -396,12 +434,12 @@ DROP TABLE IF EXISTS `server_scores`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_scores` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `monitor_id` int(10) unsigned NOT NULL, - `server_id` int(10) unsigned NOT NULL, + `id` bigint unsigned NOT NULL AUTO_INCREMENT, + `monitor_id` int unsigned NOT NULL, + `server_id` int unsigned NOT NULL, `score_ts` datetime DEFAULT NULL, `score_raw` double NOT NULL DEFAULT '0', - `stratum` tinyint(3) unsigned DEFAULT NULL, + `stratum` tinyint unsigned DEFAULT NULL, `status` enum('new','testing','active') NOT NULL DEFAULT 'new', `queue_ts` datetime DEFAULT NULL, `created_on` datetime NOT NULL, @@ -412,7 +450,7 @@ CREATE TABLE `server_scores` ( KEY `monitor_id_2` (`monitor_id`,`score_ts`), CONSTRAINT `server_score_monitor_fk` FOREIGN KEY (`monitor_id`) REFERENCES `monitors` (`id`), CONSTRAINT `server_score_server_id` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -423,13 +461,13 @@ DROP TABLE IF EXISTS `server_urls`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_urls` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(10) unsigned NOT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `server_id` int unsigned NOT NULL, `url` varchar(255) NOT NULL, PRIMARY KEY (`id`), KEY `server` (`server_id`), CONSTRAINT `server_urls_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -440,9 +478,9 @@ DROP TABLE IF EXISTS `server_verifications`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_verifications` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(10) unsigned NOT NULL, - `user_id` int(10) unsigned DEFAULT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `server_id` int unsigned NOT NULL, + `user_id` int unsigned DEFAULT NULL, `user_ip` varchar(45) NOT NULL DEFAULT '', `indirect_ip` varchar(45) NOT NULL DEFAULT '', `verified_on` datetime DEFAULT NULL, @@ -455,7 +493,7 @@ CREATE TABLE `server_verifications` ( KEY `server_verifications_ibfk_2` (`user_id`), CONSTRAINT `server_verifications_ibfk_1` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE, CONSTRAINT `server_verifications_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -466,9 +504,9 @@ DROP TABLE IF EXISTS `server_verifications_history`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_verifications_history` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(10) unsigned NOT NULL, - `user_id` int(10) unsigned DEFAULT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `server_id` int unsigned NOT NULL, + `user_id` int unsigned DEFAULT NULL, `user_ip` varchar(45) NOT NULL DEFAULT '', `indirect_ip` varchar(45) NOT NULL DEFAULT '', `verified_on` datetime DEFAULT NULL, @@ -479,7 +517,7 @@ CREATE TABLE `server_verifications_history` ( KEY `server_verifications_history_ibfk_2` (`user_id`), CONSTRAINT `server_verifications_history_ibfk_1` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE, CONSTRAINT `server_verifications_history_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -490,13 +528,13 @@ DROP TABLE IF EXISTS `server_zones`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `server_zones` ( - `server_id` int(10) unsigned NOT NULL, - `zone_id` int(10) unsigned NOT NULL, + `server_id` int unsigned NOT NULL, + `zone_id` int unsigned NOT NULL, PRIMARY KEY (`server_id`,`zone_id`), KEY `locations_zone` (`zone_id`), CONSTRAINT `locations_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE, CONSTRAINT `locations_zone` FOREIGN KEY (`zone_id`) REFERENCES `zones` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -507,17 +545,17 @@ DROP TABLE IF EXISTS `servers`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `servers` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `ip` varchar(40) NOT NULL, `ip_version` enum('v4','v6') NOT NULL DEFAULT 'v4', - `user_id` int(10) unsigned DEFAULT NULL, - `account_id` int(10) unsigned DEFAULT NULL, + `user_id` int unsigned DEFAULT NULL, + `account_id` int unsigned DEFAULT NULL, `hostname` varchar(255) DEFAULT NULL, - `stratum` tinyint(3) unsigned DEFAULT NULL, - `in_pool` tinyint(3) unsigned NOT NULL DEFAULT '0', - `in_server_list` tinyint(3) unsigned NOT NULL DEFAULT '0', - `netspeed` int(10) unsigned NOT NULL DEFAULT '10000', - `netspeed_target` int(10) unsigned NOT NULL DEFAULT '10000', + `stratum` tinyint unsigned DEFAULT NULL, + `in_pool` tinyint unsigned NOT NULL DEFAULT '0', + `in_server_list` tinyint unsigned NOT NULL DEFAULT '0', + `netspeed` int unsigned NOT NULL DEFAULT '10000', + `netspeed_target` int unsigned NOT NULL DEFAULT '10000', `created_on` datetime NOT NULL, `updated_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `score_ts` datetime DEFAULT NULL, @@ -532,7 +570,7 @@ CREATE TABLE `servers` ( KEY `server_account_fk` (`account_id`), CONSTRAINT `server_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`), CONSTRAINT `servers_user_ibfk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -543,7 +581,7 @@ DROP TABLE IF EXISTS `servers_monitor_review`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `servers_monitor_review` ( - `server_id` int(10) unsigned NOT NULL, + `server_id` int unsigned NOT NULL, `last_review` datetime DEFAULT NULL, `next_review` datetime DEFAULT NULL, `last_change` datetime DEFAULT NULL, @@ -551,7 +589,7 @@ CREATE TABLE `servers_monitor_review` ( PRIMARY KEY (`server_id`), KEY `next_review` (`next_review`), CONSTRAINT `server_monitor_review_server_id_fk` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -562,14 +600,14 @@ DROP TABLE IF EXISTS `system_settings`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `system_settings` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `key` varchar(255) NOT NULL, `value` text NOT NULL, `created_on` datetime NOT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `key` (`key`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -580,15 +618,15 @@ DROP TABLE IF EXISTS `user_equipment_applications`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user_equipment_applications` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `user_id` int(10) unsigned NOT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `user_id` int unsigned NOT NULL, `application` text, `contact_information` text, `status` enum('New','Pending','Maybe','No','Approved') NOT NULL DEFAULT 'New', PRIMARY KEY (`id`), KEY `user_equipment_applications_user_id` (`user_id`), CONSTRAINT `user_equipment_applications_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -599,9 +637,9 @@ DROP TABLE IF EXISTS `user_identities`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user_identities` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `profile_id` varchar(255) NOT NULL, - `user_id` int(10) unsigned NOT NULL, + `user_id` int unsigned NOT NULL, `provider` varchar(255) NOT NULL, `data` text, `email` varchar(255) DEFAULT NULL, @@ -611,7 +649,7 @@ CREATE TABLE `user_identities` ( UNIQUE KEY `profile_id` (`profile_id`), KEY `user_identities_user_id` (`user_id`), CONSTRAINT `user_identities_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -622,14 +660,35 @@ DROP TABLE IF EXISTS `user_privileges`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user_privileges` ( - `user_id` int(10) unsigned NOT NULL, + `user_id` int unsigned NOT NULL, `see_all_servers` tinyint(1) NOT NULL DEFAULT '0', - `vendor_admin` tinyint(4) NOT NULL DEFAULT '0', - `equipment_admin` tinyint(4) NOT NULL DEFAULT '0', - `support_staff` tinyint(4) NOT NULL DEFAULT '0', + `vendor_admin` tinyint NOT NULL DEFAULT '0', + `equipment_admin` tinyint NOT NULL DEFAULT '0', + `support_staff` tinyint NOT NULL DEFAULT '0', PRIMARY KEY (`user_id`), CONSTRAINT `user_privileges_user` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `user_sessions` +-- + +DROP TABLE IF EXISTS `user_sessions`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `user_sessions` ( + `id` int unsigned NOT NULL AUTO_INCREMENT, + `user_id` int unsigned NOT NULL, + `token_lookup` varchar(16) NOT NULL, + `token_hashed` varchar(256) NOT NULL, + `last_seen` datetime DEFAULT NULL, + `created_on` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `user_sessions_user_fk` (`user_id`), + KEY `token_lookup` (`token_lookup`), + CONSTRAINT `user_sessions_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -640,8 +699,8 @@ DROP TABLE IF EXISTS `user_tasks`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `user_tasks` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `user_id` int(10) unsigned DEFAULT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `user_id` int unsigned DEFAULT NULL, `task` enum('download','delete') NOT NULL, `status` text NOT NULL, `traceid` varchar(32) NOT NULL DEFAULT '', @@ -651,7 +710,7 @@ CREATE TABLE `user_tasks` ( PRIMARY KEY (`id`), KEY `user_tasks_user_fk` (`user_id`), CONSTRAINT `user_tasks_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -662,7 +721,7 @@ DROP TABLE IF EXISTS `users`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `users` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `email` varchar(255) NOT NULL, `name` varchar(255) DEFAULT NULL, `username` varchar(40) DEFAULT NULL, @@ -671,7 +730,7 @@ CREATE TABLE `users` ( PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`), UNIQUE KEY `username` (`username`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -682,24 +741,24 @@ DROP TABLE IF EXISTS `vendor_zones`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `vendor_zones` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `zone_name` varchar(90) NOT NULL, `status` enum('New','Pending','Approved','Rejected') NOT NULL DEFAULT 'New', - `user_id` int(10) unsigned DEFAULT NULL, + `user_id` int unsigned DEFAULT NULL, `organization_name` varchar(255) DEFAULT NULL, `client_type` enum('ntp','sntp','legacy') NOT NULL DEFAULT 'sntp', `contact_information` text, `request_information` text, `device_information` text, - `device_count` int(10) unsigned DEFAULT NULL, + `device_count` int unsigned DEFAULT NULL, `opensource` tinyint(1) NOT NULL DEFAULT '0', `opensource_info` text, - `rt_ticket` smallint(5) unsigned DEFAULT NULL, + `rt_ticket` smallint unsigned DEFAULT NULL, `approved_on` datetime DEFAULT NULL, `created_on` datetime NOT NULL, `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `dns_root_id` int(10) unsigned NOT NULL, - `account_id` int(10) unsigned DEFAULT NULL, + `dns_root_id` int unsigned NOT NULL, + `account_id` int unsigned DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `zone_name` (`zone_name`,`dns_root_id`), KEY `vendor_zones_user_id` (`user_id`), @@ -708,7 +767,7 @@ CREATE TABLE `vendor_zones` ( CONSTRAINT `dns_root_fk` FOREIGN KEY (`dns_root_id`) REFERENCES `dns_roots` (`id`), CONSTRAINT `vendor_zone_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`), CONSTRAINT `vendor_zones_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -719,18 +778,18 @@ DROP TABLE IF EXISTS `zone_server_counts`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `zone_server_counts` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `zone_id` int(10) unsigned NOT NULL, + `id` int unsigned NOT NULL AUTO_INCREMENT, + `zone_id` int unsigned NOT NULL, `ip_version` enum('v4','v6') NOT NULL, `date` date NOT NULL, - `count_active` mediumint(8) unsigned NOT NULL, - `count_registered` mediumint(8) unsigned NOT NULL, - `netspeed_active` int(10) unsigned NOT NULL, + `count_active` mediumint unsigned NOT NULL, + `count_registered` mediumint unsigned NOT NULL, + `netspeed_active` int unsigned NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `zone_date` (`zone_id`,`date`,`ip_version`), KEY `date_idx` (`date`,`zone_id`), CONSTRAINT `zone_server_counts` FOREIGN KEY (`zone_id`) REFERENCES `zones` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -741,16 +800,16 @@ DROP TABLE IF EXISTS `zones`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `zones` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id` int unsigned NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `description` varchar(255) DEFAULT NULL, - `parent_id` int(10) unsigned DEFAULT NULL, + `parent_id` int unsigned DEFAULT NULL, `dns` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`), KEY `parent` (`parent_id`), CONSTRAINT `zones_parent` FOREIGN KEY (`parent_id`) REFERENCES `zones` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -765,7 +824,7 @@ CREATE TABLE `zones` ( /*!50001 SET character_set_results = utf8mb4 */; /*!50001 SET collation_connection = utf8mb4_general_ci */; /*!50001 CREATE ALGORITHM=UNDEFINED */ -/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */ +/*!50013 DEFINER=`v-root-ntp-askntp-JRFPjVcaH1HOoQ`@`10.%` SQL SECURITY DEFINER */ /*!50001 VIEW `monitors_data` AS select `monitors`.`id` AS `id`,`monitors`.`account_id` AS `account_id`,`monitors`.`type` AS `type`,if((`monitors`.`type` = 'score'),`monitors`.`name`,substring_index(`monitors`.`tls_name`,'.',1)) AS `name`,`monitors`.`ip` AS `ip`,`monitors`.`ip_version` AS `ip_version`,`monitors`.`status` AS `status`,`monitors`.`client_version` AS `client_version`,`monitors`.`last_seen` AS `last_seen`,`monitors`.`last_submit` AS `last_submit` from `monitors` where (not((`monitors`.`tls_name` like '%.system'))) */; /*!50001 SET character_set_client = @saved_cs_client */; /*!50001 SET character_set_results = @saved_cs_results */; @@ -778,6 +837,6 @@ CREATE TABLE `zones` ( /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */; --- Dump completed on 2024-03-16 17:43:33 +-- Dump completed on 2025-01-18 4:31:13 diff --git a/scripts/run-goreleaser b/scripts/run-goreleaser index 911d55e..7df3862 100755 --- a/scripts/run-goreleaser +++ b/scripts/run-goreleaser @@ -2,7 +2,7 @@ set -euo pipefail -go install github.com/goreleaser/goreleaser/v2@v2.5.0 +go install github.com/goreleaser/goreleaser/v2@v2.5.1 if [ ! -z "${harbor_username:-}" ]; then DOCKER_FILE=~/.docker/config.json