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
4 changes: 2 additions & 2 deletions cmd/pro/add/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"os/exec"
"time"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
"github.com/sirupsen/logrus"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
proflags "github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/daemon/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"syscall"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/pro/completion"
proflags "github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/import_workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strconv"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
proflags "github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/cmd/pro/provider/list"
"github.com/skevetter/devpod/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/create/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"os"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/list/clusters.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"os"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/platform"
"github.com/skevetter/devpod/pkg/platform/client"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/list/projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/platform/client"
"github.com/skevetter/log"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/provider/list/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"

"github.com/blang/semver/v4"
managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/platform"
"github.com/skevetter/devpod/pkg/platform/client"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/list/workspaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"os"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"os"

storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"os"

storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/platform"
"github.com/skevetter/devpod/pkg/platform/client"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/provider/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"io"
"os"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
"github.com/sirupsen/logrus"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/provider/update/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"os"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/platform"
"github.com/skevetter/devpod/pkg/platform/client"
Expand Down
10 changes: 5 additions & 5 deletions cmd/pro/provider/watch/workspaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"sync"
"time"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
loftclient "github.com/loft-sh/api/v4/pkg/clientset/versioned"
informers "github.com/loft-sh/api/v4/pkg/informers/externalversions"
informermanagementv1 "github.com/loft-sh/api/v4/pkg/informers/externalversions/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
loftclient "github.com/skevetter/api/pkg/clientset/versioned"
informers "github.com/skevetter/api/pkg/informers/externalversions"
informermanagementv1 "github.com/skevetter/api/pkg/informers/externalversions/management/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/reset/password.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"strings"

storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/platform/kube"
"github.com/skevetter/devpod/pkg/random"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/sleep.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"time"

clusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
clusterv1 "github.com/skevetter/agentapi/pkg/apis/devsy/cluster/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"time"

jsonpatch "github.com/evanphx/json-patch/v5"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
"github.com/loft-sh/api/v4/pkg/auth"
loftclientset "github.com/loft-sh/api/v4/pkg/clientset/versioned"
"github.com/sirupsen/logrus"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/api/pkg/auth"
loftclientset "github.com/skevetter/api/pkg/clientset/versioned"
proflags "github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/machineid"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/wakeup.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"time"

clusterv1 "github.com/loft-sh/agentapi/v4/pkg/apis/loft/cluster/v1"
storagev1 "github.com/loft-sh/api/v4/pkg/apis/storage/v1"
clusterv1 "github.com/skevetter/agentapi/pkg/apis/devsy/cluster/v1"
storagev1 "github.com/skevetter/api/pkg/apis/storage/v1"
"github.com/skevetter/devpod/cmd/pro/flags"
"github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/platform"
Expand Down
2 changes: 1 addition & 1 deletion cmd/troubleshoot.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"errors"
"fmt"

