Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit 414dd3a

Browse files
cftorrescftorres
committed
Addressing Abby's comments
1 parent 6b359d2 commit 414dd3a

File tree

5 files changed

+32
-32
lines changed

5 files changed

+32
-32
lines changed

‎differs/package_differs.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ type SingleVersionPackageAnalyzer interface {
1818
func multiVersionDiff(image1, image2 utils.Image, differ MultiVersionPackageAnalyzer) (utils.DiffResult, error) {
1919
pack1, err := differ.getPackages(image1)
2020
if err != nil {
21-
return &utils.MultiPackageDiffResult{}, err
21+
return &utils.MultiVersionPackageDiffResult{}, err
2222
}
2323
pack2, err := differ.getPackages(image2)
2424
if err != nil {
25-
return &utils.MultiPackageDiffResult{}, err
25+
return &utils.MultiVersionPackageDiffResult{}, err
2626
}
2727

2828
diff := utils.GetMultiVersionMapDiff(pack1, pack2)
29-
return &utils.MultiPackageDiffResult{
29+
return &utils.MultiVersionPackageDiffResult{
3030
Image1: image1.Source,
3131
Image2: image2.Source,
3232
DiffType: strings.TrimSuffix(reflect.TypeOf(differ).Name(), "Analyzer"),
@@ -37,15 +37,15 @@ func multiVersionDiff(image1, image2 utils.Image, differ MultiVersionPackageAnal
3737
func singleVersionDiff(image1, image2 utils.Image, differ SingleVersionPackageAnalyzer) (utils.DiffResult, error) {
3838
pack1, err := differ.getPackages(image1)
3939
if err != nil {
40-
return &utils.PackageDiffResult{}, err
40+
return &utils.SingleVersionPackageDiffResult{}, err
4141
}
4242
pack2, err := differ.getPackages(image2)
4343
if err != nil {
44-
return &utils.PackageDiffResult{}, err
44+
return &utils.SingleVersionPackageDiffResult{}, err
4545
}
4646

4747
diff := utils.GetMapDiff(pack1, pack2)
48-
return &utils.PackageDiffResult{
48+
return &utils.SingleVersionPackageDiffResult{
4949
Image1: image1.Source,
5050
Image2: image2.Source,
5151
DiffType: strings.TrimSuffix(reflect.TypeOf(differ).Name(), "Analyzer"),
@@ -56,10 +56,10 @@ func singleVersionDiff(image1, image2 utils.Image, differ SingleVersionPackageAn
5656
func multiVersionAnalysis(image utils.Image, analyzer MultiVersionPackageAnalyzer) (utils.AnalyzeResult, error) {
5757
pack, err := analyzer.getPackages(image)
5858
if err != nil {
59-
return &utils.MultiPackageAnalyzeResult{}, err
59+
return &utils.MultiVersionPackageAnalyzeResult{}, err
6060
}
6161

62-
analysis := utils.MultiPackageAnalyzeResult{
62+
analysis := utils.MultiVersionPackageAnalyzeResult{
6363
Image: image.Source,
6464
AnalyzeType: strings.TrimSuffix(reflect.TypeOf(analyzer).Name(), "Analyzer"),
6565
Analysis: pack,
@@ -70,10 +70,10 @@ func multiVersionAnalysis(image utils.Image, analyzer MultiVersionPackageAnalyze
7070
func singleVersionAnalysis(image utils.Image, analyzer SingleVersionPackageAnalyzer) (utils.AnalyzeResult, error) {
7171
pack, err := analyzer.getPackages(image)
7272
if err != nil {
73-
return &utils.PackageAnalyzeResult{}, err
73+
return &utils.SingleVersionPackageAnalyzeResult{}, err
7474
}
7575

76-
analysis := utils.PackageAnalyzeResult{
76+
analysis := utils.SingleVersionPackageAnalyzeResult{
7777
Image: image.Source,
7878
AnalyzeType: strings.TrimSuffix(reflect.TypeOf(analyzer).Name(), "Analyzer"),
7979
Analysis: pack,

‎utils/analyze_output_utils.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ func (r ListAnalyzeResult) OutputText(analyzeType string) error {
1919
return TemplateOutput(r)
2020
}
2121

22-
type MultiPackageAnalyzeResult struct {
22+
type MultiVersionPackageAnalyzeResult struct {
2323
Image string
2424
AnalyzeType string
2525
Analysis map[string]map[string]PackageInfo
2626
}
2727

28-
func (r MultiPackageAnalyzeResult) GetStruct() AnalyzeResult {
28+
func (r MultiVersionPackageAnalyzeResult) GetStruct() AnalyzeResult {
2929
return r
3030
}
3131

32-
func (r MultiPackageAnalyzeResult) OutputText(analyzeType string) error {
32+
func (r MultiVersionPackageAnalyzeResult) OutputText(analyzeType string) error {
3333
return TemplateOutput(r)
3434
}
3535

36-
type PackageAnalyzeResult struct {
36+
type SingleVersionPackageAnalyzeResult struct {
3737
Image string
3838
AnalyzeType string
3939
Analysis map[string]PackageInfo
4040
}
4141

42-
func (r PackageAnalyzeResult) GetStruct() AnalyzeResult {
42+
func (r SingleVersionPackageAnalyzeResult) GetStruct() AnalyzeResult {
4343
return r
4444
}
4545

46-
func (r PackageAnalyzeResult) OutputText(diffType string) error {
46+
func (r SingleVersionPackageAnalyzeResult) OutputText(diffType string) error {
4747
return TemplateOutput(r)
4848
}

‎utils/diff_output_utils.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@ type DiffResult interface {
55
OutputText(diffType string) error
66
}
77

8-
type MultiPackageDiffResult struct {
8+
type MultiVersionPackageDiffResult struct {
99
Image1 string
1010
Image2 string
1111
DiffType string
1212
Diff MultiVersionPackageDiff
1313
}
1414

15-
func (r MultiPackageDiffResult) GetStruct() DiffResult {
15+
func (r MultiVersionPackageDiffResult) GetStruct() DiffResult {
1616
return r
1717
}
1818

19-
func (r MultiPackageDiffResult) OutputText(diffType string) error {
19+
func (r MultiVersionPackageDiffResult) OutputText(diffType string) error {
2020
return TemplateOutput(r)
2121
}
2222

23-
type PackageDiffResult struct {
23+
type SingleVersionPackageDiffResult struct {
2424
Image1 string
2525
Image2 string
2626
DiffType string
2727
Diff PackageDiff
2828
}
2929

30-
func (r PackageDiffResult) GetStruct() DiffResult {
30+
func (r SingleVersionPackageDiffResult) GetStruct() DiffResult {
3131
return r
3232
}
3333

34-
func (r PackageDiffResult) OutputText(diffType string) error {
34+
func (r SingleVersionPackageDiffResult) OutputText(diffType string) error {
3535
return TemplateOutput(r)
3636
}
3737

‎utils/format_utils.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414
)
1515

1616
var templates = map[string]string{
17-
"utils.PackageDiffResult": SingleVersionDiffOutput,
18-
"utils.MultiPackageDiffResult": MultiVersionDiffOutput,
19-
"utils.HistDiffResult": HistoryDiffOutput,
20-
"utils.DirDiffResult": FSDiffOutput,
21-
"utils.ListAnalyzeResult": ListAnalysisOutput,
22-
"utils.MultiPackageAnalyzeResult": MultiVersionPackageOutput,
23-
"utils.PackageAnalyzeResult": SingleVersionPackageOutput,
17+
"utils.SingleVersionPackageDiffResult": SingleVersionDiffOutput,
18+
"utils.MultiVersionPackageDiffResult": MultiVersionDiffOutput,
19+
"utils.HistDiffResult": HistoryDiffOutput,
20+
"utils.DirDiffResult": FSDiffOutput,
21+
"utils.ListAnalyzeResult": ListAnalysisOutput,
22+
"utils.MultiVersionPackageAnalyzeResult": MultiVersionPackageOutput,
23+
"utils.SingleVersionPackageAnalyzeResult": SingleVersionPackageOutput,
2424
}
2525

2626
func JSONify(diff interface{}) error {

‎utils/template_utils.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ PACKAGE IMAGE1 ({{.Image1}}) IMAGE2 ({{.Image2}}){{range .Diff.InfoDiff}}{{"\n"}
4545
const HistoryDiffOutput = `
4646
-----{{.DiffType}}-----
4747
48-
Docker history lines found only in {{.Image1}}:{{if not .Diff.Adds}} None{{else}}{{block "list" .Diff.Adds}}{{"\n"}}{{range .}}{{print "-" .}}{{end}}{{end}}{{end}}
48+
Docker history lines found only in {{.Image1}}:{{if not .Diff.Adds}} None{{else}}{{block "list" .Diff.Adds}}{{"\n"}}{{range .}}{{print "-" .}}{{"\n"}}{{end}}{{end}}{{end}}
4949
50-
Docker history lines found only in {{.Image2}}:{{if not .Diff.Dels}} None{{else}}{{block "list2" .Diff.Dels}}{{"\n"}}{{range .}}{{print "-" .}}{{end}}{{end}}{{end}}
50+
Docker history lines found only in {{.Image2}}:{{if not .Diff.Dels}} None{{else}}{{block "list2" .Diff.Dels}}{{"\n"}}{{range .}}{{print "-" .}}{{"\n"}}{{end}}{{end}}{{end}}
5151
`
5252

5353
const ListAnalysisOutput = `
5454
-----{{.AnalyzeType}}-----
5555
56-
Analysis for {{.Image}}:{{if not .Analysis}} None{{else}}{{block "list" .Analysis}}{{"\n"}}{{range .}}{{print "-" .}}{{end}}{{end}}{{end}}
56+
Analysis for {{.Image}}:{{if not .Analysis}} None{{else}}{{block "list" .Analysis}}{{"\n"}}{{range .}}{{print "-" .}}{{"\n"}}{{end}}{{end}}{{end}}
5757
`
5858

5959
const MultiVersionPackageOutput = `

0 commit comments

Comments
 (0)