From acdfd9a920360fef80b8216ac06a3c8260a93f5a Mon Sep 17 00:00:00 2001
From: Donny Xia <donnyxia@google.com>
Date: Thu, 24 Sep 2020 11:37:34 -0700
Subject: [PATCH] remove error from NewContainer

---
 kyaml/fn/runtime/container/container.go      |  4 ++--
 kyaml/fn/runtime/container/container_test.go |  5 +----
 kyaml/runfn/runfn.go                         |  5 +----
 kyaml/runfn/runfn_test.go                    | 15 +++------------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/kyaml/fn/runtime/container/container.go b/kyaml/fn/runtime/container/container.go
index b20032c49..e36d44ed1 100644
--- a/kyaml/fn/runtime/container/container.go
+++ b/kyaml/fn/runtime/container/container.go
@@ -185,8 +185,8 @@ func (c *Filter) getCommand() (string, []string) {
 }
 
 // NewContainer returns a new container filter
-func NewContainer(spec runtimeutil.ContainerSpec, uidgid string) (Filter, error) {
+func NewContainer(spec runtimeutil.ContainerSpec, uidgid string) Filter {
 	f := Filter{ContainerSpec: spec, UIDGID: uidgid}
 
-	return f, nil
+	return f
 }
diff --git a/kyaml/fn/runtime/container/container_test.go b/kyaml/fn/runtime/container/container_test.go
index 549b018b6..4f3ae388a 100644
--- a/kyaml/fn/runtime/container/container_test.go
+++ b/kyaml/fn/runtime/container/container_test.go
@@ -125,10 +125,7 @@ metadata:
 				t.FailNow()
 			}
 
-			instance, err := NewContainer(tt.containerSpec, tt.UIDGID)
-			if err != nil {
-				t.Fatal(err)
-			}
+			instance := NewContainer(tt.containerSpec, tt.UIDGID)
 			instance.Exec.FunctionConfig = cfg
 			instance.Env = append(instance.Env, "KYAML_TEST=FOO")
 			instance.setupExec()
diff --git a/kyaml/runfn/runfn.go b/kyaml/runfn/runfn.go
index 23f416d86..0620369f6 100644
--- a/kyaml/runfn/runfn.go
+++ b/kyaml/runfn/runfn.go
@@ -426,7 +426,7 @@ func (r *RunFns) ffp(spec runtimeutil.FunctionSpec, api *yaml.RNode, currentUser
 		if err != nil {
 			return nil, err
 		}
-		c, err := container.NewContainer(
+		c := container.NewContainer(
 			runtimeutil.ContainerSpec{
 				Image:         spec.Container.Image,
 				Network:       spec.Container.Network,
@@ -435,9 +435,6 @@ func (r *RunFns) ffp(spec runtimeutil.FunctionSpec, api *yaml.RNode, currentUser
 			},
 			uidgid,
 		)
-		if err != nil {
-			return nil, err
-		}
 		cf := &c
 		cf.Exec.FunctionConfig = api
 		cf.Exec.GlobalScope = r.GlobalScope
diff --git a/kyaml/runfn/runfn_test.go b/kyaml/runfn/runfn_test.go
index aaf540421..057e45416 100644
--- a/kyaml/runfn/runfn_test.go
+++ b/kyaml/runfn/runfn_test.go
@@ -68,10 +68,7 @@ kind:
 		return
 	}
 	filter, _ := instance.functionFilterProvider(spec, api, currentUser)
-	c, err := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody")
-	if err != nil {
-		t.Fatal(err)
-	}
+	c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody")
 	cf := &c
 	cf.Exec.FunctionConfig = api
 	assert.Equal(t, cf, filter)
@@ -101,10 +98,7 @@ kind:
 		return
 	}
 	filter, _ := instance.functionFilterProvider(spec, api, currentUser)
-	c, err := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "1:2")
-	if err != nil {
-		t.Fatal(err)
-	}
+	c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "1:2")
 	cf := &c
 	cf.Exec.FunctionConfig = api
 	assert.Equal(t, cf, filter)
@@ -135,10 +129,7 @@ kind:
 		return
 	}
 	filter, _ := instance.functionFilterProvider(spec, api, currentUser)
-	c, err := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody")
-	if err != nil {
-		t.Fatal(err)
-	}
+	c := container.NewContainer(runtimeutil.ContainerSpec{Image: "example.com:version"}, "nobody")
 	cf := &c
 	cf.Exec.FunctionConfig = api
 	cf.Exec.GlobalScope = true