refactor: make CycleSourcesMessage extend CycleMessage

Author: jbedard

runner/pkg/ibp/client.go

@@ -161,10 +161,10 @@ func convertWireCycle(msg map[string]interface{}) (CycleSourcesMessage, error) {
 	}
 
 	return CycleSourcesMessage{
-		Message: Message{
-			Kind: "CYCLE",
+		CycleMessage: CycleMessage{
+			Message: Message{Kind: "CYCLE"},
+			CycleId: cycleId,
 		},
-		CycleId: cycleId,
 		Sources: sources,
 	}, nil
 }

runner/pkg/ibp/protocol.go

@@ -76,8 +76,7 @@ type CycleMessage struct {
 }
 
 type CycleSourcesMessage struct {
-	Message
-	CycleId int           `json:"cycle_id"`
+	CycleMessage
 	Sources SourceInfoMap `json:"sources"`
 }
 
@@ -207,8 +206,10 @@ func (p *aspectBazelProtocol) Cycle(changes SourceInfoMap) error {
 	fmt.Printf("%s Sending cycle #%v (%v changes) to %s\n", color.GreenString("INFO:"), cycle_id, len(changes), p.socketPath)
 
 	c := CycleSourcesMessage{
-		Message: Message{Kind: "CYCLE"},
-		CycleId: cycle_id,
+		CycleMessage: CycleMessage{
+			Message: Message{Kind: "CYCLE"},
+			CycleId: cycle_id,
+		},
 		Sources: changes,
 	}
 	if err := p.socket.Send(c); err != nil {