Agent Mesh
Go a2aa2a-protocolagent-meshagentic-aiinferencemcpmeshmesh-networknetwork-securitynetworking-aip2p-network
feat(nano-init): introduce copy and run subcommands to support distroless copies
Antonio Ojea9107a5830cd0
diff --git a/.github/k8s/sam-box-canary-template.yaml b/.github/k8s/sam-box-canary-template.yamlindex f0c5af04..29885943 100644--- a/.github/k8s/sam-box-canary-template.yaml+++ b/.github/k8s/sam-box-canary-template.yaml@@ -35,7 +35,7 @@ spec:initContainers:- name: init-nano-initimage: ghcr.io/google/sam-nano-init:${IMAGE_TAG}- command: ["cp", "/nano-init", "/shared-bin/nano-init"]+ command: ["/nano-init", "copy", "/shared-bin/nano-init"]volumeMounts:- name: shared-binmountPath: /shared-bin@@ -44,6 +44,7 @@ spec:image: alpine/curl:8.12.1command:- "/shared-bin/nano-init"+ - "run"- "/var/run/sam/sam-box.sock"- "sh"- "-c"diff --git a/cmd/nano-init/main.go b/cmd/nano-init/main.goindex c8be4578..0545f9f1 100644--- a/cmd/nano-init/main.go+++ b/cmd/nano-init/main.go@@ -35,13 +35,48 @@ import ()func main() {- if len(os.Args) < 3 {- log.Fatalf("Usage: %s <uds-path> <cmd> [args...]", os.Args[0])+ if len(os.Args) < 2 {+ printUsageAndExit()}- udsPath := os.Args[1]- cmdName := os.Args[2]- cmdArgs := os.Args[3:]+ subCmd := os.Args[1]+ switch subCmd {+ case "copy":+ if len(os.Args) != 3 {+ log.Fatalf("Usage: %s copy <dest>", os.Args[0])+ }+ src, err := os.Executable()+ if err != nil {+ src = "/nano-init"+ }+ dest := os.Args[2]+ log.Printf("Copying %s to %s...", src, dest)+ if err := copyFile(src, dest); err != nil {+ log.Fatalf("Failed to copy binary: %v", err)+ }+ log.Println("Copy complete.")+ return++ case "run":+ if len(os.Args) < 4 {+ log.Fatalf("Usage: %s run <uds-path> <cmd> [args...]", os.Args[0])+ }+ udsPath := os.Args[2]+ cmdName := os.Args[3]+ cmdArgs := os.Args[4:]++ runProxy(udsPath, cmdName, cmdArgs)++ default:+ printUsageAndExit()+ }+}++func printUsageAndExit() {+ log.Fatalf("Usage:\n %s copy <dest>\n %s run <uds-path> <cmd> [args...]", os.Args[0], os.Args[0])+}++func runProxy(udsPath, cmdName string, cmdArgs []string) {ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)defer cancel()@@ -449,3 +484,20 @@ func buildAgentEnv(assignedPort int, caPath string, interceptorPath string) []streturn result}++func copyFile(src, dest string) error {+ in, err := os.Open(src)+ if err != nil {+ return err+ }+ defer func() { _ = in.Close() }()++ out, err := os.OpenFile(dest, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)+ if err != nil {+ return err+ }+ defer func() { _ = out.Close() }()++ _, err = io.Copy(out, in)+ return err+}diff --git a/cmd/nano-init/main_test.go b/cmd/nano-init/main_test.goindex ada75405..a719d0be 100644--- a/cmd/nano-init/main_test.go+++ b/cmd/nano-init/main_test.go@@ -292,6 +292,40 @@ func TestBuildAgentEnv(t *testing.T) {}}+func TestCopyFile(t *testing.T) {+ tempDir := t.TempDir()+ src := filepath.Join(tempDir, "source-file")+ dest := filepath.Join(tempDir, "dest-file")++ content := []byte("hello copy world")+ if err := os.WriteFile(src, content, 0755); err != nil {+ t.Fatalf("Failed to write source file: %v", err)+ }++ if err := copyFile(src, dest); err != nil {+ t.Fatalf("copyFile failed: %v", err)+ }++ data, err := os.ReadFile(dest)+ if err != nil {+ t.Fatalf("Failed to read dest file: %v", err)+ }++ if string(data) != string(content) {+ t.Errorf("Expected content %q, got %q", string(content), string(data))+ }++ fi, err := os.Stat(dest)+ if err != nil {+ t.Fatalf("Stat dest failed: %v", err)+ }++ expectedMode := os.FileMode(0755)+ if fi.Mode().Perm() != expectedMode {+ t.Errorf("Expected permissions %v, got %v", expectedMode, fi.Mode().Perm())+ }+}+func TestBootstrapInterceptor(t *testing.T) {tempDir := t.TempDir()udsPath := filepath.Join(tempDir, "mock-sam-box-interceptor.sock")diff --git a/site/content/docs/user/secure-gateway.md b/site/content/docs/user/secure-gateway.mdindex 21ce6c1c..d9cd96be 100644--- a/site/content/docs/user/secure-gateway.md+++ b/site/content/docs/user/secure-gateway.md@@ -129,7 +129,7 @@ spec:initContainers:- name: init-nano-initimage: ghcr.io/google/sam-nano-init:latest- command: ["cp", "/nano-init", "/shared-bin/nano-init"]+ command: ["/nano-init", "copy", "/shared-bin/nano-init"]volumeMounts:- name: shared-binmountPath: /shared-bin@@ -138,6 +138,7 @@ spec:image: python:3.11-alpinecommand:- "/shared-bin/nano-init"+ - "run"- "/var/run/sam/sam-box.sock"- "python3"- "agent.py"diff --git a/tests/integration/sambox_test.go b/tests/integration/sambox_test.goindex 2d4e4c03..8a0980c6 100644--- a/tests/integration/sambox_test.go+++ b/tests/integration/sambox_test.go@@ -166,7 +166,7 @@ func TestSamBoxNanoInitIntegration(t *testing.T) {_ = os.Remove("/tmp/ephemeral_ca.pem")defer func() { _ = os.Remove("/tmp/ephemeral_ca.pem") }()- nanoInitCmd := exec.CommandContext(nanoInitCtx, nanoInitBin, udsPath,+ nanoInitCmd := exec.CommandContext(nanoInitCtx, nanoInitBin, "run", udsPath,"curl", "--cacert", "/tmp/ephemeral_ca.pem", "-s", "https://api.github.com/",)nanoInitCmd.Env = append(os.Environ(),