fix: drop DEPRECATED

pkg/engine/plan/task/container_dockerfile.go

@@ -33,9 +33,7 @@ type Dockerfile struct {
 
 func (input *Dockerfile) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		dir := c.Directory(dagger.DirectoryOpts{
-			ID: input.Source.DirectoryID(),
-		})
+		dir := input.Source.Directory(c)
 
 		dockerfilePath := input.Dockerfile.Path
 

pkg/engine/plan/task/container_exec.go

@@ -29,9 +29,7 @@ type Exec struct {
 
 func (e *Exec) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		ct := c.Container().WithRootfs(c.Directory(dagger.DirectoryOpts{
-			ID: e.Input.DirectoryID(),
-		}))
+		ct := c.Container().WithRootfs(e.Input.Directory(c))
 
 		if workdir := e.Workdir; workdir != "" {
 			ct = ct.WithWorkdir(workdir)

pkg/engine/plan/task/container_push.go

@@ -78,9 +78,7 @@ func (input *PushImage) Do(ctx context.Context) error {
 			return errors.Errorf("missing fs")
 		}
 
-		dir := c.Directory(dagger.DirectoryOpts{
-			ID: id,
-		})
+		dir := c.LoadDirectoryFromID(id)
 
 		ctr := input.Config.ApplyTo(c.Container(dagger.ContainerOpts{
 			Platform: dagger.Platform(input.Platform),
@@ -142,9 +140,7 @@ func (input *PushManifests) Do(ctx context.Context) error {
 				return errors.Errorf("missing fs for %s", platform)
 			}
 
-			dir := c.Directory(dagger.DirectoryOpts{
-				ID: id,
-			})
+			dir := c.LoadDirectoryFromID(id)
 
 			ctr := img.Config.ApplyTo(c.Container(dagger.ContainerOpts{Platform: dagger.Platform(platform)}).WithRootfs(dir))
 

pkg/engine/plan/task/container_run.go

@@ -38,9 +38,7 @@ type Run struct {
 func (e *Run) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
 		ct := c.Container().
-			WithRootfs(c.Directory(dagger.DirectoryOpts{
-				ID: e.Input.DirectoryID(),
-			}))
+			WithRootfs(e.Input.Directory(c))
 
 		ct = e.Config.ApplyTo(ct)
 

pkg/engine/plan/task/core/fs.go

@@ -50,6 +50,13 @@ func (fs *FS) DirectoryID() dagger.DirectoryID {
 	return ""
 }
 
+func (fs *FS) Directory(c *dagger.Client) *dagger.Directory {
+	if id := fs.DirectoryID(); id != "" {
+		return c.LoadDirectoryFromID(id)
+	}
+	return c.Directory()
+}
+
 func (f *FS) Type() string {
 	return "fs"
 }
@@ -60,10 +67,7 @@ func (f *FS) CanExport() bool {
 
 func (f *FS) ExportTo(ctx context.Context, localPath string) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		rootfs := c.Directory(dagger.DirectoryOpts{
-			ID: f.DirectoryID(),
-		})
-		_, err := rootfs.Export(ctx, localPath)
+		_, err := f.Directory(c).Export(ctx, localPath)
 		return err
 	})
 }

pkg/engine/plan/task/core/image.go

@@ -28,9 +28,7 @@ func (img *Image) CanExport() bool {
 
 func (img *Image) ExportTo(ctx context.Context, localPath string) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		rootfs := c.Directory(dagger.DirectoryOpts{
-			ID: img.Rootfs.DirectoryID(),
-		})
+		rootfs := img.Rootfs.Directory(c)
 
 		ct := c.Container(dagger.ContainerOpts{
 			Platform: DefaultPlatform(img.Platform),

pkg/engine/plan/task/core/mount.go

@@ -116,10 +116,8 @@ type MountFs struct {
 	ReadOnly bool `json:"ro,omitempty" wagon:"deprecated"`
 }
 
-func (f MountFs) MountTo(client *dagger.Client, container *dagger.Container) *dagger.Container {
-	dir := client.Directory(dagger.DirectoryOpts{
-		ID: f.Contents.DirectoryID(),
-	})
+func (f MountFs) MountTo(c *dagger.Client, container *dagger.Container) *dagger.Container {
+	dir := f.Contents.Directory(c)
 
 	if source := f.Source; source != nil {
 		src := *source

pkg/engine/plan/task/fs_copy.go

@@ -26,17 +26,12 @@ type Copy struct {
 
 func (cp *Copy) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		contents := c.Directory(dagger.DirectoryOpts{
-			ID: cp.Contents.DirectoryID(),
-		})
+		contents := cp.Contents.Directory(c)
 
 		if source := cp.Source; source != "/" {
 			// When file exists
 			if f, err := contents.File(source).Sync(ctx); err == nil {
-				out := c.
-					Directory(dagger.DirectoryOpts{
-						ID: cp.Input.DirectoryID(),
-					}).
+				out := cp.Input.Directory(c).
 					WithFile(cp.Dest, f)
 
 				return cp.Output.SetDirectoryIDBy(ctx, out)
@@ -45,10 +40,7 @@ func (cp *Copy) Do(ctx context.Context) error {
 			contents = contents.Directory(source)
 		}
 
-		ct := c.
-			Directory(dagger.DirectoryOpts{
-				ID: cp.Input.DirectoryID(),
-			}).
+		ct := cp.Input.Directory(c).
 			WithDirectory(cp.Dest, contents, dagger.DirectoryWithDirectoryOpts{
 				Include: cp.Include,
 				Exclude: cp.Exclude,

pkg/engine/plan/task/fs_diff.go

@@ -23,12 +23,8 @@ type Diff struct {
 
 func (e *Diff) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		upper := c.Directory(dagger.DirectoryOpts{
-			ID: e.Upper.DirectoryID(),
-		})
-		lower := c.Directory(dagger.DirectoryOpts{
-			ID: e.Lower.DirectoryID(),
-		})
+		upper := e.Upper.Directory(c)
+		lower := e.Lower.Directory(c)
 		return e.Output.SetDirectoryIDBy(ctx, lower.Diff(upper))
 	})
 }

pkg/engine/plan/task/fs_entries.go

@@ -28,9 +28,7 @@ type Entries struct {
 func (e *Entries) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
 		fw := &entriesWalker{
-			d: c.Directory(dagger.DirectoryOpts{
-				ID: e.Input.DirectoryID(),
-			}),
+			d:        e.Input.Directory(c),
 			maxDepth: e.Depth,
 		}
 

pkg/engine/plan/task/fs_merge.go

@@ -24,12 +24,8 @@ func (e *Merge) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
 		d := c.Directory()
 
-		for i := range e.Inputs {
-			x := e.Inputs[i]
-
-			d = d.WithDirectory("/", c.Directory(dagger.DirectoryOpts{
-				ID: x.DirectoryID(),
-			}))
+		for _, input := range e.Inputs {
+			d = d.WithDirectory("/", input.Directory(c))
 		}
 
 		return e.Output.SetDirectoryIDBy(ctx, d)

pkg/engine/plan/task/fs_mkdir.go

@@ -24,9 +24,7 @@ type Mkdir struct {
 
 func (e *Mkdir) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		dir := c.Directory(dagger.DirectoryOpts{
-			ID: e.Input.DirectoryID(),
-		})
+		dir := e.Input.Directory(c)
 
 		for _, p := range e.Path.Values {
 			dir = dir.WithNewDirectory(

pkg/engine/plan/task/fs_readfile.go

@@ -21,9 +21,7 @@ type ReadFile struct {
 
 func (e *ReadFile) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		dir := c.Directory(dagger.DirectoryOpts{
-			ID: e.Input.DirectoryID(),
-		})
+		dir := e.Input.Directory(c)
 
 		f := dir.File(e.Path)
 

pkg/engine/plan/task/fs_rm.go

@@ -25,9 +25,7 @@ type Rm struct {
 
 func (e *Rm) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		dir := c.Directory(dagger.DirectoryOpts{
-			ID: e.Input.DirectoryID(),
-		})
+		dir := e.Input.Directory(c)
 
 		newDir := dir.WithoutDirectory(e.Path)
 

pkg/engine/plan/task/fs_writefile.go

@@ -26,11 +26,9 @@ type WriteFile struct {
 
 func (e *WriteFile) Do(ctx context.Context) error {
 	return daggerutil.Do(ctx, func(c *dagger.Client) error {
-		dir := c.
-			Directory(dagger.DirectoryOpts{ID: e.Input.DirectoryID()}).
-			WithNewFile(e.Path, e.Contents, dagger.DirectoryWithNewFileOpts{
-				Permissions: e.Permissions,
-			})
+		dir := e.Input.Directory(c).WithNewFile(e.Path, e.Contents, dagger.DirectoryWithNewFileOpts{
+			Permissions: e.Permissions,
+		})
 		return e.Output.SetDirectoryIDBy(ctx, dir)
 	})
 }