Skip to content

Commit 8bc3d90

Browse files
heiytorheiytor
committed
wip
1 parent a2df84a commit 8bc3d90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+3341
-1435
lines changed

‎api/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ COPY ./api/entrypoint-dev.sh /entrypoint.sh
5454
WORKDIR $GOPATH/src/github.com/shellhub-io/shellhub/api
5555

5656
RUN mkdir -p /templates
57-
RUN mkdir -p /migrations
5857

5958
COPY ./install.sh /templates/install.sh
6059

@@ -68,7 +67,6 @@ RUN apk add curl
6867
COPY --from=builder /go/src/github.com/shellhub-io/shellhub/api/api /api
6968

7069
RUN mkdir -p /templates
71-
RUN mkdir -p /migrations
7270

7371
COPY ./install.sh /templates/install.sh
7472

‎api/go.mod‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/shellhub-io/shellhub/api
22

3-
go 1.22.4
3+
go 1.23.0
44

5-
toolchain go1.22.5
5+
toolchain go1.24.1
66

77
require (
88
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08
@@ -11,25 +11,24 @@ require (
1111
github.com/gorilla/websocket v1.5.3
1212
github.com/jackc/pgx/v5 v5.7.4
1313
github.com/labstack/echo/v4 v4.13.3
14-
github.com/labstack/gommon v0.4.2
15-
github.com/pkg/errors v0.9.1
14+
github.com/oiime/logrusbun v0.1.2-0.20241011112815-4df3a0fb0e11
1615
github.com/shellhub-io/mongotest v0.0.0-20230928124937-e33b07010742
1716
github.com/shellhub-io/shellhub v0.13.4
1817
github.com/sirupsen/logrus v1.9.3
1918
github.com/spf13/cobra v1.9.1
20-
github.com/square/mongo-lock v0.0.0-20230808145049-cfcf499f6bf0
2119
github.com/stretchr/testify v1.10.0
20+
github.com/testcontainers/testcontainers-go v0.37.0
2221
github.com/testcontainers/testcontainers-go/modules/mongodb v0.35.0
22+
github.com/testcontainers/testcontainers-go/modules/postgres v0.37.0
2323
github.com/uptrace/bun v1.2.11
24+
github.com/uptrace/bun/dbfixture v1.2.11
2425
github.com/uptrace/bun/dialect/pgdialect v1.2.11
25-
github.com/xakep666/mongo-migrate v0.3.2
26-
go.mongodb.org/mongo-driver v1.17.3
27-
golang.org/x/crypto v0.33.0
28-
golang.org/x/sync v0.11.0
26+
golang.org/x/crypto v0.37.0
27+
golang.org/x/text v0.24.0
2928
)
3029

3130
require (
32-
dario.cat/mergo v1.0.0 // indirect
31+
dario.cat/mergo v1.0.1 // indirect
3332
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3433
github.com/Microsoft/go-winio v0.6.2 // indirect
3534
github.com/adhocore/gronx v1.8.1 // indirect
@@ -40,18 +39,19 @@ require (
4039
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4140
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4241
github.com/connesc/cipherio v0.2.1 // indirect
43-
github.com/containerd/containerd v1.7.27 // indirect
4442
github.com/containerd/log v0.1.0 // indirect
4543
github.com/containerd/platforms v0.2.1 // indirect
4644
github.com/cpuguy83/dockercfg v0.3.2 // indirect
4745
github.com/davecgh/go-spew v1.1.1 // indirect
4846
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
4947
github.com/distribution/reference v0.6.0 // indirect
50-
github.com/docker/docker v27.1.1+incompatible // indirect
48+
github.com/docker/docker v28.0.1+incompatible // indirect
5149
github.com/docker/go-connections v0.5.0 // indirect
5250
github.com/docker/go-units v0.5.0 // indirect
5351
github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
52+
github.com/ebitengine/purego v0.8.2 // indirect
5453
github.com/felixge/httpsnoop v1.0.4 // indirect
54+
github.com/fsnotify/fsnotify v1.6.0 // indirect
5555
github.com/go-logr/logr v1.4.2 // indirect
5656
github.com/go-logr/stdr v1.2.2 // indirect
5757
github.com/go-ole/go-ole v1.3.0 // indirect
@@ -76,9 +76,10 @@ require (
7676
github.com/jinzhu/inflection v1.0.0 // indirect
7777
github.com/klauspost/compress v1.17.8 // indirect
7878
github.com/klauspost/pgzip v1.2.5 // indirect
79+
github.com/labstack/gommon v0.4.2 // indirect
7980
github.com/leodido/go-urn v1.2.2 // indirect
8081
github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect
81-
github.com/magiconair/properties v1.8.7 // indirect
82+
github.com/magiconair/properties v1.8.10 // indirect
8283
github.com/mattn/go-colorable v0.1.14 // indirect
8384
github.com/mattn/go-isatty v0.0.20 // indirect
8485
github.com/mholt/archiver/v4 v4.0.0-alpha.8 // indirect
@@ -92,22 +93,21 @@ require (
9293
github.com/morikuni/aec v1.0.0 // indirect
9394
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
9495
github.com/opencontainers/go-digest v1.0.0 // indirect
95-
github.com/opencontainers/image-spec v1.1.0 // indirect
96+
github.com/opencontainers/image-spec v1.1.1 // indirect
9697
github.com/oschwald/geoip2-golang v1.8.0 // indirect
9798
github.com/oschwald/maxminddb-golang v1.10.0 // indirect
9899
github.com/pierrec/lz4/v4 v4.1.17 // indirect
100+
github.com/pkg/errors v0.9.1 // indirect
99101
github.com/pmezard/go-difflib v1.0.0 // indirect
100102
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
101103
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
102104
github.com/redis/go-redis/v9 v9.0.3 // indirect
103105
github.com/robfig/cron/v3 v3.0.1 // indirect
104106
github.com/sethvargo/go-envconfig v0.9.0 // indirect
105-
github.com/shirou/gopsutil/v3 v3.24.3 // indirect
106-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
107+
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
107108
github.com/spf13/cast v1.3.1 // indirect
108109
github.com/spf13/pflag v1.0.6 // indirect
109110
github.com/stretchr/objx v0.5.2 // indirect
110-
github.com/testcontainers/testcontainers-go v0.35.0 // indirect
111111
github.com/therootcompany/xz v1.0.1 // indirect
112112
github.com/tklauser/go-sysconf v0.3.13 // indirect
113113
github.com/tklauser/numcpus v0.7.0 // indirect
@@ -125,16 +125,22 @@ require (
125125
github.com/xdg-go/stringprep v1.0.4 // indirect
126126
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
127127
github.com/yusufpapurcu/wmi v1.2.4 // indirect
128-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
129-
go.opentelemetry.io/otel v1.26.0 // indirect
130-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
131-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
128+
go.mongodb.org/mongo-driver v1.17.3 // indirect
129+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
131+
go.opentelemetry.io/otel v1.35.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect
133+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
134+
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
135+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
136+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
132137
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
133-
golang.org/x/net v0.33.0 // indirect
134-
golang.org/x/sys v0.30.0 // indirect
135-
golang.org/x/text v0.22.0 // indirect
138+
golang.org/x/net v0.38.0 // indirect
139+
golang.org/x/sync v0.13.0 // indirect
140+
golang.org/x/sys v0.33.0 // indirect
136141
golang.org/x/time v0.8.0 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
142+
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
143+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
138144
google.golang.org/protobuf v1.35.2 // indirect
139145
gopkg.in/yaml.v2 v2.4.0 // indirect
140146
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)