Skip to content

Commit ca55e2d

Browse files
henrybarretohenrybarreto
committed
feat: aggregate api and ssh services into one
1 parent e02e0c0 commit ca55e2d

File tree

430 files changed

+1496
-2555
lines changed

Some content is hidden

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

430 files changed

+1496
-2555
lines changed

‎.github/workflows/docker-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
project: [api, ssh, gateway, ui, cli]
21+
project: [server, gateway, ui, cli]
2222

2323
runs-on: ubuntu-20.04
2424

‎.github/workflows/docker-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
project: [api, ssh, gateway, ui, cli]
15+
project: [server, gateway, ui, cli]
1616

1717
runs-on: ubuntu-20.04
1818

‎.github/workflows/qa.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
project: [api, agent, pkg, ssh, ui, cli]
19+
project: [server, agent, pkg, ui, cli]
2020
include:
21-
- project: api
21+
- project: server
2222
extra_args: ""
2323
lint_args: ""
2424
- project: agent
@@ -27,9 +27,6 @@ jobs:
2727
- project: pkg
2828
extra_args: ""
2929
lint_args: ""
30-
- project: ssh
31-
extra_args: "-tags internal_api"
32-
lint_args: "--build-tags internal_api"
3330
- project: ui
3431
extra_args: ""
3532
lint_args: ""

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,5 @@ agent/shellhub.key
2525

2626
# Directory used by devscripts/run-agent to store binaries
2727
bin/agent
28+
29+
tmp/

‎agent/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# base stage
2-
FROM golang:1.22.6-alpine3.19 AS base
2+
FROM golang:1.23.7-alpine3.21 AS base
33

44
ARG GOPROXY
55

‎agent/Dockerfile.amd64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-alpine3.19
1+
FROM golang:1.23.7-alpine3.21 AS base
22

33
ARG SHELLHUB_VERSION=latest
44

‎agent/Dockerfile.arm32v6

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
22

3-
FROM arm32v6/golang:1.22.6-alpine3.19
3+
FROM arm32v6/golang:1.23.7-alpine3.21
44

55
ARG SHELLHUB_VERSION=latest
66

‎agent/Dockerfile.arm32v7

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
22

3-
FROM arm32v7/golang:1.22.6-alpine3.19
3+
FROM arm32v7/golang:1.23.7-alpine3.21
44

55
ARG SHELLHUB_VERSION=latest
66

‎agent/Dockerfile.arm64v8

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
22

3-
FROM arm64v8/golang:1.22.6-alpine3.19
3+
FROM arm64v8/golang:1.23.7-alpine3.21
44

55
ARG SHELLHUB_VERSION=latest
66

‎agent/Dockerfile.i386

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-alpine3.19
1+
FROM golang:1.23.7-alpine3.21
22

33
ARG SHELLHUB_VERSION=latest
44

‎agent/Dockerfile.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.6-alpine3.19
1+
FROM golang:1.23.7-alpine3.21
22

33
ARG GOPROXY
44

‎agent/go.mod

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module github.com/shellhub-io/shellhub/agent
22

3-
go 1.22.4
3+
go 1.23.7
44

55
require (
66
github.com/Masterminds/semver v1.5.0
7-
github.com/shellhub-io/shellhub v0.13.4
7+
github.com/shellhub-io/shellhub v0.0.0-00010101000000-000000000000
88
github.com/sirupsen/logrus v1.9.3
99
github.com/spf13/cobra v1.9.1
1010
)
1111

