diff --git a/cliv2-private/cmd/cliv2/main.go b/cliv2-private/cmd/cliv2/main.go index 796e3da3e1..bfdfa80a8d 100644 --- a/cliv2-private/cmd/cliv2/main.go +++ b/cliv2-private/cmd/cliv2/main.go @@ -6,6 +6,7 @@ import ( "github.com/snyk/ambient-canary/pkg/daemon" "github.com/snyk/cli-extension-axi/pkg/agent" "github.com/snyk/cli-extension-cos/pkg/cos" + "github.com/snyk/cli-extension-studio/pkg/studio" "github.com/snyk/remy-cli-extension/pkg/remy" "github.com/snyk/rift-cli-extension/pkg/rift" @@ -19,5 +20,6 @@ func main() { core.WithAdditionalExtensions(cos.Init), core.WithAdditionalExtensions(daemon.Init), core.WithAdditionalExtensions(rift.Init), + core.WithAdditionalExtensions(studio.Init), )) } diff --git a/cliv2-private/go.mod b/cliv2-private/go.mod index e90b52eb3b..2db45c17cb 100644 --- a/cliv2-private/go.mod +++ b/cliv2-private/go.mod @@ -6,6 +6,7 @@ require ( github.com/snyk/ambient-canary v0.0.0-20260722064253-fba619a134a9 github.com/snyk/cli-extension-axi v0.0.0-20260818155424-6ae9a45c0c55 github.com/snyk/cli-extension-cos v0.0.0-20260818151318-d63bb9db9484 + github.com/snyk/cli-extension-studio v1.0.0 github.com/snyk/cli/cliv2 v0.0.0 github.com/snyk/remy-cli-extension v1.36.1 github.com/snyk/rift-cli-extension v1.1.1 @@ -301,6 +302,8 @@ require ( // For local development, point to the sibling public module: replace github.com/snyk/cli/cliv2 => ../cliv2 +// replace github.com/snyk/cli-extension-studio => ../../cli-extension-studio + // replace github.com/snyk/remy-cli-extension => ../../remy-cli-extension // replace github.com/snyk/go-application-framework => ../../go-application-framework diff --git a/cliv2-private/go.sum b/cliv2-private/go.sum index 8c8d4e0efc..a48bb55de1 100644 --- a/cliv2-private/go.sum +++ b/cliv2-private/go.sum @@ -584,6 +584,8 @@ github.com/snyk/cli-extension-sbom v0.0.0-20260818092356-16ee760085f9 h1:Kz/UCPa github.com/snyk/cli-extension-sbom v0.0.0-20260818092356-16ee760085f9/go.mod h1:YUDazoukFqA0OpYuACIoqVEsfPCAFXo9XotUk9RjmUY= github.com/snyk/cli-extension-secrets v0.0.0-20260811115637-ee872c26b0cd h1:sSVkD1CuL8v49boItrt2CnQ4DJIH+sjGwFGheGCVAxo= github.com/snyk/cli-extension-secrets v0.0.0-20260811115637-ee872c26b0cd/go.mod h1:PrKXTT4fwEJPIzphT4n1tH5mwt2D1/qadP5HNCvub9Y= +github.com/snyk/cli-extension-studio v1.0.0 h1:nb4qyX2RzTqynO1RJdKLUfOWm8SSItIdtsCbE2/SIHQ= +github.com/snyk/cli-extension-studio v1.0.0/go.mod h1:STXQpxTbP8xa7m0IEaHgKXt+juCEDxQyVC95avx73nU= github.com/snyk/code-client-go v1.31.8 h1:3o9vJKsgXiKkwiOPplJejw41nqTPylDzXqQmq5Daor8= github.com/snyk/code-client-go v1.31.8/go.mod h1:pHrCXCt5BJmG2L99KO5d8Qm4xdSOpbE9HEs61WsoHSo= github.com/snyk/container-cli v0.0.0-20260213211631-cd2b2cf8f3ea h1:/v48hCMPiZVjplylgE2FX1ib8Qd8LN/vf8ZIKfA+wkI= diff --git a/cliv2/Makefile b/cliv2/Makefile index be8d0a6725..952e1d412e 100644 --- a/cliv2/Makefile +++ b/cliv2/Makefile @@ -37,11 +37,17 @@ _validate-build-mode: echo "ERROR: BUILD_MODE=private requested but $(PRIVATE_DIR)/go.mod not found." >&2; \ exit 1; \ fi; \ - if ! (cd "$(PRIVATE_DIR)" && $(GOCMD) mod download > /dev/null 2>&1); then \ + DOWNLOAD_LOG="$$(mktemp)"; \ + if ! (cd "$(PRIVATE_DIR)" && $(GOCMD) mod download) > "$$DOWNLOAD_LOG" 2>&1; then \ echo "ERROR: BUILD_MODE=private requested but private module dependencies cannot be resolved." >&2; \ echo " Check GOPRIVATE and network connectivity." >&2; \ + echo " GOPRIVATE=$${GOPRIVATE:-}" >&2; \ + echo " 'go mod download' output:" >&2; \ + sed 's/^/ /' "$$DOWNLOAD_LOG" >&2; \ + rm -f "$$DOWNLOAD_LOG"; \ exit 1; \ fi; \ + rm -f "$$DOWNLOAD_LOG"; \ fi # Build tools