webview: remove more dead fields (#4507)

internal/cloud/io_test.go

@@ -48,10 +48,7 @@ func TestWriteSnapshotTo(t *testing.T) {
       "fromCheckpoint": -1,
       "toCheckpoint": -1
     },
-    "tiltStartTime": "0001-01-01T00:00:00Z",
-    "metricsServing": {
-
-    }
+    "tiltStartTime": "0001-01-01T00:00:00Z"
   }
 }
 `, buf.String())

internal/hud/webview/convert.go

@@ -1,13 +1,9 @@
 package webview
 
 import (
-	"os"
-	"path/filepath"
-	"sort"
 	"strings"
 
 	"github.com/tilt-dev/tilt/internal/cloud/cloudurl"
-	"github.com/tilt-dev/tilt/internal/ospath"
 	"github.com/tilt-dev/tilt/internal/store"
 	"github.com/tilt-dev/tilt/pkg/logger"
 	"github.com/tilt-dev/tilt/pkg/model"
@@ -37,41 +33,9 @@ func StateToProtoView(s store.EngineState, logCheckpoint logstore.Checkpoint) (*
 		}
 
 		ms := mt.State
-
-		var absWatchDirs []string
-		for i, p := range mt.Manifest.LocalPaths() {
-			if i > 50 {
-				// to avoid pathological perf cases, stop after 50
-				break
-			}
-			fi, err := os.Stat(p)
-
-			// Treat this as a directory if there's an error
-			if err != nil || fi.IsDir() {
-				absWatchDirs = append(absWatchDirs, p)
-			}
-		}
-
-		var pendingBuildEdits []string
-		for _, status := range ms.BuildStatuses {
-			for f := range status.PendingFileChanges {
-				pendingBuildEdits = append(pendingBuildEdits, f)
-			}
-		}
-
-		pendingBuildEdits = ospath.FileListDisplayNames(absWatchDirs, pendingBuildEdits)
-
 		buildHistory := append([]model.BuildRecord{}, ms.BuildHistory...)
-		for i, build := range buildHistory {
-			build.Edits = ospath.FileListDisplayNames(absWatchDirs, build.Edits)
-			buildHistory[i] = build
-		}
 
 		currentBuild := ms.CurrentBuild
-		currentBuild.Edits = ospath.FileListDisplayNames(absWatchDirs, ms.CurrentBuild.Edits)
-
-		// Sort the strings to make the outputs deterministic.
-		sort.Strings(pendingBuildEdits)
 
 		endpoints := store.ManifestTargetEndpoints(mt)
 
@@ -164,24 +128,14 @@ func StateToProtoView(s store.EngineState, logCheckpoint logstore.Checkpoint) (*
 	ret.TiltStartTime = start
 
 	ret.TiltfileKey = s.TiltfilePath
-	ret.MetricsServing = toMetricsServingProto(s.MetricsServing)
 
 	return ret, nil
 }
 
-func toMetricsServingProto(s store.MetricsServing) *proto_webview.MetricsServing {
-	return &proto_webview.MetricsServing{
-		Mode:        string(s.Mode),
-		GrafanaHost: s.GrafanaHost,
-	}
-}
-
 func tiltfileResourceProtoView(s store.EngineState) (*proto_webview.Resource, error) {
 	ltfb := s.TiltfileState.LastBuild()
 	ctfb := s.TiltfileState.CurrentBuild
 
-	ltfb.Edits = ospath.FileListDisplayNames([]string{filepath.Dir(s.TiltfilePath)}, ltfb.Edits)
-
 	pctfb, err := ToProtoBuildRecord(ctfb, s.LogStore)
 	if err != nil {
 		return nil, err
@@ -221,20 +175,11 @@ func protoPopulateResourceInfoView(mt *store.ManifestTarget, r *proto_webview.Re
 	r.RuntimeStatus = string(model.RuntimeStatusNotApplicable)
 
 	if mt.Manifest.PodReadinessMode() == model.PodReadinessIgnore {
-		r.YamlResourceInfo = &proto_webview.YAMLResourceInfo{
-			K8SResources: mt.Manifest.K8sTarget().DisplayNames,
-		}
 		return nil
 	}
 
 	if mt.Manifest.IsDC() {
-		dc := mt.Manifest.DockerComposeTarget()
 		dcState := mt.State.DCRuntimeState()
-		info, err := NewProtoDCResourceInfo(dc.ConfigPaths, dcState.ContainerState.Status, dcState.ContainerID, dcState.StartTime)
-		if err != nil {
-			return err
-		}
-		r.DcResourceInfo = info
 		r.RuntimeStatus = string(dcState.RuntimeStatus())
 		return nil
 	}

internal/hud/webview/convert_test.go

@@ -44,17 +44,8 @@ func TestStateToWebViewRelativeEditPaths(t *testing.T) {
 
 	state := newState([]model.Manifest{m})
 	ms := state.ManifestTargets[m.Name].State
-	ms.CurrentBuild.Edits = []string{
-		f.JoinPath("a", "b", "c", "foo"),
-		f.JoinPath("a", "b", "c", "d", "e"),
-	}
 	ms.BuildHistory = []model.BuildRecord{
-		{
-			Edits: []string{
-				f.JoinPath("a", "b", "c", "foo"),
-				f.JoinPath("a", "b", "c", "d", "e"),
-			},
-		},
+		{},
 	}
 	ms.MutableBuildStatus(m.ImageTargets[0].ID()).PendingFileChanges =
 		map[string]time.Time{
@@ -146,9 +137,6 @@ func TestStateToViewUnresourcedYAMLManifest(t *testing.T) {
 
 	r, _ := findResource(m.Name, v)
 	assert.Equal(t, "", lastBuild(r).Error)
-
-	expectedInfo := &proto_webview.YAMLResourceInfo{K8SResources: []string{"sancho:deployment"}}
-	assert.Equal(t, expectedInfo, r.YamlResourceInfo)
 }
 
 func TestStateToViewK8sTargetsIncludeDisplayNames(t *testing.T) {
@@ -293,7 +281,6 @@ func TestBuildHistory(t *testing.T) {
 		BuildTypes: []model.BuildType{model.BuildTypeImage, model.BuildTypeK8s},
 	}
 	br2 := model.BuildRecord{
-		Edits:      []string{"a.txt", "b.txt"},
 		StartTime:  time.Now().Add(-45 * time.Minute),
 		FinishTime: time.Now().Add(-44 * time.Minute),
 		Reason:     model.BuildReasonFlagChangedFiles,

internal/hud/webview/view.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/tilt-dev/tilt/internal/container"
 	"github.com/tilt-dev/tilt/pkg/model"
 	"github.com/tilt-dev/tilt/pkg/model/logstore"
 
@@ -15,19 +14,6 @@ import (
 	proto_webview "github.com/tilt-dev/tilt/pkg/webview"
 )
 
-func NewProtoDCResourceInfo(configPaths []string, status string, cID container.ID, startTime time.Time) (*proto_webview.DCResourceInfo, error) {
-	start, err := timeToProto(startTime)
-	if err != nil {
-		return nil, err
-	}
-	return &proto_webview.DCResourceInfo{
-		ConfigPaths:     configPaths,
-		ContainerStatus: string(status),
-		ContainerID:     string(cID),
-		StartTime:       start,
-	}, nil
-}
-
 func timeToProto(t time.Time) (*timestamp.Timestamp, error) {
 	ts, err := ptypes.TimestampProto(t)
 	if err != nil {