Skip to content

Commit 5b9bde4

Browse files
committed
simplify appingress, do this in dev-plane
1 parent 1e63e8f commit 5b9bde4

11 files changed

Lines changed: 27 additions & 521 deletions

File tree

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
braces.dev/errtrace v0.3.0 h1:pzfd6LcWgfWtXLaNFWRnxV/7NP+FSOlIjRLwDuHfPxs=
2-
braces.dev/errtrace v0.3.0/go.mod h1:YQpXdo+u5iimgQdZzFoic8AjedEDncXGpp6/2SfazzI=
31
buf.build/gen/go/brevdev/devplane/connectrpc/go v1.19.1-20251231160605-b3cca76916ad.2 h1:0kN/kFTB+1FwQKYfRmclNov3zl2l6piRWsLIvxI0MNg=
42
buf.build/gen/go/brevdev/devplane/connectrpc/go v1.19.1-20251231160605-b3cca76916ad.2/go.mod h1:RmMcZfWXsOjdUZZ2WoT2PuhhrLYcHbPYguosSqJ5498=
53
buf.build/gen/go/brevdev/devplane/protocolbuffers/go v1.36.11-20251231160605-b3cca76916ad.1 h1:XQiAbF+9b+yRXr5oUIUYCJ7/drS3hjd3/BpCUO04hOI=

pkg/brevdaemon/agent/config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/brevdev/dev-plane/pkg/errors"
10+
"github.com/brevdev/brev-cli/pkg/errors"
1111
)
1212

1313
const (
@@ -45,7 +45,7 @@ type Config struct {
4545
HeartbeatInterval time.Duration
4646

4747
EnableTunnel bool
48-
TunnelSSHPort int
48+
TunnelSSHPort int32
4949
TunnelCritical bool
5050
}
5151

@@ -98,14 +98,14 @@ func Load() (Config, error) {
9898
}
9999

100100
if portRaw := strings.TrimSpace(os.Getenv(EnvTunnelSSHPort)); portRaw != "" {
101-
port, err := strconv.Atoi(portRaw)
101+
port, err := strconv.ParseInt(portRaw, 10, 32)
102102
if err != nil {
103103
return Config{}, errors.WrapAndTrace(errors.Errorf("%s must be an integer: %v", EnvTunnelSSHPort, err))
104104
}
105105
if port <= 0 || port > 65535 {
106106
return Config{}, errors.Errorf("%s must be between 1 and 65535", EnvTunnelSSHPort)
107107
}
108-
cfg.TunnelSSHPort = port
108+
cfg.TunnelSSHPort = int32(port)
109109
}
110110

111111
if tunnelCriticalRaw := strings.TrimSpace(os.Getenv(EnvTunnelCritical)); tunnelCriticalRaw != "" {

pkg/brevdaemon/agent/heartbeat/heartbeat.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/brevdev/brev-cli/pkg/brevdaemon/agent/client"
1111
"github.com/brevdev/brev-cli/pkg/brevdaemon/agent/identity"
1212
"github.com/brevdev/brev-cli/pkg/brevdaemon/agent/telemetry"
13-
"github.com/brevdev/dev-plane/pkg/errors"
13+
"github.com/brevdev/brev-cli/pkg/errors"
1414
"go.uber.org/zap"
1515
"google.golang.org/protobuf/types/known/timestamppb"
1616
)

pkg/brevdaemon/agent/identity/identity.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/brevdev/brev-cli/pkg/brevdaemon/agent/client"
1515
"github.com/brevdev/brev-cli/pkg/brevdaemon/agent/config"
1616
"github.com/brevdev/brev-cli/pkg/brevdaemon/agent/telemetry"
17-
"github.com/brevdev/dev-plane/pkg/errors"
17+
"github.com/brevdev/brev-cli/pkg/errors"
1818
"go.uber.org/zap"
1919
)
2020

@@ -186,9 +186,14 @@ func EnsureIdentity(
186186
return Identity{}, errors.WrapAndTrace(err)
187187
}
188188

189+
hardwareFingerprint, err := computeHardwareFingerprint(hw)
190+
if err != nil {
191+
return Identity{}, errors.WrapAndTrace(err)
192+
}
189193
req := &brevapiv2.RegisterRequest{
190-
RegistrationToken: cfg.RegistrationToken,
191-
Hardware: hw.ToProto(),
194+
RegistrationToken: cfg.RegistrationToken,
195+
Hardware: hw.ToProto(),
196+
HardwareFingerprint: hardwareFingerprint,
192197
}
193198
if cfg.DisplayName != "" {
194199
req.DisplayName = client.ProtoString(cfg.DisplayName)
@@ -273,3 +278,7 @@ func ensureDeviceSalt(path string) (string, error) {
273278
}
274279
return salt, nil
275280
}
281+
282+
func computeHardwareFingerprint(_ telemetry.HardwareInfo) (string, error) {
283+
return rand.Text(), nil
284+
}

pkg/brevdaemon/agent/telemetry/hardware.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
brevapiv2 "buf.build/gen/go/brevdev/devplane/protocolbuffers/go/brevapi/v2"
1313
devplaneapiv1 "buf.build/gen/go/brevdev/devplane/protocolbuffers/go/devplaneapi/v1"
14-
"github.com/brevdev/dev-plane/pkg/errors"
14+
"github.com/brevdev/brev-cli/pkg/errors"
1515
"golang.org/x/sys/unix"
1616
)
1717

pkg/brevdaemon/agent/telemetry/hardware_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"runtime"
77
"testing"
88

9-
"github.com/brevdev/dev-plane/pkg/errors"
9+
"github.com/brevdev/brev-cli/pkg/errors"
1010
"github.com/stretchr/testify/require"
1111
)
1212

pkg/brevdaemon/agent/telemetry/utilization.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"time"
1414

1515
brevapiv2 "buf.build/gen/go/brevdev/devplane/protocolbuffers/go/brevapi/v2"
16-
"github.com/brevdev/dev-plane/pkg/errors"
16+
"github.com/brevdev/brev-cli/pkg/errors"
1717
"golang.org/x/sys/unix"
1818
)
1919

pkg/brevdaemon/agent/tunnel/ingress.go

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)