prepare the transition to #Plan.context
This change helps the transition between `dagger input` and `#Plan.context`. In summary, the codebase now relies on a *context* for execution with mapping to *IDs*. In the future, *context* will come from a `#Plan.context`. In the meantime, a bridge converts `dagger input` to a plan context. This allows both *old* and *new* style configurations to co-exist with the same underlying engine. - Implement `plancontext`. Context holds the execution context for a plan. Currently this includes the platform, local directories, secrets and services (e.g. unix/npipe). - Contextual data can be registered at any point. In the future, this will be done by `#Plan.context` - Migrated the `dagger input` codebase to register inputs in a `plancontext` - Migrated low-level types/operations to the *Context ID* pattern. - `dagger.#Stream` now only includes an `id` (instead of `unix` path) - `dagger.#Secret` still includes only an ID, but now it's based off `plancontext` - `op.#Local` now only includes an `id` (instead of `path`, `include`, `exclude`. Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
@@ -3,24 +3,20 @@ package solver
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/moby/buildkit/session"
|
||||
"github.com/moby/buildkit/session/sshforward"
|
||||
"go.dagger.io/dagger/plancontext"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/metadata"
|
||||
)
|
||||
|
||||
const (
|
||||
unixPrefix = "unix="
|
||||
npipePrefix = "npipe="
|
||||
)
|
||||
|
||||
type SocketProvider struct {
|
||||
pctx *plancontext.Context
|
||||
}
|
||||
|
||||
func NewDockerSocketProvider() session.Attachable {
|
||||
return &SocketProvider{}
|
||||
func NewDockerSocketProvider(pctx *plancontext.Context) session.Attachable {
|
||||
return &SocketProvider{pctx}
|
||||
}
|
||||
|
||||
func (sp *SocketProvider) Register(server *grpc.Server) {
|
||||
@@ -28,13 +24,6 @@ func (sp *SocketProvider) Register(server *grpc.Server) {
|
||||
}
|
||||
|
||||
func (sp *SocketProvider) CheckAgent(ctx context.Context, req *sshforward.CheckAgentRequest) (*sshforward.CheckAgentResponse, error) {
|
||||
id := sshforward.DefaultID
|
||||
if req.ID != "" {
|
||||
id = req.ID
|
||||
}
|
||||
if !strings.HasPrefix(id, unixPrefix) && !strings.HasPrefix(id, npipePrefix) {
|
||||
return &sshforward.CheckAgentResponse{}, fmt.Errorf("invalid socket forward key %s", id)
|
||||
}
|
||||
return &sshforward.CheckAgentResponse{}, nil
|
||||
}
|
||||
|
||||
@@ -47,7 +36,12 @@ func (sp *SocketProvider) ForwardAgent(stream sshforward.SSH_ForwardAgentServer)
|
||||
id = v[0]
|
||||
}
|
||||
|
||||
conn, err := dialStream(id)
|
||||
service := sp.pctx.Services.Get(plancontext.ContextKey(id))
|
||||
if service == nil {
|
||||
return fmt.Errorf("invalid socket id %q", id)
|
||||
}
|
||||
|
||||
conn, err := dialService(service)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to connect to %s: %w", id, err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user