refactor: move Container to separate file

cmd/vela-kubernetes/container.go

@@ -0,0 +1,44 @@
+// Copyright (c) 2020 Target Brands, Inc. All rights reserved.
+//
+// Use of this source code is governed by the LICENSE file in this repository.
+
+package main
+
+import (
+	"fmt"
+
+	"github.com/sirupsen/logrus"
+)
+
+// Container represents the plugin configuration for patching a container.
+//
+// TODO: Enable patching of other container attributes?
+// * environment variables
+// * image pull policy
+// * ports
+// * resources
+//
+// This is possible if we made Container a map[string]string.
+type Container struct {
+	// name of the container to patch
+	Name string
+	// image of the container to patch
+	Image string
+}
+
+// Validate verifies the Container is properly configured.
+func (c *Container) Validate() error {
+	logrus.Tracef("validating container configuration for %s", c.Name)
+
+	// verify name is provided
+	if len(c.Name) == 0 {
+		return fmt.Errorf("no container name provided")
+	}
+
+	// verify image is provided
+	if len(c.Image) == 0 {
+		return fmt.Errorf("no container image provided")
+	}
+
+	return nil
+}

cmd/vela-kubernetes/container_test.go

@@ -0,0 +1,46 @@
+// Copyright (c) 2020 Target Brands, Inc. All rights reserved.
+//
+// Use of this source code is governed by the LICENSE file in this repository.
+
+package main
+
+import (
+	"testing"
+)
+
+func TestKubernetes_Container_Validate(t *testing.T) {
+	// setup types
+	c := &Container{
+		Name:  "container",
+		Image: "alpine",
+	}
+
+	err := c.Validate()
+	if err != nil {
+		t.Errorf("Validate returned err: %v", err)
+	}
+}
+
+func TestKubernetes_Container_Validate_NoName(t *testing.T) {
+	// setup types
+	c := &Container{
+		Image: "alpine",
+	}
+
+	err := c.Validate()
+	if err == nil {
+		t.Errorf("Validate should have returned err")
+	}
+}
+
+func TestKubernetes_Container_Validate_NoImage(t *testing.T) {
+	// setup types
+	c := &Container{
+		Name: "container",
+	}
+
+	err := c.Validate()
+	if err == nil {
+		t.Errorf("Validate should have returned err")
+	}
+}

cmd/vela-kubernetes/patch.go

@@ -62,39 +62,6 @@ spec:
           commit_sha:
 `
 
-// Container represents the plugin configuration for patching a container.
-//
-// TODO: Enable patching of other container attributes?
-// * environment variables
-// * image pull policy
-// * ports
-// * resources
-//
-// This is possible if we made Container a map[string]string
-type Container struct {
-	// name of the container to patch
-	Name string
-	// image of the container to patch
-	Image string
-}
-
-// Validate verifies the Container is properly configured.
-func (c *Container) Validate() error {
-	logrus.Tracef("validating container configuration for %s", c.Name)
-
-	// verify name is provided
-	if len(c.Name) == 0 {
-		return fmt.Errorf("no container name provided")
-	}
-
-	// verify image is provided
-	if len(c.Image) == 0 {
-		return fmt.Errorf("no container image provided")
-	}
-
-	return nil
-}
-
 // Patch represents the plugin configuration for Patch config information.
 type Patch struct {
 	// container images from files to patch

cmd/vela-kubernetes/patch_test.go

@@ -98,7 +98,7 @@ func TestKubernetes_Patch_Validate_Invalid(t *testing.T) {
 	}
 }
 
-func TestKubernetes_Patch_Validate_NoContainers(t *testing.T) {
+func TestKubernetes_Patch_Validate_NoRawContainers(t *testing.T) {
 	// setup types
 	p := &Patch{}
 
@@ -108,7 +108,7 @@ func TestKubernetes_Patch_Validate_NoContainers(t *testing.T) {
 	}
 }
 
-func TestKubernetes_Patch_Validate_NoContainerName(t *testing.T) {
+func TestKubernetes_Patch_Validate_NoRawContainerName(t *testing.T) {
 	// setup types
 	p := &Patch{
 		Output:        "json",
@@ -120,16 +120,3 @@ func TestKubernetes_Patch_Validate_NoContainerName(t *testing.T) {
 		t.Errorf("Validate should have returned err")
 	}
 }
-
-func TestKubernetes_Patch_Validate_NoContainerImage(t *testing.T) {
-	// setup types
-	p := &Patch{
-		Output:        "json",
-		RawContainers: `[{"name": "container"}]`,
-	}
-
-	err := p.Validate()
-	if err == nil {
-		t.Errorf("Validate should have returned err")
-	}
-}