Add envd version feature gate (#2207)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: djeebus

packages/api/internal/handlers/sandbox_create.go

@@ -16,6 +16,7 @@ import (
 	"github.com/launchdarkly/go-sdk-common/v3/ldcontext"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
+	"go.uber.org/zap"
 	"golang.org/x/net/idna"
 
 	"github.com/e2b-dev/infra/packages/api/internal/api"
@@ -31,6 +32,7 @@ import (
 	"github.com/e2b-dev/infra/packages/shared/pkg/ginutils"
 	"github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator"
 	"github.com/e2b-dev/infra/packages/shared/pkg/id"
+	"github.com/e2b-dev/infra/packages/shared/pkg/logger"
 	sbxlogger "github.com/e2b-dev/infra/packages/shared/pkg/logger/sandbox"
 	sandbox_network "github.com/e2b-dev/infra/packages/shared/pkg/sandbox-network"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
@@ -185,9 +187,15 @@ func (a *APIStore) PostSandboxes(c *gin.Context) {
 	}
 
 	sbxVolumeMounts, err := convertAPIVolumesToOrchestratorVolumes(
-		ctx, a.sqlcDB, a.featureFlags, teamInfo.ID, apiVolumeMounts,
+		ctx, a.sqlcDB, a.featureFlags, teamInfo.ID, apiVolumeMounts, build,
 	)
 	if err != nil {
+		if errors.Is(err, errVolumesNotSupported) {
+			a.sendAPIStoreError(c, http.StatusBadRequest, err.Error())
+
+			return
+		}
+
 		if errors.Is(err, ErrVolumeMountsDisabled) {
 			a.sendAPIStoreError(c, http.StatusBadRequest, "Volume mounts are not enabled.")
 
@@ -292,21 +300,36 @@ func (im InvalidVolumeMountsError) Error() string {
 	return fmt.Sprintf("invalid mounts:\n%s", strings.Join(errs, "\n"))
 }
 
-func convertAPIVolumesToOrchestratorVolumes(
-	ctx context.Context,
-	sqlClient *sqlcdb.Client,
-	featureFlags featureFlagsClient,
-	teamID uuid.UUID,
-	volumeMounts []api.SandboxVolumeMount,
-) ([]*orchestrator.SandboxVolumeMount, error) {
+var errVolumesNotSupported = errors.New("volumes are not supported")
+
+var errNoEnvdVersion = errors.New("no envd version provided")
+
+const minEnvdVersionForVolumes = "0.5.8"
+
+func convertAPIVolumesToOrchestratorVolumes(ctx context.Context, sqlClient *sqlcdb.Client, featureFlags featureFlagsClient, teamID uuid.UUID, volumeMounts []api.SandboxVolumeMount, env *queries.EnvBuild) ([]*orchestrator.SandboxVolumeMount, error) {
+	// are any volumes configured?
 	if len(volumeMounts) == 0 {
 		return []*orchestrator.SandboxVolumeMount{}, nil // only b/c you should never return (nil, nil)
 	}
 
+	// are volumes enabled?
 	if !featureFlags.BoolFlag(ctx, featureflags.PersistentVolumesFlag) {
 		return nil, ErrVolumeMountsDisabled
 	}
 
+	// does your envd version support volumes?
+	if envdVersion := sharedUtils.DerefOrDefault(env.EnvdVersion, ""); envdVersion == "" {
+		logger.L().Warn(ctx, "envd version is unset")
+
+		return nil, errNoEnvdVersion
+	} else if ok, err := sharedUtils.IsGTEVersion(envdVersion, minEnvdVersionForVolumes); err != nil {
+		logger.L().Warn(ctx, "failed to check envd version", zap.Error(err), zap.String("envd_version", envdVersion))
+
+		return nil, fmt.Errorf("invalid envd version %q: %w", envdVersion, err)
+	} else if !ok {
+		return nil, fmt.Errorf("%w; template must be rebuilt. Template envd version is %s, must be at least %s to support volumes", errVolumesNotSupported, envdVersion, minEnvdVersionForVolumes)
+	}
+
 	// get volumes from the database
 	dbVolumesMap, err := getDBVolumesMap(ctx, sqlClient, teamID, volumeMounts)
 	if err != nil {

packages/api/internal/handlers/sandbox_create_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/e2b-dev/infra/packages/db/queries"
 	"github.com/e2b-dev/infra/packages/shared/pkg/grpc/orchestrator"
 	sandbox_network "github.com/e2b-dev/infra/packages/shared/pkg/sandbox-network"
+	"github.com/e2b-dev/infra/packages/shared/pkg/utils"
 )
 
 func TestBuildAutoResumeConfig(t *testing.T) {
@@ -453,7 +454,7 @@ func TestOrchestrator_convertVolumeMounts(t *testing.T) {
 
 			actual, err := convertAPIVolumesToOrchestratorVolumes(
 				t.Context(), db.SqlcClient, ffClient,
-				teamID, tc.input,
+				teamID, tc.input, &queries.EnvBuild{EnvdVersion: utils.ToPtr("0.5.8")},
 			)
 			assert.Equal(t, tc.err, err)
 			assert.Equal(t, tc.expected, actual)
@@ -483,7 +484,7 @@ func TestOrchestrator_convertVolumeMounts(t *testing.T) {
 			t.Context(), db.SqlcClient, ffClient,
 			teamID, []api.SandboxVolumeMount{
 				{Name: "vol1", Path: "/vol1"},
-			},
+			}, &queries.EnvBuild{EnvdVersion: utils.ToPtr("0.5.8")},
 		)
 		require.NoError(t, err)
 		assert.Equal(t, []*orchestrator.SandboxVolumeMount{

packages/envd/.goreleaser.yml

@@ -27,6 +27,7 @@ import (
 	processRpc "github.com/e2b-dev/infra/packages/envd/internal/services/process"
 	processSpec "github.com/e2b-dev/infra/packages/envd/internal/services/spec/process"
 	"github.com/e2b-dev/infra/packages/envd/internal/utils"
+	"github.com/e2b-dev/infra/packages/envd/pkg"
 )
 
 const (
@@ -47,8 +48,6 @@ const (
 )
 
 var (
-	Version = "0.5.8"
-
 	commitSHA string
 
 	isNotFC bool
@@ -134,7 +133,7 @@ func main() {
 	parseFlags()
 
 	if versionFlag {
-		fmt.Printf("%s\n", Version)
+		fmt.Printf("%s\n", pkg.Version)
 
 		return
 	}

packages/envd/main.go

@@ -0,0 +1,3 @@
+package pkg
+
+const Version = "0.5.8"

packages/envd/pkg/version.go

@@ -26,3 +26,7 @@ prep-cluster:
 .PHONY: test
 test:
 	go test -v ./pkg/...
+
+.PHONY: lint
+lint:
+	golangci-lint run --fix ./...

packages/shared/Makefile

@@ -10,6 +10,8 @@ replace github.com/e2b-dev/infra/packages/db => ../../packages/db
 
 replace github.com/e2b-dev/infra/packages/clickhouse => ../../packages/clickhouse
 
+replace github.com/e2b-dev/infra/packages/envd => ../../packages/envd
+
 tool (
 	github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
 	gotest.tools/gotestsum
@@ -20,6 +22,7 @@ require (
 	github.com/e2b-dev/infra/packages/auth v0.0.0
 	github.com/e2b-dev/infra/packages/clickhouse v0.0.0
 	github.com/e2b-dev/infra/packages/db v0.0.0
+	github.com/e2b-dev/infra/packages/envd v0.0.0-00010101000000-000000000000
 	github.com/e2b-dev/infra/packages/shared v0.0.0
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.5
@@ -124,8 +127,6 @@ require (
 	github.com/oapi-codegen/oapi-codegen/v2 v2.5.1 // indirect
 	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
 	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.38.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect

tests/integration/go.mod

@@ -15,6 +15,7 @@ import (
 	authdb "github.com/e2b-dev/infra/packages/db/pkg/auth"
 	authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries"
 	dbtypes "github.com/e2b-dev/infra/packages/db/pkg/types"
+	"github.com/e2b-dev/infra/packages/envd/pkg"
 	"github.com/e2b-dev/infra/packages/shared/pkg/keys"
 	"github.com/e2b-dev/infra/packages/shared/pkg/templates"
 )
@@ -207,7 +208,7 @@ INSERT INTO env_builds (
 	cluster_node_id, version, created_at, updated_at
 ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, CURRENT_TIMESTAMP)
 `, build.id, "FROM e2bdev/base:latest", dbtypes.BuildStatusUploaded,
-				2, 512, 512, 1982, "vmlinux-6.1.102", "v1.12.1_a41d3fb", "0.5.0",
+				2, 512, 512, 1982, "vmlinux-6.1.102", "v1.12.1_a41d3fb", pkg.Version,
 				"integration-test-node", templates.TemplateV1Version, build.createdAt)
 		} else {
 			err = db.TestsRawSQL(ctx, `
@@ -217,7 +218,7 @@ INSERT INTO env_builds (
 	cluster_node_id, version, updated_at
 ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, CURRENT_TIMESTAMP)
 `, build.id, "FROM e2bdev/base:latest", dbtypes.BuildStatusUploaded,
-				2, 512, 512, 1982, "vmlinux-6.1.102", "v1.12.1_a41d3fb", "0.5.0",
+				2, 512, 512, 1982, "vmlinux-6.1.102", "v1.12.1_a41d3fb", pkg.Version,
 				"integration-test-node", templates.TemplateV1Version)
 		}
 		if err != nil {