diff --git a/.github/workflows/dockerless.yaml b/.github/workflows/dockerless.yaml index 696c541cd..861f11bd3 100644 --- a/.github/workflows/dockerless.yaml +++ b/.github/workflows/dockerless.yaml @@ -49,7 +49,7 @@ jobs: - name: Check licenses run: | go install github.com/google/go-licenses/v2@v2.0.1 - go-licenses check ./... --ignore github.com/loft-sh/devpod + go-licenses check ./... --ignore github.com/curityio/devpod image: needs: check diff --git a/.github/workflows/go-licenses-check.yaml b/.github/workflows/go-licenses-check.yaml index e82c1745a..35c728f3f 100644 --- a/.github/workflows/go-licenses-check.yaml +++ b/.github/workflows/go-licenses-check.yaml @@ -33,6 +33,6 @@ jobs: - name: Run go-licenses check # go.mod's toolchain directive makes `go` switch to a downloaded toolchain, so point # GOROOT at it; otherwise go-licenses doesn't recognize standard library packages - run: GOROOT="$(go env GOROOT)" go-licenses check ./... --ignore github.com/loft-sh/devpod + run: GOROOT="$(go env GOROOT)" go-licenses check ./... --ignore github.com/curityio/devpod env: GOPRIVATE: "github.com/loft-sh/*" diff --git a/.github/workflows/go-licenses.yaml b/.github/workflows/go-licenses.yaml index bf68c9c0c..ddaf886bb 100644 --- a/.github/workflows/go-licenses.yaml +++ b/.github/workflows/go-licenses.yaml @@ -37,11 +37,7 @@ jobs: - name: Run go-licenses # go.mod's toolchain directive makes `go` switch to a downloaded toolchain, so point # GOROOT at it; otherwise go-licenses doesn't recognize standard library packages - run: GOROOT="$(go env GOROOT)" go-licenses report ./... > docs/pages/licenses/devpod.mdx --template .github/licenses.tmpl --ignore github.com/loft-sh/devpod - - - name: Point license links at this repository - # go-licenses builds the links from the Go module path, which is still github.com/loft-sh/devpod - run: sed -i 's#https://github.com/loft-sh/devpod/blob/HEAD/#https://github.com/curityio/devpod/blob/HEAD/#g' docs/pages/licenses/devpod.mdx + run: GOROOT="$(go env GOROOT)" go-licenses report ./... > docs/pages/licenses/devpod.mdx --template .github/licenses.tmpl --ignore github.com/curityio/devpod - name: Create pull request uses: peter-evans/create-pull-request@v5 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 670b39edb..3aa444042 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -159,13 +159,13 @@ jobs: - name: Build Linux agents shell: bash run: | - LDFLAGS="-s -w -X github.com/loft-sh/devpod/pkg/version.version=v${{ needs.create-release.outputs.original_package_version }} -X github.com/loft-sh/devpod/pkg/devcontainer/crane.craneSigningKey=${{ secrets.CRANE_PRIVATE_KEY }}" ./hack/build-agents.sh + LDFLAGS="-s -w -X github.com/curityio/devpod/pkg/version.version=v${{ needs.create-release.outputs.original_package_version }} -X github.com/curityio/devpod/pkg/devcontainer/crane.craneSigningKey=${{ secrets.CRANE_PRIVATE_KEY }}" ./hack/build-agents.sh - name: Build Sidecar CLI if: matrix.settings.host != 'windows-latest' run: | BIN_NAME=devpod-cli-${{ matrix.settings.target }} - GOOS=${{ matrix.settings.os }} GOARCH=${{ matrix.settings.arch }} CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/loft-sh/devpod/pkg/version.version="v${{ needs.create-release.outputs.original_package_version }}" -X github.com/loft-sh/devpod/pkg/devcontainer/crane.craneSigningKey="${{ secrets.CRANE_PRIVATE_KEY }}"" -o "test/$BIN_NAME" + GOOS=${{ matrix.settings.os }} GOARCH=${{ matrix.settings.arch }} CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/curityio/devpod/pkg/version.version="v${{ needs.create-release.outputs.original_package_version }}" -X github.com/curityio/devpod/pkg/devcontainer/crane.craneSigningKey="${{ secrets.CRANE_PRIVATE_KEY }}"" -o "test/$BIN_NAME" cp "test/$BIN_NAME" "desktop/src-tauri/bin/$BIN_NAME" ls desktop/src-tauri/bin @@ -177,7 +177,7 @@ jobs: set GOARCH=${{ matrix.settings.arch }} set BIN_NAME=devpod-cli-${{ matrix.settings.target }}.exe - go build -ldflags "-s -w -X github.com/loft-sh/devpod/pkg/version.version="v${{ needs.create-release.outputs.original_package_version }}"" -o "test\%BIN_NAME%" + go build -ldflags "-s -w -X github.com/curityio/devpod/pkg/version.version="v${{ needs.create-release.outputs.original_package_version }}"" -o "test\%BIN_NAME%" xcopy /F /Y "test\%BIN_NAME%" desktop\src-tauri\bin\* @@ -423,7 +423,7 @@ jobs: export SHA256=$(sha256sum "${debPath}" | cut -f1 -d ' ') export DESKTOP_SHA256=$(sha256sum "${desktopPath}" | cut -f1 -d ' ') export META_SHA256=$(sha256sum "${metaPath}" | cut -f1 -d ' ') - envsubst < desktop/flatpak/sh.loft.devpod.tmpl > desktop/flatpak/sh.loft.devpod.yaml + envsubst < desktop/flatpak/io.curity.devpod.tmpl > desktop/flatpak/io.curity.devpod.yaml publish-updates: needs: [build-app, create-release] diff --git a/AGENTS.md b/AGENTS.md index 168e5546c..afdf2326b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -61,9 +61,13 @@ cd src-tauri && cargo +stable check - **Pull requests go to `curityio/devpod` `main` only, never upstream.** The `upstream` remote is read-only reference. -- **The Go module path is still `github.com/loft-sh/devpod`.** Imports were deliberately not renamed; don't - "fix" them. Likewise the desktop app identifier `sh.loft.devpod` is kept because it is tied to the `devpod://` - deep link scheme, the Flatpak id and existing installs. +- **The Go module path is `github.com/curityio/devpod`** (renamed from upstream's `github.com/loft-sh/devpod`). +- **The desktop app identifier is `io.curity.devpod`** (upstream's was `sh.loft.devpod`). Tauri names the app's + data directories after it, so `desktop/src-tauri/src/identifier_migration.rs` copies an existing install's + `sh.loft.devpod` directories on first start, and `desktop/src-tauri/windows/installer-hooks.nsh` moves the + Windows installer's registry key from `Software\loft` to `Software\Curity` (the `publisher`). Changing the + identifier or the publisher again needs the same care. It also appears in `custom_protocol.rs`, `Info.plist`, + the Flatpak manifest and `command.ts` (`FLATPAK_ID`). - **Dependencies are vendored.** Builds use `-mod=vendor`. After changing imports or `go.mod`, run `GOFLAGS=-mod=mod go mod tidy && go mod vendor` and commit `vendor/`. - **The agent is embedded in the CLI.** `hack/build-agents.sh` builds the Linux agents (amd64 and arm64, with the @@ -81,12 +85,12 @@ cd src-tauri && cargo +stable check the binary, which also runs as the agent. Use `pkg/kubeclient`, which only registers core/v1 and rbac/v1; add a resource or group there if you need one. `go list -deps . | grep '^k8s.io/client-go/kubernetes'` must print nothing. -- **Don't depend on `github.com/loft-sh` modules** (other than this module's own path). They are no longer +- **Don't depend on `github.com/loft-sh` modules.** They are no longer maintained, and the ones DevPod used now live here: the logger is `pkg/log` (`log.Logger`, `log.Default`, `pkg/log/table`, `pkg/log/survey`), and the SSH server that runs in the container is `pkg/ssh/sshd`, a copy of `gliderlabs/ssh` with unix socket forwarding added. Check that a new dependency is maintained before adding it. -- **`dockerless/` is a separate Go module** (`github.com/loft-sh/devpod/dockerless`), with its own `go.mod`, no +- **`dockerless/` is a separate Go module** (`github.com/curityio/devpod/dockerless`), with its own `go.mod`, no `vendor/`, a newer Go and golangci-lint v2 (its `.golangci.yaml`). Commands run at the root don't see it: run them in `dockerless/`, with `GOOS=linux`. Its image is published from a `dockerless-v` tag; DevPod pins the version in `pkg/devcontainer/single.go`, so a change to `dockerless/` needs a new tag and that pin bumped. diff --git a/CHANGELOG.md b/CHANGELOG.md index a3ca5d5bd..c6d8d0bcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,18 @@ Add new entries to the top of the "Unreleased" section. navy. In dark mode the background is Curity's navy with a purple glow, and cards are translucent purple panels. The Curity logo is white in dark mode. +- The Go module path is `github.com/curityio/devpod` instead of `github.com/loft-sh/devpod` (and + `github.com/curityio/devpod/dockerless` for `dockerless/`), so stack traces and `-ldflags -X` settings, such as + `github.com/curityio/devpod/pkg/version.version`, use the new path. +- The desktop app's identifier is `io.curity.devpod` instead of `sh.loft.devpod` (and the Flatpak id), and its + Windows publisher is Curity. On first start, it copies its settings, providers, logs, CLI shims and webview + storage from the old `sh.loft.devpod` directories, which are kept so that a `PATH` pointing at the old CLI + shims on Windows still works. The Windows installer finds an installation made with the old identifier. +- A provider given by its name alone (`devpod provider add `) is downloaded from GitHub's + `curityio/devpod-provider-` instead of `loft-sh/devpod-provider-`, except for the providers that + only exist under `loft-sh` so far: `aws`, `azure`, `civo`, `digitalocean`, `dockerless`, `ecs`, `gcloud`, + `kubernetes`, `ssh` and `terraform`. `devpod provider list-available` lists those and the `devpod-provider-*` + repositories of `curityio` (it used to list only the first 30 repositories of `loft-sh`). ## v0.9.0 (2026-10-23) diff --git a/TODO.md b/TODO.md index 5cfd5b4d2..016261f09 100644 --- a/TODO.md +++ b/TODO.md @@ -10,14 +10,24 @@ The built-in and documented providers still live under the `loft-sh` GitHub orga - [ ] `devpod-provider-azure` - [ ] `devpod-provider-civo` - [ ] `devpod-provider-digitalocean` +- [ ] `devpod-provider-dockerless` +- [ ] `devpod-provider-ecs` - [ ] `devpod-provider-gcloud` - [ ] `devpod-provider-kubernetes` - [ ] `devpod-provider-ssh` +- [ ] `devpod-provider-terraform` For each provider we keep: fork it to `curityio`, then update its references in this repository (provider sources, `providers/*/provider.yaml`, docs, desktop app and e2e tests). Providers we don't keep should be removed from the code and docs. +A provider given by its name alone (`devpod provider add aws`) is downloaded from +`curityio/devpod-provider-`, except for the names in `LoftProviders` (`pkg/workspace/provider.go`), which +are still downloaded from `loft-sh`. Remove each provider from that list as it's migrated, and remove the list +(and the note about it in `docs/pages/managing-providers/add-provider.mdx`) once it's empty. Providers added +before they were migrated keep their `loft-sh` repository as their source, so `devpod provider update` keeps +downloading them from there until they are added again. + ## Fix links to content that only exists upstream These links still point to `loft-sh/devpod` because the issues and releases they reference don't exist diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go index 650157dcd..7ee112252 100644 --- a/cmd/agent/agent.go +++ b/cmd/agent/agent.go @@ -3,13 +3,13 @@ package agent import ( "os" - "github.com/loft-sh/devpod/cmd/agent/container" - "github.com/loft-sh/devpod/cmd/agent/workspace" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/envfile" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/agent/container" + "github.com/curityio/devpod/cmd/agent/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/envfile" + "github.com/curityio/devpod/pkg/log" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/agent/container/container.go b/cmd/agent/container/container.go index 1ea5515ab..290e7ce5e 100644 --- a/cmd/agent/container/container.go +++ b/cmd/agent/container/container.go @@ -1,7 +1,7 @@ package container import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/agent/container/credentials_server.go b/cmd/agent/container/credentials_server.go index 9ac0db9b1..d44b999c5 100644 --- a/cmd/agent/container/credentials_server.go +++ b/cmd/agent/container/credentials_server.go @@ -9,16 +9,16 @@ import ( "os" "strconv" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - "github.com/loft-sh/devpod/pkg/credentials" - "github.com/loft-sh/devpod/pkg/dockercredentials" - "github.com/loft-sh/devpod/pkg/gitcredentials" - "github.com/loft-sh/devpod/pkg/gitsshsigning" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/netstat" - portpkg "github.com/loft-sh/devpod/pkg/port" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + "github.com/curityio/devpod/pkg/credentials" + "github.com/curityio/devpod/pkg/dockercredentials" + "github.com/curityio/devpod/pkg/gitcredentials" + "github.com/curityio/devpod/pkg/gitsshsigning" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/netstat" + portpkg "github.com/curityio/devpod/pkg/port" "github.com/spf13/cobra" ) diff --git a/cmd/agent/container/daemon.go b/cmd/agent/container/daemon.go index ea861bba3..007fc9fa5 100644 --- a/cmd/agent/container/daemon.go +++ b/cmd/agent/container/daemon.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/loft-sh/devpod/pkg/agent" - agentd "github.com/loft-sh/devpod/pkg/daemon/agent" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/agent" + agentd "github.com/curityio/devpod/pkg/daemon/agent" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/agent/container/openvscode_async.go b/cmd/agent/container/openvscode_async.go index 2327c552e..71ff64a93 100644 --- a/cmd/agent/container/openvscode_async.go +++ b/cmd/agent/container/openvscode_async.go @@ -3,11 +3,11 @@ package container import ( "encoding/json" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/compress" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/ide/openvscode" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/compress" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/ide/openvscode" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/container/setup.go b/cmd/agent/container/setup.go index e7228a59c..846ae76ba 100644 --- a/cmd/agent/container/setup.go +++ b/cmd/agent/container/setup.go @@ -13,31 +13,31 @@ import ( "strconv" "strings" + "github.com/curityio/devpod/cmd/flags" v1 "github.com/google/go-containerregistry/pkg/v1" - "github.com/loft-sh/devpod/cmd/flags" - - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/compress" - config2 "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/credentials" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/setup" - "github.com/loft-sh/devpod/pkg/dockercredentials" - "github.com/loft-sh/devpod/pkg/envfile" - "github.com/loft-sh/devpod/pkg/extract" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/ide/jetbrains" - "github.com/loft-sh/devpod/pkg/ide/jupyter" - "github.com/loft-sh/devpod/pkg/ide/openvscode" - "github.com/loft-sh/devpod/pkg/ide/rstudio" - "github.com/loft-sh/devpod/pkg/ide/vscode" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/single" + + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/compress" + config2 "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/credentials" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/setup" + "github.com/curityio/devpod/pkg/dockercredentials" + "github.com/curityio/devpod/pkg/envfile" + "github.com/curityio/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/ide/jetbrains" + "github.com/curityio/devpod/pkg/ide/jupyter" + "github.com/curityio/devpod/pkg/ide/openvscode" + "github.com/curityio/devpod/pkg/ide/rstudio" + "github.com/curityio/devpod/pkg/ide/vscode" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/single" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/agent/container/setup_windows.go b/cmd/agent/container/setup_windows.go index a69da0173..00920d399 100644 --- a/cmd/agent/container/setup_windows.go +++ b/cmd/agent/container/setup_windows.go @@ -3,7 +3,7 @@ package container import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/agent/container/vscode_async.go b/cmd/agent/container/vscode_async.go index f4ac271b2..ef8c37a88 100644 --- a/cmd/agent/container/vscode_async.go +++ b/cmd/agent/container/vscode_async.go @@ -3,11 +3,11 @@ package container import ( "encoding/json" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/compress" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/ide/vscode" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/compress" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/ide/vscode" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/agent/container_tunnel.go b/cmd/agent/container_tunnel.go index 34efd2a39..d5f0eb173 100644 --- a/cmd/agent/container_tunnel.go +++ b/cmd/agent/container_tunnel.go @@ -8,15 +8,15 @@ import ( "os/signal" "syscall" - "github.com/loft-sh/devpod/cmd/agent/workspace" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/devcontainer" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/setup" - "github.com/loft-sh/devpod/pkg/encoding" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/agent/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/devcontainer" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/setup" + "github.com/curityio/devpod/pkg/encoding" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/spf13/cobra" ) diff --git a/cmd/agent/daemon.go b/cmd/agent/daemon.go index 0c3e2c57d..feb9a4ce3 100644 --- a/cmd/agent/daemon.go +++ b/cmd/agent/daemon.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/driver/custom" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/driver/custom" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/agent/docker_credentials.go b/cmd/agent/docker_credentials.go index 9d0fee5e1..31291c149 100644 --- a/cmd/agent/docker_credentials.go +++ b/cmd/agent/docker_credentials.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/dockercredentials" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/dockercredentials" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/git_credentials.go b/cmd/agent/git_credentials.go index 526543a8b..5238ea266 100644 --- a/cmd/agent/git_credentials.go +++ b/cmd/agent/git_credentials.go @@ -10,10 +10,10 @@ import ( "os" "strconv" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/gitcredentials" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/gitcredentials" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/git_ssh_signature.go b/cmd/agent/git_ssh_signature.go index 265a82c8c..d9624cead 100644 --- a/cmd/agent/git_ssh_signature.go +++ b/cmd/agent/git_ssh_signature.go @@ -3,9 +3,9 @@ package agent import ( "errors" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/gitsshsigning" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/gitsshsigning" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/git_ssh_signature_helper.go b/cmd/agent/git_ssh_signature_helper.go index 0881549f4..4adb4f26c 100644 --- a/cmd/agent/git_ssh_signature_helper.go +++ b/cmd/agent/git_ssh_signature_helper.go @@ -4,9 +4,9 @@ import ( "fmt" "os/user" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/gitsshsigning" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/gitsshsigning" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/build.go b/cmd/agent/workspace/build.go index c1e23011c..d93e68b27 100644 --- a/cmd/agent/workspace/build.go +++ b/cmd/agent/workspace/build.go @@ -4,10 +4,10 @@ import ( "context" "os" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/delete.go b/cmd/agent/workspace/delete.go index bd061ce0d..0d21bee8d 100644 --- a/cmd/agent/workspace/delete.go +++ b/cmd/agent/workspace/delete.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - agentdaemon "github.com/loft-sh/devpod/pkg/daemon/agent" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + agentdaemon "github.com/curityio/devpod/pkg/daemon/agent" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/install_dotfiles.go b/cmd/agent/workspace/install_dotfiles.go index 0e19e8def..b1dde0915 100644 --- a/cmd/agent/workspace/install_dotfiles.go +++ b/cmd/agent/workspace/install_dotfiles.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/agent/workspace/logs.go b/cmd/agent/workspace/logs.go index 5c7f56671..4ddce8b51 100644 --- a/cmd/agent/workspace/logs.go +++ b/cmd/agent/workspace/logs.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/devcontainer" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/devcontainer" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/logs_daemon.go b/cmd/agent/workspace/logs_daemon.go index 2731906ad..d3e4ea3a1 100644 --- a/cmd/agent/workspace/logs_daemon.go +++ b/cmd/agent/workspace/logs_daemon.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/setup_gpg.go b/cmd/agent/workspace/setup_gpg.go index 8672798fa..80d3f4fe4 100644 --- a/cmd/agent/workspace/setup_gpg.go +++ b/cmd/agent/workspace/setup_gpg.go @@ -5,11 +5,11 @@ import ( "encoding/base64" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/credentials" - "github.com/loft-sh/devpod/pkg/gitcredentials" - "github.com/loft-sh/devpod/pkg/gpg" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/credentials" + "github.com/curityio/devpod/pkg/gitcredentials" + "github.com/curityio/devpod/pkg/gpg" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/status.go b/cmd/agent/workspace/status.go index fe4a148d4..e6311c055 100644 --- a/cmd/agent/workspace/status.go +++ b/cmd/agent/workspace/status.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/stop.go b/cmd/agent/workspace/stop.go index 75a47dd34..fc118eff2 100644 --- a/cmd/agent/workspace/stop.go +++ b/cmd/agent/workspace/stop.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/up.go b/cmd/agent/workspace/up.go index 0041561aa..e983541cf 100644 --- a/cmd/agent/workspace/up.go +++ b/cmd/agent/workspace/up.go @@ -9,23 +9,23 @@ import ( "path/filepath" "strconv" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - "github.com/loft-sh/devpod/pkg/binaries" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/credentials" - agentdaemon "github.com/loft-sh/devpod/pkg/daemon/agent" - "github.com/loft-sh/devpod/pkg/devcontainer" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/dockercredentials" - "github.com/loft-sh/devpod/pkg/extract" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/util" - "github.com/loft-sh/devpod/scripts" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + "github.com/curityio/devpod/pkg/binaries" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/credentials" + agentdaemon "github.com/curityio/devpod/pkg/daemon/agent" + "github.com/curityio/devpod/pkg/devcontainer" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/dockercredentials" + "github.com/curityio/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/util" + "github.com/curityio/devpod/scripts" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/agent/workspace/update_config.go b/cmd/agent/workspace/update_config.go index aea86f8b6..43b286cdd 100644 --- a/cmd/agent/workspace/update_config.go +++ b/cmd/agent/workspace/update_config.go @@ -3,9 +3,9 @@ package workspace import ( "context" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/agent/workspace/workspace.go b/cmd/agent/workspace/workspace.go index 4bd9bd402..51843cc15 100644 --- a/cmd/agent/workspace/workspace.go +++ b/cmd/agent/workspace/workspace.go @@ -1,7 +1,7 @@ package workspace import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/build.go b/cmd/build.go index 9c9dace35..756ba144f 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -6,16 +6,16 @@ import ( "io" "os" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/image" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/image" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/completion/suggestions.go b/cmd/completion/suggestions.go index 0b961b2bb..347e63c9d 100644 --- a/cmd/completion/suggestions.go +++ b/cmd/completion/suggestions.go @@ -5,10 +5,10 @@ import ( "github.com/spf13/cobra" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" ) func RegisterFlagCompletionFuns(rootCmd *cobra.Command, globalFlags *flags.GlobalFlags) error { diff --git a/cmd/context/context.go b/cmd/context/context.go index 2eea85f56..4012caeb0 100644 --- a/cmd/context/context.go +++ b/cmd/context/context.go @@ -1,7 +1,7 @@ package context import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/context/create.go b/cmd/context/create.go index 0eac84887..5f8863a71 100644 --- a/cmd/context/create.go +++ b/cmd/context/create.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/context/delete.go b/cmd/context/delete.go index 07f6196ba..128353293 100644 --- a/cmd/context/delete.go +++ b/cmd/context/delete.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/context/list.go b/cmd/context/list.go index ecd78985f..48bf83c3b 100644 --- a/cmd/context/list.go +++ b/cmd/context/list.go @@ -7,10 +7,10 @@ import ( "sort" "strconv" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" "github.com/spf13/cobra" ) diff --git a/cmd/context/options.go b/cmd/context/options.go index 70df2fc2a..aed26c3a5 100644 --- a/cmd/context/options.go +++ b/cmd/context/options.go @@ -6,10 +6,10 @@ import ( "fmt" "sort" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" "github.com/spf13/cobra" ) diff --git a/cmd/context/set_options.go b/cmd/context/set_options.go index 2e90fd519..7ed5d5619 100644 --- a/cmd/context/set_options.go +++ b/cmd/context/set_options.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/context/use.go b/cmd/context/use.go index 959cfd83e..ba8364646 100644 --- a/cmd/context/use.go +++ b/cmd/context/use.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/delete.go b/cmd/delete.go index 07e47568a..1b3731514 100644 --- a/cmd/delete.go +++ b/cmd/delete.go @@ -3,12 +3,12 @@ package cmd import ( "context" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/export.go b/cmd/export.go index ea5a25918..701b91bdf 100644 --- a/cmd/export.go +++ b/cmd/export.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/helper/check_provider_update.go b/cmd/helper/check_provider_update.go index 49af53bcf..30243df73 100644 --- a/cmd/helper/check_provider_update.go +++ b/cmd/helper/check_provider_update.go @@ -8,11 +8,11 @@ import ( "strings" "github.com/blang/semver" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/helper/docker_credentials.go b/cmd/helper/docker_credentials.go index 30417dc1b..e32741a72 100644 --- a/cmd/helper/docker_credentials.go +++ b/cmd/helper/docker_credentials.go @@ -4,10 +4,10 @@ import ( "fmt" "os/user" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/credentials" - "github.com/loft-sh/devpod/pkg/dockercredentials" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/credentials" + "github.com/curityio/devpod/pkg/dockercredentials" + "github.com/curityio/devpod/pkg/log" "github.com/spf13/cobra" ) diff --git a/cmd/helper/get_image.go b/cmd/helper/get_image.go index 099aa4360..6254df782 100644 --- a/cmd/helper/get_image.go +++ b/cmd/helper/get_image.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/image" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/image" "github.com/spf13/cobra" ) diff --git a/cmd/helper/get_provider_name.go b/cmd/helper/get_provider_name.go index 46e582485..fd64db5d0 100644 --- a/cmd/helper/get_provider_name.go +++ b/cmd/helper/get_provider_name.go @@ -5,10 +5,10 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/helper/get_workspace_config.go b/cmd/helper/get_workspace_config.go index 5326127d4..e49194947 100644 --- a/cmd/helper/get_workspace_config.go +++ b/cmd/helper/get_workspace_config.go @@ -7,10 +7,10 @@ import ( "os" "time" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/devcontainer" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/devcontainer" + "github.com/curityio/devpod/pkg/log" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/helper/get_workspace_name.go b/cmd/helper/get_workspace_name.go index bd1bd51d3..d04ac073d 100644 --- a/cmd/helper/get_workspace_name.go +++ b/cmd/helper/get_workspace_name.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/helper/get_workspace_uid.go b/cmd/helper/get_workspace_uid.go index e3a8f09ca..7a2ba0483 100644 --- a/cmd/helper/get_workspace_uid.go +++ b/cmd/helper/get_workspace_uid.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/encoding" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/encoding" "github.com/spf13/cobra" ) diff --git a/cmd/helper/helper.go b/cmd/helper/helper.go index a56fcf50f..89a290732 100644 --- a/cmd/helper/helper.go +++ b/cmd/helper/helper.go @@ -1,11 +1,11 @@ package helper import ( - "github.com/loft-sh/devpod/cmd/agent" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/cmd/helper/http" - "github.com/loft-sh/devpod/cmd/helper/json" - "github.com/loft-sh/devpod/cmd/helper/strings" + "github.com/curityio/devpod/cmd/agent" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/helper/http" + "github.com/curityio/devpod/cmd/helper/json" + "github.com/curityio/devpod/cmd/helper/strings" "github.com/spf13/cobra" ) diff --git a/cmd/helper/http/http.go b/cmd/helper/http/http.go index 37bec2e13..ed91543d0 100644 --- a/cmd/helper/http/http.go +++ b/cmd/helper/http/http.go @@ -1,7 +1,7 @@ package http import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/helper/http/request.go b/cmd/helper/http/request.go index b44996929..02df7e82b 100644 --- a/cmd/helper/http/request.go +++ b/cmd/helper/http/request.go @@ -8,7 +8,7 @@ import ( "os" "strings" - devpodhttp "github.com/loft-sh/devpod/pkg/http" + devpodhttp "github.com/curityio/devpod/pkg/http" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/helper/json/json.go b/cmd/helper/json/json.go index 7954ec3bf..1e9711bcd 100644 --- a/cmd/helper/json/json.go +++ b/cmd/helper/json/json.go @@ -1,7 +1,7 @@ package json import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/helper/sh.go b/cmd/helper/sh.go index f43e49791..807be0e21 100644 --- a/cmd/helper/sh.go +++ b/cmd/helper/sh.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/pkg/shell" + "github.com/curityio/devpod/pkg/shell" "github.com/spf13/cobra" ) diff --git a/cmd/helper/ssh_client.go b/cmd/helper/ssh_client.go index 7ada7efdc..5f8528bb4 100644 --- a/cmd/helper/ssh_client.go +++ b/cmd/helper/ssh_client.go @@ -4,7 +4,7 @@ import ( "context" "os" - command2 "github.com/loft-sh/devpod/pkg/command" + command2 "github.com/curityio/devpod/pkg/command" "github.com/pkg/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh" diff --git a/cmd/helper/ssh_server.go b/cmd/helper/ssh_server.go index a1d3a8866..6a34a96dc 100644 --- a/cmd/helper/ssh_server.go +++ b/cmd/helper/ssh_server.go @@ -6,14 +6,14 @@ import ( "os" "time" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/log" - helperssh "github.com/loft-sh/devpod/pkg/ssh/server" - "github.com/loft-sh/devpod/pkg/ssh/server/port" - "github.com/loft-sh/devpod/pkg/ssh/sshd" - "github.com/loft-sh/devpod/pkg/stdio" - "github.com/loft-sh/devpod/pkg/token" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/log" + helperssh "github.com/curityio/devpod/pkg/ssh/server" + "github.com/curityio/devpod/pkg/ssh/server/port" + "github.com/curityio/devpod/pkg/ssh/sshd" + "github.com/curityio/devpod/pkg/stdio" + "github.com/curityio/devpod/pkg/token" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/helper/strings/strings.go b/cmd/helper/strings/strings.go index 0e1e2f01e..35fcd6768 100644 --- a/cmd/helper/strings/strings.go +++ b/cmd/helper/strings/strings.go @@ -1,7 +1,7 @@ package strings import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/ide/ide.go b/cmd/ide/ide.go index 09a7f0d47..ed814d122 100644 --- a/cmd/ide/ide.go +++ b/cmd/ide/ide.go @@ -1,7 +1,7 @@ package ide import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/ide/list.go b/cmd/ide/list.go index 3e614347b..e6c35abad 100644 --- a/cmd/ide/list.go +++ b/cmd/ide/list.go @@ -7,11 +7,11 @@ import ( "sort" "strconv" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide/ideparse" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide/ideparse" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" "github.com/spf13/cobra" ) diff --git a/cmd/ide/options.go b/cmd/ide/options.go index 37b51f2ad..f4a765189 100644 --- a/cmd/ide/options.go +++ b/cmd/ide/options.go @@ -6,12 +6,12 @@ import ( "fmt" "sort" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/ide/ideparse" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/ide/ideparse" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" "github.com/spf13/cobra" ) diff --git a/cmd/ide/set_options.go b/cmd/ide/set_options.go index 3cf02de19..90749f043 100644 --- a/cmd/ide/set_options.go +++ b/cmd/ide/set_options.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide/ideparse" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide/ideparse" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/ide/use.go b/cmd/ide/use.go index d56310ab0..f25d70e8d 100644 --- a/cmd/ide/use.go +++ b/cmd/ide/use.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/ide/ideparse" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/ide/ideparse" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/import.go b/cmd/import.go index 2fb3d1a5d..f5da2b368 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -8,12 +8,12 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/extract" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/list.go b/cmd/list.go index 4effff657..930d15ce9 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/logs.go b/cmd/logs.go index 464616860..d7ad57ffa 100644 --- a/cmd/logs.go +++ b/cmd/logs.go @@ -6,14 +6,14 @@ import ( "io" "os" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - clientpkg "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/ssh" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + clientpkg "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/workspace" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/logs_daemon.go b/cmd/logs_daemon.go index eaef5ee53..c2dbd1c31 100644 --- a/cmd/logs_daemon.go +++ b/cmd/logs_daemon.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/machine/create.go b/cmd/machine/create.go index 87f1f1d90..32c8f97e9 100644 --- a/cmd/machine/create.go +++ b/cmd/machine/create.go @@ -3,11 +3,11 @@ package machine import ( "context" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/machine/delete.go b/cmd/machine/delete.go index 9d103833d..c2bb6bac2 100644 --- a/cmd/machine/delete.go +++ b/cmd/machine/delete.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/machine/inspect.go b/cmd/machine/inspect.go index d5f5fb03b..4dad6666b 100644 --- a/cmd/machine/inspect.go +++ b/cmd/machine/inspect.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/machine/list.go b/cmd/machine/list.go index 47b53e4e3..23aa4c173 100644 --- a/cmd/machine/list.go +++ b/cmd/machine/list.go @@ -8,11 +8,11 @@ import ( "sort" "time" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" + "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/machine/machine.go b/cmd/machine/machine.go index a83950c51..df57d67af 100644 --- a/cmd/machine/machine.go +++ b/cmd/machine/machine.go @@ -1,7 +1,7 @@ package machine import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/machine/ssh.go b/cmd/machine/ssh.go index 5851197a8..d203662e5 100644 --- a/cmd/machine/ssh.go +++ b/cmd/machine/ssh.go @@ -6,14 +6,14 @@ import ( "io" "os" - "github.com/loft-sh/devpod/cmd/flags" - devagent "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - devssh "github.com/loft-sh/devpod/pkg/ssh" - devsshagent "github.com/loft-sh/devpod/pkg/ssh/agent" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + devagent "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + devssh "github.com/curityio/devpod/pkg/ssh" + devsshagent "github.com/curityio/devpod/pkg/ssh/agent" + "github.com/curityio/devpod/pkg/workspace" "github.com/mattn/go-isatty" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/cmd/machine/start.go b/cmd/machine/start.go index f208d6171..a9728021e 100644 --- a/cmd/machine/start.go +++ b/cmd/machine/start.go @@ -3,11 +3,11 @@ package machine import ( "context" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/machine/status.go b/cmd/machine/status.go index 914afd60f..e961deb89 100644 --- a/cmd/machine/status.go +++ b/cmd/machine/status.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/machine/stop.go b/cmd/machine/stop.go index f26388794..a6e8fb737 100644 --- a/cmd/machine/stop.go +++ b/cmd/machine/stop.go @@ -3,11 +3,11 @@ package machine import ( "context" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/provider/add.go b/cmd/provider/add.go index b6011bf1b..7f7c0cc23 100644 --- a/cmd/provider/add.go +++ b/cmd/provider/add.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" + "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/provider/add_test.go b/cmd/provider/add_test.go index bf1745836..7f280a045 100644 --- a/cmd/provider/add_test.go +++ b/cmd/provider/add_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" "gotest.tools/assert" ) diff --git a/cmd/provider/delete.go b/cmd/provider/delete.go index da9b277b1..63b06e44d 100644 --- a/cmd/provider/delete.go +++ b/cmd/provider/delete.go @@ -5,12 +5,12 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - logpkg "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + logpkg "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/provider/list-default-providers.go b/cmd/provider/list-default-providers.go index c9eda48f2..6bb7a5224 100644 --- a/cmd/provider/list-default-providers.go +++ b/cmd/provider/list-default-providers.go @@ -6,20 +6,35 @@ import ( "fmt" "io" "net/http" + "slices" "strings" - "github.com/loft-sh/devpod/cmd/flags" - devpodhttp "github.com/loft-sh/devpod/pkg/http" + "github.com/curityio/devpod/cmd/flags" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) +const providerRepoPrefix = "devpod-provider-" + // ListAvailableCmd holds the list cmd flags type ListAvailableCmd struct { flags.GlobalFlags } +type repoSearchResult struct { + Items []struct { + Name string `json:"name"` + } `json:"items"` +} + func getDevpodProviderList() error { - req, err := http.NewRequest("GET", "https://api.github.com/users/loft-sh/repos", nil) + url := fmt.Sprintf( + "https://api.github.com/search/repositories?q=%s+in:name+org:%s&per_page=100", + providerRepoPrefix, + workspace.GithubProviderOwner, + ) + req, err := http.NewRequest("GET", url, nil) if err != nil { return err } @@ -33,24 +48,41 @@ func getDevpodProviderList() error { if err != nil { return err } + if resp.StatusCode != http.StatusOK { + return fmt.Errorf("list provider repositories: %s: %s", resp.Status, strings.TrimSpace(string(result))) + } - var jsonResult []map[string]interface{} - err = json.Unmarshal(result, &jsonResult) + var searchResult repoSearchResult + err = json.Unmarshal(result, &searchResult) if err != nil { return err } + repoNames := make([]string, 0, len(searchResult.Items)) + for _, item := range searchResult.Items { + repoNames = append(repoNames, item.Name) + } - fmt.Println("List of available providers from loft:") - for _, v := range jsonResult { - if strings.Contains(v["name"].(string), "devpod-provider") { - name := strings.TrimPrefix(v["name"].(string), "devpod-provider-") - fmt.Println("\t", name) - } + fmt.Println("List of available providers:") + for _, name := range availableProviders(repoNames) { + fmt.Println("\t", name) } return nil } +// availableProviders returns the sorted names of the providers in the given repositories and of the +// providers that are still downloaded from loft-sh. +func availableProviders(repoNames []string) []string { + names := slices.Clone(workspace.LoftProviders) + for _, repoName := range repoNames { + if name, ok := strings.CutPrefix(repoName, providerRepoPrefix); ok && name != "" { + names = append(names, name) + } + } + slices.Sort(names) + return slices.Compact(names) +} + // NewListAvailableCmd creates a new command func NewListAvailableCmd(flags *flags.GlobalFlags) *cobra.Command { cmd := &ListAvailableCmd{ diff --git a/cmd/provider/list-default-providers_test.go b/cmd/provider/list-default-providers_test.go new file mode 100644 index 000000000..9bddab914 --- /dev/null +++ b/cmd/provider/list-default-providers_test.go @@ -0,0 +1,26 @@ +package provider + +import ( + "slices" + "testing" +) + +func TestAvailableProviders(t *testing.T) { + got := availableProviders([]string{"devpod-provider-hetzner", "devpod-provider-aws", "devpod", "devpod-provider-"}) + want := []string{ + "aws", + "azure", + "civo", + "digitalocean", + "dockerless", + "ecs", + "gcloud", + "hetzner", + "kubernetes", + "ssh", + "terraform", + } + if !slices.Equal(got, want) { + t.Errorf("availableProviders() = %v, want %v", got, want) + } +} diff --git a/cmd/provider/list.go b/cmd/provider/list.go index 303e2148e..6a9613362 100644 --- a/cmd/provider/list.go +++ b/cmd/provider/list.go @@ -7,12 +7,12 @@ import ( "sort" "strconv" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" - "github.com/loft-sh/devpod/pkg/types" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" + "github.com/curityio/devpod/pkg/types" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/provider/options.go b/cmd/provider/options.go index f7e67bb24..c0a380681 100644 --- a/cmd/provider/options.go +++ b/cmd/provider/options.go @@ -7,13 +7,13 @@ import ( "sort" "strconv" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" - "github.com/loft-sh/devpod/pkg/types" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" + "github.com/curityio/devpod/pkg/types" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/provider/provider.go b/cmd/provider/provider.go index 91b59c00a..9685ebaf8 100644 --- a/cmd/provider/provider.go +++ b/cmd/provider/provider.go @@ -1,7 +1,7 @@ package provider import ( - "github.com/loft-sh/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/flags" "github.com/spf13/cobra" ) diff --git a/cmd/provider/set_options.go b/cmd/provider/set_options.go index bcda53fcb..8ab9331d7 100644 --- a/cmd/provider/set_options.go +++ b/cmd/provider/set_options.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/provider/update.go b/cmd/provider/update.go index d655772d1..7a1c23a75 100644 --- a/cmd/provider/update.go +++ b/cmd/provider/update.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -46,7 +46,7 @@ func NewUpdateCmd(flags *flags.GlobalFlags) *cobra.Command { func (cmd *UpdateCmd) Run(ctx context.Context, devPodConfig *config.Config, args []string) error { if len(args) != 1 && len(args) != 2 { - return fmt.Errorf("please specify either a local file, url or git repository. E.g. devpod provider update my-provider loft-sh/devpod-provider-gcloud") + return fmt.Errorf("please specify either a local file, url or git repository. E.g. devpod provider update my-provider gcloud") } providerSource := "" diff --git a/cmd/provider/use.go b/cmd/provider/use.go index 74915c90c..52a19b43d 100644 --- a/cmd/provider/use.go +++ b/cmd/provider/use.go @@ -5,14 +5,14 @@ import ( "fmt" "io" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - options2 "github.com/loft-sh/devpod/pkg/options" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + options2 "github.com/curityio/devpod/pkg/options" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/root.go b/cmd/root.go index 8b6ee1fd4..5d8800ebf 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -5,20 +5,20 @@ import ( "os" "os/exec" - "github.com/loft-sh/devpod/cmd/agent" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/context" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/cmd/helper" - "github.com/loft-sh/devpod/cmd/ide" - "github.com/loft-sh/devpod/cmd/machine" - "github.com/loft-sh/devpod/cmd/provider" - "github.com/loft-sh/devpod/cmd/use" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/config" - log2 "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/terminal" - "github.com/loft-sh/devpod/pkg/telemetry" + "github.com/curityio/devpod/cmd/agent" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/context" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/helper" + "github.com/curityio/devpod/cmd/ide" + "github.com/curityio/devpod/cmd/machine" + "github.com/curityio/devpod/cmd/provider" + "github.com/curityio/devpod/cmd/use" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/config" + log2 "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/terminal" + "github.com/curityio/devpod/pkg/telemetry" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "golang.org/x/crypto/ssh" diff --git a/cmd/ssh.go b/cmd/ssh.go index 816f7b48e..d3f4eba2c 100644 --- a/cmd/ssh.go +++ b/cmd/ssh.go @@ -11,19 +11,19 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/cmd/machine" - "github.com/loft-sh/devpod/pkg/agent" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/gpg" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/port" - "github.com/loft-sh/devpod/pkg/provider" - devssh "github.com/loft-sh/devpod/pkg/ssh" - "github.com/loft-sh/devpod/pkg/tunnel" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/machine" + "github.com/curityio/devpod/pkg/agent" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/gpg" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/port" + "github.com/curityio/devpod/pkg/provider" + devssh "github.com/curityio/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/tunnel" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/status.go b/cmd/status.go index a3075b06f..98e21c20e 100644 --- a/cmd/status.go +++ b/cmd/status.go @@ -7,13 +7,13 @@ import ( "sync" "time" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/table" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/table" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/status_test.go b/cmd/status_test.go index c0700e785..c05a75df4 100644 --- a/cmd/status_test.go +++ b/cmd/status_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/sirupsen/logrus" "gotest.tools/assert" ) diff --git a/cmd/stop.go b/cmd/stop.go index fef53d8d8..d1a6c5367 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/troubleshoot.go b/cmd/troubleshoot.go index 3f21cbb5d..57ce593df 100644 --- a/cmd/troubleshoot.go +++ b/cmd/troubleshoot.go @@ -5,15 +5,15 @@ import ( "encoding/json" "fmt" - "github.com/loft-sh/devpod/cmd/completion" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/cmd/provider" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - pkgprovider "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/version" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/completion" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/provider" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + pkgprovider "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/version" + "github.com/curityio/devpod/pkg/workspace" "github.com/spf13/cobra" ) diff --git a/cmd/up.go b/cmd/up.go index 3f0a3695c..6b298e2f8 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -14,29 +14,29 @@ import ( "strings" "syscall" - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/sshtunnel" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/ide/jetbrains" - "github.com/loft-sh/devpod/pkg/ide/jupyter" - "github.com/loft-sh/devpod/pkg/ide/openvscode" - "github.com/loft-sh/devpod/pkg/ide/rstudio" - "github.com/loft-sh/devpod/pkg/ide/vscode" - "github.com/loft-sh/devpod/pkg/ide/zed" - "github.com/loft-sh/devpod/pkg/log" - open2 "github.com/loft-sh/devpod/pkg/open" - "github.com/loft-sh/devpod/pkg/port" - provider2 "github.com/loft-sh/devpod/pkg/provider" - devssh "github.com/loft-sh/devpod/pkg/ssh" - "github.com/loft-sh/devpod/pkg/telemetry" - "github.com/loft-sh/devpod/pkg/tunnel" - "github.com/loft-sh/devpod/pkg/util" - workspace2 "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/sshtunnel" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/ide/jetbrains" + "github.com/curityio/devpod/pkg/ide/jupyter" + "github.com/curityio/devpod/pkg/ide/openvscode" + "github.com/curityio/devpod/pkg/ide/rstudio" + "github.com/curityio/devpod/pkg/ide/vscode" + "github.com/curityio/devpod/pkg/ide/zed" + "github.com/curityio/devpod/pkg/log" + open2 "github.com/curityio/devpod/pkg/open" + "github.com/curityio/devpod/pkg/port" + provider2 "github.com/curityio/devpod/pkg/provider" + devssh "github.com/curityio/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/telemetry" + "github.com/curityio/devpod/pkg/tunnel" + "github.com/curityio/devpod/pkg/util" + workspace2 "github.com/curityio/devpod/pkg/workspace" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/upgrade.go b/cmd/upgrade.go index c139ef16e..d7ed0d299 100644 --- a/cmd/upgrade.go +++ b/cmd/upgrade.go @@ -5,8 +5,8 @@ import ( "os/signal" "syscall" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/upgrade" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/upgrade" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/use/use.go b/cmd/use/use.go index a5bae9ee5..e5714a467 100644 --- a/cmd/use/use.go +++ b/cmd/use/use.go @@ -1,9 +1,9 @@ package use import ( - "github.com/loft-sh/devpod/cmd/flags" - "github.com/loft-sh/devpod/cmd/ide" - "github.com/loft-sh/devpod/cmd/provider" + "github.com/curityio/devpod/cmd/flags" + "github.com/curityio/devpod/cmd/ide" + "github.com/curityio/devpod/cmd/provider" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index a90fb3581..8ff08047b 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/loft-sh/devpod/pkg/version" + "github.com/curityio/devpod/pkg/version" "github.com/spf13/cobra" ) diff --git a/desktop/flatpak/DevPod.metainfo.xml b/desktop/flatpak/DevPod.metainfo.xml index 78e77b032..3240f1f6d 100644 --- a/desktop/flatpak/DevPod.metainfo.xml +++ b/desktop/flatpak/DevPod.metainfo.xml @@ -1,10 +1,10 @@ - sh.loft.devpod + io.curity.devpod Devpod Codespaces but open-source, client-only and unopinionated: Works with any IDE and lets you use any cloud, kubernetes or just localhost docker. - Loft Labs + Curity FSFAP MPL-2.0 @@ -25,7 +25,7 @@