managementv1 "github.com/loft-sh/api/v4/pkg/apis/management/v1"
managementv1 "github.com/skevetter/api/pkg/apis/management/v1"
"github.com/skevetter/devpod/cmd/completion"
"github.com/skevetter/devpod/cmd/flags"
"github.com/skevetter/devpod/cmd/provider"
Expand Down
18 changes: 9 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ require (
github.com/gorilla/handlers v1.5.2
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
github.com/joho/godotenv v1.5.1
github.com/loft-sh/agentapi/v4 v4.8.1
github.com/loft-sh/api/v4 v4.4.0
github.com/loft-sh/apiserver v0.0.0-20260113122925-594495a02e96
github.com/moby/buildkit v0.29.0
github.com/moby/patternmatcher v0.6.1
github.com/moby/term v0.5.2
github.com/onsi/ginkgo/v2 v2.28.1
github.com/onsi/gomega v1.39.1
github.com/pkg/sftp v1.13.10
github.com/sirupsen/logrus v1.9.4
github.com/skevetter/agentapi v1.0.0
github.com/skevetter/api v1.0.1
github.com/skevetter/apiserver v1.0.2
Comment thread
coderabbitai[bot] marked this conversation as resolved.
github.com/skevetter/log v0.0.0-20260106023547-bfd26ab1367c
github.com/skevetter/ssh v0.1.0
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
Expand Down Expand Up @@ -158,15 +158,15 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.22.5 // indirect
github.com/go-openapi/jsonreference v0.21.5 // indirect
github.com/go-openapi/swag v0.25.4 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag v0.25.5 // indirect
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
github.com/go-openapi/swag/conv v0.25.5 // indirect
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
github.com/go-openapi/swag/loading v0.25.5 // indirect
github.com/go-openapi/swag/mangling v0.25.5 // indirect
github.com/go-openapi/swag/netutils v0.25.4 // indirect
github.com/go-openapi/swag/netutils v0.25.5 // indirect
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
Expand All @@ -178,7 +178,7 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.26.1 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/go-github/v74 v74.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
Expand All @@ -200,7 +200,6 @@ require (
github.com/kr/fs v0.1.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/loft-sh/admin-apis v0.0.0-20260311181619-506013b79ba0 // indirect
github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
Expand Down Expand Up @@ -244,6 +243,7 @@ require (
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
github.com/shibumi/go-pathspec v1.3.0 // indirect
github.com/skevetter/admin-apis v1.0.0 // indirect
github.com/stoewer/go-strcase v1.3.1 // indirect
github.com/tailscale/certstore v0.1.1-0.20231202035212-d3fa0460f47e // indirect
github.com/tailscale/go-winio v0.0.0-20231025203758-c4f33415bf55 // indirect
Expand Down Expand Up @@ -303,7 +303,7 @@ require (
k8s.io/apiserver v0.35.3 // indirect
k8s.io/cli-runtime v0.35.3 // indirect
k8s.io/component-base v0.35.3 // indirect
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 // indirect
k8s.io/metrics v0.35.3 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
Expand Down
36 changes: 18 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ github.com/go-openapi/jsonpointer v0.22.5 h1:8on/0Yp4uTb9f4XvTrM2+1CPrV05QPZXu+r
github.com/go-openapi/jsonpointer v0.22.5/go.mod h1:gyUR3sCvGSWchA2sUBJGluYMbe1zazrYWIkWPjjMUY0=
github.com/go-openapi/jsonreference v0.21.5 h1:6uCGVXU/aNF13AQNggxfysJ+5ZcU4nEAe+pJyVWRdiE=
github.com/go-openapi/jsonreference v0.21.5/go.mod h1:u25Bw85sX4E2jzFodh1FOKMTZLcfifd1Q+iKKOUxExw=
github.com/go-openapi/swag v0.25.4 h1:OyUPUFYDPDBMkqyxOTkqDYFnrhuhi9NR6QVUvIochMU=
github.com/go-openapi/swag v0.25.4/go.mod h1:zNfJ9WZABGHCFg2RnY0S4IOkAcVTzJ6z2Bi+Q4i6qFQ=
github.com/go-openapi/swag/cmdutils v0.25.4 h1:8rYhB5n6WawR192/BfUu2iVlxqVR9aRgGJP6WaBoW+4=
github.com/go-openapi/swag/cmdutils v0.25.4/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=
github.com/go-openapi/swag v0.25.5 h1:pNkwbUEeGwMtcgxDr+2GBPAk4kT+kJ+AaB+TMKAg+TU=
github.com/go-openapi/swag v0.25.5/go.mod h1:B3RT6l8q7X803JRxa2e59tHOiZlX1t8viplOcs9CwTA=
github.com/go-openapi/swag/cmdutils v0.25.5 h1:yh5hHrpgsw4NwM9KAEtaDTXILYzdXh/I8Whhx9hKj7c=
github.com/go-openapi/swag/cmdutils v0.25.5/go.mod h1:pdae/AFo6WxLl5L0rq87eRzVPm/XRHM3MoYgRMvG4A0=
github.com/go-openapi/swag/conv v0.25.5 h1:wAXBYEXJjoKwE5+vc9YHhpQOFj2JYBMF2DUi+tGu97g=
github.com/go-openapi/swag/conv v0.25.5/go.mod h1:CuJ1eWvh1c4ORKx7unQnFGyvBbNlRKbnRyAvDvzWA4k=
github.com/go-openapi/swag/fileutils v0.25.5 h1:B6JTdOcs2c0dBIs9HnkyTW+5gC+8NIhVBUwERkFhMWk=
Expand All @@ -314,8 +314,8 @@ github.com/go-openapi/swag/loading v0.25.5 h1:odQ/umlIZ1ZVRteI6ckSrvP6e2w9UTF5qg
github.com/go-openapi/swag/loading v0.25.5/go.mod h1:I8A8RaaQ4DApxhPSWLNYWh9NvmX2YKMoB9nwvv6oW6g=
github.com/go-openapi/swag/mangling v0.25.5 h1:hyrnvbQRS7vKePQPHHDso+k6CGn5ZBs5232UqWZmJZw=
github.com/go-openapi/swag/mangling v0.25.5/go.mod h1:6hadXM/o312N/h98RwByLg088U61TPGiltQn71Iw0NY=
github.com/go-openapi/swag/netutils v0.25.4 h1:Gqe6K71bGRb3ZQLusdI8p/y1KLgV4M/k+/HzVSqT8H0=
github.com/go-openapi/swag/netutils v0.25.4/go.mod h1:m2W8dtdaoX7oj9rEttLyTeEFFEBvnAx9qHd5nJEBzYg=
github.com/go-openapi/swag/netutils v0.25.5 h1:LZq2Xc2QI8+7838elRAaPCeqJnHODfSyOa7ZGfxDKlU=
github.com/go-openapi/swag/netutils v0.25.5/go.mod h1:lHbtmj4m57APG/8H7ZcMMSWzNqIQcu0RFiXrPUara14=
github.com/go-openapi/swag/stringutils v0.25.5 h1:NVkoDOA8YBgtAR/zvCx5rhJKtZF3IzXcDdwOsYzrB6M=
github.com/go-openapi/swag/stringutils v0.25.5/go.mod h1:PKK8EZdu4QJq8iezt17HM8RXnLAzY7gW0O1KKarrZII=
github.com/go-openapi/swag/typeutils v0.25.5 h1:EFJ+PCga2HfHGdo8s8VJXEVbeXRCYwzzr9u4rJk7L7E=
Expand Down Expand Up @@ -352,8 +352,8 @@ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
Expand Down Expand Up @@ -452,14 +452,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
github.com/loft-sh/admin-apis v0.0.0-20260311181619-506013b79ba0 h1:12fy1LhhyuQ46ls272yWn6HpAMLNUClsBYqRvu+qTC0=
github.com/loft-sh/admin-apis v0.0.0-20260311181619-506013b79ba0/go.mod h1:pp+2PgOsRCTb1DXnEev/HCc0gvj5t0nHuTIMU8C8b90=
github.com/loft-sh/agentapi/v4 v4.8.1 h1:o50ZvSS9R62gaWYcZl6uhVYnhYb6KbBvuOCiIpqUX1E=
github.com/loft-sh/agentapi/v4 v4.8.1/go.mod h1:imoDDofcfZKLEy8Mpt0gWUKQWAXQ3oUVEyfWFil9Vdc=
github.com/loft-sh/api/v4 v4.4.0 h1:RP4YsNay7xqay0oxb8g4n7NECVxE/ogQApFov8Z4nZ8=
github.com/loft-sh/api/v4 v4.4.0/go.mod h1:LqPbhgISsMvxIucmEUe42ifwuAG6kyqSBy1WTcrtGPQ=
github.com/loft-sh/apiserver v0.0.0-20260113122925-594495a02e96 h1:MnvrgRnVm7X8zQPyVS2U2veIxacmVUYSFTHsoi6sJrw=
github.com/loft-sh/apiserver v0.0.0-20260113122925-594495a02e96/go.mod h1:yBY01KhmW2XAWoqbAx8rx3xqwVwGMa3OYwiM2eYalY4=
github.com/loft-sh/ssh v0.0.5 h1:CmLfBrbekAZmYhpS+urhqmUZW1XU9kUo2bi4lJiUFH8=
github.com/loft-sh/ssh v0.0.5/go.mod h1:jgAfPSNioyL2wdFesXY5Wi4pYpdNo4u7AzworofHeyU=
github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
Expand Down Expand Up @@ -603,6 +595,14 @@ github.com/sigstore/sigstore-go v1.1.4 h1:wTTsgCHOfqiEzVyBYA6mDczGtBkN7cM8mPpjJj
github.com/sigstore/sigstore-go v1.1.4/go.mod h1:2U/mQOT9cjjxrtIUeKDVhL+sHBKsnWddn8URlswdBsg=
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
github.com/skevetter/admin-apis v1.0.0 h1:oXIWW5LTHfPT2cdVYfmg5SggbBykrmZRNr/H+IUHsBk=
github.com/skevetter/admin-apis v1.0.0/go.mod h1:rDIvXLlsR4XkMVDeEXsggcmu68cDFGzZBaCVl1qU93Y=
github.com/skevetter/agentapi v1.0.0 h1:de5L6nbBkinLKwifDsG4+/6DGpiMNe4hdzHPzcnMouM=
github.com/skevetter/agentapi v1.0.0/go.mod h1:l+46eWug+2eke0sEJnn8kH2TSY1ncPCqFvuiBhl06A4=
github.com/skevetter/api v1.0.1 h1:kEn92GKhqOvIxQ2Sb3R7QiFoku7Za6TAt3F4gK7wswI=
github.com/skevetter/api v1.0.1/go.mod h1:AwvwDqWn+2umZGwtqC0iw4vvPaihAKwmKbVQj0ehBsc=
github.com/skevetter/apiserver v1.0.2 h1:mBLG7soqHAMsjKsQ2JBE2FGVtm57brOKPGiWGiapbr0=
github.com/skevetter/apiserver v1.0.2/go.mod h1:WiLG4gsfMyvET33XtIeZtnJoOmE2zqXtoAdWDgma3Fg=
github.com/skevetter/log v0.0.0-20260106023547-bfd26ab1367c h1:2IjLo9V6TLV2rORRKKu+NVMSrOAEeuS4KJPk3v9e1rs=
github.com/skevetter/log v0.0.0-20260106023547-bfd26ab1367c/go.mod h1:Aqjwx8xRSxBWtTYXK3EzxManSgYZl7FaSh8J5LvTAK0=
github.com/skevetter/ssh v0.1.0 h1:+Kcb77Z8WHc+uiHVF9JJCMZjdFiY+o/Tn2Pz7pGyIDs=
Expand Down Expand Up @@ -891,8 +891,8 @@ k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/kube-aggregator v0.35.3 h1:erIo8Dfapd0Fg44XAbgCNioJMtr3Z5mI/G1PSpj9B7Q=
k8s.io/kube-aggregator v0.35.3/go.mod h1:lOLyWTEuiKT2kS/Wkj0foq+P+Xt4gs/xkrhz2r33lAQ=
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31 h1:V+sn9a/1fEYDGwnllCmqXBk8x7obZ+hl869Q3Abumkg=
k8s.io/kube-openapi v0.0.0-20260330154417-16be699c7b31/go.mod h1:uGBT7iTA6c6MvqUvSXIaYZo9ukscABYi2btjhvgKGZ0=
k8s.io/kubectl v0.35.3 h1:1KqSYXk/sodU7VeDvK6atX2kAGUZd2QTeR5K7Hb9r9w=
k8s.io/kubectl v0.35.3/go.mod h1:GPHxZqRe+u/i3gTBoVQHeIyq2NilfNPj9hDWeuN3x5s=
k8s.io/metrics v0.35.3 h1:WonA18pEwrtb7a6XfhFg1ZY1Le0RFkcEw7CFApMTZos=
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tunnelserver/options.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package tunnelserver

import (
"github.com/loft-sh/api/v4/pkg/devpod"
"github.com/skevetter/api/pkg/devsy"
"github.com/skevetter/devpod/pkg/devcontainer/config"
"github.com/skevetter/devpod/pkg/netstat"
provider2 "github.com/skevetter/devpod/pkg/provider"
Expand Down Expand Up @@ -51,7 +51,7 @@ func WithMounts(mounts []*config.Mount) Option {
}
}

func WithPlatformOptions(options *devpod.PlatformOptions) Option {
func WithPlatformOptions(options *devsy.PlatformOptions) Option {
return func(s *tunnelServer) *tunnelServer {
s.platformOptions = options
return s
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/tunnelserver/tunnelserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"path/filepath"
"strings"

"github.com/loft-sh/api/v4/pkg/devpod"
"github.com/moby/patternmatcher/ignorefile"
"github.com/skevetter/api/pkg/devsy"
"github.com/skevetter/devpod/pkg/agent/tunnel"
pkgconfig "github.com/skevetter/devpod/pkg/config"
"github.com/skevetter/devpod/pkg/devcontainer/config"
Expand Down Expand Up @@ -118,7 +118,7 @@ type tunnelServer struct {
workspace *provider2.Workspace
log log.Logger

platformOptions *devpod.PlatformOptions
platformOptions *devsy.PlatformOptions
}

func (t *tunnelServer) RunWithResult(
Expand Down
Loading