Snapshotters: Export the root path

dcantah · dcantah · commit 32caaee48423 · 2024-04-14T06:24:33.000-07:00
Some of the snapshotters that allow you to change their root location
were already doing this, this just makes all of them follow the same
pattern.

Signed-off-by: Danny Canter &lt;danny@dcantah.dev&gt;
diff --git a/plugins/snapshots/blockfile/plugin/plugin.go b/plugins/snapshots/blockfile/plugin/plugin.go
@@ -74,6 +74,7 @@ func init() {
 			}
 			opts = append(opts, blockfile.WithRecreateScratch(config.RecreateScratch))
 
+			ic.Meta.Exports[plugins.SnapshotterRootDir] = root
 			return blockfile.NewSnapshotter(root, opts...)
 		},
 	})
diff --git a/plugins/snapshots/btrfs/plugin/plugin.go b/plugins/snapshots/btrfs/plugin/plugin.go
@@ -54,7 +54,7 @@ func init() {
 				root = config.RootPath
 			}
 
-			ic.Meta.Exports = map[string]string{"root": root}
+			ic.Meta.Exports[plugins.SnapshotterRootDir] = root
 			return btrfs.NewSnapshotter(root)
 		},
 	})
diff --git a/plugins/snapshots/devmapper/plugin/plugin.go b/plugins/snapshots/devmapper/plugin/plugin.go
@@ -50,6 +50,7 @@ func init() {
 				config.RootPath = ic.Properties[plugins.PropertyRootDir]
 			}
 
+			ic.Meta.Exports[plugins.SnapshotterRootDir] = config.RootPath
 			return devmapper.NewSnapshotter(ic.Context, config)
 		},
 	})
diff --git a/plugins/snapshots/native/plugin/plugin.go b/plugins/snapshots/native/plugin/plugin.go
@@ -50,6 +50,7 @@ func init() {
 				root = config.RootPath
 			}
 
+			ic.Meta.Exports[plugins.SnapshotterRootDir] = root
 			return native.NewSnapshotter(root)
 		},
 	})
diff --git a/plugins/snapshots/overlay/plugin/plugin.go b/plugins/snapshots/overlay/plugin/plugin.go
@@ -92,7 +92,7 @@ func init() {
 				ic.Meta.Capabilities = append(ic.Meta.Capabilities, capaOnlyRemapIDs)
 			}
 
-			ic.Meta.Exports["root"] = root
+			ic.Meta.Exports[plugins.SnapshotterRootDir] = root
 			return overlay.NewSnapshotter(root, oOpts...)
 		},
 	})
diff --git a/plugins/types.go b/plugins/types.go
@@ -93,3 +93,7 @@ const (
 	// PropertyTTRPCAddress is the ttrpc address used for client connections to containerd
 	PropertyTTRPCAddress = "io.containerd.plugin.ttrpc.address"
 )
+
+const (
+	SnapshotterRootDir = "root"
+)

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ func init() {`
`74`	`74`	`}`
`75`	`75`	`opts = append(opts, blockfile.WithRecreateScratch(config.RecreateScratch))`
`76`	`76`
	`77`	`+ ic.Meta.Exports[plugins.SnapshotterRootDir] = root`
`77`	`78`	`return blockfile.NewSnapshotter(root, opts...)`
`78`	`79`	`},`
`79`	`80`	`})`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func init() {`
`54`	`54`	`root = config.RootPath`
`55`	`55`	`}`
`56`	`56`
`57`		`- ic.Meta.Exports = map[string]string{"root": root}`
	`57`	`+ ic.Meta.Exports[plugins.SnapshotterRootDir] = root`
`58`	`58`	`return btrfs.NewSnapshotter(root)`
`59`	`59`	`},`
`60`	`60`	`})`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ func init() {`
`50`	`50`	`config.RootPath = ic.Properties[plugins.PropertyRootDir]`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ ic.Meta.Exports[plugins.SnapshotterRootDir] = config.RootPath`
`53`	`54`	`return devmapper.NewSnapshotter(ic.Context, config)`
`54`	`55`	`},`
`55`	`56`	`})`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func init() {`
`92`	`92`	`ic.Meta.Capabilities = append(ic.Meta.Capabilities, capaOnlyRemapIDs)`
`93`	`93`	`}`
`94`	`94`
`95`		`- ic.Meta.Exports["root"] = root`
	`95`	`+ ic.Meta.Exports[plugins.SnapshotterRootDir] = root`
`96`	`96`	`return overlay.NewSnapshotter(root, oOpts...)`
`97`	`97`	`},`
`98`	`98`	`})`
Original file line number	Diff line number	Diff line change
`@@ -93,3 +93,7 @@ const (`
`93`	`93`	`// PropertyTTRPCAddress is the ttrpc address used for client connections to containerd`
`94`	`94`	`PropertyTTRPCAddress = "io.containerd.plugin.ttrpc.address"`
`95`	`95`	`)`
	`96`	`+`
	`97`	`+const (`
	`98`	`+ SnapshotterRootDir = "root"`
	`99`	`+)`