finally got around to fixing the SelfView fake info

deckarep · Jan 15, 2024 · 389b452 · 389b452
1 parent 8ae6534
commit 389b452
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/cmd/utility_test.go b/cmd/utility_test.go
@@ -41,7 +41,7 @@ func TestGetHosts(t *testing.T) {
 	tv := &pkg.GeneralTableView{
 		ContextView: pkg.ContextView{},
 		TailnetView: pkg.TailnetView{},
-		SelfView:    pkg.SelfView{},
+		Self:        &pkg.SelfView{},
 		Headers:     []pkg.Header{},
 		Rows: [][]string{
 			{"a", "a1", "a2", "a3", "a4", "a5"},

diff --git a/pkg/processors.go b/pkg/processors.go
@@ -100,17 +100,23 @@ func ProcessDevicesTable(ctx context.Context, devList []*WrappedDevice) (*Genera
 			// This should represent the size of the entire result-set.
 			TotalMachines: len(devList),
 		},
-		SelfView: SelfView{
-			Index:   0,
-			DNSName: "foo.bar.3234.dns.name.",
-		},
+		//SelfView: SelfView{
+		//	Index:   0,
+		//	DNSName: "foo.bar.3234.dns.name.",
+		//},
 		Headers: hdrs,
 	}
 
 	// Pre-alloc size.
 	tbl.Rows = make([][]string, 0, len(slicedDevList))
 
 	for idx, dev := range slicedDevList {
+		if dev.EnrichedInfo != nil && dev.EnrichedInfo.IsSelf {
+			tbl.Self = &SelfView{
+				Index:   idx,
+				DNSName: dev.Name,
+			}
+		}
 		tbl.Rows = append(tbl.Rows, getRow(ctx, idx, hdrs, dev))
 	}
 

diff --git a/pkg/renderers.go b/pkg/renderers.go
@@ -158,9 +158,9 @@ func renderTableProlog(ctx context.Context, tableView *GeneralTableView, w io.Wr
 	fmt.Fprint(w, ui.Styles.Faint.Render("Query: "))
 	fmt.Fprintln(w, ui.Styles.Bold.Render(tableView.Query))
 
-	if len(tableView.DNSName) > 0 {
-		fmt.Fprint(w, ui.Styles.Faint.Render(fmt.Sprintf("Self (%d): ", tableView.SelfView.Index)))
-		fmt.Fprintln(w, ui.Styles.Bold.Render(tableView.SelfView.DNSName))
+	if tableView.Self != nil && len(tableView.Self.DNSName) > 0 {
+		fmt.Fprint(w, ui.Styles.Faint.Render(fmt.Sprintf("Self (%d): ", tableView.Self.Index)))
+		fmt.Fprintln(w, ui.Styles.Bold.Render(tableView.Self.DNSName))
 	}
 
 	return nil

diff --git a/pkg/renderers_test.go b/pkg/renderers_test.go
@@ -35,7 +35,7 @@ func TestRenderIPs(t *testing.T) {
 	tv := &GeneralTableView{
 		ContextView: ContextView{},
 		TailnetView: TailnetView{},
-		SelfView:    SelfView{},
+		Self:        &SelfView{},
 		Rows: [][]string{
 			{"foo", "bar", "127.0.0.1"},
 			{"coo", "car", "127.0.0.2"},
@@ -58,7 +58,7 @@ func TestRenderJson(t *testing.T) {
 	tv := &GeneralTableView{
 		ContextView: ContextView{},
 		TailnetView: TailnetView{},
-		SelfView:    SelfView{},
+		Self:        &SelfView{},
 		Headers: []Header{
 			HdrNo, HdrMachine, HdrIpv4,
 		},

diff --git a/pkg/views.go b/pkg/views.go
@@ -56,7 +56,7 @@ type DevicesTable struct {
 type GeneralTableView struct {
 	ContextView
 	TailnetView
-	SelfView
+	Self    *SelfView
 	Headers []Header
 	Rows    [][]string
 }