address PR comments, fix test

Author: dobrac

packages/api/internal/handlers/template_start_build_v2.go

@@ -16,18 +16,13 @@ import (
 	"github.com/e2b-dev/infra/packages/db/queries"
 	"github.com/e2b-dev/infra/packages/shared/pkg/models/envbuild"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
+	"github.com/e2b-dev/infra/packages/shared/pkg/templates"
 	"github.com/e2b-dev/infra/packages/shared/pkg/utils"
 )
 
 const (
 	jsSDKPrefix     = "e2b-js-sdk/"
 	pythonSDKPrefix = "e2b-python-sdk/"
-	testsUserAgent  = "e2b-tests/"
-)
-
-const (
-	buildSystem2Version = "v2.0.0"
-	buildLatestVersion  = "v2.1.0"
 )
 
 type dockerfileStore struct {
@@ -130,7 +125,7 @@ func (a *APIStore) PostV2TemplatesTemplateIDBuildsBuildID(c *gin.Context, templa
 		return
 	}
 
-	version, err := templateUserAgentToVersion(c.Request.UserAgent())
+	version, err := userAgentToTemplateVersion(c.Request.UserAgent())
 	if err != nil {
 		a.sendAPIStoreError(c, http.StatusBadRequest, fmt.Sprintf("Error when parsing user agent: %s", err))
 		telemetry.ReportCriticalError(ctx, "error when parsing user agent", err, telemetry.WithTemplateID(templateID))
@@ -175,30 +170,28 @@ func (a *APIStore) PostV2TemplatesTemplateIDBuildsBuildID(c *gin.Context, templa
 	c.Status(http.StatusAccepted)
 }
 
-func templateUserAgentToVersion(userAgent string) (string, error) {
-	version := buildSystem2Version
+func userAgentToTemplateVersion(userAgent string) (string, error) {
+	version := templates.TemplateV2LatestVersion
 
 	switch {
 	case strings.HasPrefix(userAgent, jsSDKPrefix):
 		sdk := strings.TrimPrefix(userAgent, jsSDKPrefix)
-		ok, err := utils.IsGTEVersion(sdk, "2.3.0")
+		ok, err := utils.IsGTEVersion(sdk, templates.SDKDefaultUserVersion)
 		if err != nil {
 			return "", fmt.Errorf("parsing JS SDK version: %w", err)
 		}
-		if ok {
-			version = buildLatestVersion
+		if !ok {
+			version = templates.TemplateV2BetaVersion
 		}
 	case strings.HasPrefix(userAgent, pythonSDKPrefix):
 		sdk := strings.TrimPrefix(userAgent, pythonSDKPrefix)
-		ok, err := utils.IsGTEVersion(sdk, "2.3.0")
+		ok, err := utils.IsGTEVersion(sdk, templates.SDKDefaultUserVersion)
 		if err != nil {
 			return "", fmt.Errorf("parsing Python SDK version: %w", err)
 		}
-		if ok {
-			version = buildLatestVersion
+		if !ok {
+			version = templates.TemplateV2BetaVersion
 		}
-	case strings.HasPrefix(userAgent, testsUserAgent):
-		version = buildLatestVersion
 	}
 
 	return version, nil

packages/envd/spec/envd.yaml

@@ -147,7 +147,6 @@ components:
       description: User used for setting the owner, or resolving relative paths.
       schema:
         type: string
-        pattern: "^(root|user|.+)$"
     Signature:
       name: signature
       in: query

packages/orchestrator/benchmark_test.go

@@ -58,6 +58,7 @@ func BenchmarkBaseImageLaunch(b *testing.B) {
 		buildID             = "ba6aae36-74f7-487a-b6f7-74fd7c94e479"
 		useHugePages        = false
 		allowInternetAccess = true
+		templateVersion     = "v2.0.0"
 	)
 
 	// cache paths, to speed up test runs. these paths aren't wiped between tests
@@ -243,7 +244,7 @@ func BenchmarkBaseImageLaunch(b *testing.B) {
 		// build template
 		force := true
 		templateConfig := config.TemplateConfig{
-			Version:    "v2.0.0",
+			Version:    templateVersion,
 			TemplateID: templateID,
 			FromImage:  baseImage,
 			Force:      &force,

packages/orchestrator/cmd/build-template/main.go

@@ -199,7 +199,7 @@ func buildTemplate(
 
 	force := true
 	template := config.TemplateConfig{
-		Version:    "v2.0.0",
+		Version:    config.,
 		TeamID:     "",
 		TemplateID: templateID,
 		FromImage:  baseImage,

packages/orchestrator/internal/sandbox/envd.go

@@ -17,6 +17,7 @@ import (
 	"github.com/e2b-dev/infra/packages/shared/pkg/consts"
 	"github.com/e2b-dev/infra/packages/shared/pkg/logger"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
+	"github.com/e2b-dev/infra/packages/shared/pkg/utils"
 )
 
 const (
@@ -140,7 +141,12 @@ func (s *Sandbox) initEnvd(ctx context.Context) error {
 	}
 
 	if response.StatusCode != http.StatusNoContent {
-		zap.L().Error("envd init request failed", logger.WithSandboxID(s.Runtime.SandboxID), logger.WithEnvdVersion(s.Config.Envd.Version), zap.Int("status_code", response.StatusCode), zap.String("response_body", string(body)))
+		zap.L().Error("envd init request failed",
+			logger.WithSandboxID(s.Runtime.SandboxID),
+			logger.WithEnvdVersion(s.Config.Envd.Version),
+			zap.Int("status_code", response.StatusCode),
+			zap.String("response_body", utils.Truncate(string(body), 100)),
+		)
 		return fmt.Errorf("unexpected status code: %d", response.StatusCode)
 	}
 

packages/orchestrator/internal/template/build/builder.go

@@ -35,6 +35,7 @@ import (
 	"github.com/e2b-dev/infra/packages/shared/pkg/storage"
 	"github.com/e2b-dev/infra/packages/shared/pkg/storage/header"
 	"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
+	"github.com/e2b-dev/infra/packages/shared/pkg/templates"
 	"github.com/e2b-dev/infra/packages/shared/pkg/utils"
 )
 
@@ -101,7 +102,7 @@ type Result struct {
 //
 // 8. Snapshot
 // 9. Upload template (and all not yet uploaded layers)
-func (b *Builder) Build(ctx context.Context, template storage.TemplateFiles, config config.TemplateConfig, logsCore zapcore.Core) (r *Result, e error) {
+func (b *Builder) Build(ctx context.Context, template storage.TemplateFiles, cfg config.TemplateConfig, logsCore zapcore.Core) (r *Result, e error) {
 	ctx, childSpan := tracer.Start(ctx, "build")
 	defer childSpan.End()
 
@@ -113,20 +114,20 @@ func (b *Builder) Build(ctx context.Context, template storage.TemplateFiles, con
 		b.metrics.RecordBuildDuration(ctx, duration, success)
 
 		if success {
-			b.metrics.RecordBuildResult(ctx, config.TeamID, true)
+			b.metrics.RecordBuildResult(ctx, cfg.TeamID, true)
 			b.metrics.RecordRootfsSize(ctx, r.RootfsSizeMB<<constants.ToMBShift)
 		} else if !errors.Is(e, context.Canceled) {
 			// Skip reporting failure metrics only on explicit cancellation
-			b.metrics.RecordBuildResult(ctx, config.TeamID, false)
+			b.metrics.RecordBuildResult(ctx, cfg.TeamID, false)
 		}
 	}()
 
-	cacheScope := config.CacheScope
+	cacheScope := cfg.CacheScope
 
 	// Validate template, update force layers if needed
-	config = forceSteps(config)
+	cfg = forceSteps(cfg)
 
-	isV1Build := utils.IsVersion(config.Version, "v1.0.0") || (config.FromImage == "" && config.FromTemplate == nil)
+	isV1Build := utils.IsVersion(cfg.Version, templates.TemplateV1Version) || (cfg.FromImage == "" && cfg.FromTemplate == nil)
 
 	logger := zap.New(logsCore)
 	defer func() {
@@ -143,7 +144,7 @@ func (b *Builder) Build(ctx context.Context, template storage.TemplateFiles, con
 
 	defer func() {
 		if r := recover(); r != nil {
-			telemetry.ReportCriticalError(ctx, "recovered from panic in template build", nil, attribute.String("panic", fmt.Sprintf("%v", r)), telemetry.WithTemplateID(config.TemplateID), telemetry.WithBuildID(template.BuildID))
+			telemetry.ReportCriticalError(ctx, "recovered from panic in template build", nil, attribute.String("panic", fmt.Sprintf("%v", r)), telemetry.WithTemplateID(cfg.TemplateID), telemetry.WithBuildID(template.BuildID))
 			e = errors.New("fatal error occurred during template build, please contact us")
 		}
 	}()
@@ -154,7 +155,7 @@ func (b *Builder) Build(ctx context.Context, template storage.TemplateFiles, con
 		logger = zap.New(hookedCore)
 	}
 
-	logger.Info(fmt.Sprintf("Building template %s/%s", config.TemplateID, template.BuildID))
+	logger.Info(fmt.Sprintf("Building template %s/%s", cfg.TemplateID, template.BuildID))
 
 	defer func(ctx context.Context) {
 		if e == nil {
@@ -183,13 +184,13 @@ func (b *Builder) Build(ctx context.Context, template storage.TemplateFiles, con
 	}()
 
 	buildContext := buildcontext.BuildContext{
-		Config:         config,
+		Config:         cfg,
 		Template:       template,
 		UploadErrGroup: &uploadErrGroup,
 		EnvdVersion:    envdVersion,
 		CacheScope:     cacheScope,
 		IsV1Build:      isV1Build,
-		Version:        config.Version,
+		Version:        cfg.Version,
 	}
 
 	return runBuild(ctx, logger, buildContext, b)
@@ -269,7 +270,7 @@ func runBuild(
 		baseBuilder,
 	}
 	// Default user is only set for version TemplateDefaultUserVersion
-	ok, err := utils.IsGTEVersion(bc.Version, config.TemplateDefaultUserVersion)
+	ok, err := utils.IsGTEVersion(bc.Version, templates.TemplateDefaultUserVersion)
 	if err != nil {
 		return nil, fmt.Errorf("error checking build version: %w", err)
 	}

packages/orchestrator/internal/template/build/config/config.go

@@ -10,8 +10,7 @@ const (
 	InstanceBuildPrefix = "b"
 
 	// TemplateDefaultUser is the default user to use in the template to run all commands.
-	TemplateDefaultUser        = "user"
-	TemplateDefaultUserVersion = "v2.1.0"
+	TemplateDefaultUser = "user"
 )
 
 type TemplateConfig struct {

packages/orchestrator/internal/template/build/phases/user/hash.go

@@ -5,10 +5,12 @@ import (
 	"github.com/e2b-dev/infra/packages/orchestrator/internal/template/build/storage/cache"
 )
 
+const prefix = "DEFAULT USER"
+
 func (ub *UserBuilder) Hash(sourceLayer phases.LayerResult) (string, error) {
 	return cache.HashKeys(
 		sourceLayer.Hash,
-		"DEFAULT USER",
+		prefix,
 		ub.user,
 	), nil
 }

packages/shared/pkg/templates/versions.go

@@ -0,0 +1,14 @@
+package templates
+
+const (
+	TemplateV2LatestVersion = "v2.1.0"
+
+	TemplateV2BetaVersion = "v2.0.0"
+
+	TemplateV1Version = "v1.0.0"
+)
+
+const (
+	SDKDefaultUserVersion      = "2.3.0"
+	TemplateDefaultUserVersion = "v2.1.0"
+)

packages/shared/pkg/utils/strings.go

@@ -0,0 +1,14 @@
+package utils
+
+const ellipses = "..."
+
+func Truncate(s string, maxLen int) string {
+	runes := []rune(s)
+	if len(runes) <= maxLen {
+		return s
+	}
+	if maxLen <= len(ellipses) {
+		return string(runes[:maxLen])
+	}
+	return string(runes[:maxLen-len(ellipses)]) + ellipses
+}