Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ RUN export GOPATH=$GOPATH
RUN go env -w GO111MODULE=auto

# Copy source files
COPY cmd $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/cmd
COPY cmd $GOPATH/src/github.com/openchami/remote-console/v2/cmd
COPY configs configs
COPY scripts scripts
COPY internal $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/internal
COPY go.mod $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/go.mod
COPY go.sum $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/go.sum
COPY internal $GOPATH/src/github.com/openchami/remote-console/v2/internal
COPY go.mod $GOPATH/src/github.com/openchami/remote-console/v2/go.mod
COPY go.sum $GOPATH/src/github.com/openchami/remote-console/v2/go.sum

# Build the image
RUN set -ex && go build -C $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/cmd/remote-console -v -o /usr/local/bin/remote-console
RUN set -ex && go build -C $GOPATH/src/github.com/openchami/remote-console/v2/cmd/remote-console -v -o /usr/local/bin/remote-console

### Final Stage ###
FROM ubuntu:26.04 AS final
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ RUN go env -w GO111MODULE=auto
RUN export CGO_ENABLED=0

# Copy source files
COPY cmd $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/cmd
COPY cmd $GOPATH/src/github.com/openchami/remote-console/v2/cmd
COPY configs configs
COPY scripts scripts
COPY internal $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/internal
COPY go.mod $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/go.mod
COPY go.sum $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/go.sum
COPY internal $GOPATH/src/github.com/openchami/remote-console/v2/internal
COPY go.mod $GOPATH/src/github.com/openchami/remote-console/v2/go.mod
COPY go.sum $GOPATH/src/github.com/openchami/remote-console/v2/go.sum

# Build the image
RUN go build -C $GOPATH/src/github.com/OpenCHAMI/remote-console/v2/cmd/remote-console -v \
RUN go build -C $GOPATH/src/github.com/openchami/remote-console/v2/cmd/remote-console -v \
-gcflags=all="-N -l" \
-o /usr/local/bin/remote-console

Expand Down
8 changes: 4 additions & 4 deletions cmd/remote-console/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"log/slog"
"slices"

"github.com/OpenCHAMI/remote-console/internal/conman"
"github.com/OpenCHAMI/remote-console/internal/creds"
"github.com/OpenCHAMI/remote-console/internal/logs"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/conman"
"github.com/openchami/remote-console/internal/creds"
"github.com/openchami/remote-console/internal/logs"
"github.com/openchami/remote-console/internal/ssh"
)

type OAuth2Config struct {
Expand Down
12 changes: 6 additions & 6 deletions cmd/remote-console/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
"time"

compcreds "github.com/Cray-HPE/hms-compcredentials"
"github.com/OpenCHAMI/remote-console/internal/conman"
"github.com/OpenCHAMI/remote-console/internal/console"
"github.com/OpenCHAMI/remote-console/internal/creds"
"github.com/OpenCHAMI/remote-console/internal/logs"
"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/conman"
"github.com/openchami/remote-console/internal/console"
"github.com/openchami/remote-console/internal/creds"
"github.com/openchami/remote-console/internal/logs"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
"golang.org/x/oauth2"
"golang.org/x/oauth2/clientcredentials"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//
// (MIT License)

module github.com/OpenCHAMI/remote-console
module github.com/openchami/remote-console

go 1.26.0

Expand Down
2 changes: 1 addition & 1 deletion internal/conman/conman.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/Cray-HPE/hms-compcredentials"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

type ConmanService struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/conman/conman_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/Cray-HPE/hms-compcredentials"
"github.com/stretchr/testify/require"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

func TestGenerateBaseConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/console/conman_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"syscall"
"time"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/creack/pty"
"github.com/openchami/remote-console/internal/nodes"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/console/consoles.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package console
import (
"net/http"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

type ConsolesResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/console/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"log/slog"
"net/http"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

// HealthResponse - used to report service health stats
Expand Down
4 changes: 2 additions & 2 deletions internal/console/interactive.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"sync"
"time"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/gorilla/websocket"
"github.com/nxadm/tail/ratelimiter"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
)

// interactiveSessions tracks which nodes currently have an active
Expand Down
4 changes: 2 additions & 2 deletions internal/console/interactive_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/gorilla/websocket"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
)

func TestReservationExclusive(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/console/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/gorilla/websocket"
openchami_authenticator "github.com/openchami/chi-middleware/auth"

"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/ssh"
)

const routePrefix = "/remote-console"
Expand Down
2 changes: 1 addition & 1 deletion internal/console/ssh_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"
"sync/atomic"

"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/ssh"
)

// clientIDCounter generates unique client IDs within a process.
Expand Down
2 changes: 1 addition & 1 deletion internal/console/tail.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/nxadm/tail"
"github.com/nxadm/tail/ratelimiter"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

type consoleTailSession struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/creds/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"log/slog"

compcreds "github.com/Cray-HPE/hms-compcredentials"
"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

type SignalConmanTERM func()
Expand Down
2 changes: 1 addition & 1 deletion internal/logs/aggregation.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

"github.com/nxadm/tail"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

// aggregateFile starts tailing a log file if not already running (idempotent)
Expand Down
2 changes: 1 addition & 1 deletion internal/logs/aggregation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

func TestWriteToAggLog(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/logs/rotation.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"strings"
"time"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

// LogRotate initializes and starts log rotation
Expand Down
2 changes: 1 addition & 1 deletion internal/logs/rotation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/ssh/concurrent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
compcredentials "github.com/Cray-HPE/hms-compcredentials"
gossh "golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
)

// TestSSHConsoleManagerConcurrent exercises concurrent access to SSHConsoleManager
Expand Down
2 changes: 1 addition & 1 deletion internal/ssh/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/ssh"
)

func TestSSHConfigValidate(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/ssh/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
compcredentials "github.com/Cray-HPE/hms-compcredentials"
gossh "golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

// errNoCredentials means no credential entry has reached this node.
Expand Down
2 changes: 1 addition & 1 deletion internal/ssh/console_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

gossh "golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

// TestSSHConsoleReconnect verifies automatic reconnection and status markers.
Expand Down
2 changes: 1 addition & 1 deletion internal/ssh/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/Cray-HPE/hms-compcredentials"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/nodes"
)

// ErrNotConnected means a managed node is temporarily disconnected. Write discards input and
Expand Down
4 changes: 2 additions & 2 deletions internal/ssh/manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
compcredentials "github.com/Cray-HPE/hms-compcredentials"
gossh "golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
)

// deadAddr returns an unused local address so connections fail immediately.
Expand Down
4 changes: 2 additions & 2 deletions internal/ssh/scale_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
compcredentials "github.com/Cray-HPE/hms-compcredentials"
gossh "golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/ssh/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/Cray-HPE/hms-compcredentials"
gossh "golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/OpenCHAMI/remote-console/internal/ssh"
"github.com/openchami/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/ssh"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions test/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/testcontainers/testcontainers-go/network"
"golang.org/x/crypto/ssh"

"github.com/OpenCHAMI/remote-console/internal/console"
"github.com/OpenCHAMI/remote-console/internal/nodes"
"github.com/openchami/remote-console/internal/console"
"github.com/openchami/remote-console/internal/nodes"
)

const (
Expand Down