- sh.loft.devpod.desktop + io.curity.devpod.desktop https://devpod.curityio.net/media/add-provider-2.png diff --git a/desktop/flatpak/sh.loft.devpod.tmpl b/desktop/flatpak/io.curity.devpod.tmpl similarity index 68% rename from desktop/flatpak/sh.loft.devpod.tmpl rename to desktop/flatpak/io.curity.devpod.tmpl index e9e2d7e74..e43f312d9 100644 --- a/desktop/flatpak/sh.loft.devpod.tmpl +++ b/desktop/flatpak/io.curity.devpod.tmpl @@ -1,10 +1,10 @@ -id: sh.loft.devpod +id: io.curity.devpod runtime: org.gnome.Platform runtime-version: '47' sdk: org.gnome.Sdk -command: "sh.loft.devpod" +command: "io.curity.devpod" finish-args: - --socket=wayland # Permission needed to show the window - --socket=fallback-x11 # Permission needed to show the window @@ -42,11 +42,11 @@ modules: - cp devpod-wrapper /app/bin/devpod-cli - chmod +x /app/bin/devpod-cli - install -Dm755 usr/bin/devpod-cli /app/bin/devpod-bin - - install -Dm755 usr/bin/DevPod\ Desktop /app/bin/sh.loft.devpod - - install -Dm644 DevPod.desktop /app/share/applications/sh.loft.devpod.desktop - - desktop-file-edit --set-key Exec --set-value sh.loft.devpod /app/share/applications/sh.loft.devpod.desktop - - desktop-file-edit --set-icon sh.loft.devpod /app/share/applications/sh.loft.devpod.desktop - - install -Dm644 usr/share/icons/hicolor/128x128/apps/DevPod\ Desktop.png /app/share/icons/hicolor/128x128/apps/sh.loft.devpod.png - - install -Dm644 usr/share/icons/hicolor/32x32/apps/DevPod\ Desktop.png /app/share/icons/hicolor/32x32/apps/sh.loft.devpod.png - - install -Dm644 usr/share/icons/hicolor/256x256@2/apps/DevPod\ Desktop.png /app/share/icons/hicolor/256x256@2/apps/sh.loft.devpod.png - - install -Dm644 DevPod.metainfo.xml /app/share/metainfo/sh.loft.devpod.metainfo.xml \ No newline at end of file + - install -Dm755 usr/bin/DevPod\ Desktop /app/bin/io.curity.devpod + - install -Dm644 DevPod.desktop /app/share/applications/io.curity.devpod.desktop + - desktop-file-edit --set-key Exec --set-value io.curity.devpod /app/share/applications/io.curity.devpod.desktop + - desktop-file-edit --set-icon io.curity.devpod /app/share/applications/io.curity.devpod.desktop + - install -Dm644 usr/share/icons/hicolor/128x128/apps/DevPod\ Desktop.png /app/share/icons/hicolor/128x128/apps/io.curity.devpod.png + - install -Dm644 usr/share/icons/hicolor/32x32/apps/DevPod\ Desktop.png /app/share/icons/hicolor/32x32/apps/io.curity.devpod.png + - install -Dm644 usr/share/icons/hicolor/256x256@2/apps/DevPod\ Desktop.png /app/share/icons/hicolor/256x256@2/apps/io.curity.devpod.png + - install -Dm644 DevPod.metainfo.xml /app/share/metainfo/io.curity.devpod.metainfo.xml \ No newline at end of file diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml index 164f9574e..e055ac2d2 100644 --- a/desktop/src-tauri/Cargo.toml +++ b/desktop/src-tauri/Cargo.toml @@ -2,7 +2,7 @@ name = "devpod-desktop" version = "0.1.0" description = "A Tauri App" -authors = ["loft.sh"] +authors = ["Curity"] license = "" repository = "" edition = "2021" diff --git a/desktop/src-tauri/Info.plist b/desktop/src-tauri/Info.plist index b38cf45a9..737af84e0 100644 --- a/desktop/src-tauri/Info.plist +++ b/desktop/src-tauri/Info.plist @@ -8,7 +8,7 @@ CFBundleTypeRole Viewer CFBundleURLName - sh.loft.devpod + io.curity.devpod LSUIElement CFBundleURLSchemes diff --git a/desktop/src-tauri/src/custom_protocol.rs b/desktop/src-tauri/src/custom_protocol.rs index 63dbf3524..45349c6d6 100644 --- a/desktop/src-tauri/src/custom_protocol.rs +++ b/desktop/src-tauri/src/custom_protocol.rs @@ -11,7 +11,7 @@ use thiserror::Error; use url::Url; // Should match the one from "tauri.config.json" and "Info.plist" -const APP_IDENTIFIER: &str = "sh.loft.devpod"; +const APP_IDENTIFIER: &str = "io.curity.devpod"; const APP_URL_SCHEME: &str = "devpod"; pub struct CustomProtocol; diff --git a/desktop/src-tauri/src/identifier_migration.rs b/desktop/src-tauri/src/identifier_migration.rs new file mode 100644 index 000000000..16dcb9400 --- /dev/null +++ b/desktop/src-tauri/src/identifier_migration.rs @@ -0,0 +1,210 @@ +//! DevPod Desktop's identifier used to be upstream's `sh.loft.devpod`. Tauri keeps the app's data in +//! directories named after the identifier: the settings and provider stores, action logs and the +//! Windows CLI shims (in the app data dir), logs, and on Windows and Linux the webview's local storage +//! (in the app local data dir; on macOS it's in `~/Library/WebKit/`). +//! +//! On the first start with the new identifier, the old directories are copied to the new ones. They +//! are copied, not moved, because the user's `PATH` on Windows can point at the old CLI shims, and so +//! that an older DevPod Desktop still finds its data. +//! +//! This has to run before Tauri opens the stores or creates the webview. + +use std::{ + fs, io, + path::{Path, PathBuf}, +}; + +const OLD_IDENTIFIER_PREFIX: &str = "sh.loft.devpod"; +const NEW_IDENTIFIER_PREFIX: &str = "io.curity.devpod"; + +// Webview caches, which can be large and are rebuilt when missing. +const SKIPPED_DIR_NAMES: [&str; 7] = [ + "Cache", + "Code Cache", + "GPUCache", + "GrShaderCache", + "GraphiteDawnCache", + "ShaderCache", + "DawnCache", +]; + +/// Copies the app's directories from the old identifier to `identifier`, and returns what was done +/// (or failed) so that it can be logged once logging is set up. +pub fn migrate_app_dirs(identifier: &str) -> Vec> { + let Some(suffix) = identifier.strip_prefix(NEW_IDENTIFIER_PREFIX) else { + return vec![]; + }; + let old_identifier = format!("{}{}", OLD_IDENTIFIER_PREFIX, suffix); + + #[allow(unused_mut)] + let mut bases: Vec = [dirs::data_dir(), dirs::data_local_dir()] + .into_iter() + .flatten() + .collect(); + #[cfg(target_os = "macos")] + if let Some(home) = dirs::home_dir() { + bases.push(home.join("Library/Logs")); + bases.push(home.join("Library/WebKit")); + } + // On macOS and Linux, the data and local data dirs are the same. + bases.sort(); + bases.dedup(); + + bases + .iter() + .filter_map(|base| migrate_dir(&base.join(&old_identifier), &base.join(identifier))) + .collect() +} + +fn migrate_dir(old: &Path, new: &Path) -> Option> { + if !old.is_dir() || new.exists() { + return None; + } + + // Copy to a temporary directory first, so that an interrupted copy is retried on the next start. + let mut tmp_name = new.file_name()?.to_os_string(); + tmp_name.push(".migrating"); + let tmp = new.with_file_name(tmp_name); + if tmp.exists() { + let _ = fs::remove_dir_all(&tmp); + } + + let result = copy_dir(old, &tmp).and_then(|_| fs::rename(&tmp, new)); + Some(match result { + Ok(()) => Ok(format!("Copied {} to {}", old.display(), new.display())), + Err(err) => { + let _ = fs::remove_dir_all(&tmp); + Err(format!( + "Failed to copy {} to {}: {}", + old.display(), + new.display(), + err + )) + } + }) +} + +fn copy_dir(from: &Path, to: &Path) -> io::Result<()> { + fs::create_dir_all(to)?; + for entry in fs::read_dir(from)? { + let entry = entry?; + let file_type = entry.file_type()?; + let target = to.join(entry.file_name()); + if file_type.is_dir() { + if SKIPPED_DIR_NAMES + .iter() + .any(|name| entry.file_name() == *name) + { + continue; + } + copy_dir(&entry.path(), &target)?; + } else if file_type.is_file() { + fs::copy(entry.path(), &target)?; + } else if file_type.is_symlink() { + #[cfg(unix)] + std::os::unix::fs::symlink(fs::read_link(entry.path())?, &target)?; + } + } + Ok(()) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn temp_dir(name: &str) -> PathBuf { + let dir = std::env::temp_dir().join(format!( + "devpod-identifier-migration-{}-{}", + name, + std::process::id() + )); + let _ = fs::remove_dir_all(&dir); + fs::create_dir_all(&dir).unwrap(); + dir + } + + #[test] + fn copies_old_dir_to_new_dir() { + let base = temp_dir("copies"); + let old = base.join("sh.loft.devpod"); + let new = base.join("io.curity.devpod"); + fs::create_dir_all(old.join("bin")).unwrap(); + fs::create_dir_all(old.join("EBWebView/Default/Cache")).unwrap(); + fs::create_dir_all(old.join("EBWebView/Default/Local Storage")).unwrap(); + fs::write(old.join(".settings.json"), "{\"a\":1}").unwrap(); + fs::write(old.join("bin/devpod.cmd"), "cmd").unwrap(); + fs::write(old.join("EBWebView/Default/Cache/data"), "cache").unwrap(); + fs::write(old.join("EBWebView/Default/Local Storage/ls"), "ls").unwrap(); + + let result = migrate_dir(&old, &new); + + assert!(matches!(result, Some(Ok(_))), "{:?}", result); + assert_eq!( + fs::read_to_string(new.join(".settings.json")).unwrap(), + "{\"a\":1}" + ); + assert_eq!( + fs::read_to_string(new.join("bin/devpod.cmd")).unwrap(), + "cmd" + ); + assert_eq!( + fs::read_to_string(new.join("EBWebView/Default/Local Storage/ls")).unwrap(), + "ls" + ); + assert!(!new.join("EBWebView/Default/Cache").exists()); + assert!(old.join(".settings.json").exists(), "the old dir is kept"); + assert!(!base.join("io.curity.devpod.migrating").exists()); + fs::remove_dir_all(&base).unwrap(); + } + + #[test] + fn keeps_existing_new_dir() { + let base = temp_dir("keeps"); + let old = base.join("sh.loft.devpod"); + let new = base.join("io.curity.devpod"); + fs::create_dir_all(&old).unwrap(); + fs::create_dir_all(&new).unwrap(); + fs::write(old.join(".settings.json"), "old").unwrap(); + fs::write(new.join(".settings.json"), "new").unwrap(); + + assert!(migrate_dir(&old, &new).is_none()); + assert_eq!( + fs::read_to_string(new.join(".settings.json")).unwrap(), + "new" + ); + fs::remove_dir_all(&base).unwrap(); + } + + #[test] + fn does_nothing_without_old_dir() { + let base = temp_dir("nothing"); + let new = base.join("io.curity.devpod"); + assert!(migrate_dir(&base.join("sh.loft.devpod"), &new).is_none()); + assert!(!new.exists()); + fs::remove_dir_all(&base).unwrap(); + } + + #[test] + fn retries_after_interrupted_copy() { + let base = temp_dir("retries"); + let old = base.join("sh.loft.devpod"); + let new = base.join("io.curity.devpod"); + fs::create_dir_all(&old).unwrap(); + fs::write(old.join(".settings.json"), "old").unwrap(); + fs::create_dir_all(base.join("io.curity.devpod.migrating")).unwrap(); + fs::write(base.join("io.curity.devpod.migrating/partial"), "x").unwrap(); + + assert!(matches!(migrate_dir(&old, &new), Some(Ok(_)))); + assert!(!new.join("partial").exists()); + assert_eq!( + fs::read_to_string(new.join(".settings.json")).unwrap(), + "old" + ); + fs::remove_dir_all(&base).unwrap(); + } + + #[test] + fn ignores_other_identifiers() { + assert!(migrate_app_dirs("com.example.app").is_empty()); + } +} diff --git a/desktop/src-tauri/src/install_cli.rs b/desktop/src-tauri/src/install_cli.rs index dfb090fcc..62d0dd34d 100644 --- a/desktop/src-tauri/src/install_cli.rs +++ b/desktop/src-tauri/src/install_cli.rs @@ -245,7 +245,7 @@ fn install(app_handle: AppHandle, force: bool) -> Result<(), InstallCLIError> { bin_dir.push("bin"); // Create binary directory in app dir and write bin_files to disk - // These will be stored in a /bin folder under our control, usually `%APP_DIR%/sh.loft.devpod/bin` + // These will be stored in a /bin folder under our control, usually `%APP_DIR%/io.curity.devpod/bin` let cli_path = cli_path.to_str().ok_or(InstallCLIError::PathConversion)?; let sh_file = BinFile { diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs index fb2bed741..5e5d920b0 100644 --- a/desktop/src-tauri/src/main.rs +++ b/desktop/src-tauri/src/main.rs @@ -14,6 +14,7 @@ mod custom_protocol; mod file_exists; mod fix_env; mod get_env; +mod identifier_migration; mod install_cli; mod logging; mod providers; @@ -61,6 +62,9 @@ fn main() -> anyhow::Result<()> { let ctx = tauri::generate_context!(); let app_name = ctx.package_info().name.to_string(); + // Before the stores are opened and the webview is created + let identifier_migration = identifier_migration::migrate_app_dirs(&ctx.config().identifier); + CustomProtocol::forward_deep_link(); let (tx, rx) = mpsc::channel::(10); @@ -101,6 +105,12 @@ fn main() -> anyhow::Result<()> { .plugin(tauri_plugin_updater::Builder::new().build()) .setup(move |app| { info!("Setup application"); + for result in &identifier_migration { + match result { + Ok(msg) => info!("{}", msg), + Err(msg) => error!("{}", msg), + } + } providers::check_dangling_provider(&app.handle()); let window_helper = window::WindowHelper::new(app.handle().clone()); diff --git a/desktop/src-tauri/tauri-dev.conf.json b/desktop/src-tauri/tauri-dev.conf.json index b80dc8991..284485485 100644 --- a/desktop/src-tauri/tauri-dev.conf.json +++ b/desktop/src-tauri/tauri-dev.conf.json @@ -1,5 +1,5 @@ { - "identifier": "sh.loft.devpod.for.devpod.devs", + "identifier": "io.curity.devpod.for.devpod.devs", "plugins": { "updater": { "active": false diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json index 1845fc782..a6ead14d7 100644 --- a/desktop/src-tauri/tauri.conf.json +++ b/desktop/src-tauri/tauri.conf.json @@ -7,13 +7,15 @@ }, "bundle": { "active": true, + "publisher": "Curity", "windows": { "certificateThumbprint": null, "digestAlgorithm": "sha256", "timestampUrl": "", "nsis": { "displayLanguageSelector": false, - "installMode": "currentUser" + "installMode": "currentUser", + "installerHooks": "./windows/installer-hooks.nsh" } }, "category": "DeveloperTool", @@ -64,7 +66,7 @@ "productName": "DevPod", "mainBinaryName": "DevPod Desktop", "version": "../package.json", - "identifier": "sh.loft.devpod", + "identifier": "io.curity.devpod", "plugins": { "updater": { "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEMxRjc1MjVDQUM2MjU1NEUKUldST1ZXS3NYRkwzd1VaY1FrRXBVdHBoWGhPbWlHWmtjbWFORzlIM1VtU3czWnh3TFVxaE1HNFIK", diff --git a/desktop/src-tauri/windows/installer-hooks.nsh b/desktop/src-tauri/windows/installer-hooks.nsh new file mode 100644 index 000000000..0a6668430 --- /dev/null +++ b/desktop/src-tauri/windows/installer-hooks.nsh @@ -0,0 +1,26 @@ +; Hooks for Tauri's NSIS installer template, included before the template defines its own symbols. +!include LogicLib.nsh + +; DevPod's bundle identifier used to be sh.loft.devpod, which made the installer's manufacturer "loft", +; so installers before it changed to io.curity.devpod (with publisher "Curity", see tauri.conf.json) +; kept the install folder in Software\loft\DevPod. The installer reads Software\Curity\DevPod to run +; the installed version's uninstaller, which it does by default when upgrading, so copy the old key +; before the pages are shown. The template's MANUFACTURER and PRODUCTNAME aren't defined yet here. +!define MUI_CUSTOMFUNCTION_GUIINIT DevPodMigrateInstallDirKey + +Function DevPodMigrateInstallDirKey + Push $0 + ReadRegStr $0 SHCTX "Software\Curity\DevPod" "" + ${If} $0 == "" + ReadRegStr $0 SHCTX "Software\loft\DevPod" "" + ${If} $0 != "" + WriteRegStr SHCTX "Software\Curity\DevPod" "" $0 + ${EndIf} + ${EndIf} + Pop $0 +FunctionEnd + +!macro NSIS_HOOK_POSTINSTALL + DeleteRegKey SHCTX "Software\loft\DevPod" + DeleteRegKey /ifempty SHCTX "Software\loft" +!macroend diff --git a/desktop/src/client/command.ts b/desktop/src/client/command.ts index 08a32d7cc..190c3fcb1 100644 --- a/desktop/src/client/command.ts +++ b/desktop/src/client/command.ts @@ -91,7 +91,7 @@ export class Command implements TCommand> { if (this.isFlatpak === undefined) { this.isFlatpak = await this.getEnv("FLATPAK_ID") if (this.isFlatpak) { - this.extraEnvVars["FLATPAK_ID"] = "sh.loft.devpod" + this.extraEnvVars["FLATPAK_ID"] = "io.curity.devpod" this.extraEnvVars[DEVPOD_ADDITIONAL_ENV_VARS] = recordToCSV(this.extraEnvVars) this.sidecarCommand = ShellCommand.sidecar(DEVPOD_BINARY, this.args, { env: this.extraEnvVars, diff --git a/desktop/src/components/useInstallCLI.tsx b/desktop/src/components/useInstallCLI.tsx index ba3be79e5..01335f14a 100644 --- a/desktop/src/components/useInstallCLI.tsx +++ b/desktop/src/components/useInstallCLI.tsx @@ -115,7 +115,7 @@ export function useInstallCLI() { Adds the DevPod CLI to your $PATH.{" "} {isWindows ? ( <> - It will be placed in %APP_DATA%\sh.loft.devpod\bin + It will be placed in %APP_DATA%\io.curity.devpod\bin ) : ( <> diff --git a/desktop/src/views/Providers/AddProvider/SetupProviderSourceForm.tsx b/desktop/src/views/Providers/AddProvider/SetupProviderSourceForm.tsx index 1db167af7..8b6dd4554 100644 --- a/desktop/src/views/Providers/AddProvider/SetupProviderSourceForm.tsx +++ b/desktop/src/views/Providers/AddProvider/SetupProviderSourceForm.tsx @@ -496,7 +496,7 @@ function CustomProviderInput({ field, isInvalid, onAccept }: TCustomProviderInpu `. The providers `aws`, `azure`, `civo`, `digitalocean`, `dockerless`, `ecs`, +`gcloud`, `ssh` and `terraform` don't have a repository there yet, so they are downloaded from +`loft-sh/devpod-provider-`. + :::info Multiple providers at the same time You can use the `--name` flag to add multiple providers of the same type with different options, for example `devpod provider add aws --name aws-gpu -o AWS_INSTANCE_TYPE=p3.8xlarge` ::: diff --git a/e2e/e2e_suite_test.go b/e2e/e2e_suite_test.go index 19fdfde34..7b3885fa2 100644 --- a/e2e/e2e_suite_test.go +++ b/e2e/e2e_suite_test.go @@ -8,15 +8,15 @@ import ( "github.com/onsi/gomega" // Register tests - _ "github.com/loft-sh/devpod/e2e/tests/build" - _ "github.com/loft-sh/devpod/e2e/tests/context" - _ "github.com/loft-sh/devpod/e2e/tests/ide" - _ "github.com/loft-sh/devpod/e2e/tests/integration" - _ "github.com/loft-sh/devpod/e2e/tests/machine" - _ "github.com/loft-sh/devpod/e2e/tests/machineprovider" - _ "github.com/loft-sh/devpod/e2e/tests/provider" - _ "github.com/loft-sh/devpod/e2e/tests/ssh" - _ "github.com/loft-sh/devpod/e2e/tests/up" + _ "github.com/curityio/devpod/e2e/tests/build" + _ "github.com/curityio/devpod/e2e/tests/context" + _ "github.com/curityio/devpod/e2e/tests/ide" + _ "github.com/curityio/devpod/e2e/tests/integration" + _ "github.com/curityio/devpod/e2e/tests/machine" + _ "github.com/curityio/devpod/e2e/tests/machineprovider" + _ "github.com/curityio/devpod/e2e/tests/provider" + _ "github.com/curityio/devpod/e2e/tests/ssh" + _ "github.com/curityio/devpod/e2e/tests/up" ) // TestRunE2ETests checks configuration parameters (specified through flags) and then runs diff --git a/e2e/framework/command.go b/e2e/framework/command.go index ccabeedff..634adb143 100644 --- a/e2e/framework/command.go +++ b/e2e/framework/command.go @@ -7,9 +7,9 @@ import ( "os/exec" "path/filepath" - "github.com/loft-sh/devpod/pkg/client" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/workspace" + "github.com/curityio/devpod/pkg/client" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/workspace" ) func (f *Framework) FindWorkspace(ctx context.Context, id string) (*provider2.Workspace, error) { diff --git a/e2e/tests/build/build.go b/e2e/tests/build/build.go index c8881f854..7f6e8eafc 100644 --- a/e2e/tests/build/build.go +++ b/e2e/tests/build/build.go @@ -6,12 +6,12 @@ import ( "path/filepath" "runtime" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/devcontainer/build" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/dockerfile" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/devcontainer/build" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/dockerfile" + "github.com/curityio/devpod/pkg/log" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/context/context.go b/e2e/tests/context/context.go index d9291c925..74aabf988 100644 --- a/e2e/tests/context/context.go +++ b/e2e/tests/context/context.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/ide/ide.go b/e2e/tests/ide/ide.go index 6177551b5..8336c2396 100644 --- a/e2e/tests/ide/ide.go +++ b/e2e/tests/ide/ide.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/integration/integration.go b/e2e/tests/integration/integration.go index 3f07697d0..ed168d620 100644 --- a/e2e/tests/integration/integration.go +++ b/e2e/tests/integration/integration.go @@ -6,7 +6,7 @@ import ( "os" "os/exec" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/e2e/tests/machine/create.go b/e2e/tests/machine/create.go index 0d6f5d475..26f7fae61 100644 --- a/e2e/tests/machine/create.go +++ b/e2e/tests/machine/create.go @@ -4,8 +4,8 @@ import ( "context" "os" + "github.com/curityio/devpod/e2e/framework" "github.com/google/uuid" - "github.com/loft-sh/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/machine/delete.go b/e2e/tests/machine/delete.go index 3d0abe6b6..cc5172250 100644 --- a/e2e/tests/machine/delete.go +++ b/e2e/tests/machine/delete.go @@ -4,8 +4,8 @@ import ( "context" "os" + "github.com/curityio/devpod/e2e/framework" "github.com/google/uuid" - "github.com/loft-sh/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/machineprovider/machineprovider.go b/e2e/tests/machineprovider/machineprovider.go index c37373cd7..e584ffdcd 100644 --- a/e2e/tests/machineprovider/machineprovider.go +++ b/e2e/tests/machineprovider/machineprovider.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/provider/provider.go b/e2e/tests/provider/provider.go index f4d128e6f..d130b8ce4 100644 --- a/e2e/tests/provider/provider.go +++ b/e2e/tests/provider/provider.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/ssh/ssh.go b/e2e/tests/ssh/ssh.go index 386bd1806..337100be4 100644 --- a/e2e/tests/ssh/ssh.go +++ b/e2e/tests/ssh/ssh.go @@ -12,7 +12,7 @@ import ( "strconv" "time" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/up/docker-wsl.go b/e2e/tests/up/docker-wsl.go index fa710d392..608083092 100644 --- a/e2e/tests/up/docker-wsl.go +++ b/e2e/tests/up/docker-wsl.go @@ -10,11 +10,11 @@ import ( "runtime" "strings" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/devcontainer/config" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" "github.com/docker/docker/api/types" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/e2e/tests/up/docker.go b/e2e/tests/up/docker.go index 118ec83aa..893664fc8 100644 --- a/e2e/tests/up/docker.go +++ b/e2e/tests/up/docker.go @@ -10,12 +10,12 @@ import ( "runtime" "strings" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/devcontainer/config" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" "github.com/docker/docker/api/types" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/e2e/tests/up/docker_build.go b/e2e/tests/up/docker_build.go index e9ebbc012..7a9677059 100644 --- a/e2e/tests/up/docker_build.go +++ b/e2e/tests/up/docker_build.go @@ -5,10 +5,10 @@ import ( "fmt" "os" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/devcontainer/config" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/e2e/tests/up/docker_compose.go b/e2e/tests/up/docker_compose.go index eb791afc7..2aa382ac9 100644 --- a/e2e/tests/up/docker_compose.go +++ b/e2e/tests/up/docker_compose.go @@ -12,11 +12,11 @@ import ( "strings" "time" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/compose" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" "github.com/docker/docker/api/types" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/compose" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/e2e/tests/up/docker_compose_build.go b/e2e/tests/up/docker_compose_build.go index e6f80e559..144d8cb63 100644 --- a/e2e/tests/up/docker_compose_build.go +++ b/e2e/tests/up/docker_compose_build.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/compose" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/compose" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/e2e/tests/up/git_ssh_to_https.go b/e2e/tests/up/git_ssh_to_https.go index 42428b43a..01e6f3723 100644 --- a/e2e/tests/up/git_ssh_to_https.go +++ b/e2e/tests/up/git_ssh_to_https.go @@ -8,10 +8,10 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/devcontainer/config" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/e2e/tests/up/helper.go b/e2e/tests/up/helper.go index 18f16bef6..3756acc71 100644 --- a/e2e/tests/up/helper.go +++ b/e2e/tests/up/helper.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/scanner" ) func findMessage(reader io.Reader, message string) error { diff --git a/e2e/tests/up/podman.go b/e2e/tests/up/podman.go index 3bcc03ef7..d3c58fd6a 100644 --- a/e2e/tests/up/podman.go +++ b/e2e/tests/up/podman.go @@ -5,7 +5,7 @@ import ( "os" "os/exec" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" ) diff --git a/e2e/tests/up/post_start.go b/e2e/tests/up/post_start.go index 1d22ad85c..948f57707 100644 --- a/e2e/tests/up/post_start.go +++ b/e2e/tests/up/post_start.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/loft-sh/devpod/e2e/framework" + "github.com/curityio/devpod/e2e/framework" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) diff --git a/e2e/tests/up/up.go b/e2e/tests/up/up.go index b2511fc5c..80636ecb3 100644 --- a/e2e/tests/up/up.go +++ b/e2e/tests/up/up.go @@ -10,11 +10,11 @@ import ( "runtime" "strings" - "github.com/loft-sh/devpod/e2e/framework" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - docker "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/language" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/e2e/framework" + "github.com/curityio/devpod/pkg/devcontainer/config" + docker "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/language" + "github.com/curityio/devpod/pkg/log" "github.com/onsi/ginkgo/v2" "github.com/onsi/gomega" ) @@ -183,7 +183,7 @@ var _ = DevPodDescribe("devpod up test suite", func() { ginkgo.DeferCleanup(f.DevPodWorkspaceDelete, context.Background(), name) // Wait for devpod workspace to come online (deadline: 30s) - err = f.DevPodUp(ctx, "github.com/loft-sh/devpod@pull/3/head") + err = f.DevPodUp(ctx, "github.com/curityio/devpod@pull/3/head") framework.ExpectNoError(err) }) diff --git a/go.mod b/go.mod index ea31a1330..f869b4527 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/loft-sh/devpod +module github.com/curityio/devpod go 1.23.1 diff --git a/hack/build-e2e.sh b/hack/build-e2e.sh index 1df676f4e..336be08fb 100755 --- a/hack/build-e2e.sh +++ b/hack/build-e2e.sh @@ -14,7 +14,7 @@ fi # Each build gets its own version, so that DevPod replaces the agent that an earlier build put into a container. # The CLI and the agents it embeds must have the same version. VERSION="${VERSION:-v0.0.0-dev.$(date -u +%Y%m%d%H%M%S)}" -LDFLAGS="-s -w -X github.com/loft-sh/devpod/pkg/version.version=$VERSION" +LDFLAGS="-s -w -X github.com/curityio/devpod/pkg/version.version=$VERSION" echo "Building version $VERSION" # the CLI embeds the Linux agents diff --git a/hack/rebuild.sh b/hack/rebuild.sh index a144eb07a..cc76ee63f 100755 --- a/hack/rebuild.sh +++ b/hack/rebuild.sh @@ -13,7 +13,7 @@ fi # Each build gets its own version, so that DevPod replaces the agent that an earlier build put into a container. # The CLI and the agents it embeds must have the same version. VERSION="${VERSION:-v0.0.0-dev.$(date -u +%Y%m%d%H%M%S)}" -LDFLAGS="-s -w -X github.com/loft-sh/devpod/pkg/version.version=$VERSION" +LDFLAGS="-s -w -X github.com/curityio/devpod/pkg/version.version=$VERSION" echo "[INFO] Building version $VERSION" # the CLI embeds the Linux agents, so they're always needed diff --git a/main.go b/main.go index 1e0e2b47f..b453167ee 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "github.com/loft-sh/devpod/cmd" +import "github.com/curityio/devpod/cmd" func main() { cmd.Execute() diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go index bfe652bc2..f3a3e77c2 100644 --- a/pkg/agent/agent.go +++ b/pkg/agent/agent.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/compress" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/compress" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" perrors "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/agent/agent_test.go b/pkg/agent/agent_test.go index b9b2eb0b5..54ac51066 100644 --- a/pkg/agent/agent_test.go +++ b/pkg/agent/agent_test.go @@ -4,7 +4,7 @@ import ( "path/filepath" "testing" - provider2 "github.com/loft-sh/devpod/pkg/provider" + provider2 "github.com/curityio/devpod/pkg/provider" "gotest.tools/assert" ) diff --git a/pkg/agent/inject.go b/pkg/agent/inject.go index 7f59f97f9..b2ee4bc94 100644 --- a/pkg/agent/inject.go +++ b/pkg/agent/inject.go @@ -10,11 +10,11 @@ import ( "runtime" "time" - "github.com/loft-sh/devpod/pkg/agent/agentbin" - "github.com/loft-sh/devpod/pkg/inject" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/shell" - "github.com/loft-sh/devpod/pkg/version" + "github.com/curityio/devpod/pkg/agent/agentbin" + "github.com/curityio/devpod/pkg/inject" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/shell" + "github.com/curityio/devpod/pkg/version" ) var waitForInstanceConnectionTimeout = time.Minute * 5 diff --git a/pkg/agent/tunnel/tunnel.pb.go b/pkg/agent/tunnel/tunnel.pb.go index ba1d6c6d4..fdcd4c191 100644 --- a/pkg/agent/tunnel/tunnel.pb.go +++ b/pkg/agent/tunnel/tunnel.pb.go @@ -531,10 +531,10 @@ var file_tunnel_proto_rawDesc = string([]byte{ 0x74, 0x12, 0x1a, 0x2e, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0d, 0x2e, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x2e, 0x43, 0x68, 0x75, 0x6e, 0x6b, 0x22, 0x00, 0x30, 0x01, - 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, - 0x6f, 0x66, 0x74, 0x2d, 0x73, 0x68, 0x2f, 0x64, 0x65, 0x76, 0x70, 0x6f, 0x64, 0x2f, 0x70, 0x6b, - 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, + 0x75, 0x72, 0x69, 0x74, 0x79, 0x69, 0x6f, 0x2f, 0x64, 0x65, 0x76, 0x70, 0x6f, 0x64, 0x2f, 0x70, + 0x6b, 0x67, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x74, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) var ( diff --git a/pkg/agent/tunnel/tunnel.proto b/pkg/agent/tunnel/tunnel.proto index 62770885d..a6dbf34c5 100644 --- a/pkg/agent/tunnel/tunnel.proto +++ b/pkg/agent/tunnel/tunnel.proto @@ -1,7 +1,7 @@ // protoc -I . tunnel.proto --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative syntax = "proto3"; -option go_package = "github.com/loft-sh/devpod/pkg/agent/tunnel"; +option go_package = "github.com/curityio/devpod/pkg/agent/tunnel"; package tunnel; diff --git a/pkg/agent/tunnelserver/client.go b/pkg/agent/tunnelserver/client.go index fa3c9cc12..a46762770 100644 --- a/pkg/agent/tunnelserver/client.go +++ b/pkg/agent/tunnelserver/client.go @@ -5,8 +5,8 @@ import ( "io" "net" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/stdio" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/stdio" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/resolver" diff --git a/pkg/agent/tunnelserver/logger.go b/pkg/agent/tunnelserver/logger.go index 0d4b15a50..1dd230035 100644 --- a/pkg/agent/tunnelserver/logger.go +++ b/pkg/agent/tunnelserver/logger.go @@ -7,11 +7,11 @@ import ( "os" "time" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/log/survey" "github.com/go-logr/logr" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/scanner" - "github.com/loft-sh/devpod/pkg/log/survey" "github.com/sirupsen/logrus" ) diff --git a/pkg/agent/tunnelserver/options.go b/pkg/agent/tunnelserver/options.go index 788f2b2ec..77779d6ce 100644 --- a/pkg/agent/tunnelserver/options.go +++ b/pkg/agent/tunnelserver/options.go @@ -1,9 +1,9 @@ package tunnelserver import ( - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/netstat" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/netstat" + provider2 "github.com/curityio/devpod/pkg/provider" ) type Option func(*tunnelServer) *tunnelServer diff --git a/pkg/agent/tunnelserver/stream.go b/pkg/agent/tunnelserver/stream.go index 019d1743a..86a3bede0 100644 --- a/pkg/agent/tunnelserver/stream.go +++ b/pkg/agent/tunnelserver/stream.go @@ -5,8 +5,8 @@ import ( "io" "time" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/log" ) func NewStreamReader(stream tunnel.Tunnel_StreamWorkspaceClient, log log.Logger) io.Reader { diff --git a/pkg/agent/tunnelserver/tunnelserver.go b/pkg/agent/tunnelserver/tunnelserver.go index a3efa9e6d..e39833636 100644 --- a/pkg/agent/tunnelserver/tunnelserver.go +++ b/pkg/agent/tunnelserver/tunnelserver.go @@ -12,18 +12,18 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/dockercredentials" - "github.com/loft-sh/devpod/pkg/extract" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/gitcredentials" - "github.com/loft-sh/devpod/pkg/gitsshsigning" - "github.com/loft-sh/devpod/pkg/gpg" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/netstat" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/stdio" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/dockercredentials" + "github.com/curityio/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/gitcredentials" + "github.com/curityio/devpod/pkg/gitsshsigning" + "github.com/curityio/devpod/pkg/gpg" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/netstat" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/stdio" "github.com/moby/patternmatcher" "github.com/moby/patternmatcher/ignorefile" perrors "github.com/pkg/errors" diff --git a/pkg/agent/tunnelserver/tunnelserver_git_test.go b/pkg/agent/tunnelserver/tunnelserver_git_test.go index fcfe523fe..a145d2c47 100644 --- a/pkg/agent/tunnelserver/tunnelserver_git_test.go +++ b/pkg/agent/tunnelserver/tunnelserver_git_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/extract" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/log" "gotest.tools/assert" is "gotest.tools/assert/cmp" ) diff --git a/pkg/agent/tunnelserver/tunnelserver_streammount_test.go b/pkg/agent/tunnelserver/tunnelserver_streammount_test.go index 6fbedd4c7..4a8fb5f68 100644 --- a/pkg/agent/tunnelserver/tunnelserver_streammount_test.go +++ b/pkg/agent/tunnelserver/tunnelserver_streammount_test.go @@ -12,9 +12,9 @@ import ( "sort" "testing" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/log" "google.golang.org/grpc" "gotest.tools/assert" is "gotest.tools/assert/cmp" diff --git a/pkg/agent/tunnelserver/tunnelserver_test.go b/pkg/agent/tunnelserver/tunnelserver_test.go index 5e63a491d..c2155abde 100644 --- a/pkg/agent/tunnelserver/tunnelserver_test.go +++ b/pkg/agent/tunnelserver/tunnelserver_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "gotest.tools/assert" ) diff --git a/pkg/agent/workspace.go b/pkg/agent/workspace.go index 6f5d8d550..36b26f769 100644 --- a/pkg/agent/workspace.go +++ b/pkg/agent/workspace.go @@ -9,13 +9,13 @@ import ( "runtime" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/gitcredentials" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/gitcredentials" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/util" "github.com/moby/patternmatcher/ignorefile" ) diff --git a/pkg/binaries/download.go b/pkg/binaries/download.go index af6b1e939..804da322b 100644 --- a/pkg/binaries/download.go +++ b/pkg/binaries/download.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/download" - "github.com/loft-sh/devpod/pkg/extract" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/hash" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/download" + "github.com/curityio/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/hash" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/client/client.go b/pkg/client/client.go index 31c535e0d..b6dc7106e 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/provider" ) type BaseClient interface { diff --git a/pkg/client/clientimplementation/machine_client.go b/pkg/client/clientimplementation/machine_client.go index ac1a25385..ba8210761 100644 --- a/pkg/client/clientimplementation/machine_client.go +++ b/pkg/client/clientimplementation/machine_client.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/options" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/options" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/client/clientimplementation/workspace_client.go b/pkg/client/clientimplementation/workspace_client.go index 4235ef401..c5cac29d0 100644 --- a/pkg/client/clientimplementation/workspace_client.go +++ b/pkg/client/clientimplementation/workspace_client.go @@ -13,18 +13,18 @@ import ( "sync" "time" + "github.com/curityio/devpod/pkg/binaries" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/compress" + "github.com/curityio/devpod/pkg/config" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/options" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/shell" + "github.com/curityio/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/types" "github.com/gofrs/flock" - "github.com/loft-sh/devpod/pkg/binaries" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/compress" - "github.com/loft-sh/devpod/pkg/config" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/options" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/shell" - "github.com/loft-sh/devpod/pkg/ssh" - "github.com/loft-sh/devpod/pkg/types" perrors "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/command/user.go b/pkg/command/user.go index 5c00a1a93..cd37d9794 100644 --- a/pkg/command/user.go +++ b/pkg/command/user.go @@ -3,7 +3,7 @@ package command import ( "os/user" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/util" ) func GetHome(userName string) (string, error) { diff --git a/pkg/compose/helper.go b/pkg/compose/helper.go index 8f97bdcce..7ac8d38f3 100644 --- a/pkg/compose/helper.go +++ b/pkg/compose/helper.go @@ -13,8 +13,8 @@ import ( "github.com/blang/semver" composecli "github.com/compose-spec/compose-go/v2/cli" composetypes "github.com/compose-spec/compose-go/v2/types" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/docker" "github.com/pkg/errors" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index ac9260199..7c23d2372 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,9 +8,9 @@ import ( "strconv" "time" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/types" "github.com/ghodss/yaml" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/types" "github.com/pkg/errors" ) diff --git a/pkg/config/dir.go b/pkg/config/dir.go index fe844c74c..481da253a 100644 --- a/pkg/config/dir.go +++ b/pkg/config/dir.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/util" ) // Override devpod home diff --git a/pkg/credentials/request.go b/pkg/credentials/request.go index 60af4a512..999f9a5e0 100644 --- a/pkg/credentials/request.go +++ b/pkg/credentials/request.go @@ -8,8 +8,8 @@ import ( "syscall" "time" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" diff --git a/pkg/credentials/server.go b/pkg/credentials/server.go index 3b0f12db9..a4105fec0 100644 --- a/pkg/credentials/server.go +++ b/pkg/credentials/server.go @@ -10,8 +10,8 @@ import ( "os" "strconv" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/agent/tunnel" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/credentials/start.go b/pkg/credentials/start.go index f9c180408..f660e9cdb 100644 --- a/pkg/credentials/start.go +++ b/pkg/credentials/start.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - "github.com/loft-sh/devpod/pkg/agent/tunnel" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" - portpkg "github.com/loft-sh/devpod/pkg/port" - "github.com/loft-sh/devpod/pkg/random" + "github.com/curityio/devpod/pkg/agent/tunnel" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" + portpkg "github.com/curityio/devpod/pkg/port" + "github.com/curityio/devpod/pkg/random" ) func StartCredentialsServer(ctx context.Context, cancel context.CancelFunc, client tunnel.TunnelClient, log log.Logger) (int, error) { diff --git a/pkg/daemon/agent/daemon.go b/pkg/daemon/agent/daemon.go index fd36019cf..d5738fed8 100644 --- a/pkg/daemon/agent/daemon.go +++ b/pkg/daemon/agent/daemon.go @@ -7,8 +7,8 @@ import ( "os/exec" "runtime" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/single" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/single" perrors "github.com/pkg/errors" "github.com/takama/daemon" ) diff --git a/pkg/devcontainer/build.go b/pkg/devcontainer/build.go index 246093762..06548f8a7 100644 --- a/pkg/devcontainer/build.go +++ b/pkg/devcontainer/build.go @@ -8,15 +8,15 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/compose" - "github.com/loft-sh/devpod/pkg/devcontainer/build" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/feature" - "github.com/loft-sh/devpod/pkg/devcontainer/metadata" - "github.com/loft-sh/devpod/pkg/dockerfile" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/image" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/compose" + "github.com/curityio/devpod/pkg/devcontainer/build" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/feature" + "github.com/curityio/devpod/pkg/devcontainer/metadata" + "github.com/curityio/devpod/pkg/dockerfile" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/image" + "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/build/options.go b/pkg/devcontainer/build/options.go index 17a5d1680..a4662502b 100644 --- a/pkg/devcontainer/build/options.go +++ b/pkg/devcontainer/build/options.go @@ -6,13 +6,13 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/feature" - "github.com/loft-sh/devpod/pkg/devcontainer/metadata" - "github.com/loft-sh/devpod/pkg/dockerfile" - "github.com/loft-sh/devpod/pkg/id" - "github.com/loft-sh/devpod/pkg/log/hash" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/feature" + "github.com/curityio/devpod/pkg/devcontainer/metadata" + "github.com/curityio/devpod/pkg/dockerfile" + "github.com/curityio/devpod/pkg/id" + "github.com/curityio/devpod/pkg/log/hash" + "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/buildkit/buildkit.go b/pkg/devcontainer/buildkit/buildkit.go index d3b279a26..c2e174e0f 100644 --- a/pkg/devcontainer/buildkit/buildkit.go +++ b/pkg/devcontainer/buildkit/buildkit.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/devcontainer/build" - "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/devcontainer/build" + "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/log" buildkit "github.com/moby/buildkit/client" "github.com/moby/buildkit/session" "github.com/moby/buildkit/session/auth/authprovider" diff --git a/pkg/devcontainer/compose.go b/pkg/devcontainer/compose.go index 3f630cd07..0e5a05235 100644 --- a/pkg/devcontainer/compose.go +++ b/pkg/devcontainer/compose.go @@ -12,13 +12,13 @@ import ( "time" composetypes "github.com/compose-spec/compose-go/v2/types" + "github.com/curityio/devpod/pkg/compose" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/feature" + "github.com/curityio/devpod/pkg/devcontainer/metadata" + "github.com/curityio/devpod/pkg/dockerfile" + "github.com/curityio/devpod/pkg/driver" "github.com/joho/godotenv" - "github.com/loft-sh/devpod/pkg/compose" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/feature" - "github.com/loft-sh/devpod/pkg/devcontainer/metadata" - "github.com/loft-sh/devpod/pkg/dockerfile" - "github.com/loft-sh/devpod/pkg/driver" "github.com/pkg/errors" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" diff --git a/pkg/devcontainer/config.go b/pkg/devcontainer/config.go index a087e82a9..10e19c409 100644 --- a/pkg/devcontainer/config.go +++ b/pkg/devcontainer/config.go @@ -5,9 +5,9 @@ import ( "path" "path/filepath" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/language" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/language" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/config/build.go b/pkg/devcontainer/config/build.go index fc1f954e9..7e3a901b3 100644 --- a/pkg/devcontainer/config/build.go +++ b/pkg/devcontainer/config/build.go @@ -1,7 +1,7 @@ package config import ( - "github.com/loft-sh/devpod/pkg/dockerfile" + "github.com/curityio/devpod/pkg/dockerfile" ) const ( diff --git a/pkg/devcontainer/config/config.go b/pkg/devcontainer/config/config.go index 14d196122..10339c999 100644 --- a/pkg/devcontainer/config/config.go +++ b/pkg/devcontainer/config/config.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/types" ) type MergedDevContainerConfig struct { diff --git a/pkg/devcontainer/config/feature.go b/pkg/devcontainer/config/feature.go index 55d0fd9e8..6dca7a971 100644 --- a/pkg/devcontainer/config/feature.go +++ b/pkg/devcontainer/config/feature.go @@ -1,6 +1,6 @@ package config -import "github.com/loft-sh/devpod/pkg/types" +import "github.com/curityio/devpod/pkg/types" type FeatureSet struct { ConfigID string diff --git a/pkg/devcontainer/config/merge.go b/pkg/devcontainer/config/merge.go index e6dc58dfb..467bdb583 100644 --- a/pkg/devcontainer/config/merge.go +++ b/pkg/devcontainer/config/merge.go @@ -3,7 +3,7 @@ package config import ( "strconv" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/types" ) func MergeConfiguration(config *DevContainerConfig, imageMetadataEntries []*ImageMetadata) (*MergedDevContainerConfig, error) { diff --git a/pkg/devcontainer/config/prebuild.go b/pkg/devcontainer/config/prebuild.go index cc1ef0574..3a331aa0b 100644 --- a/pkg/devcontainer/config/prebuild.go +++ b/pkg/devcontainer/config/prebuild.go @@ -6,13 +6,13 @@ import ( "path/filepath" "strings" - util "github.com/loft-sh/devpod/pkg/util/hash" + util "github.com/curityio/devpod/pkg/util/hash" "github.com/moby/patternmatcher" "github.com/moby/patternmatcher/ignorefile" "github.com/pkg/errors" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/hash" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/hash" ) func CalculatePrebuildHash( diff --git a/pkg/devcontainer/config/substitute.go b/pkg/devcontainer/config/substitute.go index cd885fe92..d9655e95a 100644 --- a/pkg/devcontainer/config/substitute.go +++ b/pkg/devcontainer/config/substitute.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - "github.com/loft-sh/devpod/pkg/log/hash" + "github.com/curityio/devpod/pkg/log/hash" ) type ReplaceFunction func(match, variable string, args []string) string diff --git a/pkg/devcontainer/config/userenvprobe.go b/pkg/devcontainer/config/userenvprobe.go index fea97d67e..1162caea6 100644 --- a/pkg/devcontainer/config/userenvprobe.go +++ b/pkg/devcontainer/config/userenvprobe.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/shell" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/shell" ) type UserEnvProbe string diff --git a/pkg/devcontainer/delete.go b/pkg/devcontainer/delete.go index 6995a99c2..dfc9a0b48 100644 --- a/pkg/devcontainer/delete.go +++ b/pkg/devcontainer/delete.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/loft-sh/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/config" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/feature/extend.go b/pkg/devcontainer/feature/extend.go index d3f601ddc..508f21fcc 100644 --- a/pkg/devcontainer/feature/extend.go +++ b/pkg/devcontainer/feature/extend.go @@ -9,12 +9,12 @@ import ( "strconv" "strings" + "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/graph" + "github.com/curityio/devpod/pkg/devcontainer/metadata" + "github.com/curityio/devpod/pkg/log" "github.com/google/go-containerregistry/pkg/name" - "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/graph" - "github.com/loft-sh/devpod/pkg/devcontainer/metadata" - "github.com/loft-sh/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/feature/features.go b/pkg/devcontainer/feature/features.go index 8dd541a8c..bd20820fa 100644 --- a/pkg/devcontainer/feature/features.go +++ b/pkg/devcontainer/feature/features.go @@ -10,15 +10,15 @@ import ( "regexp" "strings" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/extract" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/hash" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/extract" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/hash" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/feature/options.go b/pkg/devcontainer/feature/options.go index 5e54aebbc..4405f4df6 100644 --- a/pkg/devcontainer/feature/options.go +++ b/pkg/devcontainer/feature/options.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/loft-sh/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/config" ) func getFeatureEnvVariables(feature *config.FeatureConfig, featureOptions interface{}) []string { diff --git a/pkg/devcontainer/helpers.go b/pkg/devcontainer/helpers.go index efcb53225..f256f6dfc 100644 --- a/pkg/devcontainer/helpers.go +++ b/pkg/devcontainer/helpers.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/image" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/image" + "github.com/curityio/devpod/pkg/log" ) type GetWorkspaceConfigResult struct { diff --git a/pkg/devcontainer/inspect.go b/pkg/devcontainer/inspect.go index 331056c0f..ed9b144ff 100644 --- a/pkg/devcontainer/inspect.go +++ b/pkg/devcontainer/inspect.go @@ -3,9 +3,9 @@ package devcontainer import ( "context" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/image" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/image" ) func (r *runner) inspectImage(ctx context.Context, imageName string) (*config.ImageDetails, error) { diff --git a/pkg/devcontainer/metadata/metadata.go b/pkg/devcontainer/metadata/metadata.go index e083ba1e0..73f001acb 100644 --- a/pkg/devcontainer/metadata/metadata.go +++ b/pkg/devcontainer/metadata/metadata.go @@ -3,8 +3,8 @@ package metadata import ( "encoding/json" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/log" ) const ImageMetadataLabel = "devcontainer.metadata" diff --git a/pkg/devcontainer/prebuild.go b/pkg/devcontainer/prebuild.go index 8e27e7b65..91985fa13 100644 --- a/pkg/devcontainer/prebuild.go +++ b/pkg/devcontainer/prebuild.go @@ -7,11 +7,11 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/devcontainer/build" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/image" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/build" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/image" + "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/run.go b/pkg/devcontainer/run.go index 9689efe04..359edb3a1 100644 --- a/pkg/devcontainer/run.go +++ b/pkg/devcontainer/run.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/driver/drivercreate" - "github.com/loft-sh/devpod/pkg/encoding" - "github.com/loft-sh/devpod/pkg/language" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/driver/drivercreate" + "github.com/curityio/devpod/pkg/encoding" + "github.com/curityio/devpod/pkg/language" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/devcontainer/setup.go b/pkg/devcontainer/setup.go index 6fed1f121..fc4cb39c5 100644 --- a/pkg/devcontainer/setup.go +++ b/pkg/devcontainer/setup.go @@ -11,14 +11,14 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - "github.com/loft-sh/devpod/pkg/compress" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/sshtunnel" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/ide" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + "github.com/curityio/devpod/pkg/compress" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/sshtunnel" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/ide" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/devcontainer/setup/lifecyclehooks.go b/pkg/devcontainer/setup/lifecyclehooks.go index 6a49836dc..b741ceeb4 100644 --- a/pkg/devcontainer/setup/lifecyclehooks.go +++ b/pkg/devcontainer/setup/lifecyclehooks.go @@ -13,10 +13,10 @@ import ( "strings" "sync" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/devcontainer/setup/setup.go b/pkg/devcontainer/setup/setup.go index 95490c942..f65dd43d5 100644 --- a/pkg/devcontainer/setup/setup.go +++ b/pkg/devcontainer/setup/setup.go @@ -9,11 +9,11 @@ import ( "sort" "strings" - "github.com/loft-sh/devpod/pkg/command" - copy2 "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/envfile" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/command" + copy2 "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/envfile" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/single.go b/pkg/devcontainer/single.go index 30ac868b6..75e700dc5 100644 --- a/pkg/devcontainer/single.go +++ b/pkg/devcontainer/single.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/metadata" - "github.com/loft-sh/devpod/pkg/driver" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/metadata" + "github.com/curityio/devpod/pkg/driver" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/devcontainer/sshtunnel/sshtunnel.go b/pkg/devcontainer/sshtunnel/sshtunnel.go index ae3a1b2d7..c0e1d9a3b 100644 --- a/pkg/devcontainer/sshtunnel/sshtunnel.go +++ b/pkg/devcontainer/sshtunnel/sshtunnel.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" - client2 "github.com/loft-sh/devpod/pkg/client" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - devssh "github.com/loft-sh/devpod/pkg/ssh" - devsshagent "github.com/loft-sh/devpod/pkg/ssh/agent" + client2 "github.com/curityio/devpod/pkg/client" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + devssh "github.com/curityio/devpod/pkg/ssh" + devsshagent "github.com/curityio/devpod/pkg/ssh/agent" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/devcontainer/sshtunnel/sshtunnel_test.go b/pkg/devcontainer/sshtunnel/sshtunnel_test.go index e1ed0d87f..915f0d3f5 100644 --- a/pkg/devcontainer/sshtunnel/sshtunnel_test.go +++ b/pkg/devcontainer/sshtunnel/sshtunnel_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/log" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/log" "gotest.tools/assert" ) diff --git a/pkg/docker/client.go b/pkg/docker/client.go index 1fb236312..56b1ba05f 100644 --- a/pkg/docker/client.go +++ b/pkg/docker/client.go @@ -3,8 +3,8 @@ package docker import ( "context" + "github.com/curityio/devpod/pkg/log" dockerclient "github.com/docker/docker/client" - "github.com/loft-sh/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/docker/helper.go b/pkg/docker/helper.go index 11f183952..1f935c427 100644 --- a/pkg/docker/helper.go +++ b/pkg/docker/helper.go @@ -11,11 +11,11 @@ import ( "os/exec" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/image" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/image" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/scanner" perrors "github.com/pkg/errors" ) diff --git a/pkg/dockercredentials/dockercredentials.go b/pkg/dockercredentials/dockercredentials.go index 3f725fe8f..a1446bc79 100644 --- a/pkg/dockercredentials/dockercredentials.go +++ b/pkg/dockercredentials/dockercredentials.go @@ -6,13 +6,13 @@ import ( "path/filepath" "strings" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/random" "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/types" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/random" "github.com/pkg/errors" dockerconfig "github.com/containers/image/v5/pkg/docker/config" diff --git a/pkg/dockerfile/parse.go b/pkg/dockerfile/parse.go index 8e7e1d368..f69ff6f4b 100644 --- a/pkg/dockerfile/parse.go +++ b/pkg/dockerfile/parse.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/loft-sh/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/log/scanner" "github.com/moby/buildkit/frontend/dockerfile/parser" ) diff --git a/pkg/download/download.go b/pkg/download/download.go index 418e82906..0b7090678 100644 --- a/pkg/download/download.go +++ b/pkg/download/download.go @@ -8,9 +8,9 @@ import ( "net/url" "strings" - "github.com/loft-sh/devpod/pkg/gitcredentials" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/gitcredentials" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/driver/custom/custom.go b/pkg/driver/custom/custom.go index 0737d0c44..53a76d19e 100644 --- a/pkg/driver/custom/custom.go +++ b/pkg/driver/custom/custom.go @@ -9,15 +9,15 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/binaries" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/scanner" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/binaries" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/scanner" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/driver/docker.go b/pkg/driver/docker.go index 1fd36784d..7f2aaab58 100644 --- a/pkg/driver/docker.go +++ b/pkg/driver/docker.go @@ -3,12 +3,12 @@ package driver import ( "context" - "github.com/loft-sh/devpod/pkg/compose" - config2 "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/feature" - "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/compose" + config2 "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/feature" + "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/provider" ) type DockerDriver interface { diff --git a/pkg/driver/docker/build.go b/pkg/driver/docker/build.go index 168ee07d6..90d7d6bfb 100644 --- a/pkg/driver/docker/build.go +++ b/pkg/driver/docker/build.go @@ -7,12 +7,12 @@ import ( "io" "strings" - "github.com/loft-sh/devpod/pkg/devcontainer/build" - "github.com/loft-sh/devpod/pkg/devcontainer/buildkit" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/feature" - "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/build" + "github.com/curityio/devpod/pkg/devcontainer/buildkit" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/feature" + "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/driver/docker/docker.go b/pkg/driver/docker/docker.go index 395114ec2..76359dca9 100644 --- a/pkg/driver/docker/docker.go +++ b/pkg/driver/docker/docker.go @@ -13,14 +13,14 @@ import ( "strconv" "strings" - "github.com/loft-sh/devpod/pkg/compose" - config2 "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/docker" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/ide/jetbrains" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/compose" + config2 "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/docker" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/ide/jetbrains" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/driver/drivercreate/create.go b/pkg/driver/drivercreate/create.go index b82e7047b..df5bf39b9 100644 --- a/pkg/driver/drivercreate/create.go +++ b/pkg/driver/drivercreate/create.go @@ -3,12 +3,12 @@ package drivercreate import ( "fmt" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/driver/custom" - "github.com/loft-sh/devpod/pkg/driver/docker" - "github.com/loft-sh/devpod/pkg/driver/kubernetes" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/driver/custom" + "github.com/curityio/devpod/pkg/driver/docker" + "github.com/curityio/devpod/pkg/driver/kubernetes" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" ) func NewDriver(workspaceInfo *provider2.AgentWorkspaceInfo, log log.Logger) (driver.Driver, error) { diff --git a/pkg/driver/kubernetes/client.go b/pkg/driver/kubernetes/client.go index 6e60bf6db..13868ac32 100644 --- a/pkg/driver/kubernetes/client.go +++ b/pkg/driver/kubernetes/client.go @@ -6,7 +6,7 @@ import ( "io" "os" - "github.com/loft-sh/devpod/pkg/kubeclient" + "github.com/curityio/devpod/pkg/kubeclient" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" diff --git a/pkg/driver/kubernetes/driver.go b/pkg/driver/kubernetes/driver.go index 82391cd7e..26b9187b0 100644 --- a/pkg/driver/kubernetes/driver.go +++ b/pkg/driver/kubernetes/driver.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/loft-sh/devpod/pkg/driver" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" perrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/driver/kubernetes/find.go b/pkg/driver/kubernetes/find.go index 46a82d84d..4c7ce4f9b 100644 --- a/pkg/driver/kubernetes/find.go +++ b/pkg/driver/kubernetes/find.go @@ -3,7 +3,7 @@ package kubernetes import ( "context" - "github.com/loft-sh/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/config" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/driver/kubernetes/helper.go b/pkg/driver/kubernetes/helper.go index c820481d4..7d26899f8 100644 --- a/pkg/driver/kubernetes/helper.go +++ b/pkg/driver/kubernetes/helper.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" + "github.com/curityio/devpod/pkg/log" "github.com/ghodss/yaml" - "github.com/loft-sh/devpod/pkg/log" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/driver/kubernetes/init_container.go b/pkg/driver/kubernetes/init_container.go index 318867363..5b43133bb 100644 --- a/pkg/driver/kubernetes/init_container.go +++ b/pkg/driver/kubernetes/init_container.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/loft-sh/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/driver" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/driver/kubernetes/namespace_test.go b/pkg/driver/kubernetes/namespace_test.go index af5289678..77149c333 100644 --- a/pkg/driver/kubernetes/namespace_test.go +++ b/pkg/driver/kubernetes/namespace_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/loft-sh/devpod/pkg/kubeclient" - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/kubeclient" + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" "gotest.tools/assert" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/driver/kubernetes/pullsecrets.go b/pkg/driver/kubernetes/pullsecrets.go index 46c77c0a1..35f7363a0 100644 --- a/pkg/driver/kubernetes/pullsecrets.go +++ b/pkg/driver/kubernetes/pullsecrets.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/pkg/dockercredentials" + "github.com/curityio/devpod/pkg/dockercredentials" perrors "github.com/pkg/errors" k8sv1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/driver/kubernetes/pvc.go b/pkg/driver/kubernetes/pvc.go index cfa46f475..82b5520a7 100644 --- a/pkg/driver/kubernetes/pvc.go +++ b/pkg/driver/kubernetes/pvc.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/loft-sh/devpod/pkg/driver" + "github.com/curityio/devpod/pkg/driver" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/pkg/driver/kubernetes/run.go b/pkg/driver/kubernetes/run.go index d01920c79..aa7db51f1 100644 --- a/pkg/driver/kubernetes/run.go +++ b/pkg/driver/kubernetes/run.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/driver" - provider2 "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/driver" + provider2 "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/driver/kubernetes/throttledlogger/throttled_logger.go b/pkg/driver/kubernetes/throttledlogger/throttled_logger.go index 84860a089..06fc6cdef 100644 --- a/pkg/driver/kubernetes/throttledlogger/throttled_logger.go +++ b/pkg/driver/kubernetes/throttledlogger/throttled_logger.go @@ -3,7 +3,7 @@ package throttledlogger import ( "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" ) // ThrottledLogger is a logger that throttles the output, diff --git a/pkg/driver/kubernetes/wait.go b/pkg/driver/kubernetes/wait.go index 97b8ea294..3b35b0a12 100644 --- a/pkg/driver/kubernetes/wait.go +++ b/pkg/driver/kubernetes/wait.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/driver/kubernetes/throttledlogger" + "github.com/curityio/devpod/pkg/driver/kubernetes/throttledlogger" perrors "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/driver/types.go b/pkg/driver/types.go index 83b58b089..9c64dec03 100644 --- a/pkg/driver/types.go +++ b/pkg/driver/types.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/loft-sh/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/config" ) // Driver is the default interface for DevPod drivers diff --git a/pkg/encoding/encoding.go b/pkg/encoding/encoding.go index 7506b5dc9..9d9927f51 100644 --- a/pkg/encoding/encoding.go +++ b/pkg/encoding/encoding.go @@ -7,10 +7,10 @@ import ( "fmt" "strings" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/util" "github.com/denisbrodbeck/machineid" "github.com/google/uuid" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/util" ) const ( diff --git a/pkg/envfile/envfile.go b/pkg/envfile/envfile.go index 22bf90cae..2c3b0d8eb 100644 --- a/pkg/envfile/envfile.go +++ b/pkg/envfile/envfile.go @@ -4,7 +4,7 @@ import ( "encoding/json" "os" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" ) var location = "/etc/envfile.json" diff --git a/pkg/git/clone.go b/pkg/git/clone.go index 45fe9a887..da1a49a66 100644 --- a/pkg/git/clone.go +++ b/pkg/git/clone.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" "github.com/sirupsen/logrus" "github.com/spf13/pflag" ) diff --git a/pkg/git/git.go b/pkg/git/git.go index e56231e5c..315800106 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" "github.com/sirupsen/logrus" ) diff --git a/pkg/git/install.go b/pkg/git/install.go index dd647b3d0..c2b390246 100644 --- a/pkg/git/install.go +++ b/pkg/git/install.go @@ -4,8 +4,8 @@ import ( "fmt" "os/exec" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/gitcredentials/gitcredentials.go b/pkg/gitcredentials/gitcredentials.go index e4daf3539..e532f91d2 100644 --- a/pkg/gitcredentials/gitcredentials.go +++ b/pkg/gitcredentials/gitcredentials.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/log/scanner" "github.com/pkg/errors" ) diff --git a/pkg/gitsshsigning/client.go b/pkg/gitsshsigning/client.go index 2bf7ee93e..3274ad2ed 100644 --- a/pkg/gitsshsigning/client.go +++ b/pkg/gitsshsigning/client.go @@ -7,9 +7,9 @@ import ( "os" "strconv" - "github.com/loft-sh/devpod/pkg/credentials" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/credentials" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" ) // HandleGitSSHProgramCall implements logic handling call from git when signing a commit diff --git a/pkg/gitsshsigning/helper.go b/pkg/gitsshsigning/helper.go index 641c5efaf..9ee0d73f7 100644 --- a/pkg/gitsshsigning/helper.go +++ b/pkg/gitsshsigning/helper.go @@ -7,10 +7,10 @@ import ( "path/filepath" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/scanner" "github.com/pkg/errors" ) diff --git a/pkg/gpg/gpg_forwarding.go b/pkg/gpg/gpg_forwarding.go index 700637f06..135712c1f 100644 --- a/pkg/gpg/gpg_forwarding.go +++ b/pkg/gpg/gpg_forwarding.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" - devssh "github.com/loft-sh/devpod/pkg/ssh" + devssh "github.com/curityio/devpod/pkg/ssh" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" ) diff --git a/pkg/ide/ideparse/parse.go b/pkg/ide/ideparse/parse.go index fc288d8a2..059a8d945 100644 --- a/pkg/ide/ideparse/parse.go +++ b/pkg/ide/ideparse/parse.go @@ -6,16 +6,16 @@ import ( "regexp" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/ide/jetbrains" - "github.com/loft-sh/devpod/pkg/ide/jupyter" - "github.com/loft-sh/devpod/pkg/ide/openvscode" - "github.com/loft-sh/devpod/pkg/ide/rstudio" - "github.com/loft-sh/devpod/pkg/ide/vscode" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/ide/jetbrains" + "github.com/curityio/devpod/pkg/ide/jupyter" + "github.com/curityio/devpod/pkg/ide/openvscode" + "github.com/curityio/devpod/pkg/ide/rstudio" + "github.com/curityio/devpod/pkg/ide/vscode" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" "github.com/pkg/errors" ) diff --git a/pkg/ide/ideparse/parse_test.go b/pkg/ide/ideparse/parse_test.go index d53f14165..33fa2850b 100644 --- a/pkg/ide/ideparse/parse_test.go +++ b/pkg/ide/ideparse/parse_test.go @@ -3,9 +3,9 @@ package ideparse import ( "testing" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" "gotest.tools/assert" ) diff --git a/pkg/ide/jetbrains/clion.go b/pkg/ide/jetbrains/clion.go index bc743140e..4b2126625 100644 --- a/pkg/ide/jetbrains/clion.go +++ b/pkg/ide/jetbrains/clion.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/dataspell.go b/pkg/ide/jetbrains/dataspell.go index e8fce88b5..5982b0454 100644 --- a/pkg/ide/jetbrains/dataspell.go +++ b/pkg/ide/jetbrains/dataspell.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/generic.go b/pkg/ide/jetbrains/generic.go index 2d01a46c0..d0ebb2777 100644 --- a/pkg/ide/jetbrains/generic.go +++ b/pkg/ide/jetbrains/generic.go @@ -10,14 +10,14 @@ import ( "path/filepath" "runtime" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - copy2 "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/extract" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + copy2 "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/extract" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/util" "github.com/pkg/errors" "github.com/skratchdot/open-golang/open" ) diff --git a/pkg/ide/jetbrains/goland.go b/pkg/ide/jetbrains/goland.go index 49ce0e429..ee559e0fb 100644 --- a/pkg/ide/jetbrains/goland.go +++ b/pkg/ide/jetbrains/goland.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/intellij.go b/pkg/ide/jetbrains/intellij.go index c31e25e13..0bf832ebd 100644 --- a/pkg/ide/jetbrains/intellij.go +++ b/pkg/ide/jetbrains/intellij.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/phpstorm.go b/pkg/ide/jetbrains/phpstorm.go index 8a5308daa..2aee7b952 100644 --- a/pkg/ide/jetbrains/phpstorm.go +++ b/pkg/ide/jetbrains/phpstorm.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/pycharm.go b/pkg/ide/jetbrains/pycharm.go index c7affa57f..728238d53 100644 --- a/pkg/ide/jetbrains/pycharm.go +++ b/pkg/ide/jetbrains/pycharm.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/rider.go b/pkg/ide/jetbrains/rider.go index cb6f09cc1..c6727a9e7 100644 --- a/pkg/ide/jetbrains/rider.go +++ b/pkg/ide/jetbrains/rider.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/rubymine.go b/pkg/ide/jetbrains/rubymine.go index ea8ca7118..9a7f4e0af 100644 --- a/pkg/ide/jetbrains/rubymine.go +++ b/pkg/ide/jetbrains/rubymine.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/rustrover.go b/pkg/ide/jetbrains/rustrover.go index 15ae276c8..5e5eb2017 100644 --- a/pkg/ide/jetbrains/rustrover.go +++ b/pkg/ide/jetbrains/rustrover.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jetbrains/webstorm.go b/pkg/ide/jetbrains/webstorm.go index 37af63135..996614955 100644 --- a/pkg/ide/jetbrains/webstorm.go +++ b/pkg/ide/jetbrains/webstorm.go @@ -1,9 +1,9 @@ package jetbrains import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/ide/jupyter/jupyter.go b/pkg/ide/jupyter/jupyter.go index 772620a53..5c0261d5f 100644 --- a/pkg/ide/jupyter/jupyter.go +++ b/pkg/ide/jupyter/jupyter.go @@ -5,11 +5,11 @@ import ( "os/exec" "strconv" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/single" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/single" ) const ( diff --git a/pkg/ide/openvscode/openvscode.go b/pkg/ide/openvscode/openvscode.go index 4585088a0..00b5052b5 100644 --- a/pkg/ide/openvscode/openvscode.go +++ b/pkg/ide/openvscode/openvscode.go @@ -8,16 +8,16 @@ import ( "runtime" "strconv" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - copy2 "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/extract" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/ide/vscode" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/single" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + copy2 "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/extract" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/ide/vscode" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/single" + "github.com/curityio/devpod/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/ide/rstudio/rstudio.go b/pkg/ide/rstudio/rstudio.go index d420fadeb..1e9f786fb 100644 --- a/pkg/ide/rstudio/rstudio.go +++ b/pkg/ide/rstudio/rstudio.go @@ -14,13 +14,13 @@ import ( "runtime" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - copypkg "github.com/loft-sh/devpod/pkg/copy" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/single" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + copypkg "github.com/curityio/devpod/pkg/copy" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/single" ) const ( diff --git a/pkg/ide/types.go b/pkg/ide/types.go index fc7505c85..26fb93f4a 100644 --- a/pkg/ide/types.go +++ b/pkg/ide/types.go @@ -4,8 +4,8 @@ import ( "io" "time" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" ) type IDE interface { diff --git a/pkg/ide/vscode/apk.go b/pkg/ide/vscode/apk.go index 1ffcf061e..fae38bd98 100644 --- a/pkg/ide/vscode/apk.go +++ b/pkg/ide/vscode/apk.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" ) // InstallAPKRequirements installs the requirements using apk. diff --git a/pkg/ide/vscode/open.go b/pkg/ide/vscode/open.go index 271f6f215..24deb6a48 100644 --- a/pkg/ide/vscode/open.go +++ b/pkg/ide/vscode/open.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" "github.com/skratchdot/open-golang/open" ) diff --git a/pkg/ide/vscode/vscode.go b/pkg/ide/vscode/vscode.go index af5755342..270ba6d13 100644 --- a/pkg/ide/vscode/vscode.go +++ b/pkg/ide/vscode/vscode.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/config" - copy2 "github.com/loft-sh/devpod/pkg/copy" - "github.com/loft-sh/devpod/pkg/ide" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/config" + copy2 "github.com/curityio/devpod/pkg/copy" + "github.com/curityio/devpod/pkg/ide" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/ide/zed/zed.go b/pkg/ide/zed/zed.go index 3572dd823..4859b72ad 100644 --- a/pkg/ide/zed/zed.go +++ b/pkg/ide/zed/zed.go @@ -6,10 +6,10 @@ import ( "context" "fmt" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" "github.com/skratchdot/open-golang/open" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/pkg/config" ) // Open first finds the zed binary for the local platform and then opens the zed editor with the given workspace folder diff --git a/pkg/ide/zed/zed_linux.go b/pkg/ide/zed/zed_linux.go index 2ace62022..5f0aedc18 100644 --- a/pkg/ide/zed/zed_linux.go +++ b/pkg/ide/zed/zed_linux.go @@ -7,9 +7,9 @@ import ( "fmt" "os/exec" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/pkg/config" ) // Open first finds the zed binary for the local platform and then opens the zed editor with the given workspace folder diff --git a/pkg/image/image.go b/pkg/image/image.go index 25135c971..bd043b30c 100644 --- a/pkg/image/image.go +++ b/pkg/image/image.go @@ -6,11 +6,11 @@ import ( "net/http" "regexp" + "github.com/curityio/devpod/pkg/log" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" v1 "github.com/google/go-containerregistry/pkg/v1" "github.com/google/go-containerregistry/pkg/v1/remote" - "github.com/loft-sh/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/image/kubernetes_keychain.go b/pkg/image/kubernetes_keychain.go index d956458e5..808459116 100644 --- a/pkg/image/kubernetes_keychain.go +++ b/pkg/image/kubernetes_keychain.go @@ -28,9 +28,9 @@ import ( "sort" "strings" + "github.com/curityio/devpod/pkg/kubeclient" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/logs" - "github.com/loft-sh/devpod/pkg/kubeclient" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/image/kubernetes_keychain_test.go b/pkg/image/kubernetes_keychain_test.go index 7eabbf045..700ffad57 100644 --- a/pkg/image/kubernetes_keychain_test.go +++ b/pkg/image/kubernetes_keychain_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" + "github.com/curityio/devpod/pkg/kubeclient" "github.com/google/go-containerregistry/pkg/authn" "github.com/google/go-containerregistry/pkg/name" - "github.com/loft-sh/devpod/pkg/kubeclient" "gotest.tools/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index 65becc2ff..37804242d 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" perrors "github.com/pkg/errors" ) diff --git a/pkg/inject/inject_test.go b/pkg/inject/inject_test.go index 84af955a1..354cce5b8 100644 --- a/pkg/inject/inject_test.go +++ b/pkg/inject/inject_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" "gotest.tools/assert" ) diff --git a/pkg/inject/script.go b/pkg/inject/script.go index 2a3e33b1d..200e7d2e6 100644 --- a/pkg/inject/script.go +++ b/pkg/inject/script.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/loft-sh/devpod/pkg/template" + "github.com/curityio/devpod/pkg/template" ) func GenerateScript(script string, params *Params) (string, error) { diff --git a/pkg/language/language.go b/pkg/language/language.go index 4f679a408..a49e5023d 100644 --- a/pkg/language/language.go +++ b/pkg/language/language.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/log" ) type ProgrammingLanguage string diff --git a/pkg/log/discard_logger.go b/pkg/log/discard_logger.go index 5c9172ef2..cdf4a4852 100644 --- a/pkg/log/discard_logger.go +++ b/pkg/log/discard_logger.go @@ -6,8 +6,8 @@ import ( "os" "sync" + "github.com/curityio/devpod/pkg/log/survey" "github.com/go-logr/logr" - "github.com/loft-sh/devpod/pkg/log/survey" "github.com/sirupsen/logrus" ) diff --git a/pkg/log/file_logger.go b/pkg/log/file_logger.go index ebf57d5ef..45ac3653a 100644 --- a/pkg/log/file_logger.go +++ b/pkg/log/file_logger.go @@ -7,8 +7,8 @@ import ( "strings" "sync" + "github.com/curityio/devpod/pkg/log/survey" "github.com/go-logr/logr" - "github.com/loft-sh/devpod/pkg/log/survey" "github.com/sirupsen/logrus" lumberjack "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/pkg/log/jsonstream.go b/pkg/log/jsonstream.go index 058bbd0fa..dd9d2f81e 100644 --- a/pkg/log/jsonstream.go +++ b/pkg/log/jsonstream.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io" - "github.com/loft-sh/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/log/scanner" "github.com/sirupsen/logrus" ) diff --git a/pkg/log/log.go b/pkg/log/log.go index b808ae65d..90a541902 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -5,8 +5,8 @@ import ( "io" "sync" + "github.com/curityio/devpod/pkg/log/survey" "github.com/go-logr/logr" - "github.com/loft-sh/devpod/pkg/log/survey" "github.com/sirupsen/logrus" ) diff --git a/pkg/log/logger.go b/pkg/log/logger.go index bb7d4637a..671dbe63e 100644 --- a/pkg/log/logger.go +++ b/pkg/log/logger.go @@ -3,8 +3,8 @@ package log import ( "io" + "github.com/curityio/devpod/pkg/log/survey" "github.com/go-logr/logr" - "github.com/loft-sh/devpod/pkg/log/survey" "github.com/sirupsen/logrus" ) diff --git a/pkg/log/stream_logger.go b/pkg/log/stream_logger.go index a0184f4b7..198d8b6ba 100644 --- a/pkg/log/stream_logger.go +++ b/pkg/log/stream_logger.go @@ -10,11 +10,11 @@ import ( "sync" "time" + "github.com/curityio/devpod/pkg/log/hash" + "github.com/curityio/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/log/survey" + "github.com/curityio/devpod/pkg/log/terminal" "github.com/go-logr/logr" - "github.com/loft-sh/devpod/pkg/log/hash" - "github.com/loft-sh/devpod/pkg/log/scanner" - "github.com/loft-sh/devpod/pkg/log/survey" - "github.com/loft-sh/devpod/pkg/log/terminal" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/pkg/log/table/table.go b/pkg/log/table/table.go index 9a6e34881..2905ad3a0 100644 --- a/pkg/log/table/table.go +++ b/pkg/log/table/table.go @@ -5,7 +5,7 @@ import ( "strings" "unicode" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" "github.com/mattn/go-runewidth" "github.com/sirupsen/logrus" ) diff --git a/pkg/netstat/watcher.go b/pkg/netstat/watcher.go index d40c1c44d..88e29cda9 100644 --- a/pkg/netstat/watcher.go +++ b/pkg/netstat/watcher.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" ) type Forwarder interface { diff --git a/pkg/open/open.go b/pkg/open/open.go index 0b27e7089..b9200d27d 100644 --- a/pkg/open/open.go +++ b/pkg/open/open.go @@ -7,8 +7,8 @@ import ( "os/exec" "time" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - "github.com/loft-sh/devpod/pkg/log" + devpodhttp "github.com/curityio/devpod/pkg/http" + "github.com/curityio/devpod/pkg/log" "github.com/skratchdot/open-golang/open" ) diff --git a/pkg/options/resolve.go b/pkg/options/resolve.go index 15dcafcd1..0527b3d83 100644 --- a/pkg/options/resolve.go +++ b/pkg/options/resolve.go @@ -5,14 +5,14 @@ import ( "os" "reflect" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/binaries" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/options/resolver" - - "github.com/loft-sh/devpod/pkg/log" - provider2 "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/binaries" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/options/resolver" + + "github.com/curityio/devpod/pkg/log" + provider2 "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" ) func ResolveAndSaveOptionsMachine( diff --git a/pkg/options/resolve_test.go b/pkg/options/resolve_test.go index 4b241ea83..9122048bd 100644 --- a/pkg/options/resolve_test.go +++ b/pkg/options/resolve_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/options/resolver" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/options/resolver" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" "gotest.tools/assert" ) diff --git a/pkg/options/resolver/parse.go b/pkg/options/resolver/parse.go index 53e8ad59a..8a1197747 100644 --- a/pkg/options/resolver/parse.go +++ b/pkg/options/resolver/parse.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/types" ) func printUnusedUserValues(userValues map[string]string, options config.OptionDefinitions, log log.Logger) { diff --git a/pkg/options/resolver/resolve.go b/pkg/options/resolver/resolve.go index a4d018965..d9fa1c65c 100644 --- a/pkg/options/resolver/resolve.go +++ b/pkg/options/resolver/resolve.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log/survey" - "github.com/loft-sh/devpod/pkg/log/terminal" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log/survey" + "github.com/curityio/devpod/pkg/log/terminal" + "github.com/curityio/devpod/pkg/types" "github.com/pkg/errors" ) diff --git a/pkg/options/resolver/resolver.go b/pkg/options/resolver/resolver.go index eb0139c65..68370e19b 100644 --- a/pkg/options/resolver/resolver.go +++ b/pkg/options/resolver/resolver.go @@ -4,10 +4,10 @@ import ( "context" "regexp" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/devcontainer/graph" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/devcontainer/graph" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/types" ) const ( diff --git a/pkg/options/resolver/sub_options.go b/pkg/options/resolver/sub_options.go index 63b0ad91a..126902eab 100644 --- a/pkg/options/resolver/sub_options.go +++ b/pkg/options/resolver/sub_options.go @@ -7,11 +7,11 @@ import ( "strings" "time" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/shell" + "github.com/curityio/devpod/pkg/types" "github.com/ghodss/yaml" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/shell" - "github.com/loft-sh/devpod/pkg/types" "github.com/pkg/errors" ) diff --git a/pkg/options/resolver/util.go b/pkg/options/resolver/util.go index fd058e85a..c0c04629e 100644 --- a/pkg/options/resolver/util.go +++ b/pkg/options/resolver/util.go @@ -4,9 +4,9 @@ import ( "fmt" "sort" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/devcontainer/graph" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/devcontainer/graph" + "github.com/curityio/devpod/pkg/types" ) func combine(resolvedOptions map[string]config.OptionValue, extraValues map[string]string) map[string]string { diff --git a/pkg/provider/context_options.go b/pkg/provider/context_options.go index 78f5e5c59..d95b482fe 100644 --- a/pkg/provider/context_options.go +++ b/pkg/provider/context_options.go @@ -4,8 +4,8 @@ import ( "context" "strconv" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/git" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/git" ) // ApplyContextOptions sets the CLI options that the agent needs from the context options, so that every command diff --git a/pkg/provider/context_options_test.go b/pkg/provider/context_options_test.go index b8a0c12f5..3fc0d6d6a 100644 --- a/pkg/provider/context_options_test.go +++ b/pkg/provider/context_options_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/loft-sh/devpod/pkg/config" + "github.com/curityio/devpod/pkg/config" "gotest.tools/assert" ) diff --git a/pkg/provider/dir.go b/pkg/provider/dir.go index 4307152fe..903889573 100644 --- a/pkg/provider/dir.go +++ b/pkg/provider/dir.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/pkg/config" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/file" + "github.com/curityio/devpod/pkg/config" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/file" ) const ( diff --git a/pkg/provider/env.go b/pkg/provider/env.go index c5eb8ba0d..091710575 100644 --- a/pkg/provider/env.go +++ b/pkg/provider/env.go @@ -7,8 +7,8 @@ import ( "runtime" "strings" - "github.com/loft-sh/devpod/pkg/config" - log2 "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/config" + log2 "github.com/curityio/devpod/pkg/log" ) const ( diff --git a/pkg/provider/export.go b/pkg/provider/export.go index 0a1ad8b5a..b561f4652 100644 --- a/pkg/provider/export.go +++ b/pkg/provider/export.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "fmt" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/extract" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/extract" ) var excludedPaths = []string{ diff --git a/pkg/provider/machine.go b/pkg/provider/machine.go index a00184fed..73a28b565 100644 --- a/pkg/provider/machine.go +++ b/pkg/provider/machine.go @@ -1,8 +1,8 @@ package provider import ( - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/types" ) type Machine struct { diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index 12fee0c7f..bcbfcfff0 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -1,7 +1,7 @@ package provider import ( - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/types" ) const ( diff --git a/pkg/provider/workspace.go b/pkg/provider/workspace.go index ccefdb03a..de2545cc9 100644 --- a/pkg/provider/workspace.go +++ b/pkg/provider/workspace.go @@ -4,10 +4,10 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/config" - devcontainerconfig "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + devcontainerconfig "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/types" ) var ( diff --git a/pkg/single/single.go b/pkg/single/single.go index 8b367f038..046c1abf2 100644 --- a/pkg/single/single.go +++ b/pkg/single/single.go @@ -7,8 +7,8 @@ import ( "strconv" "time" + "github.com/curityio/devpod/pkg/command" "github.com/gofrs/flock" - "github.com/loft-sh/devpod/pkg/command" "github.com/pkg/errors" ) diff --git a/pkg/ssh/config.go b/pkg/ssh/config.go index 746f6e264..ead3f8c9f 100644 --- a/pkg/ssh/config.go +++ b/pkg/ssh/config.go @@ -11,9 +11,9 @@ import ( "strings" "sync" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/scanner" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/scanner" + "github.com/curityio/devpod/pkg/util" "github.com/pkg/errors" ) diff --git a/pkg/ssh/connection_counter.go b/pkg/ssh/connection_counter.go index a5722b42d..ad4feca6d 100644 --- a/pkg/ssh/connection_counter.go +++ b/pkg/ssh/connection_counter.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" ) func newConnectionCounter(ctx context.Context, timeout time.Duration, onTimeout func(), address string, log log.Logger) *connectionCounter { diff --git a/pkg/ssh/forward.go b/pkg/ssh/forward.go index d9c524a56..2a5b24ee4 100644 --- a/pkg/ssh/forward.go +++ b/pkg/ssh/forward.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" "golang.org/x/crypto/ssh" ) diff --git a/pkg/ssh/helper.go b/pkg/ssh/helper.go index ff547b4b0..643063b02 100644 --- a/pkg/ssh/helper.go +++ b/pkg/ssh/helper.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/loft-sh/devpod/pkg/stdio" + "github.com/curityio/devpod/pkg/stdio" "github.com/pkg/errors" "golang.org/x/crypto/ssh" ) diff --git a/pkg/ssh/keys.go b/pkg/ssh/keys.go index edd5e072c..1482d3fe4 100644 --- a/pkg/ssh/keys.go +++ b/pkg/ssh/keys.go @@ -11,8 +11,8 @@ import ( "path/filepath" "sync" - "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/util" "github.com/pkg/errors" "golang.org/x/crypto/ssh" diff --git a/pkg/ssh/server/agent.go b/pkg/ssh/server/agent.go index c9d2ac3bb..b3dedda7b 100644 --- a/pkg/ssh/server/agent.go +++ b/pkg/ssh/server/agent.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/pkg/ssh/sshd" + "github.com/curityio/devpod/pkg/ssh/sshd" ) // agentSocketFile is the name of the agent socket in its directory, the same diff --git a/pkg/ssh/server/exec.go b/pkg/ssh/server/exec.go index 8d119318b..e2d4cc2a5 100644 --- a/pkg/ssh/server/exec.go +++ b/pkg/ssh/server/exec.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/ssh/sshd" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/ssh/sshd" perrors "github.com/pkg/errors" ) diff --git a/pkg/ssh/server/exit.go b/pkg/ssh/server/exit.go index af863ee6d..2bc755ddd 100644 --- a/pkg/ssh/server/exit.go +++ b/pkg/ssh/server/exit.go @@ -5,8 +5,8 @@ import ( "os/exec" "strings" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/ssh/sshd" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/ssh/sshd" perrors "github.com/pkg/errors" ) diff --git a/pkg/ssh/server/sftp_handler.go b/pkg/ssh/server/sftp_handler.go index a90330b41..514552832 100644 --- a/pkg/ssh/server/sftp_handler.go +++ b/pkg/ssh/server/sftp_handler.go @@ -4,9 +4,9 @@ import ( "errors" "io" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/ssh/sshd" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/ssh/sshd" "github.com/pkg/sftp" "github.com/sirupsen/logrus" ) diff --git a/pkg/ssh/server/ssh.go b/pkg/ssh/server/ssh.go index f2e16b224..ee288bc41 100644 --- a/pkg/ssh/server/ssh.go +++ b/pkg/ssh/server/ssh.go @@ -7,9 +7,9 @@ import ( "os/exec" "os/user" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/shell" - "github.com/loft-sh/devpod/pkg/ssh/sshd" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/shell" + "github.com/curityio/devpod/pkg/ssh/sshd" ) const DefaultPort int = 8022 diff --git a/pkg/ssh/server/ssh_test.go b/pkg/ssh/server/ssh_test.go index 2c896953c..2883cf40d 100644 --- a/pkg/ssh/server/ssh_test.go +++ b/pkg/ssh/server/ssh_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" gossh "golang.org/x/crypto/ssh" ) diff --git a/pkg/ssh/server/workdir.go b/pkg/ssh/server/workdir.go index c5510b321..b006e6760 100644 --- a/pkg/ssh/server/workdir.go +++ b/pkg/ssh/server/workdir.go @@ -3,7 +3,7 @@ package server import ( "os" - "github.com/loft-sh/devpod/pkg/command" + "github.com/curityio/devpod/pkg/command" ) func findWorkdir(workdir string, userName string) string { diff --git a/pkg/ssh/ssh_add.go b/pkg/ssh/ssh_add.go index 655fdaa60..eea20c056 100644 --- a/pkg/ssh/ssh_add.go +++ b/pkg/ssh/ssh_add.go @@ -8,10 +8,10 @@ import ( "path/filepath" "time" - "github.com/loft-sh/devpod/pkg/command" - "github.com/loft-sh/devpod/pkg/log" - devsshagent "github.com/loft-sh/devpod/pkg/ssh/agent" - "github.com/loft-sh/devpod/pkg/util" + "github.com/curityio/devpod/pkg/command" + "github.com/curityio/devpod/pkg/log" + devsshagent "github.com/curityio/devpod/pkg/ssh/agent" + "github.com/curityio/devpod/pkg/util" "golang.org/x/crypto/ssh" ) diff --git a/pkg/telemetry/telemetry.go b/pkg/telemetry/telemetry.go index d4b256b5b..cf538a836 100644 --- a/pkg/telemetry/telemetry.go +++ b/pkg/telemetry/telemetry.go @@ -2,7 +2,7 @@ // Telemetry is disabled: CollectorCLI never sends anything until a Curity backend exists to collect it. package telemetry -import devpodclient "github.com/loft-sh/devpod/pkg/client" +import devpodclient "github.com/curityio/devpod/pkg/client" const UIEnvVar = "DEVPOD_UI" diff --git a/pkg/token/token.go b/pkg/token/token.go index d1f5495e7..c60d88271 100644 --- a/pkg/token/token.go +++ b/pkg/token/token.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "encoding/json" - "github.com/loft-sh/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/ssh" "github.com/pkg/errors" ) diff --git a/pkg/tunnel/container.go b/pkg/tunnel/container.go index fdfc60a6b..b27295341 100644 --- a/pkg/tunnel/container.go +++ b/pkg/tunnel/container.go @@ -11,12 +11,12 @@ import ( "os" "time" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/provider" - devssh "github.com/loft-sh/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/provider" + devssh "github.com/curityio/devpod/pkg/ssh" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" diff --git a/pkg/tunnel/direct.go b/pkg/tunnel/direct.go index 3e2ed5fa5..99f04f369 100644 --- a/pkg/tunnel/direct.go +++ b/pkg/tunnel/direct.go @@ -5,7 +5,7 @@ import ( "io" "os" - devssh "github.com/loft-sh/devpod/pkg/ssh" + devssh "github.com/curityio/devpod/pkg/ssh" "github.com/pkg/errors" ) diff --git a/pkg/tunnel/forwarder.go b/pkg/tunnel/forwarder.go index fd2e68c42..6f047f3ae 100644 --- a/pkg/tunnel/forwarder.go +++ b/pkg/tunnel/forwarder.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/netstat" - devssh "github.com/loft-sh/devpod/pkg/ssh" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/netstat" + devssh "github.com/curityio/devpod/pkg/ssh" "golang.org/x/crypto/ssh" ) diff --git a/pkg/tunnel/services.go b/pkg/tunnel/services.go index 17996bc25..5a4e7470d 100644 --- a/pkg/tunnel/services.go +++ b/pkg/tunnel/services.go @@ -12,18 +12,18 @@ import ( "strings" "time" + "github.com/curityio/devpod/pkg/agent" + "github.com/curityio/devpod/pkg/agent/tunnelserver" + "github.com/curityio/devpod/pkg/config" + config2 "github.com/curityio/devpod/pkg/devcontainer/config" + "github.com/curityio/devpod/pkg/devcontainer/setup" + "github.com/curityio/devpod/pkg/gitsshsigning" + "github.com/curityio/devpod/pkg/ide/openvscode" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/netstat" + "github.com/curityio/devpod/pkg/provider" + devssh "github.com/curityio/devpod/pkg/ssh" "github.com/docker/go-connections/nat" - "github.com/loft-sh/devpod/pkg/agent" - "github.com/loft-sh/devpod/pkg/agent/tunnelserver" - "github.com/loft-sh/devpod/pkg/config" - config2 "github.com/loft-sh/devpod/pkg/devcontainer/config" - "github.com/loft-sh/devpod/pkg/devcontainer/setup" - "github.com/loft-sh/devpod/pkg/gitsshsigning" - "github.com/loft-sh/devpod/pkg/ide/openvscode" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/netstat" - "github.com/loft-sh/devpod/pkg/provider" - devssh "github.com/loft-sh/devpod/pkg/ssh" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" diff --git a/pkg/types/types_test.go b/pkg/types/types_test.go index 38909ed2b..83813f6a0 100644 --- a/pkg/types/types_test.go +++ b/pkg/types/types_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/types" "gotest.tools/assert" ) diff --git a/pkg/upgrade/github.go b/pkg/upgrade/github.go index 771961ba2..245c8c2d9 100644 --- a/pkg/upgrade/github.go +++ b/pkg/upgrade/github.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/loft-sh/devpod/pkg/download" + "github.com/curityio/devpod/pkg/download" ) const ( diff --git a/pkg/upgrade/install.go b/pkg/upgrade/install.go index 740920803..acc69166f 100644 --- a/pkg/upgrade/install.go +++ b/pkg/upgrade/install.go @@ -12,7 +12,7 @@ import ( "runtime" "slices" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" ) // install describes where Upgrade puts a new release. diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index a58cfd82f..3794d0a51 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/loft-sh/devpod/pkg/download" - "github.com/loft-sh/devpod/pkg/log" - versionpkg "github.com/loft-sh/devpod/pkg/version" + "github.com/curityio/devpod/pkg/download" + "github.com/curityio/devpod/pkg/log" + versionpkg "github.com/curityio/devpod/pkg/version" ) // These are variables so that tests can replace them. diff --git a/pkg/upgrade/upgrade_test.go b/pkg/upgrade/upgrade_test.go index b509ed1b5..3c9f07222 100644 --- a/pkg/upgrade/upgrade_test.go +++ b/pkg/upgrade/upgrade_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/loft-sh/devpod/pkg/download" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/download" + "github.com/curityio/devpod/pkg/log" ) func TestParseVersion(t *testing.T) { diff --git a/pkg/upgrade/upgrade_unix_test.go b/pkg/upgrade/upgrade_unix_test.go index e2842d537..c64172220 100644 --- a/pkg/upgrade/upgrade_unix_test.go +++ b/pkg/upgrade/upgrade_unix_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/pkg/workspace/delete.go b/pkg/workspace/delete.go index d8c3bffcd..aa60c0089 100644 --- a/pkg/workspace/delete.go +++ b/pkg/workspace/delete.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - client2 "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" + client2 "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" ) diff --git a/pkg/workspace/gituser.go b/pkg/workspace/gituser.go index 527f021cb..d010329e9 100644 --- a/pkg/workspace/gituser.go +++ b/pkg/workspace/gituser.go @@ -3,9 +3,9 @@ package workspace import ( "fmt" - "github.com/loft-sh/devpod/pkg/gitcredentials" - "github.com/loft-sh/devpod/pkg/log" - providerpkg "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/gitcredentials" + "github.com/curityio/devpod/pkg/log" + providerpkg "github.com/curityio/devpod/pkg/provider" ) // GitUserOptions are the `devpod up` options for the git identity of the workspace's container. diff --git a/pkg/workspace/gituser_test.go b/pkg/workspace/gituser_test.go index eb9322c2d..c672d25e6 100644 --- a/pkg/workspace/gituser_test.go +++ b/pkg/workspace/gituser_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - providerpkg "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + providerpkg "github.com/curityio/devpod/pkg/provider" "gotest.tools/assert" ) diff --git a/pkg/workspace/id.go b/pkg/workspace/id.go index 8153145ad..70aac1fc2 100644 --- a/pkg/workspace/id.go +++ b/pkg/workspace/id.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/loft-sh/devpod/pkg/git" + "github.com/curityio/devpod/pkg/git" ) var ( diff --git a/pkg/workspace/list.go b/pkg/workspace/list.go index 073c21048..6786e546b 100644 --- a/pkg/workspace/list.go +++ b/pkg/workspace/list.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - providerpkg "github.com/loft-sh/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + providerpkg "github.com/curityio/devpod/pkg/provider" ) func List(ctx context.Context, devPodConfig *config.Config, log log.Logger) ([]*providerpkg.Workspace, error) { diff --git a/pkg/workspace/list_test.go b/pkg/workspace/list_test.go index 344a4301c..58d558bbe 100644 --- a/pkg/workspace/list_test.go +++ b/pkg/workspace/list_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/log" - providerpkg "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/log" + providerpkg "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" "gotest.tools/assert" "gotest.tools/assert/cmp" ) diff --git a/pkg/workspace/machine.go b/pkg/workspace/machine.go index 749b025b7..e1c5e9651 100644 --- a/pkg/workspace/machine.go +++ b/pkg/workspace/machine.go @@ -6,16 +6,16 @@ import ( "os" "path/filepath" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/encoding" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/survey" - "github.com/loft-sh/devpod/pkg/log/terminal" - providerpkg "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/encoding" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/survey" + "github.com/curityio/devpod/pkg/log/terminal" + providerpkg "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" ) func listMachines(devPodConfig *config.Config, log log.Logger) ([]*providerpkg.Machine, error) { diff --git a/pkg/workspace/provider.go b/pkg/workspace/provider.go index b4228ab87..0004e016a 100644 --- a/pkg/workspace/provider.go +++ b/pkg/workspace/provider.go @@ -6,17 +6,18 @@ import ( "io" "os" "path/filepath" + "slices" "strings" - devpodhttp "github.com/loft-sh/devpod/pkg/http" - providerpkg "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" - "github.com/loft-sh/devpod/providers" + devpodhttp "github.com/curityio/devpod/pkg/http" + providerpkg "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" + "github.com/curityio/devpod/providers" - "github.com/loft-sh/devpod/pkg/binaries" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/download" - "github.com/loft-sh/devpod/pkg/log" + "github.com/curityio/devpod/pkg/binaries" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/download" + "github.com/curityio/devpod/pkg/log" "github.com/pkg/errors" ) @@ -192,6 +193,35 @@ func ResolveProvider(providerSource string, log log.Logger) ([]byte, *providerpk return nil, nil, fmt.Errorf("unrecognized provider type, please specify either a local file, url or github repository") } +// GithubProviderOwner is the GitHub owner of the devpod-provider- repository that a provider given +// by its name alone is downloaded from, unless it's one of the LoftProviders. +const GithubProviderOwner = "curityio" + +// LoftProviders are the providers that so far only exist under loft-sh's GitHub organization, so a +// provider given by one of these names is downloaded from loft-sh/devpod-provider- instead. +// TODO: remove once the providers are migrated to curityio (see TODO.md). +var LoftProviders = []string{ + "aws", + "azure", + "civo", + "digitalocean", + "dockerless", + "ecs", + "gcloud", + "kubernetes", + "ssh", + "terraform", +} + +// GithubProviderRepo returns the GitHub repository (owner/repo) of the provider with the given name. +func GithubProviderRepo(name string) string { + owner := GithubProviderOwner + if slices.Contains(LoftProviders, name) { + owner = "loft-sh" + } + return owner + "/devpod-provider-" + name +} + func DownloadProviderGithub(originalPath string, log log.Logger) ([]byte, *providerpkg.ProviderSource, error) { path := strings.TrimPrefix(originalPath, "github.com/") @@ -206,7 +236,7 @@ func DownloadProviderGithub(originalPath string, log log.Logger) ([]byte, *provi // split by separator splitted := strings.Split(strings.TrimSuffix(path, "/"), "/") if len(splitted) == 1 { - path = "loft-sh/devpod-provider-" + path + path = GithubProviderRepo(path) } else if len(splitted) != 2 { return nil, nil, nil } diff --git a/pkg/workspace/provider_test.go b/pkg/workspace/provider_test.go new file mode 100644 index 000000000..b1ad81bff --- /dev/null +++ b/pkg/workspace/provider_test.go @@ -0,0 +1,23 @@ +package workspace + +import "testing" + +func TestGithubProviderRepo(t *testing.T) { + tests := []struct { + name string + want string + }{ + {name: "aws", want: "loft-sh/devpod-provider-aws"}, + {name: "ssh", want: "loft-sh/devpod-provider-ssh"}, + {name: "terraform", want: "loft-sh/devpod-provider-terraform"}, + {name: "hetzner", want: "curityio/devpod-provider-hetzner"}, + {name: "aws2", want: "curityio/devpod-provider-aws2"}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := GithubProviderRepo(tt.name); got != tt.want { + t.Errorf("GithubProviderRepo(%q) = %q, want %q", tt.name, got, tt.want) + } + }) + } +} diff --git a/pkg/workspace/workspace.go b/pkg/workspace/workspace.go index 2dd04a3f2..7e7469c29 100644 --- a/pkg/workspace/workspace.go +++ b/pkg/workspace/workspace.go @@ -8,18 +8,18 @@ import ( "strings" "github.com/charmbracelet/huh" - "github.com/loft-sh/devpod/pkg/client" - "github.com/loft-sh/devpod/pkg/client/clientimplementation" - "github.com/loft-sh/devpod/pkg/config" - "github.com/loft-sh/devpod/pkg/encoding" - "github.com/loft-sh/devpod/pkg/file" - "github.com/loft-sh/devpod/pkg/git" - "github.com/loft-sh/devpod/pkg/ide/ideparse" - "github.com/loft-sh/devpod/pkg/image" - "github.com/loft-sh/devpod/pkg/log" - "github.com/loft-sh/devpod/pkg/log/terminal" - providerpkg "github.com/loft-sh/devpod/pkg/provider" - "github.com/loft-sh/devpod/pkg/types" + "github.com/curityio/devpod/pkg/client" + "github.com/curityio/devpod/pkg/client/clientimplementation" + "github.com/curityio/devpod/pkg/config" + "github.com/curityio/devpod/pkg/encoding" + "github.com/curityio/devpod/pkg/file" + "github.com/curityio/devpod/pkg/git" + "github.com/curityio/devpod/pkg/ide/ideparse" + "github.com/curityio/devpod/pkg/image" + "github.com/curityio/devpod/pkg/log" + "github.com/curityio/devpod/pkg/log/terminal" + providerpkg "github.com/curityio/devpod/pkg/provider" + "github.com/curityio/devpod/pkg/types" ) // Resolve takes the `devpod up|build` CLI input and either finds an existing workspace or creates a new one