gofmt
This commit is contained in:
parent
2640bdced8
commit
fcb5ec01ef
@ -49,7 +49,7 @@ func NewFileInfo(realPath, path string, info os.FileInfo) FileInfo {
|
||||
var linkName string
|
||||
var size int64
|
||||
|
||||
if info.Mode() & os.ModeSymlink != 0 {
|
||||
if info.Mode()&os.ModeSymlink != 0 {
|
||||
fileType = tar.TypeSymlink
|
||||
|
||||
linkName, err = os.Readlink(realPath)
|
||||
|
@ -179,7 +179,6 @@ func (img *ImageArchive) ToImage() (*image.Image, error) {
|
||||
layers = append(layers, dockerLayer.ToLayer())
|
||||
}
|
||||
|
||||
|
||||
return &image.Image{
|
||||
Trees: trees,
|
||||
Layers: layers,
|
||||
|
@ -14,7 +14,6 @@ type layer struct {
|
||||
tree *filetree.FileTree
|
||||
}
|
||||
|
||||
|
||||
// String represents a layer in a columnar format.
|
||||
func (l *layer) ToLayer() *image.Layer {
|
||||
id := strings.Split(l.tree.Name, "/")[0]
|
||||
|
@ -13,7 +13,7 @@ import (
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
type resolver struct {}
|
||||
type resolver struct{}
|
||||
|
||||
func NewResolver() *resolver {
|
||||
return &resolver{}
|
||||
@ -100,4 +100,3 @@ func (r *resolver) fetchArchive(id string) (io.ReadCloser, error) {
|
||||
|
||||
return readCloser, nil
|
||||
}
|
||||
|
||||
|
@ -76,7 +76,7 @@ func processLayer(name, rootDir string) (*filetree.FileTree, error) {
|
||||
return err
|
||||
}
|
||||
// add this file to the tree...
|
||||
relativeImagePath := "/"+strings.TrimPrefix(strings.TrimPrefix(path, rootDir), "/")
|
||||
relativeImagePath := "/" + strings.TrimPrefix(strings.TrimPrefix(path, rootDir), "/")
|
||||
fileInfo := filetree.NewFileInfo(path, relativeImagePath, info)
|
||||
|
||||
tree.FileSize += uint64(fileInfo.Size)
|
||||
|
@ -11,7 +11,7 @@ import (
|
||||
"os"
|
||||
)
|
||||
|
||||
type resolver struct {}
|
||||
type resolver struct{}
|
||||
|
||||
func NewResolver() *resolver {
|
||||
return &resolver{}
|
||||
@ -25,7 +25,6 @@ func (r *resolver) Build(args []string) (*image.Image, error) {
|
||||
return r.Fetch(id)
|
||||
}
|
||||
|
||||
|
||||
func (r *resolver) Fetch(id string) (*image.Image, error) {
|
||||
img, err := r.resolveFromDisk(id)
|
||||
if err == nil {
|
||||
@ -57,7 +56,7 @@ func (r *resolver) resolveFromDisk(id string) (*image.Image, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ImageLoop:
|
||||
ImageLoop:
|
||||
for _, candidateImage := range images {
|
||||
for _, name := range candidateImage.Names() {
|
||||
if name == id {
|
||||
@ -108,7 +107,7 @@ func (r *resolver) fetchDockerArchive(id string) (string, error) {
|
||||
return "", err
|
||||
}
|
||||
|
||||
for _, item:= range images {
|
||||
for _, item := range images {
|
||||
for _, name := range item.Names() {
|
||||
if name == id {
|
||||
file, err := ioutil.TempFile(os.TempDir(), "dive-resolver-tar")
|
||||
|
@ -14,7 +14,7 @@ type export struct {
|
||||
func NewExport(analysis *diveImage.AnalysisResult) *export {
|
||||
data := export{
|
||||
Layer: make([]layer, len(analysis.Layers)),
|
||||
Image: image {
|
||||
Image: image{
|
||||
InefficientFiles: make([]fileReference, len(analysis.Inefficiencies)),
|
||||
SizeBytes: analysis.SizeBytes,
|
||||
EfficiencyScore: analysis.Efficiency,
|
||||
|
@ -134,7 +134,7 @@ func (controller *DetailsController) Render() error {
|
||||
if currentLayer.Names != nil && len(currentLayer.Names) > 0 {
|
||||
lines = append(lines, Formatting.Header("Tags: ")+strings.Join(currentLayer.Names, ", "))
|
||||
} else {
|
||||
lines = append(lines, Formatting.Header("Tags: ")+ "(none)")
|
||||
lines = append(lines, Formatting.Header("Tags: ")+"(none)")
|
||||
}
|
||||
lines = append(lines, Formatting.Header("Id: ")+currentLayer.Id)
|
||||
lines = append(lines, Formatting.Header("Digest: ")+currentLayer.Digest)
|
||||
|
@ -72,8 +72,6 @@ func assertTestData(t *testing.T, actualBytes []byte) {
|
||||
helperCheckDiff(t, expectedBytes, actualBytes)
|
||||
}
|
||||
|
||||
|
||||
|
||||
func initializeTestViewModel(t *testing.T) *FileTreeViewModel {
|
||||
result := docker.TestAnalysisFromArchive(t, "../../.data/test-docker-image.tar")
|
||||
|
||||
|
@ -131,7 +131,6 @@ func toggleFilterView(g *gocui.Gui, v *gocui.View) error {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user