http report wip

pkg/session/progress.go

@@ -10,19 +10,19 @@ type Progress map[types.ContainerID]*ContainerStatus
 // UpdateFromContainer sets various status fields from their corresponding container equivalents
 func UpdateFromContainer(cont types.Container, newImage types.ImageID, state State) *ContainerStatus {
 	return &ContainerStatus{
-		containerID:   cont.ID(),
-		containerName: cont.Name(),
-		imageName:     cont.ImageName(),
-		oldImage:      cont.SafeImageID(),
-		newImage:      newImage,
-		state:         state,
+		ID:         cont.ID(),
+		Name:       cont.Name(),
+		ImageName:  cont.ImageName(),
+		OldImageID: cont.SafeImageID(),
+		NewImageID: newImage,
+		State:      state,
 	}
 }
 
 // AddSkipped adds a container to the Progress with the state set as skipped
 func (m Progress) AddSkipped(cont types.Container, err error) {
 	update := UpdateFromContainer(cont, cont.SafeImageID(), SkippedState)
-	update.error = err
+	update.Error = err
 	m.Add(update)
 }
 
@@ -35,22 +35,17 @@ func (m Progress) AddScanned(cont types.Container, newImage types.ImageID) {
 func (m Progress) UpdateFailed(failures map[types.ContainerID]error) {
 	for id, err := range failures {
 		update := m[id]
-		update.error = err
-		update.state = FailedState
+		update.Error = err
+		update.State = FailedState
 	}
 }
 
 // Add a container to the map using container ID as the key
 func (m Progress) Add(update *ContainerStatus) {
-	m[update.containerID] = update
+	m[update.ID] = update
 }
 
 // MarkForUpdate marks the container identified by containerID for update
 func (m Progress) MarkForUpdate(containerID types.ContainerID) {
-	m[containerID].state = UpdatedState
-}
-
-// Report creates a new Report from a Progress instance
-func (m Progress) Report() types.Report {
-	return NewReport(m)
+	m[containerID].State = UpdatedState
 }