Skip to content

feat: aggregate api and ssh services into one #4722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: aggregate api and ssh services into one #4722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca55e2d
feat: aggregate api and ssh services into one
henrybarreto Apr 9, 2025
241a7d7
chore(ui): changed path to VBtn vuetify component on tests
luannmoreira Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
project: [api, ssh, gateway, ui, cli]
project: [server, gateway, ui, cli]

runs-on: ubuntu-20.04

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: true
matrix:
project: [api, ssh, gateway, ui, cli]
project: [server, gateway, ui, cli]

runs-on: ubuntu-20.04

Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/qa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
strategy:
fail-fast: false
matrix:
project: [api, agent, pkg, ssh, ui, cli]
project: [server, agent, pkg, ui, cli]
include:
- project: api
- project: server
extra_args: ""
lint_args: ""
- project: agent
Expand All @@ -27,9 +27,6 @@ jobs:
- project: pkg
extra_args: ""
lint_args: ""
- project: ssh
extra_args: "-tags internal_api"
lint_args: "--build-tags internal_api"
- project: ui
extra_args: ""
lint_args: ""
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ agent/shellhub.key

# Directory used by devscripts/run-agent to store binaries
bin/agent

tmp/
2 changes: 1 addition & 1 deletion agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# base stage
FROM golang:1.22.6-alpine3.19 AS base
FROM golang:1.23.7-alpine3.21 AS base

ARG GOPROXY

Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.6-alpine3.19
FROM golang:1.23.7-alpine3.21 AS base

ARG SHELLHUB_VERSION=latest

Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile.arm32v6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

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

ARG SHELLHUB_VERSION=latest

Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile.arm32v7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

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

ARG SHELLHUB_VERSION=latest

Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile.arm64v8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

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

ARG SHELLHUB_VERSION=latest

Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile.i386
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.6-alpine3.19
FROM golang:1.23.7-alpine3.21

ARG SHELLHUB_VERSION=latest

Expand Down
2 changes: 1 addition & 1 deletion agent/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22.6-alpine3.19
FROM golang:1.23.7-alpine3.21

ARG GOPROXY

Expand Down
54 changes: 27 additions & 27 deletions agent/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
module github.com/shellhub-io/shellhub/agent

go 1.22.4
go 1.23.7

require (
github.com/Masterminds/semver v1.5.0
github.com/shellhub-io/shellhub v0.13.4
github.com/shellhub-io/shellhub v0.0.0-00010101000000-000000000000
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
)

require (
github.com/labstack/gommon v0.4.0 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
)
Expand All @@ -22,47 +22,47 @@ require (
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/creack/pty v1.1.24 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/docker v28.0.4+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gliderlabs/ssh v0.3.5 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gliderlabs/ssh v0.3.8 // indirect
github.com/go-logr/logr v1.4.2 // 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.11.2 // indirect
github.com/go-resty/resty/v2 v2.7.0 // indirect
github.com/go-playground/validator/v10 v10.26.0 // indirect
github.com/go-resty/resty/v2 v2.16.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/labstack/echo/v4 v4.10.2 // indirect
github.com/leodido/go-urn v1.2.2 // indirect
github.com/labstack/echo/v4 v4.13.3 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/openwall/yescrypt-go v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.5 // indirect
github.com/sethvargo/go-envconfig v0.9.0 // indirect
github.com/pkg/sftp v1.13.9 // indirect
github.com/sethvargo/go-envconfig v1.1.1 // indirect
github.com/spf13/pflag v1.0.6 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/net v0.36.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
gotest.tools/v3 v3.5.1 // indirect
)

replace github.com/shellhub-io/shellhub => ../

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