diff image config (#329)

* diff image config

* fix comments and use opensource package to show the fuzzy diff in image config

* clean up log

* fix comments & use ` --log-fmt=console` to better print the info

Author: jockeych

bin/makisu/cmd/diff.go

@@ -2,11 +2,15 @@ package cmd
 
 import (
 	"archive/tar"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 
 	"github.com/andres-erbsen/clock"
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/spf13/cobra"
 	"github.com/uber/makisu/lib/docker/image"
 	"github.com/uber/makisu/lib/log"
@@ -49,7 +53,6 @@ func getDiffCmd() *diffCmd {
 }
 
 func (cmd *diffCmd) Diff(imagesFullName []string) error {
-	log.Infof("ingore time? :%t", cmd.ignoreModTime)
 	var pullImages []image.Name
 	for _, imageFullName := range imagesFullName {
 		pullImage, err := image.ParseNameForPull(imageFullName)
@@ -69,6 +72,7 @@ func (cmd *diffCmd) Diff(imagesFullName []string) error {
 	}
 
 	var memFSArr []*snapshot.MemFS
+	var imageConfigs []*image.Config
 	for i, pullImage := range pullImages {
 		client := registry.New(store, pullImage.GetRegistry(), pullImage.GetRepository())
 		manifest, err := client.Pull(pullImage.GetTag())
@@ -94,11 +98,31 @@ func (cmd *diffCmd) Diff(imagesFullName []string) error {
 				panic(fmt.Errorf("untar image %d layer reader: %s", i+1, err))
 			}
 		}
+
 		memFSArr = append(memFSArr, memfs)
+		reader, err := store.Layers.GetStoreFileReader(manifest.GetConfigDigest().Hex())
+		if err != nil {
+			panic(fmt.Errorf("get image%d config file reader %s: %s", i+1, manifest.GetConfigDigest().Hex(), err))
+		}
+
+		configBytes, err := ioutil.ReadAll(reader)
+		if err != nil {
+			panic(fmt.Errorf("read image%d config file %s: %s", i+1, manifest.GetConfigDigest().Hex(), err))
+		}
+
+		config := new(image.Config)
+		if err := json.Unmarshal(configBytes, config); err != nil {
+			panic(fmt.Errorf("unmarshal image%d config file %s: %s", i+1, manifest.GetConfigDigest().Hex(), err))
+		}
+		imageConfigs = append(imageConfigs, config)
+	}
+
+	log.Infof("* Diff image configs ")
+	if configDiff := cmp.Diff(imageConfigs[0], imageConfigs[1], cmpopts.IgnoreUnexported(image.Config{})); configDiff != "" {
+		log.Infof("-image %s +image %s):\n%s", pullImages[0].GetRepository()+":"+pullImages[0].GetTag(), pullImages[1].GetRepository()+":"+pullImages[1].GetTag(), configDiff)
 	}
 
-	log.Infof("* Diff two images")
-	// TODO: compare the image config.
+	log.Infof("* Diff image layers")
 	snapshot.CompareFS(memFSArr[0], memFSArr[1], pullImages[0], pullImages[1], cmd.ignoreModTime)
 	return nil
 }

go.mod

@@ -22,6 +22,7 @@ require (
 	github.com/go-redis/redis v6.14.2+incompatible
 	github.com/golang/mock v1.2.0
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/go-cmp v0.4.0
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/mux v1.6.2 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect

go.sum

@@ -53,6 +53,8 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
@@ -158,6 +160,8 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5 h1:ZcPpqKMdoZeNQ/4GHlyY4COf8n8SmpPv6mcqF1+VPSM=
 golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=