don't validate unsandboxed workloads (#162)

* don't validate unsandboxed workloads * tweaking logic for validate disable * Add sandbox conditional to statically-linked ELF binary spec * Fix linter --------- Co-authored-by: kt <[email protected]>
synadia-io · Apr 11, 2024 · f9c2c6b · f9c2c6b
1 parent f7f6b18
commit f9c2c6b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/agent/agent.go b/agent/agent.go
@@ -70,7 +70,7 @@ func NewAgent(ctx context.Context, cancelF context.CancelFunc) (*Agent, error) {
 	var metadata *agentapi.MachineMetadata
 	var err error
 
-	if strings.ToLower(os.Getenv(nexEnvSandbox)) == "false" {
+	if !isSandboxed() {
 		metadata, err = GetMachineMetadataFromEnv()
 	} else {
 		metadata, err = GetMachineMetadata()
@@ -293,12 +293,19 @@ func (a *Agent) handleDeploy(m *nats.Msg) {
 	}
 	a.provider = provider
 
-	err = a.provider.Validate()
-	if err != nil {
-		msg := fmt.Sprintf("Failed to validate workload: %s", err)
-		a.LogError(msg)
-		_ = a.workAck(m, false, msg)
-		return
+	shouldValidate := true
+	if !a.sandboxed && strings.EqualFold(*request.WorkloadType, agentapi.NexExecutionProviderELF) {
+		shouldValidate = false
+	}
+
+	if shouldValidate {
+		err = a.provider.Validate()
+		if err != nil {
+			msg := fmt.Sprintf("Failed to validate workload: %s", err)
+			a.LogError(msg)
+			_ = a.workAck(m, false, msg)
+			return
+		}
 	}
 
 	err = a.provider.Deploy()
@@ -484,5 +491,5 @@ func (a *Agent) workAck(m *nats.Msg, accepted bool, msg string) error {
 }
 
 func isSandboxed() bool {
-	return strings.ToLower(os.Getenv("NEX_SANDBOX")) != "false"
+	return !strings.EqualFold(strings.ToLower(os.Getenv(nexEnvSandbox)), "false")
 }
diff --git a/internal/node/processmanager/process_mgr.go b/internal/node/processmanager/process_mgr.go
@@ -51,7 +51,7 @@ type ProcessManager interface {
 	StopProcess(id string) error
 }
 
-// Initialie an appropriate agent process manager instance based on the sandbox config value
+// Initialize an appropriate agent process manager instance based on the sandbox config value
 func NewProcessManager(
 	log *slog.Logger,
 	config *models.NodeConfiguration,

diff --git a/spec/node_test.go b/spec/node_test.go
@@ -450,8 +450,12 @@ var _ = Describe("nex node", func() {
 										_ = cmd.Wait()
 									})
 
-									It("should fail to deploy the ELF workload", func(ctx SpecContext) {
-										Expect(err.Error()).To(ContainSubstring("elf binary contains at least one dynamically linked dependency"))
+									It("should [fail to] deploy the ELF workload", func(ctx SpecContext) {
+										if sandbox {
+											Expect(err.Error()).To(ContainSubstring("elf binary contains at least one dynamically linked dependency"))
+										} else {
+											Expect(err).To(BeNil())
+										}
 									})
 
 									// It("should keep a reference to all running agent processes", func(ctx SpecContext) {