Add Container/Sandbox args struct for creation

There were 3 string arguments that could be easily misplaced
and it makes it easier to add new arguments, especially for
Container that has dozens of callers.

PiperOrigin-RevId: 253872074

1 files changed, 177 insertions, 48 deletions

diff --git a/runsc/container/container_test.go b/runsc/container/container_test.go
index 0e3a736b3..610dd1bf8 100644
--- a/runsc/container/container_test.go
+++ b/runsc/container/container_test.go
@@ -211,7 +211,12 @@ func run(spec *specs.Spec, conf *boot.Config) error {
 	defer os.RemoveAll(bundleDir)
 
 	// Create, start and wait for the container.
-	ws, err := Run(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "", false)
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      spec,
+		BundleDir: bundleDir,
+	}
+	ws, err := Run(conf, args, false)
 	if err != nil {
 		return fmt.Errorf("running container: %v", err)
 	}
@@ -295,15 +300,19 @@ func TestLifecycle(t *testing.T) {
 			},
 		}
 		// Create the container.
-		id := testutil.UniqueContainerID()
-		c, err := Create(id, spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		c, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
 		defer c.Destroy()
 
 		// Load the container from disk and check the status.
-		c, err = Load(rootDir, id)
+		c, err = Load(rootDir, args.ID)
 		if err != nil {
 			t.Fatalf("error loading container: %v", err)
 		}
@@ -316,7 +325,7 @@ func TestLifecycle(t *testing.T) {
 		if err != nil {
 			t.Fatalf("error listing containers: %v", err)
 		}
-		if got, want := ids, []string{id}; !reflect.DeepEqual(got, want) {
+		if got, want := ids, []string{args.ID}; !reflect.DeepEqual(got, want) {
 			t.Errorf("container list got %v, want %v", got, want)
 		}
 
@@ -326,7 +335,7 @@ func TestLifecycle(t *testing.T) {
 		}
 
 		// Load the container from disk and check the status.
-		c, err = Load(rootDir, id)
+		c, err = Load(rootDir, args.ID)
 		if err != nil {
 			t.Fatalf("error loading container: %v", err)
 		}
@@ -367,7 +376,7 @@ func TestLifecycle(t *testing.T) {
 		wg.Wait()
 
 		// Load the container from disk and check the status.
-		c, err = Load(rootDir, id)
+		c, err = Load(rootDir, args.ID)
 		if err != nil {
 			t.Fatalf("error loading container: %v", err)
 		}
@@ -390,7 +399,7 @@ func TestLifecycle(t *testing.T) {
 		}
 
 		// Loading the container by id should fail.
-		if _, err = Load(rootDir, id); err == nil {
+		if _, err = Load(rootDir, args.ID); err == nil {
 			t.Errorf("expected loading destroyed container to fail, but it did not")
 		}
 	}
@@ -417,7 +426,12 @@ func TestExePath(t *testing.T) {
 				t.Fatalf("exec: %s, error setting up container: %v", test.path, err)
 			}
 
-			ws, err := Run(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "", false)
+			args := Args{
+				ID:        testutil.UniqueContainerID(),
+				Spec:      spec,
+				BundleDir: bundleDir,
+			}
+			ws, err := Run(conf, args, false)
 
 			os.RemoveAll(rootDir)
 			os.RemoveAll(bundleDir)
@@ -450,7 +464,12 @@ func TestAppExitStatus(t *testing.T) {
 	defer os.RemoveAll(rootDir)
 	defer os.RemoveAll(bundleDir)
 
-	ws, err := Run(testutil.UniqueContainerID(), succSpec, conf, bundleDir, "", "", "", false)
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      succSpec,
+		BundleDir: bundleDir,
+	}
+	ws, err := Run(conf, args, false)
 	if err != nil {
 		t.Fatalf("error running container: %v", err)
 	}
@@ -469,7 +488,12 @@ func TestAppExitStatus(t *testing.T) {
 	defer os.RemoveAll(rootDir2)
 	defer os.RemoveAll(bundleDir2)
 
-	ws, err = Run(testutil.UniqueContainerID(), errSpec, conf, bundleDir2, "", "", "", false)
+	args2 := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      errSpec,
+		BundleDir: bundleDir2,
+	}
+	ws, err = Run(conf, args2, false)
 	if err != nil {
 		t.Fatalf("error running container: %v", err)
 	}
@@ -494,7 +518,12 @@ func TestExec(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -526,7 +555,7 @@ func TestExec(t *testing.T) {
 			t.Error(err)
 		}
 
-		args := &control.ExecArgs{
+		execArgs := &control.ExecArgs{
 			Filename:         "/bin/sleep",
 			Argv:             []string{"/bin/sleep", "5"},
 			WorkingDirectory: "/",
@@ -537,7 +566,7 @@ func TestExec(t *testing.T) {
 		// First, start running exec (whick blocks).
 		status := make(chan error, 1)
 		go func() {
-			exitStatus, err := cont.executeSync(args)
+			exitStatus, err := cont.executeSync(execArgs)
 			if err != nil {
 				log.Debugf("error executing: %v", err)
 				status <- err
@@ -585,7 +614,12 @@ func TestKillPid(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -656,7 +690,12 @@ func TestCheckpointRestore(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -702,7 +741,12 @@ func TestCheckpointRestore(t *testing.T) {
 		defer outputFile2.Close()
 
 		// Restore into a new container.
-		cont2, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args2 := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont2, err := New(conf, args2)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -741,7 +785,12 @@ func TestCheckpointRestore(t *testing.T) {
 		defer outputFile3.Close()
 
 		// Restore into a new container.
-		cont3, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args3 := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont3, err := New(conf, args3)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -820,7 +869,12 @@ func TestUnixDomainSockets(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -867,7 +921,12 @@ func TestUnixDomainSockets(t *testing.T) {
 		defer outputFile2.Close()
 
 		// Restore into a new container.
-		contRestore, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		argsRestore := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		contRestore, err := New(conf, argsRestore)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -921,7 +980,12 @@ func TestPauseResume(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -949,7 +1013,7 @@ func TestPauseResume(t *testing.T) {
 		}
 
 		script := fmt.Sprintf("while [[ -f %q ]]; do sleep 0.1; done", lock.Name())
-		args := &control.ExecArgs{
+		execArgs := &control.ExecArgs{
 			Filename:         "/bin/bash",
 			Argv:             []string{"bash", "-c", script},
 			WorkingDirectory: "/",
@@ -957,7 +1021,7 @@ func TestPauseResume(t *testing.T) {
 		}
 
 		// First, start running exec.
-		_, err = cont.Execute(args)
+		_, err = cont.Execute(execArgs)
 		if err != nil {
 			t.Fatalf("error executing: %v", err)
 		}
@@ -1026,7 +1090,12 @@ func TestPauseResumeStatus(t *testing.T) {
 	defer os.RemoveAll(bundleDir)
 
 	// Create and start the container.
-	cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      spec,
+		BundleDir: bundleDir,
+	}
+	cont, err := New(conf, args)
 	if err != nil {
 		t.Fatalf("error creating container: %v", err)
 	}
@@ -1090,7 +1159,12 @@ func TestCapabilities(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -1132,7 +1206,7 @@ func TestCapabilities(t *testing.T) {
 		// Need to traverse the intermediate directory.
 		os.Chmod(rootDir, 0755)
 
-		args := &control.ExecArgs{
+		execArgs := &control.ExecArgs{
 			Filename:         exePath,
 			Argv:             []string{exePath},
 			WorkingDirectory: "/",
@@ -1142,16 +1216,16 @@ func TestCapabilities(t *testing.T) {
 		}
 
 		// "exe" should fail because we don't have the necessary permissions.
-		if _, err := cont.executeSync(args); err == nil {
+		if _, err := cont.executeSync(execArgs); err == nil {
 			t.Fatalf("container executed without error, but an error was expected")
 		}
 
 		// Now we run with the capability enabled and should succeed.
-		args.Capabilities = &auth.TaskCapabilities{
+		execArgs.Capabilities = &auth.TaskCapabilities{
 			EffectiveCaps: auth.CapabilitySetOf(linux.CAP_DAC_OVERRIDE),
 		}
 		// "exe" should not fail this time.
-		if _, err := cont.executeSync(args); err != nil {
+		if _, err := cont.executeSync(execArgs); err != nil {
 			t.Fatalf("container failed to exec %v: %v", args, err)
 		}
 	}
@@ -1232,7 +1306,12 @@ func TestReadonlyRoot(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create, start and wait for the container.
-		c, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		c, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -1300,7 +1379,12 @@ func TestUIDMap(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create, start and wait for the container.
-		c, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		c, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -1352,7 +1436,12 @@ func TestReadonlyMount(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create, start and wait for the container.
-		c, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		c, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -1396,7 +1485,12 @@ func TestAbbreviatedIDs(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and start the container.
-		cont, err := Create(cid, spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        cid,
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -1441,7 +1535,12 @@ func TestGoferExits(t *testing.T) {
 	defer os.RemoveAll(bundleDir)
 
 	// Create and start the container.
-	c, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      spec,
+		BundleDir: bundleDir,
+	}
+	c, err := New(conf, args)
 	if err != nil {
 		t.Fatalf("error creating container: %v", err)
 	}
@@ -1520,7 +1619,13 @@ func TestUserLog(t *testing.T) {
 	userLog := filepath.Join(dir, "user.log")
 
 	// Create, start and wait for the container.
-	ws, err := Run(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", userLog, false)
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      spec,
+		BundleDir: bundleDir,
+		UserLog:   userLog,
+	}
+	ws, err := Run(conf, args, false)
 	if err != nil {
 		t.Fatalf("error running container: %v", err)
 	}
@@ -1554,7 +1659,12 @@ func TestWaitOnExitedSandbox(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create and Start the container.
-		c, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		c, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
@@ -1597,7 +1707,12 @@ func TestDestroyNotStarted(t *testing.T) {
 	defer os.RemoveAll(bundleDir)
 
 	// Create the container and check that it can be destroyed.
-	c, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      spec,
+		BundleDir: bundleDir,
+	}
+	c, err := New(conf, args)
 	if err != nil {
 		t.Fatalf("error creating container: %v", err)
 	}
@@ -1619,15 +1734,19 @@ func TestDestroyStarting(t *testing.T) {
 		defer os.RemoveAll(bundleDir)
 
 		// Create the container and check that it can be destroyed.
-		id := testutil.UniqueContainerID()
-		c, err := Create(id, spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		c, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("error creating container: %v", err)
 		}
 
 		// Container is not thread safe, so load another instance to run in
 		// concurrently.
-		startCont, err := Load(rootDir, id)
+		startCont, err := Load(rootDir, args.ID)
 		if err != nil {
 			t.Fatalf("error loading container: %v", err)
 		}
@@ -1732,7 +1851,12 @@ func TestMountPropagation(t *testing.T) {
 	defer os.RemoveAll(rootDir)
 	defer os.RemoveAll(bundleDir)
 
-	cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+	args := Args{
+		ID:        testutil.UniqueContainerID(),
+		Spec:      spec,
+		BundleDir: bundleDir,
+	}
+	cont, err := New(conf, args)
 	if err != nil {
 		t.Fatalf("creating container: %v", err)
 	}
@@ -1750,21 +1874,21 @@ func TestMountPropagation(t *testing.T) {
 
 	// Check that mount didn't propagate to private mount.
 	privFile := filepath.Join(priv, "mnt", "file")
-	args := &control.ExecArgs{
+	execArgs := &control.ExecArgs{
 		Filename: "/usr/bin/test",
 		Argv:     []string{"test", "!", "-f", privFile},
 	}
-	if ws, err := cont.executeSync(args); err != nil || ws != 0 {
+	if ws, err := cont.executeSync(execArgs); err != nil || ws != 0 {
 		t.Fatalf("exec: test ! -f %q, ws: %v, err: %v", privFile, ws, err)
 	}
 
 	// Check that mount propagated to slave mount.
 	slaveFile := filepath.Join(slave, "mnt", "file")
-	args = &control.ExecArgs{
+	execArgs = &control.ExecArgs{
 		Filename: "/usr/bin/test",
 		Argv:     []string{"test", "-f", slaveFile},
 	}
-	if ws, err := cont.executeSync(args); err != nil || ws != 0 {
+	if ws, err := cont.executeSync(execArgs); err != nil || ws != 0 {
 		t.Fatalf("exec: test -f %q, ws: %v, err: %v", privFile, ws, err)
 	}
 }
@@ -1813,7 +1937,12 @@ func TestMountSymlink(t *testing.T) {
 		defer os.RemoveAll(rootDir)
 		defer os.RemoveAll(bundleDir)
 
-		cont, err := Create(testutil.UniqueContainerID(), spec, conf, bundleDir, "", "", "")
+		args := Args{
+			ID:        testutil.UniqueContainerID(),
+			Spec:      spec,
+			BundleDir: bundleDir,
+		}
+		cont, err := New(conf, args)
 		if err != nil {
 			t.Fatalf("creating container: %v", err)
 		}
@@ -1826,11 +1955,11 @@ func TestMountSymlink(t *testing.T) {
 		// Check that symlink was resolved and mount was created where the symlink
 		// is pointing to.
 		file := path.Join(target, "file")
-		args := &control.ExecArgs{
+		execArgs := &control.ExecArgs{
 			Filename: "/usr/bin/test",
 			Argv:     []string{"test", "-f", file},
 		}
-		if ws, err := cont.executeSync(args); err != nil || ws != 0 {
+		if ws, err := cont.executeSync(execArgs); err != nil || ws != 0 {
 			t.Fatalf("exec: test -f %q, ws: %v, err: %v", file, ws, err)
 		}
 	}