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:
@@ -2,55 +2,27 @@ package solver
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"github.com/moby/buildkit/session"
|
||||
"github.com/moby/buildkit/session/secrets"
|
||||
"github.com/moby/buildkit/session/secrets/secretsprovider"
|
||||
"github.com/rs/zerolog/log"
|
||||
"go.dagger.io/dagger/state"
|
||||
"go.dagger.io/dagger/plancontext"
|
||||
)
|
||||
|
||||
type SecretsStore struct {
|
||||
Secrets session.Attachable
|
||||
store *inputStore
|
||||
}
|
||||
|
||||
func (s SecretsStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
|
||||
return s.store.GetSecret(ctx, id)
|
||||
}
|
||||
|
||||
func NewSecretsStoreProvider(st *state.State) SecretsStore {
|
||||
store := &inputStore{st}
|
||||
|
||||
return SecretsStore{
|
||||
Secrets: secretsprovider.NewSecretProvider(store),
|
||||
store: store,
|
||||
}
|
||||
func NewSecretsStoreProvider(pctx *plancontext.Context) session.Attachable {
|
||||
return secretsprovider.NewSecretProvider(&inputStore{pctx})
|
||||
}
|
||||
|
||||
type inputStore struct {
|
||||
st *state.State
|
||||
pctx *plancontext.Context
|
||||
}
|
||||
|
||||
func (s *inputStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
|
||||
lg := log.Ctx(ctx)
|
||||
|
||||
const secretPrefix = "secret="
|
||||
|
||||
if !strings.HasPrefix(id, secretPrefix) {
|
||||
return nil, secrets.ErrNotFound
|
||||
}
|
||||
|
||||
id = strings.TrimPrefix(id, secretPrefix)
|
||||
|
||||
id = strings.Split(id, ";hash=")[0]
|
||||
|
||||
input, ok := s.st.Inputs[id]
|
||||
if !ok {
|
||||
return nil, secrets.ErrNotFound
|
||||
}
|
||||
if input.Secret == nil {
|
||||
secret := s.pctx.Secrets.Get(plancontext.ContextKey(id))
|
||||
if secret == nil {
|
||||
return nil, secrets.ErrNotFound
|
||||
}
|
||||
|
||||
@@ -59,5 +31,5 @@ func (s *inputStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
|
||||
Str("id", id).
|
||||
Msg("injecting secret")
|
||||
|
||||
return []byte(input.Secret.PlainText()), nil
|
||||
return []byte(secret.PlainText), nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user