Migrate dagger.#Secret and dagger.#Stream to new format

- Refactored to keep every transformation of built-in types (e.g. FS,
  Secret, etc) to/from CUE in the same place (plancontext)
- dagger.#Service and dagger.#Secret are now following the new FS-like format
  (e.g. `_service: id: string`)
- Backward compatibility
- dagger.#Stream is now an alias for dagger.#Service

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

client/client.go

@@ -217,7 +217,7 @@ func (c *Client) logSolveStatus(ctx context.Context, pctx *plancontext.Context,
 	secureSprintf := func(format string, a ...interface{}) string {
 		s := fmt.Sprintf(format, a...)
 		for _, secret := range secrets {
-			s = strings.ReplaceAll(s, secret.PlainText, "***")
+			s = strings.ReplaceAll(s, secret.PlainText(), "***")
 		}
 		return s
 	}

cmd/dagger/cmd/common/common.go

@@ -88,7 +88,11 @@ func FormatValue(val *compiler.Value) string {
 	if val.HasAttr("artifact") {
 		return "dagger.#Artifact"
 	}
-	if val.HasAttr("secret") {
+
+	if val.LookupPath(cue.MakePath(
+		cue.Hid("_secret", "alpha.dagger.io/dagger"),
+		cue.Str("id"),
+	)).Exists() {
 		return "dagger.#Secret"
 	}
 	if val.IsConcreteR() != nil {

compiler/compiler.go

@@ -24,10 +24,6 @@ func NewValue() *Value {
 	return DefaultCompiler.NewValue()
 }
 
-func NewValueWithContent(x interface{}, selectors ...cue.Selector) (*Value, error) {
-	return DefaultCompiler.NewValueWithContent(x, selectors...)
-}
-
 // FIXME can be refactored away now?
 func Wrap(v cue.Value) *Value {
 	return DefaultCompiler.Wrap(v)
@@ -84,14 +80,6 @@ func (c *Compiler) NewValue() *Value {
 	return empty
 }
 
-func (c *Compiler) NewValueWithContent(x interface{}, selectors ...cue.Selector) (*Value, error) {
-	v := c.NewValue()
-	if err := v.FillPath(cue.MakePath(selectors...), x); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
 func (c *Compiler) Compile(name string, src string) (*Value, error) {
 	c.lock()
 	defer c.unlock()

docs/reference/argocd.md

@@ -21,7 +21,7 @@ Create an ArgoCD application
 |*config.version*          | `*"v2.0.5" \| string`                            |ArgoCD CLI binary version       |
 |*config.server*           | `string`                                         |ArgoCD server                   |
 |*config.project*          | `*"default" \| string`                           |ArgoCD project                  |
-|*config.token*            | `dagger.#Secret`                                 |ArgoCD authentication token     |
+|*config.token*            | `*null \| {}`                                    |ArgoCD authentication token     |
 |*name*                    | `string`                                         |App name                        |
 |*repo*                    | `string`                                         |Repository url (git or helm)    |
 |*path*                    | `string`                                         |Folder to deploy                |
@@ -29,7 +29,7 @@ Create an ArgoCD application
 |*image.config.version*    | `*"v2.0.5" \| string`                            |ArgoCD CLI binary version       |
 |*image.config.server*     | `string`                                         |ArgoCD server                   |
 |*image.config.project*    | `*"default" \| string`                           |ArgoCD project                  |
-|*image.config.token*      | `dagger.#Secret`                                 |ArgoCD authentication token     |
+|*image.config.token*      | `*null \| {}`                                    |ArgoCD authentication token     |
 |*namespace*               | `*"default" \| string`                           |Destination namespace           |
 |*env.APP_NAME*            | `string`                                         |-                               |
 |*env.APP_REPO*            | `string`                                         |-                               |
@@ -52,7 +52,7 @@ Re-usable CLI component
 |*config.version*    | `*"v2.0.5" \| string`     |ArgoCD CLI binary version      |
 |*config.server*     | `string`                  |ArgoCD server                  |
 |*config.project*    | `*"default" \| string`    |ArgoCD project                 |
-|*config.token*      | `dagger.#Secret`          |ArgoCD authentication token    |
+|*config.token*      | `*null \| {}`             |ArgoCD authentication token    |
 
 ### argocd.#CLI Outputs
 
@@ -69,7 +69,7 @@ ArgoCD configuration
 |*version*         | `*"v2.0.5" \| string`     |ArgoCD CLI binary version      |
 |*server*          | `string`                  |ArgoCD server                  |
 |*project*         | `*"default" \| string`    |ArgoCD project                 |
-|*token*           | `dagger.#Secret`          |ArgoCD authentication token    |
+|*token*           | `*null \| {}`             |ArgoCD authentication token    |
 
 ### argocd.#Config Outputs
 
@@ -86,7 +86,7 @@ Get application's status
 |*config.version*    | `*"v2.0.5" \| string`     |ArgoCD CLI binary version      |
 |*config.server*     | `string`                  |ArgoCD server                  |
 |*config.project*    | `*"default" \| string`    |ArgoCD project                 |
-|*config.token*      | `dagger.#Secret`          |ArgoCD authentication token    |
+|*config.token*      | `*null \| {}`             |ArgoCD authentication token    |
 |*name*              | `string`                  |ArgoCD application             |
 
 ### argocd.#Status Outputs
@@ -111,18 +111,18 @@ Sync an application to its targer state
 |*config.version*              | `*"v2.0.5" \| string`     |ArgoCD CLI binary version                 |
 |*config.server*               | `string`                  |ArgoCD server                             |
 |*config.project*              | `*"default" \| string`    |ArgoCD project                            |
-|*config.token*                | `dagger.#Secret`          |ArgoCD authentication token               |
+|*config.token*                | `*null \| {}`             |ArgoCD authentication token               |
 |*application*                 | `string`                  |ArgoCD application                        |
 |*wait*                        | `*false \| bool`          |Wait the application to sync correctly    |
 |*ctr.image.config.version*    | `*"v2.0.5" \| string`     |ArgoCD CLI binary version                 |
 |*ctr.image.config.server*     | `string`                  |ArgoCD server                             |
 |*ctr.image.config.project*    | `*"default" \| string`    |ArgoCD project                            |
-|*ctr.image.config.token*      | `dagger.#Secret`          |ArgoCD authentication token               |
+|*ctr.image.config.token*      | `*null \| {}`             |ArgoCD authentication token               |
 |*ctr.env.APPLICATION*         | `string`                  |-                                         |
 |*status.config.version*       | `*"v2.0.5" \| string`     |ArgoCD CLI binary version                 |
 |*status.config.server*        | `string`                  |ArgoCD server                             |
 |*status.config.project*       | `*"default" \| string`    |ArgoCD project                            |
-|*status.config.token*         | `dagger.#Secret`          |ArgoCD authentication token               |
+|*status.config.token*         | `*null \| {}`             |ArgoCD authentication token               |
 |*status.name*                 | `string`                  |ArgoCD application                        |
 
 ### argocd.#Sync Outputs

docs/reference/dagger/README.md

@@ -56,6 +56,18 @@ _No input._
 
 _No output._
 
+## dagger.#Service
+
+A reference to a network service endpoint, for example:  - A TCP or UDP port  - A unix or npipe socket  - An HTTPS endpoint
+
+### dagger.#Service Inputs
+
+_No input._
+
+### dagger.#Service Outputs
+
+_No output._
+
 ## dagger.#Stream
 
 Dagger stream. Can be mounted as a UNIX socket.

docs/reference/git.md

@@ -19,7 +19,7 @@ Commit & push to git repository
 | Name                     | Type                | Description                              |
 | -------------            |:-------------:      |:-------------:                           |
 |*repository.remote*       | `string`            |Repository remote URL                     |
-|*repository.authToken*    | `dagger.#Secret`    |Authentication token (PAT or password)    |
+|*repository.authToken*    | `*null \| {}`       |Authentication token (PAT or password)    |
 |*repository.branch*       | `string`            |Git branch                                |
 |*name*                    | `string`            |Username                                  |
 |*email*                   | `string`            |Email                                     |
@@ -69,8 +69,8 @@ A git repository
 |*remote*          | `string`             |Git remote link                                             |
 |*ref*             | `string`             |Git ref: can be a commit, tag or branch. Example: "main"    |
 |*subdir*          | `*null \| string`    |(optional) Subdirectory                                     |
-|*authToken*       | `dagger.#Secret`     |(optional) Add Personal Access Token                        |
+|*authToken*       | `*null \| {}`        |(optional) Add Personal Access Token                        |
-|*authHeader*      | `dagger.#Secret`     |(optional) Add OAuth Token                                  |
+|*authHeader*      | `*null \| {}`        |(optional) Add OAuth Token                                  |
 
 ### git.#Repository Outputs
 

docs/reference/kubernetes/README.md

@@ -37,7 +37,7 @@ Apply Kubernetes resources
 |*url*             | `*null \| string`         |Kubernetes manifest url to deploy remote configuration    |
 |*namespace*       | `*"default" \| string`    |Kubernetes Namespace to deploy to                         |
 |*version*         | `*"v1.19.9" \| string`    |Version of kubectl client                                 |
-|*kubeconfig*      | `dagger.#Secret`          |Kube config file                                          |
+|*kubeconfig*      | `(string\|struct)`        |Kube config file                                          |
 
 ### kubernetes.#Resources Outputs
 

docs/reference/kubernetes/helm.md

@@ -27,7 +27,7 @@ Install a Helm chart
 |*timeout*           | `*"5m" \| string`                                  |time to wait for any individual Kubernetes operation (like Jobs for hooks)                                                                                                                                                     |
 |*wait*              | `*true \| bool`                                    |if set, will wait until all Pods, PVCs, Services, and minimum number of Pods of a Deployment, StatefulSet, or ReplicaSet are in a ready state before marking the release as successful. It will wait for as long as timeout    |
 |*atomic*            | `*true \| bool`                                    |if set, installation process purges chart on fail. The wait option will be set automatically if atomic is used                                                                                                                 |
-|*kubeconfig*        | `dagger.#Secret`                                   |Kube config file                                                                                                                                                                                                               |
+|*kubeconfig*        | `(string\|struct)`                                 |Kube config file                                                                                                                                                                                                               |
 |*version*           | `*"3.5.2" \| string`                               |Helm version                                                                                                                                                                                                                   |
 |*kubectlVersion*    | `*"v1.19.9" \| string`                             |Kubectl version                                                                                                                                                                                                                |
 

environment/pipeline.go

@@ -270,16 +270,11 @@ func (p *Pipeline) doOp(ctx context.Context, op *compiler.Value, st llb.State) (
 	// dagger.#FS forward compat
 	// FIXME: remove this
 	if isFS(op) {
-		id, err := op.LookupPath(fsIDPath).String()
+		fs, err := p.pctx.FS.FromValue(op)
 		if err != nil {
-			return st, err
+			return st, nil
 		}
-
+		return fs.Result().ToState()
-		fs := p.pctx.FS.Get(plancontext.ContextKey(id))
-		if fs == nil {
-			return st, fmt.Errorf("fs %q not found", id)
-		}
-		return fs.Result.ToState()
 	}
 
 	do, err := op.Lookup("do").String()
@@ -595,30 +590,26 @@ func (p *Pipeline) mount(ctx context.Context, dest string, mnt *compiler.Value)
 
 	// eg. mount: "/foo": secret: mysecret
 	if secret := mnt.Lookup("secret"); secret.Exists() {
-		id, err := getSecretID(secret)
+		s, err := p.pctx.Secrets.FromValue(secret)
 		if err != nil {
 			return nil, err
 		}
 
 		return llb.AddSecret(dest,
-			llb.SecretID(id),
+			llb.SecretID(s.ID()),
 			llb.SecretFileOpt(0, 0, 0400), // uid, gid, mask)
 		), nil
 	}
 
 	// eg. mount: "/var/run/docker.sock": stream: mystream
 	if stream := mnt.Lookup("stream"); stream.Exists() {
-		if !stream.HasAttr("stream") {
+		s, err := p.pctx.Services.FromValue(stream)
-			return nil, fmt.Errorf("invalid stream %q: not a stream", stream.Path().String())
-		}
-
-		id, err := stream.Lookup("id").String()
 		if err != nil {
-			return nil, fmt.Errorf("invalid stream %q: %w", stream.Path().String(), err)
+			return nil, err
 		}
 
 		return llb.AddSSHSocket(
-			llb.SSHID(id),
+			llb.SSHID(s.ID()),
 			llb.SSHSocketTarget(dest),
 		), nil
 	}
@@ -761,15 +752,11 @@ func parseStringOrSecret(pctx *plancontext.Context, v *compiler.Value) (string,
 	}
 
 	// If we get here, it's a secret
-	id, err := getSecretID(v)
+	secret, err := pctx.Secrets.FromValue(v)
 	if err != nil {
 		return "", err
 	}
-	secret := pctx.Secrets.Get(plancontext.ContextKey(id))
+	return secret.PlainText(), nil
-	if secret == nil {
-		return "", fmt.Errorf("secret %s not found", id)
-	}
-	return secret.PlainText, nil
 }
 
 func (p *Pipeline) Load(ctx context.Context, op *compiler.Value, st llb.State) (llb.State, error) {
@@ -973,21 +960,6 @@ func (p *Pipeline) SaveImage(ctx context.Context, op *compiler.Value, st llb.Sta
 	), nil
 }
 
-func getSecretID(secretField *compiler.Value) (string, error) {
-	if !secretField.HasAttr("secret") {
-		return "", fmt.Errorf("invalid secret %q: not a secret", secretField.Path().String())
-	}
-	idValue := secretField.Lookup("id")
-	if !idValue.Exists() {
-		return "", fmt.Errorf("invalid secret %q: no id field", secretField.Path().String())
-	}
-	id, err := idValue.String()
-	if err != nil {
-		return "", fmt.Errorf("invalid secret id: %w", err)
-	}
-	return id, nil
-}
-
 func (p *Pipeline) FetchGit(ctx context.Context, op *compiler.Value, st llb.State) (llb.State, error) {
 	remote, err := op.Lookup("remote").String()
 	if err != nil {
@@ -1017,18 +989,18 @@ func (p *Pipeline) FetchGit(ctx context.Context, op *compiler.Value, st llb.Stat
 	}
 	// Secret
 	if authToken := op.Lookup("authToken"); authToken.Exists() {
-		id, err := getSecretID(authToken)
+		authTokenSecret, err := p.pctx.Secrets.FromValue(authToken)
 		if err != nil {
 			return st, err
 		}
-		gitOpts = append(gitOpts, llb.AuthTokenSecret(id))
+		gitOpts = append(gitOpts, llb.AuthTokenSecret(authTokenSecret.ID()))
 	}
 	if authHeader := op.Lookup("authHeader"); authHeader.Exists() {
-		id, err := getSecretID(authHeader)
+		authHeaderSecret, err := p.pctx.Secrets.FromValue(authHeader)
 		if err != nil {
 			return st, err
 		}
-		gitOpts = append(gitOpts, llb.AuthHeaderSecret(id))
+		gitOpts = append(gitOpts, llb.AuthHeaderSecret(authHeaderSecret.ID()))
 	}
 
 	gitOpts = append(gitOpts, llb.WithCustomName(p.vertexNamef("FetchGit %s@%s", remoteRedacted, ref)))

plan/plan.go

@@ -67,10 +67,7 @@ func (p *Plan) registerLocalDirs() error {
 		if err != nil {
 			return err
 		}
-
+		p.context.LocalDirs.Add(dir)
-		p.context.LocalDirs.Register(&plancontext.LocalDir{
-			Path: dir,
-		})
 	}
 
 	return nil

plan/task/import.go

@@ -68,13 +68,10 @@ func (c importTask) Run(ctx context.Context, pctx *plancontext.Context, s solver
 		return nil, err
 	}
 
-	id := pctx.FS.Register(&plancontext.FS{
+	fs := pctx.FS.New(result)
-		Result: result,
+	out := compiler.NewValue()
-	})
+	if err := out.FillPath(cue.ParsePath("fs"), fs.Value()); err != nil {
-
+		return nil, err
-	return compiler.NewValueWithContent(id,
+	}
-		cue.Str("fs"),
+	return out, nil
-		cue.Hid("_fs", "alpha.dagger.io/dagger"),
-		cue.Str("id"),
-	)
 }

plan/task/secretenv.go

@@ -36,12 +36,10 @@ func (c secretEnvTask) Run(ctx context.Context, pctx *plancontext.Context, _ sol
 	if env == "" {
 		return nil, fmt.Errorf("environment variable %q not set", secretEnv.Envvar)
 	}
-	id := pctx.Secrets.Register(&plancontext.Secret{
+	secret := pctx.Secrets.New(env)
-		PlainText: env,
+	out := compiler.NewValue()
-	})
+	if err := out.FillPath(cue.ParsePath("contents"), secret.Value()); err != nil {
-
+		return nil, err
-	return compiler.NewValueWithContent(id,
+	}
-		cue.Str("contents"),
+	return out, nil
-		cue.Str("id"),
-	)
 }

plan/task/secretfile.go

@@ -35,12 +35,11 @@ func (c secretFileTask) Run(ctx context.Context, pctx *plancontext.Context, _ so
 	if err != nil {
 		return nil, err
 	}
-	id := pctx.Secrets.Register(&plancontext.Secret{
-		PlainText: string(data),
-	})
 
-	return compiler.NewValueWithContent(id,
+	secret := pctx.Secrets.New(string(data))
-		cue.Str("contents"),
+	out := compiler.NewValue()
-		cue.Str("id"),
+	if err := out.FillPath(cue.ParsePath("contents"), secret.Value()); err != nil {
-	)
+		return nil, err
+	}
+	return out, nil
 }

plancontext/context.go

@@ -2,18 +2,10 @@ package plancontext
 
 import (
 	"crypto/sha256"
-	"encoding/json"
 	"fmt"
 )
 
-type ContextKey string
-
 // Context holds the execution context for a plan.
-//
-// Usage:
-// ctx := plancontext.New()
-// id := ctx.Secrets.Register("mysecret")
-// secret := ctx.Secrets.Get(id)
 type Context struct {
 	Platform  *platformContext
 	FS        *fsContext
@@ -28,25 +20,26 @@ func New() *Context {
 			platform: defaultPlatform,
 		},
 		FS: &fsContext{
-			store: make(map[ContextKey]*FS),
+			store: make(map[string]*FS),
 		},
 		LocalDirs: &localDirContext{
-			store: make(map[ContextKey]*LocalDir),
+			store: []string{},
 		},
 		Secrets: &secretContext{
-			store: make(map[ContextKey]*Secret),
+			store: make(map[string]*Secret),
 		},
 		Services: &serviceContext{
-			store: make(map[ContextKey]*Service),
+			store: make(map[string]*Service),
 		},
 	}
 }
 
-func hashID(v interface{}) ContextKey {
+func hashID(values ...string) string {
-	data, err := json.Marshal(v)
+	hash := sha256.New()
-	if err != nil {
+	for _, v := range values {
+		if _, err := hash.Write([]byte(v)); err != nil {
 			panic(err)
 		}
-	hash := sha256.Sum256(data)
+	}
-	return ContextKey(fmt.Sprintf("%x", hash))
+	return fmt.Sprintf("%x", hash)
 }

plancontext/context_test.go

@@ -9,10 +9,8 @@ import (
 func TestContext(t *testing.T) {
 	ctx := New()
 
-	id := ctx.Secrets.Register(&Secret{
+	secret := ctx.Secrets.New("test")
-		PlainText: "test",
+	get, err := ctx.Secrets.FromValue(secret.Value())
-	})
+	require.NoError(t, err)
-	secret := ctx.Secrets.Get(id)
+	require.Equal(t, "test", get.PlainText())
-	require.NotNil(t, secret)
-	require.Equal(t, "test", secret.PlainText)
 }

plancontext/fs.go

@@ -1,32 +1,71 @@
 package plancontext
 
 import (
+	"fmt"
 	"sync"
 
+	"cuelang.org/go/cue"
+	"github.com/google/uuid"
 	bkgw "github.com/moby/buildkit/frontend/gateway/client"
+	"go.dagger.io/dagger/compiler"
+)
+
+var (
+	fsIDPath = cue.MakePath(
+		cue.Hid("_fs", "alpha.dagger.io/dagger"),
+		cue.Str("id"),
+	)
 )
 
 type FS struct {
-	Result bkgw.Reference
+	id     string
+	result bkgw.Reference
+}
+
+func (fs *FS) Result() bkgw.Reference {
+	return fs.result
+}
+
+func (fs *FS) Value() *compiler.Value {
+	v := compiler.NewValue()
+	if err := v.FillPath(fsIDPath, fs.id); err != nil {
+		panic(err)
+	}
+	return v
 }
 
 type fsContext struct {
 	l     sync.RWMutex
-	store map[ContextKey]*FS
+	store map[string]*FS
 }
 
-func (c *fsContext) Register(fs *FS) ContextKey {
+func (c *fsContext) New(result bkgw.Reference) *FS {
 	c.l.Lock()
 	defer c.l.Unlock()
 
-	id := hashID(fs)
+	fs := &FS{
-	c.store[id] = fs
+		// FIXME: get a hash from result instead
-	return id
+		id:     uuid.New().String(),
+		result: result,
 	}
 
-func (c *fsContext) Get(id ContextKey) *FS {
+	c.store[fs.id] = fs
+	return fs
+}
+
+func (c *fsContext) FromValue(v *compiler.Value) (*FS, error) {
 	c.l.RLock()
 	defer c.l.RUnlock()
 
-	return c.store[id]
+	id, err := v.LookupPath(fsIDPath).String()
+	if err != nil {
+		return nil, fmt.Errorf("invalid FS %q: %w", v.Path(), err)
+	}
+
+	fs, ok := c.store[id]
+	if !ok {
+		return nil, fmt.Errorf("fs %q not found", id)
+	}
+
+	return fs, nil
 }

plancontext/localdir.go

@@ -5,41 +5,16 @@ import (
 	"sync"
 )
 
-type LocalDir struct {
-	Path string
-}
-
 type localDirContext struct {
 	l     sync.RWMutex
-	store map[ContextKey]*LocalDir
+	store []string
 }
 
-func (c *localDirContext) Register(directory *LocalDir) ContextKey {
+func (c *localDirContext) Add(dir string) {
 	c.l.Lock()
 	defer c.l.Unlock()
 
-	id := hashID(directory)
+	c.store = append(c.store, dir)
-	c.store[id] = directory
-	return id
-}
-
-func (c *localDirContext) Get(id ContextKey) *LocalDir {
-	c.l.RLock()
-	defer c.l.RUnlock()
-
-	return c.store[id]
-}
-
-func (c *localDirContext) List() []*LocalDir {
-	c.l.RLock()
-	defer c.l.RUnlock()
-
-	directories := make([]*LocalDir, 0, len(c.store))
-	for _, d := range c.store {
-		directories = append(directories, d)
-	}
-
-	return directories
 }
 
 func (c *localDirContext) Paths() (map[string]string, error) {
@@ -48,12 +23,12 @@ func (c *localDirContext) Paths() (map[string]string, error) {
 
 	directories := make(map[string]string)
 	for _, d := range c.store {
-		abs, err := filepath.Abs(d.Path)
+		abs, err := filepath.Abs(d)
 		if err != nil {
 			return nil, err
 		}
 
-		directories[d.Path] = abs
+		directories[d] = abs
 	}
 
 	return directories, nil

plancontext/secret.go

@@ -1,26 +1,77 @@
 package plancontext
 
-import "sync"
+import (
+	"fmt"
+	"sync"
+
+	"cuelang.org/go/cue"
+	"go.dagger.io/dagger/compiler"
+)
+
+var (
+	secretIDPath = cue.MakePath(
+		cue.Hid("_secret", "alpha.dagger.io/dagger"),
+		cue.Str("id"),
+	)
+)
+
+type Secret struct {
+	id        string
+	plainText string
+}
+
+func (s *Secret) ID() string {
+	return s.id
+}
+
+func (s *Secret) PlainText() string {
+	return s.plainText
+}
+
+func (s *Secret) Value() *compiler.Value {
+	v := compiler.NewValue()
+	if err := v.FillPath(secretIDPath, s.id); err != nil {
+		panic(err)
+	}
+	return v
+}
 
 type secretContext struct {
 	l     sync.RWMutex
-	store map[ContextKey]*Secret
+	store map[string]*Secret
 }
 
-type Secret struct {
+func (c *secretContext) New(plaintext string) *Secret {
-	PlainText string
+	secret := &Secret{
+		id:        hashID(plaintext),
+		plainText: plaintext,
 	}
 
-func (c *secretContext) Register(secret *Secret) ContextKey {
 	c.l.Lock()
 	defer c.l.Unlock()
 
-	id := hashID(secret.PlainText)
+	c.store[secret.id] = secret
-	c.store[id] = secret
+	return secret
-	return id
 }
 
-func (c *secretContext) Get(id ContextKey) *Secret {
+func (c *secretContext) FromValue(v *compiler.Value) (*Secret, error) {
+	c.l.RLock()
+	defer c.l.RUnlock()
+
+	id, err := v.LookupPath(secretIDPath).String()
+	if err != nil {
+		return nil, fmt.Errorf("invalid secret %q: %w", v.Path(), err)
+	}
+
+	secret, ok := c.store[id]
+	if !ok {
+		return nil, fmt.Errorf("secret %q not found", id)
+	}
+
+	return secret, nil
+}
+
+func (c *secretContext) Get(id string) *Secret {
 	c.l.RLock()
 	defer c.l.RUnlock()
 

plancontext/service.go

@@ -1,27 +1,84 @@
 package plancontext
 
-import "sync"
+import (
+	"fmt"
+	"sync"
+
+	"cuelang.org/go/cue"
+	"go.dagger.io/dagger/compiler"
+)
+
+var (
+	serviceIDPath = cue.MakePath(
+		cue.Hid("_service", "alpha.dagger.io/dagger"),
+		cue.Str("id"),
+	)
+)
+
+type Service struct {
+	id string
+
+	unix  string
+	npipe string
+}
+
+func (s *Service) ID() string {
+	return s.id
+}
+
+func (s *Service) Unix() string {
+	return s.unix
+}
+
+func (s *Service) NPipe() string {
+	return s.npipe
+}
+
+func (s *Service) Value() *compiler.Value {
+	v := compiler.NewValue()
+	if err := v.FillPath(serviceIDPath, s.id); err != nil {
+		panic(err)
+	}
+	return v
+}
 
 type serviceContext struct {
 	l     sync.RWMutex
-	store map[ContextKey]*Service
+	store map[string]*Service
 }
 
-type Service struct {
+func (c *serviceContext) New(unix, npipe string) *Service {
-	Unix  string
-	Npipe string
-}
-
-func (c *serviceContext) Register(service *Service) ContextKey {
 	c.l.Lock()
 	defer c.l.Unlock()
 
-	id := hashID(service)
+	s := &Service{
-	c.store[id] = service
+		id:    hashID(unix, npipe),
-	return id
+		unix:  unix,
+		npipe: npipe,
 	}
 
-func (c *serviceContext) Get(id ContextKey) *Service {
+	c.store[s.id] = s
+	return s
+}
+
+func (c *serviceContext) FromValue(v *compiler.Value) (*Service, error) {
+	c.l.RLock()
+	defer c.l.RUnlock()
+
+	id, err := v.LookupPath(serviceIDPath).String()
+	if err != nil {
+		return nil, fmt.Errorf("invalid service %q: %w", v.Path(), err)
+	}
+
+	s, ok := c.store[id]
+	if !ok {
+		return nil, fmt.Errorf("service %q not found", id)
+	}
+
+	return s, nil
+}
+
+func (c *serviceContext) Get(id string) *Service {
 	c.l.RLock()
 	defer c.l.RUnlock()
 

solver/secretsprovider.go

@@ -21,7 +21,7 @@ type inputStore struct {
 func (s *inputStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
 	lg := log.Ctx(ctx)
 
-	secret := s.pctx.Secrets.Get(plancontext.ContextKey(id))
+	secret := s.pctx.Secrets.Get(id)
 	if secret == nil {
 		return nil, secrets.ErrNotFound
 	}
@@ -31,5 +31,5 @@ func (s *inputStore) GetSecret(ctx context.Context, id string) ([]byte, error) {
 		Str("id", id).
 		Msg("injecting secret")
 
-	return []byte(secret.PlainText), nil
+	return []byte(secret.PlainText()), nil
 }

solver/socketprovider.go

@@ -36,7 +36,7 @@ func (sp *SocketProvider) ForwardAgent(stream sshforward.SSH_ForwardAgentServer)
 		id = v[0]
 	}
 
-	service := sp.pctx.Services.Get(plancontext.ContextKey(id))
+	service := sp.pctx.Services.Get(id)
 	if service == nil {
 		return fmt.Errorf("invalid socket id %q", id)
 	}

solver/socketprovider_unix.go

@@ -12,9 +12,9 @@ import (
 )
 
 func dialService(service *plancontext.Service) (net.Conn, error) {
-	if service.Unix == "" {
+	if service.Unix() == "" {
 		return nil, errors.New("unsupported socket type")
 	}
 
-	return net.DialTimeout("unix", service.Unix, time.Second)
+	return net.DialTimeout("unix", service.Unix(), time.Second)
 }

solver/socketprovider_windows.go

@@ -13,10 +13,10 @@ import (
 )
 
 func dialService(service *plancontext.Service) (net.Conn, error) {
-	if service.Npipe == "" {
+	if service.NPipe() == "" {
 		return nil, errors.New("unsupported socket type")
 	}
 
 	dur := time.Second
-	return winio.DialPipe(service.Npipe, &dur)
+	return winio.DialPipe(service.NPipe(), &dur)
 }

state/input.go

@@ -12,7 +12,6 @@ import (
 	"cuelang.org/go/cue"
 
 	"go.dagger.io/dagger/compiler"
-	"go.dagger.io/dagger/plancontext"
 )
 
 // An input is a value or artifact supplied by the user.
@@ -121,9 +120,7 @@ func (dir dirInput) Compile(state *State) (*compiler.Value, error) {
 		return nil, err
 	}
 
-	state.Context.LocalDirs.Register(&plancontext.LocalDir{
+	state.Context.LocalDirs.Add(p)
-		Path: p,
-	})
 
 	llb := fmt.Sprintf(
 		`#up: [{do: "local", dir: %s, include: %s, exclude: %s}]`,
@@ -195,11 +192,8 @@ func SecretInput(data string) Input {
 type secretInput string
 
 func (i secretInput) Compile(st *State) (*compiler.Value, error) {
-	id := st.Context.Secrets.Register(&plancontext.Secret{
+	secret := st.Context.Secrets.New(i.PlainText())
-		PlainText: i.PlainText(),
+	return secret.Value(), nil
-	})
-	secretValue := fmt.Sprintf(`{id: %q}`, id)
-	return compiler.Compile("", secretValue)
 }
 
 func (i secretInput) PlainText() string {
@@ -301,10 +295,6 @@ type socketInput struct {
 }
 
 func (i socketInput) Compile(st *State) (*compiler.Value, error) {
-	id := st.Context.Services.Register(&plancontext.Service{
+	service := st.Context.Services.New(i.Unix, i.Npipe)
-		Unix:  i.Unix,
+	return service.Value(), nil
-		Npipe: i.Npipe,
-	})
-	socketValue := fmt.Sprintf(`{id: %q}`, id)
-	return compiler.Compile("", socketValue)
 }

stdlib/dagger/dagger.cue

@@ -24,13 +24,18 @@ import (
 	...
 }
 
-// Dagger stream. Can be mounted as a UNIX socket.
+// A reference to a network service endpoint, for example:
-#Stream: {
+//  - A TCP or UDP port
-	@dagger(stream)
+//  - A unix or npipe socket
-
+//  - An HTTPS endpoint
-	id: string
+#Service: {
+	_service: id: string
 }
 
+// Dagger stream. Can be mounted as a UNIX socket.
+// FIXME: Deprecated. For backward compatibility only, use #Service instead.
+#Stream: #Service
+
 // A reference to an external secret, for example:
 //  - A password
 //  - A SSH private key
@@ -38,9 +43,7 @@ import (
 // Secrets are never merged in the Cue tree. They can only be used
 // by a special filesystem mount designed to minimize leak risk.
 #Secret: {
-	@dagger(secret)
+	_secret: id: string
-
-	id: string
 }
 
 #Input: {

tests/compute/secrets/simple/simple.cue

@@ -17,7 +17,6 @@ TestSecrets: #up: [
 
 	op.#Exec & {
 		mount: "/secret": secret: mySecret
-		env: PLAIN: mySecret.id
 		args: [
 			"/bin/bash",
 			"--noprofile",
@@ -27,7 +26,6 @@ TestSecrets: #up: [
 			"-c",
 			#"""
 				test "$(cat /secret)" = "SecretValue"
-				test "$PLAIN" != "SecretValue"
 				"""#,
 		]
 	},

tests/core.bats

@@ -141,10 +141,6 @@ setup() {
     "$DAGGER" input secret mySecret SecretValue
     run "$DAGGER" up
     assert_success
-
-    # Make sure the secret doesn't show in dagger query
-    run "$DAGGER" query mySecret.id -f text
-    assert_success
 }
 
 @test "core: stream" {