1212
require (
13-
github.com/labstack/gommon v0.4.0 // indirect
13+
github.com/labstack/gommon v0.4.2 // indirect
1414
github.com/mattn/go-colorable v0.1.13 // indirect
15-
github.com/mattn/go-isatty v0.0.19 // indirect
15+
github.com/mattn/go-isatty v0.0.20 // indirect
1616
github.com/valyala/bytebufferpool v1.0.0 // indirect
1717
github.com/valyala/fasttemplate v1.2.2 // indirect
1818
)
@@ -22,47 +22,47 @@ require (
2222
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect
2323
github.com/Microsoft/go-winio v0.6.2 // indirect
2424
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
25-
github.com/creack/pty v1.1.18 // indirect
25+
github.com/creack/pty v1.1.24 // indirect
2626
github.com/distribution/reference v0.6.0 // indirect
27-
github.com/docker/docker v27.1.1+incompatible // indirect
27+
github.com/docker/docker v28.0.4+incompatible // indirect
2828
github.com/docker/go-connections v0.5.0 // indirect
2929
github.com/docker/go-units v0.5.0 // indirect
3030
github.com/felixge/httpsnoop v1.0.4 // indirect
31-
github.com/gliderlabs/ssh v0.3.5 // indirect
31+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
32+
github.com/gliderlabs/ssh v0.3.8 // indirect
3233
github.com/go-logr/logr v1.4.2 // indirect
3334
github.com/go-logr/stdr v1.2.2 // indirect
3435
github.com/go-playground/locales v0.14.1 // indirect
3536
github.com/go-playground/universal-translator v0.18.1 // indirect
36-
github.com/go-playground/validator/v10 v10.11.2 // indirect
37-
github.com/go-resty/resty/v2 v2.7.0 // indirect
37+
github.com/go-playground/validator/v10 v10.26.0 // indirect
38+
github.com/go-resty/resty/v2 v2.16.5 // indirect
3839
github.com/gogo/protobuf v1.3.2 // indirect
39-
github.com/gorilla/websocket v1.5.0 // indirect
40+
github.com/gorilla/websocket v1.5.3 // indirect
4041
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4142
github.com/kr/fs v0.1.0 // indirect
42-
github.com/labstack/echo/v4 v4.10.2 // indirect
43-
github.com/leodido/go-urn v1.2.2 // indirect
43+
github.com/labstack/echo/v4 v4.13.3 // indirect
44+
github.com/leodido/go-urn v1.4.0 // indirect
4445
github.com/mattn/go-shellwords v1.0.12 // indirect
4546
github.com/moby/docker-image-spec v1.3.1 // indirect
4647
github.com/opencontainers/go-digest v1.0.0 // indirect
47-
github.com/opencontainers/image-spec v1.1.0 // indirect
48+
github.com/opencontainers/image-spec v1.1.1 // indirect
4849
github.com/openwall/yescrypt-go v1.0.0 // indirect
4950
github.com/pkg/errors v0.9.1 // indirect
50-
github.com/pkg/sftp v1.13.5 // indirect
51-
github.com/sethvargo/go-envconfig v0.9.0 // indirect
51+
github.com/pkg/sftp v1.13.9 // indirect
52+
github.com/sethvargo/go-envconfig v1.1.1 // indirect
5253
github.com/spf13/pflag v1.0.6 // indirect
53-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
54-
go.opentelemetry.io/otel v1.26.0 // indirect
55-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
56-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
57-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
58-
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
59-
golang.org/x/crypto v0.31.0 // indirect
60-
golang.org/x/net v0.33.0 // indirect
61-
golang.org/x/sys v0.28.0 // indirect
62-
golang.org/x/text v0.21.0 // indirect
54+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
55+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
56+
go.opentelemetry.io/otel v1.35.0 // indirect
57+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
58+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
59+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
60+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
61+
golang.org/x/crypto v0.37.0 // indirect
62+
golang.org/x/net v0.36.0 // indirect
63+
golang.org/x/sys v0.32.0 // indirect
64+
golang.org/x/text v0.24.0 // indirect
6365
gotest.tools/v3 v3.5.1 // indirect
6466
)
6567

6668
replace github.com/shellhub-io/shellhub => ../
67-
68-
replace github.com/gliderlabs/ssh => github.com/shellhub-io/ssh v0.0.0-20230224143412-edd48dfd6eea

0 commit comments

Comments
 (0)