-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Report launching and connecting messages to the API
- Loading branch information
1 parent
84ad4d3
commit bbba6de
Showing
7 changed files
with
151 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| package progresshelper | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "connectrpc.com/connect" | ||
| depotapi "github.com/depot/cli/pkg/api" | ||
| cliv1 "github.com/depot/cli/pkg/proto/depot/cli/v1" | ||
| cliv1connect "github.com/depot/cli/pkg/proto/depot/cli/v1/cliv1connect" | ||
| controlapi "github.com/moby/buildkit/api/services/control" | ||
| "github.com/moby/buildkit/client" | ||
| ) | ||
|
|
||
| func reportToAPI(client cliv1connect.BuildServiceClient, status *client.SolveStatus, buildID, token string) { | ||
| if buildID != "" && token != "" { | ||
| req := &cliv1.ReportStatusRequest{ | ||
| BuildId: buildID, | ||
| Statuses: []*controlapi.StatusResponse{toStatusResponse(status)}, | ||
| } | ||
|
|
||
| ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) | ||
| defer cancel() | ||
|
|
||
| _, _ = client.ReportStatus(ctx, depotapi.WithAuthentication(connect.NewRequest(req), token)) | ||
| } | ||
| } | ||
|
|
||
| func toStatusResponse(status *client.SolveStatus) *controlapi.StatusResponse { | ||
| vertexes := make([]*controlapi.Vertex, 0, len(status.Vertexes)) | ||
| for _, v := range status.Vertexes { | ||
| vertexes = append(vertexes, &controlapi.Vertex{ | ||
| Digest: v.Digest, | ||
| Inputs: v.Inputs, | ||
| Name: v.Name, | ||
| Cached: v.Cached, | ||
| Started: v.Started, | ||
| Completed: v.Completed, | ||
| Error: v.Error, | ||
| ProgressGroup: v.ProgressGroup, | ||
| }) | ||
| } | ||
|
|
||
| statuses := make([]*controlapi.VertexStatus, 0, len(status.Statuses)) | ||
| for _, s := range status.Statuses { | ||
| statuses = append(statuses, &controlapi.VertexStatus{ | ||
| ID: s.ID, | ||
| Vertex: s.Vertex, | ||
| Name: s.Name, | ||
| Current: s.Current, | ||
| Total: s.Total, | ||
| Timestamp: s.Timestamp, | ||
| Started: s.Started, | ||
| Completed: s.Completed, | ||
| }) | ||
| } | ||
|
|
||
| logs := make([]*controlapi.VertexLog, 0, len(status.Logs)) | ||
| for _, l := range status.Logs { | ||
| logs = append(logs, &controlapi.VertexLog{ | ||
| Vertex: l.Vertex, | ||
| Timestamp: l.Timestamp, | ||
| Stream: int64(l.Stream), | ||
| Msg: l.Data, | ||
| }) | ||
| } | ||
|
|
||
| warnings := make([]*controlapi.VertexWarning, 0, len(status.Warnings)) | ||
| for _, w := range status.Warnings { | ||
| warnings = append(warnings, &controlapi.VertexWarning{ | ||
| Vertex: w.Vertex, | ||
| Level: int64(w.Level), | ||
| Short: w.Short, | ||
| Detail: w.Detail, | ||
| Url: w.URL, | ||
| Info: w.SourceInfo, | ||
| Ranges: w.Range, | ||
| }) | ||
| } | ||
|
|
||
| return &controlapi.StatusResponse{ | ||
| Vertexes: vertexes, | ||
| Statuses: statuses, | ||
| Logs: logs, | ||
| Warnings: warnings, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package progresshelper | ||
|
|
||
| import ( | ||
| depotapi "github.com/depot/cli/pkg/api" | ||
| "github.com/docker/buildx/util/progress" | ||
| "github.com/moby/buildkit/client" | ||
| ) | ||
|
|
||
| func NewReportingLogger(w progress.Logger, buildID, token string) progress.Logger { | ||
| depotClient := depotapi.NewBuildClient() | ||
| return func(status *client.SolveStatus) { | ||
| w(status) | ||
| reportToAPI(depotClient, status, buildID, token) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package progresshelper | ||
|
|
||
| import ( | ||
| depotapi "github.com/depot/cli/pkg/api" | ||
| cliv1connect "github.com/depot/cli/pkg/proto/depot/cli/v1/cliv1connect" | ||
| "github.com/docker/buildx/util/progress" | ||
| "github.com/moby/buildkit/client" | ||
| ) | ||
|
|
||
| var _ progress.Writer = (*reportingWriter)(nil) | ||
|
|
||
| type reportingWriter struct { | ||
| progress.Writer | ||
|
|
||
| buildID string | ||
| token string | ||
| client cliv1connect.BuildServiceClient | ||
| } | ||
|
|
||
| func NewReportingWriter(w progress.Writer, buildID, token string) progress.Writer { | ||
| return &reportingWriter{ | ||
| Writer: w, | ||
| buildID: buildID, | ||
| token: token, | ||
| client: depotapi.NewBuildClient(), | ||
| } | ||
| } | ||
|
|
||
| func (s *reportingWriter) Write(status *client.SolveStatus) { | ||
| s.Writer.Write(status) | ||
| reportToAPI(s.client, status, s.buildID, s.token) | ||
| } |