Merge pull request #369 from depot/feat/org-switching

Add org switching capability

Author: alexisbouchez

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.24.4"
           check-latest: true
           cache: true
 
@@ -51,13 +51,11 @@ jobs:
           assert-nothing-changed go mod tidy
           exit $STATUS
 
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.56.2
+          version: v2.2.1
           only-new-issues: false
           skip-cache: false
-          skip-build-cache: true
-          skip-pkg-cache: true
           args: --timeout 5m
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -74,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.24.4"
           check-latest: true
           cache: true
 

.golangci.yml

@@ -1,2 +1,9 @@
+version: "2"
+
 run:
-  go: "1.22"
+  go: "1.24.4"
+linters:
+  # Disable errcheck which is very strict about error handling
+  disable:
+    - errcheck
+    - staticcheck

.tool-versions

@@ -1 +1 @@
-golang 1.22.12
+golang 1.24.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.22 AS build
+FROM --platform=$BUILDPLATFORM golang:1.24.4 AS build
 WORKDIR /src
 ARG LDFLAGS
 ARG TARGETARCH

README.md

@@ -32,6 +32,10 @@ Official CLI for [Depot](https://depot.dev) - you can use the CLI to build Docke
     - [`depot init`](#depot-init)
     - [`depot login`](#depot-login)
     - [`depot logout`](#depot-logout)
+    - [`depot org`](#depot-org)
+      - [`depot org list`](#depot-org-list)
+      - [`depot org show`](#depot-org-show)
+      - [`depot org switch`](#depot-org-switch)
     - [`depot pull`](#depot-pull)
     - [`depot push`](#depot-push)
     - [`depot pull-token`](#depot-pull-token)
@@ -174,7 +178,7 @@ services:
 | `provenance`     | Shorthand for "--set=\*.attest=type=provenance"                                                           |
 | `pull`           | Always attempt to pull all referenced images                                                              |
 | `push`           | Shorthand for "--set=\*.output=type=registry"                                                             |
-| `save`           | Saves bake targets to the Depot registry                                                        |
+| `save`           | Saves bake targets to the Depot registry                                                                  |
 | `sbom`           | Shorthand for "--set=\*.attest=type=sbom"                                                                 |
 | `set`            | Override target value (e.g., "targetpattern.key=value")                                                   |
 | `token`          | Depot API token                                                                                           |
@@ -242,7 +246,7 @@ depot build -t repo/image:tag . --push
 | `pull`            | Always attempt to pull all referenced images                                                              |
 | `push`            | Shorthand for "--output=type=registry"                                                                    |
 | `quiet`           | Suppress the build output and print image ID on success                                                   |
-| `save`           | Saves build to the Depot registry                                                                |
+| `save`            | Saves build to the Depot registry                                                                         |
 | `sbom`            | Shorthand for "--attest=type=sbom"                                                                        |
 | `secret`          | Secret to expose to the build (format: "id=mysecret[,src=/local/secret]")                                 |
 | `shm-size`        | Size of "/dev/shm"                                                                                        |
@@ -290,21 +294,20 @@ depot exec dagger run ...
 
 #### Flags for `exec`
 
-| Name          | Description                                                       |
-| ------------- | ----------------------------------------------------------------- |
-| `env-var`     | Environment variable name for the BuildKit connection (default: "BUILDKIT_HOST") |
-| `platform`    | Platform to execute the command on (linux/amd64 or linux/arm64)   |
-| `project`     | Depot project ID                                                  |
-| `progress`    | Set type of progress output ("auto", "plain", "tty")              |
-| `token`       | Depot token                                                       |
+| Name       | Description                                                                      |
+| ---------- | -------------------------------------------------------------------------------- |
+| `env-var`  | Environment variable name for the BuildKit connection (default: "BUILDKIT_HOST") |
+| `platform` | Platform to execute the command on (linux/amd64 or linux/arm64)                  |
+| `project`  | Depot project ID                                                                 |
+| `progress` | Set type of progress output ("auto", "plain", "tty")                             |
+| `token`    | Depot token                                                                      |
 
 ### `depot gocache`
 
 Configure Go tools to use Depot Cache. The Go tools will use the remote cache service to store and retrieve build artifacts.
 
 _Note: This requires Go 1.24 or later._
 
-
 Set the environment variable `GOCACHEPROG` to `depot gocache` to configure Go to use Depot Cache.
 
 ```shell
@@ -418,12 +421,12 @@ depot projects create --organization your-org-id --region us-west-2 --cache-stor
 
 #### Flags for `projects create`
 
-| Name                  | Description                                                  |
-| --------------------- | ------------------------------------------------------------ |
-| `organization` / `-o` | Depot organization ID                                        |
-| `region`              | Build data storage region (default: "us-east-1")             |
-| `cache-storage-policy`| Build cache to keep per architecture in GB (default: 50)     |
-| `token`               | Depot API token                                              |
+| Name                   | Description                                              |
+| ---------------------- | -------------------------------------------------------- |
+| `organization` / `-o`  | Depot organization ID                                    |
+| `region`               | Build data storage region (default: "us-east-1")         |
+| `cache-storage-policy` | Build cache to keep per architecture in GB (default: 50) |
+| `token`                | Depot API token                                          |
 
 #### `depot projects list`
 
@@ -465,6 +468,68 @@ Remove any saved login defails from your local machine.
 depot logout
 ```
 
+### `depot org`
+
+Manage Depot organizations. The `org` command consists of subcommands for each operation.
+
+#### `depot org list`
+
+Display an interactive listing of organizations that you can access. The command shows organization IDs and names in a table format.
+
+To exit type `q` or `ctrl+c`
+
+**Example**
+
+```shell
+depot org list
+```
+
+**Example**
+
+The list command can output organization information to stdout with the `--output` option. It supports `json` and `csv`.
+
+Output organizations in JSON format:
+
+```shell
+depot org list --output json
+```
+
+Output organizations in CSV format:
+
+```shell
+depot org list --output csv
+```
+
+#### `depot org show`
+
+Show the current organization ID that is set in your global Depot settings.
+
+**Example**
+
+```shell
+depot org show
+```
+
+#### `depot org switch`
+
+Set the current organization in global Depot settings. You can either specify an organization ID as an argument or run the command interactively to select from available organizations.
+
+**Example**
+
+Switch to a specific organization by ID:
+
+```shell
+depot org switch your-org-id
+```
+
+**Example**
+
+Switch to an organization interactively:
+
+```shell
+depot org switch
+```
+
 ### `depot pull`
 
 Pull an image from the Depot registry to your local Docker daemon.
@@ -510,10 +575,10 @@ depot pull-token --project <PROJECT_ID>
 
 #### Flags for `pull-token`
 
-| Name       | Description        |
-| ---------- | ------------------ |
-| `project`  | Depot project ID   |
-| `token`    | Depot API token    |
+| Name      | Description      |
+| --------- | ---------------- |
+| `project` | Depot project ID |
+| `token`   | Depot API token  |
 
 ### `depot version`
 

examples/go.mod

@@ -1,6 +1,6 @@
 module github.com/depot/cli/examples
 
-go 1.22
+go 1.24.4
 
 require (
 	github.com/depot/cli v1.8.3
@@ -15,12 +15,23 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/Shopify/logrus-bugsnag v0.0.0-20230117174420-439a4b8ba167 // indirect
+	github.com/adrg/xdg v0.4.0 // indirect
 	github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
+	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/briandowns/spinner v1.18.1 // indirect
+	github.com/catppuccin/go v0.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/charmbracelet/lipgloss v0.7.1 // indirect
+	github.com/charmbracelet/bubbles v0.21.0 // indirect
+	github.com/charmbracelet/bubbletea v1.3.4 // indirect
+	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/huh v0.7.0 // indirect
+	github.com/charmbracelet/lipgloss v1.1.0 // indirect
+	github.com/charmbracelet/x/ansi v0.8.0 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
+	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
+	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/containerd/containerd v1.6.20 // indirect
 	github.com/containerd/continuity v0.4.1 // indirect
@@ -36,7 +47,12 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/erikgeiser/promptkit v0.9.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -50,44 +66,66 @@ require (
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.16.3 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.4 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/patternmatcher v0.5.0 // indirect
+	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/moby/sys/signal v0.7.0 // indirect
 	github.com/moby/term v0.0.0-20221120202655-abb19827d345 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.15.2 // indirect
+	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/sahilm/fuzzy v0.1.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/cobra v1.6.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.14.0 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/theupdateframework/notary v0.6.1 // indirect
 	github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
 	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
 	github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
 	go.opentelemetry.io/otel v1.20.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
 	go.opentelemetry.io/otel/metric v1.20.0 // indirect
@@ -98,10 +136,10 @@ require (
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/oauth2 v0.11.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/appengine v1.6.7 // indirect
@@ -111,7 +149,9 @@ require (
 	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.0 // indirect
 	k8s.io/apimachinery v0.25.4 // indirect
 	k8s.io/client-go v0.25.4 // indirect