Replace gometalinter with GolangCI-Lint

gometalinter is broken @ HEAD, and I looked into why that was. During
that process, I remembered that we took the linting scripts from
skaffold, and found that in skaffold gometalinter was replaced with
GolangCI-Lint:

https://github.com/GoogleContainerTools/skaffold/pull/619

The change made linting in skaffold faster, so I figured instead of
fixing gometalinter it made more sense to remove it and replace it with
GolangCI-Lint for kaniko as well.
This commit is contained in:
Priya Wadhwa
2018-09-11 13:30:42 -07:00
parent 06defa6552
commit 99ab68e7f4
19 changed files with 466 additions and 100 deletions
+5 -10
View File
@@ -71,7 +71,6 @@ func initGCPConfig() *gcpConfig {
}
const (
ubuntuImage = "ubuntu"
daemonPrefix = "daemon://"
dockerfilesPath = "dockerfiles"
emptyContainerDiff = `[
@@ -240,30 +239,26 @@ func TestLayers(t *testing.T) {
kanikoImage := GetKanikoImage(config.imageRepo, dockerfile)
pullCmd := exec.Command("docker", "pull", kanikoImage)
RunCommand(pullCmd, t)
if err := checkLayers(t, dockerImage, kanikoImage, offset[dockerfile]); err != nil {
t.Error(err)
t.Fail()
}
checkLayers(t, dockerImage, kanikoImage, offset[dockerfile])
})
}
}
func checkLayers(t *testing.T, image1, image2 string, offset int) error {
func checkLayers(t *testing.T, image1, image2 string, offset int) {
img1, err := getImageDetails(image1)
if err != nil {
return fmt.Errorf("Couldn't get details from image reference for (%s): %s", image1, err)
t.Fatalf("Couldn't get details from image reference for (%s): %s", image1, err)
}
img2, err := getImageDetails(image2)
if err != nil {
return fmt.Errorf("Couldn't get details from image reference for (%s): %s", image2, err)
t.Fatalf("Couldn't get details from image reference for (%s): %s", image2, err)
}
actualOffset := int(math.Abs(float64(img1.numLayers - img2.numLayers)))
if actualOffset != offset {
return fmt.Errorf("Difference in number of layers in each image is %d but should be %d. Image 1: %s, Image 2: %s", actualOffset, offset, img1, img2)
t.Fatalf("Difference in number of layers in each image is %d but should be %d. Image 1: %s, Image 2: %s", actualOffset, offset, img1, img2)
}
return nil
}
func getImageDetails(image string) (*imageDetails, error) {