Fix lint errors

Signed-off-by: David Gageot <david@gageot.net>
GoogleContainerTools · Jun 5, 2018 · 9bddebf · 9bddebf
1 parent f69d8bc
commit 9bddebf
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 31 deletions.
diff --git a/pkg/skaffold/build/local_test.go b/pkg/skaffold/build/local_test.go
@@ -69,9 +69,9 @@ func TestLocalRun(t *testing.T) {
 		out          io.Writer
 		api          docker.DockerAPIClient
 		tagger       tag.Tagger
-		localCluster bool
 		artifacts    []*v1alpha2.Artifact
 		expected     []Build
+		localCluster bool
 		shouldErr    bool
 	}{
 		{

diff --git a/pkg/skaffold/build/tag/date_time.go b/pkg/skaffold/build/tag/date_time.go
@@ -31,12 +31,13 @@ type dateTimeTagger struct {
 	timeFn   func() time.Time
 }
 
-func NewDateTimeTagger(format, timezone string) (*dateTimeTagger, error) {
+// NewDateTimeTagger creates a tagger from a date format and timezone.
+func NewDateTimeTagger(format, timezone string) Tagger {
 	return &dateTimeTagger{
 		Format:   format,
 		TimeZone: timezone,
 		timeFn:   func() time.Time { return time.Now() },
-	}, nil
+	}
 }
 
 // GenerateFullyQualifiedImageName tags an image with the supplied image name and the current timestamp

diff --git a/pkg/skaffold/build/tag/date_time_test.go b/pkg/skaffold/build/tag/date_time_test.go
@@ -23,14 +23,6 @@ import (
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
-type mockClock struct {
-	time time.Time
-}
-
-func (m mockClock) Now() time.Time {
-	return m.time
-}
-
 func TestDateTime_GenerateFullyQualifiedImageName(t *testing.T) {
 	aLocalTimeStamp := time.Date(2015, 03, 07, 11, 06, 39, 123456789, time.Local)
 	localZone, _ := aLocalTimeStamp.Zone()

diff --git a/pkg/skaffold/build/tag/env_template.go b/pkg/skaffold/build/tag/env_template.go
@@ -30,7 +30,7 @@ type envTemplateTagger struct {
 }
 
 // NewEnvTemplateTagger creates a new envTemplateTagger
-func NewEnvTemplateTagger(t string) (*envTemplateTagger, error) {
+func NewEnvTemplateTagger(t string) (Tagger, error) {
 	tmpl, err := util.ParseEnvTemplate(t)
 	if err != nil {
 		return nil, errors.Wrap(err, "parsing template")

diff --git a/pkg/skaffold/docker/image_test.go b/pkg/skaffold/docker/image_test.go
@@ -37,7 +37,6 @@ func TestMain(m *testing.M) {
 type testImageAPI struct {
 	description  string
 	imageName    string
-	imageID      string
 	tagToImageID map[string]string
 	shouldErr    bool
 	expected     string
@@ -96,7 +95,6 @@ func TestRunBuild(t *testing.T) {
 		{
 			description:  "build",
 			tagToImageID: map[string]string{},
-			imageID:      "sha256:test",
 			expected:     "test",
 		},
 		{

diff --git a/pkg/skaffold/kubernetes/wait_test.go b/pkg/skaffold/kubernetes/wait_test.go
@@ -79,20 +79,6 @@ var podBadPhase = &v1.Pod{
 	},
 }
 
-var podDifferentName = &v1.Pod{
-	ObjectMeta: metav1.ObjectMeta{
-		Name: "pod_different_name",
-	},
-	Status: v1.PodStatus{
-		Conditions: []v1.PodCondition{
-			{
-				Type: v1.PodScheduled,
-			},
-		},
-		Phase: "not a real phase",
-	},
-}
-
 func TestWaitForPodReady(t *testing.T) {
 	var tests = []struct {
 		description string

diff --git a/pkg/skaffold/runner/runner.go b/pkg/skaffold/runner/runner.go
@@ -141,7 +141,7 @@ func getTagger(t v1alpha2.TagPolicy, customTag string) (tag.Tagger, error) {
 		return &tag.GitCommit{}, nil
 
 	case t.DateTimeTagger != nil:
-		return tag.NewDateTimeTagger(t.DateTimeTagger.Format, t.DateTimeTagger.TimeZone)
+		return tag.NewDateTimeTagger(t.DateTimeTagger.Format, t.DateTimeTagger.TimeZone), nil
 
 	default:
 		return nil, fmt.Errorf("Unknown tagger for strategy %+v", t)

diff --git a/pkg/skaffold/util/env_template_test.go b/pkg/skaffold/util/env_template_test.go
@@ -60,12 +60,12 @@ func TestEnvTemplate_ExecuteEnvTemplate(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			test_template := template.Must(template.New("").Parse(test.template))
+			testTemplate := template.Must(template.New("").Parse(test.template))
 			OSEnviron = func() []string {
 				return test.env
 			}
 
-			got, err := ExecuteEnvTemplate(test_template, test.customMap)
+			got, err := ExecuteEnvTemplate(testTemplate, test.customMap)
 			testutil.CheckErrorAndDeepEqual(t, test.shouldErr, err, test.want, got)
 		})
 	}