Move to internal config

Author: jakubno

packages/orchestrator/internal/sandbox/envd.go

@@ -70,7 +70,7 @@ func (s *Sandbox) initEnvd(ctx context.Context) error {
 	ctx, span := tracer.Start(ctx, "envd-init", trace.WithAttributes(telemetry.WithEnvdVersion(s.Config.Envd.Version)))
 	defer span.End()
 
-	attributes := []attribute.KeyValue{telemetry.WithEnvdVersion(s.Config.Envd.Version), attribute.Int64("timeout_ms", s.Config.EnvdInitRequestTimeout.Milliseconds())}
+	attributes := []attribute.KeyValue{telemetry.WithEnvdVersion(s.Config.Envd.Version), attribute.Int64("timeout_ms", s.internalConfig.EnvdInitRequestTimeout.Milliseconds())}
 	attributesFail := append(attributes, attribute.Bool("success", false))
 	attributesSuccess := append(attributes, attribute.Bool("success", true))
 
@@ -89,7 +89,7 @@ func (s *Sandbox) initEnvd(ctx context.Context) error {
 		return err
 	}
 
-	response, count, err := doRequestWithInfiniteRetries(ctx, "POST", address, body, s.Config.Envd.AccessToken, s.Config.EnvdInitRequestTimeout, s.Runtime.SandboxID, s.Config.Envd.Version)
+	response, count, err := doRequestWithInfiniteRetries(ctx, "POST", address, body, s.Config.Envd.AccessToken, s.internalConfig.EnvdInitRequestTimeout, s.Runtime.SandboxID, s.Config.Envd.Version)
 	if err != nil {
 		envdInitCalls.Add(ctx, count, metric.WithAttributes(attributesFail...))
 		return fmt.Errorf("failed to init envd: %w", err)

packages/orchestrator/internal/sandbox/sandbox.go

@@ -59,8 +59,7 @@ type Config struct {
 
 	AllowInternetAccess *bool
 
-	Envd                   EnvdMetadata
-	EnvdInitRequestTimeout time.Duration
+	Envd EnvdMetadata
 }
 
 type EnvdMetadata struct {
@@ -84,9 +83,14 @@ type Resources struct {
 	memory uffd.MemoryBackend
 }
 
+type internalConfig struct {
+	EnvdInitRequestTimeout time.Duration
+}
+
 type Metadata struct {
-	Config  Config
-	Runtime RuntimeMetadata
+	internalConfig internalConfig
+	Config         Config
+	Runtime        RuntimeMetadata
 
 	StartedAt time.Time
 	EndAt     time.Time
@@ -280,6 +284,10 @@ func (f *Factory) CreateSandbox(
 	}
 
 	metadata := &Metadata{
+		internalConfig: internalConfig{
+			EnvdInitRequestTimeout: f.GetEnvdInitRequestTimeout(ctx),
+		},
+
 		Config:  config,
 		Runtime: runtime,
 
@@ -514,6 +522,10 @@ func (f *Factory) ResumeSandbox(
 	}
 
 	metadata := &Metadata{
+		internalConfig: internalConfig{
+			EnvdInitRequestTimeout: f.GetEnvdInitRequestTimeout(ctx),
+		},
+
 		Config:  config,
 		Runtime: runtime,
 
@@ -976,7 +988,7 @@ func (s *Sandbox) WaitForEnvd(
 		duration := time.Since(start).Milliseconds()
 		waitForEnvdDurationHistogram.Record(ctx, duration, metric.WithAttributes(
 			telemetry.WithEnvdVersion(s.Config.Envd.Version),
-			attribute.Int64("timeout_ms", s.Config.EnvdInitRequestTimeout.Milliseconds()),
+			attribute.Int64("timeout_ms", s.internalConfig.EnvdInitRequestTimeout.Milliseconds()),
 		))
 		// Update the sandbox as started now
 		s.Metadata.StartedAt = time.Now()

packages/orchestrator/internal/server/sandboxes.go

@@ -117,7 +117,6 @@ func (s *server) Create(ctx context.Context, req *orchestrator.SandboxCreateRequ
 				AccessToken: req.Sandbox.EnvdAccessToken,
 				Vars:        req.Sandbox.EnvVars,
 			},
-			EnvdInitRequestTimeout: s.sandboxFactory.GetEnvdInitRequestTimeout(ctx),
 		},
 		sandbox.RuntimeMetadata{
 			TemplateID:  req.Sandbox.TemplateId,

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

@@ -221,7 +221,6 @@ func (bb *BaseBuilder) buildLayerFromOCI(
 		Envd: sandbox.EnvdMetadata{
 			Version: bb.EnvdVersion,
 		},
-		EnvdInitRequestTimeout: bb.sandboxFactory.GetEnvdInitRequestTimeout(ctx),
 	}
 	err = bb.provisionSandbox(
 		ctx,

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

@@ -125,7 +125,6 @@ func (ppb *PostProcessingBuilder) Build(
 		Envd: sandbox.EnvdMetadata{
 			Version: ppb.EnvdVersion,
 		},
-		EnvdInitRequestTimeout: ppb.sandboxFactory.GetEnvdInitRequestTimeout(ctx),
 	}
 
 	// Always restart the sandbox for the final layer to properly wire the rootfs path for the final template

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

@@ -162,7 +162,6 @@ func (sb *StepBuilder) Build(
 		Envd: sandbox.EnvdMetadata{
 			Version: sb.EnvdVersion,
 		},
-		EnvdInitRequestTimeout: sb.sandboxFactory.GetEnvdInitRequestTimeout(ctx),
 	}
 
 	// First not cached layer is create (to change CPU, Memory, etc), subsequent are layers are resumes.