Show SBOMs in interactive pane

internal/termui/dashboard.go

@@ -204,5 +204,9 @@ func info(buildpackInfo dist.BuildpackInfo) string {
 		return buildpackInfo.Description
 	}
 
-	return buildpackInfo.Homepage
+	if buildpackInfo.Homepage != "" {
+		return buildpackInfo.Homepage
+	}
+
+	return "-"
 }

internal/termui/detect.go

@@ -95,7 +95,10 @@ func (d *Detect) find(buildpackID, buildpackVersion string) dist.BuildpackInfo {
 		}
 	}
 
-	return dist.BuildpackInfo{}
+	return dist.BuildpackInfo{
+		ID:      buildpackID,
+		Version: buildpackVersion,
+	}
 }
 
 func detectStatusTV() *tview.TextView {

internal/termui/dive.go

@@ -17,13 +17,12 @@ type Dive struct {
 	menuTable         *tview.Table
 	fileExplorerTable *tview.Table
 	buildpackInfo     []dist.BuildpackInfo
-	selectedBuildpack dist.BuildpackInfo
 	buildpacksTreeMap map[string]*tview.TreeNode
 	escHandler        func()
 }
 
 func NewDive(app app, buildpackInfo []dist.BuildpackInfo, selectedBuildpack dist.BuildpackInfo, nodes map[string]*tview.TreeNode, escHandler func()) *Dive {
-	menu := initMenu(buildpackInfo)
+	menu := initMenu(buildpackInfo, nodes)
 	fileExplorerTable := initFileExplorer()
 
 	screen := tview.NewFlex().
@@ -53,33 +52,51 @@ func NewDive(app app, buildpackInfo []dist.BuildpackInfo, selectedBuildpack dist
 }
 
 func (d *Dive) handle() {
+	selectionFunc := func(nodeKey string) func(row, column int) {
+		return func(row, column int) {
+			node := d.fileExplorerTable.GetCell(row, 3).GetReference().(*tview.TreeNode)
+
+			if !node.GetReference().(*tar.Header).FileInfo().IsDir() {
+				return
+			}
+
+			if node.IsExpanded() {
+				node.Collapse()
+			} else {
+				node.Expand()
+			}
+
+			d.loadFileExplorerData(nodeKey)
+		}
+	}
+
 	d.menuTable.SetSelectionChangedFunc(func(row, column int) {
 		// protect from panic
 		if row < 0 {
 			return
 		}
 
-		d.selectedBuildpack = d.buildpackInfo[row-4]
-
-		d.loadFileExplorerData()
+		// if SBOM
+		if row == d.menuTable.GetRowCount()-1 {
+			nodeKey := "layers/sbom"
 
-		d.fileExplorerTable.ScrollToBeginning()
-	})
+			d.loadFileExplorerData(nodeKey)
 
-	d.fileExplorerTable.SetSelectedFunc(func(row, column int) {
-		node := d.fileExplorerTable.GetCell(row, 3).GetReference().(*tview.TreeNode)
+			d.fileExplorerTable.ScrollToBeginning()
 
-		if !node.GetReference().(*tar.Header).FileInfo().IsDir() {
+			d.fileExplorerTable.SetSelectedFunc(selectionFunc(nodeKey))
 			return
 		}
 
-		if node.IsExpanded() {
-			node.Collapse()
-		} else {
-			node.Expand()
-		}
+		// if buildpack
+		selectedBuildpack := d.buildpackInfo[row-4]
+		nodeKey := "layers/" + strings.ReplaceAll(selectedBuildpack.ID, "/", "_")
+
+		d.loadFileExplorerData(nodeKey)
+
+		d.fileExplorerTable.ScrollToBeginning()
 
-		d.loadFileExplorerData()
+		d.fileExplorerTable.SetSelectedFunc(selectionFunc(nodeKey))
 	})
 
 	d.menuTable.SetDoneFunc(func(key tcell.Key) {
@@ -109,10 +126,10 @@ func (d *Dive) handle() {
 	})
 }
 
-func (d *Dive) loadFileExplorerData() {
+func (d *Dive) loadFileExplorerData(nodeKey string) {
 	// Configure tree
 	root := tview.NewTreeNode("[::b]Filetree[::-]")
-	for _, child := range d.buildpacksTreeMap["layers/"+strings.ReplaceAll(d.selectedBuildpack.ID, "/", "_")].GetChildren() {
+	for _, child := range d.buildpacksTreeMap[nodeKey].GetChildren() {
 		root.AddChild(child)
 	}
 
@@ -203,7 +220,7 @@ func (d *Dive) loadFileExplorerData() {
 	})
 }
 
-func initMenu(buildpackInfos []dist.BuildpackInfo) *tview.Table {
+func initMenu(buildpackInfos []dist.BuildpackInfo, nodes map[string]*tview.TreeNode) *tview.Table {
 	style := tcell.StyleDefault.
 		Foreground(tcell.ColorMediumTurquoise).
 		Background(tcell.ColorDarkSlateGray).
@@ -240,6 +257,21 @@ func initMenu(buildpackInfos []dist.BuildpackInfo) *tview.Table {
 		tview.NewTableCell("EXPORT").
 			SetTextColor(tcell.ColorDarkGray).
 			SetSelectable(false))
+
+	// set spacing
+	i++
+	i++
+	sbomTextColor := tcell.ColorMediumTurquoise
+	sbomSelectable := true
+	if _, ok := nodes["layers/sbom"]; !ok {
+		sbomTextColor = tcell.ColorDarkGray
+		sbomSelectable = false
+	}
+
+	table.SetCell(i, 0,
+		tview.NewTableCell("SBOM").
+			SetTextColor(sbomTextColor).
+			SetSelectable(sbomSelectable))
 	return table
 }
 

internal/termui/dive_test.go

@@ -61,5 +61,17 @@ func testDive(t *testing.T, when spec.G, it spec.S) {
 		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 1).Text, "501:20")
 		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 2).Text, "14 B  ")
 		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 3).Text, "    └── some-file-2.txt")
+
+		// select SBOM
+		lastRow := screen.menuTable.GetRowCount() - 1
+		screen.menuTable.Select(lastRow, 0)
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(1, 0).Text, "drwxr-xr-x")
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(1, 1).Text, "501:20")
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(1, 2).Text, "-  ")
+		h.AssertContainsMatch(t, screen.fileExplorerTable.GetCell(1, 3).Text, "└── .*launch")
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 0).Text, "-rw-r--r--")
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 1).Text, "501:20")
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 2).Text, "32 B  ")
+		h.AssertContains(t, screen.fileExplorerTable.GetCell(2, 3).Text, "    └── sbom.cdx.json")
 	})
 }

internal/termui/testdata/generate.sh

@@ -3,9 +3,11 @@
 dir=$(cd $(dirname $0) && pwd)
 mkdir -p $dir/layers/some_buildpack-1
 mkdir -p $dir/layers/some_buildpack-2/some-dir
+mkdir -p $dir/layers/sbom/launch
 
 echo -n "some-content-1" > $dir/layers/some_buildpack-1/some-file-1.txt
 echo -n "some-content-2" > $dir/layers/some_buildpack-2/some-dir/some-file-2.txt
+echo -n '{"content": "some-sbom-content"}' > $dir/layers/sbom/launch/sbom.cdx.json
 
 tar cvf $dir/fake-layers.tar layers
 rm -rf $dir/layers

pkg/client/build.go

@@ -351,7 +351,7 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error {
 		GID:                opts.GroupID,
 		PreviousImage:      opts.PreviousImage,
 		Interactive:        opts.Interactive,
-		Termui:             termui.NewTermui(imageRef.Name(), bldr, runImageName),
+		Termui:             termui.NewTermui(imageRef.Name(), ephemeralBuilder, runImageName),
 	}
 
 	lifecycleVersion := ephemeralBuilder.LifecycleDescriptor().Info.Version