Snapshotters: Export the root path

dcantah · Kern Walster · commit bd423bf84d2d · 2024-04-18T22:51:58.000Z
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 <danny@dcantah.dev> (cherry picked from commit 32caaee) Signed-off-by: Kern Walster <walster@amazon.com>
diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -104,6 +104,10 @@ const (
 	DeprecationsPlugin = "deprecations"
 )
 
+const (
+	SnapshotterRootDir = "root"
+)
+
 // Registration contains information for registering a plugin
 type Registration struct {
 	// Type of the plugin
diff --git a/snapshots/blockfile/plugin/plugin.go b/snapshots/blockfile/plugin/plugin.go
@@ -67,6 +67,7 @@ func init() {
 				opts = append(opts, blockfile.WithMountOptions(config.MountOptions))
 			}
 
+			ic.Meta.Exports[plugin.SnapshotterRootDir] = root
 			return blockfile.NewSnapshotter(root, opts...)
 		},
 	})
diff --git a/snapshots/btrfs/plugin/plugin.go b/snapshots/btrfs/plugin/plugin.go
@@ -52,7 +52,7 @@ func init() {
 				root = config.RootPath
 			}
 
-			ic.Meta.Exports = map[string]string{"root": root}
+			ic.Meta.Exports[plugin.SnapshotterRootDir] = root
 			return btrfs.NewSnapshotter(root)
 		},
 	})
diff --git a/snapshots/devmapper/plugin/plugin.go b/snapshots/devmapper/plugin/plugin.go
@@ -47,6 +47,7 @@ func init() {
 				config.RootPath = ic.Root
 			}
 
+			ic.Meta.Exports[plugin.SnapshotterRootDir] = config.RootPath
 			return devmapper.NewSnapshotter(ic.Context, config)
 		},
 	})
diff --git a/snapshots/native/plugin/plugin.go b/snapshots/native/plugin/plugin.go
@@ -48,6 +48,7 @@ func init() {
 				root = config.RootPath
 			}
 
+			ic.Meta.Exports[plugin.SnapshotterRootDir] = root
 			return native.NewSnapshotter(root)
 		},
 	})
diff --git a/snapshots/overlay/plugin/plugin.go b/snapshots/overlay/plugin/plugin.go
@@ -67,7 +67,7 @@ func init() {
 				oOpts = append(oOpts, overlay.WithMountOptions(config.MountOptions))
 			}
 
-			ic.Meta.Exports["root"] = root
+			ic.Meta.Exports[plugin.SnapshotterRootDir] = root
 			return overlay.NewSnapshotter(root, oOpts...)
 		},
 	})

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ func init() {`
`67`	`67`	`opts = append(opts, blockfile.WithMountOptions(config.MountOptions))`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ ic.Meta.Exports[plugin.SnapshotterRootDir] = root`
`70`	`71`	`return blockfile.NewSnapshotter(root, opts...)`
`71`	`72`	`},`
`72`	`73`	`})`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func init() {`
`52`	`52`	`root = config.RootPath`
`53`	`53`	`}`
`54`	`54`
`55`		`- ic.Meta.Exports = map[string]string{"root": root}`
	`55`	`+ ic.Meta.Exports[plugin.SnapshotterRootDir] = root`
`56`	`56`	`return btrfs.NewSnapshotter(root)`
`57`	`57`	`},`
`58`	`58`	`})`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ func init() {`
`47`	`47`	`config.RootPath = ic.Root`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ ic.Meta.Exports[plugin.SnapshotterRootDir] = config.RootPath`
`50`	`51`	`return devmapper.NewSnapshotter(ic.Context, config)`
`51`	`52`	`},`
`52`	`53`	`})`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ func init() {`
`48`	`48`	`root = config.RootPath`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ ic.Meta.Exports[plugin.SnapshotterRootDir] = root`
`51`	`52`	`return native.NewSnapshotter(root)`
`52`	`53`	`},`
`53`	`54`	`})`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func init() {`
`67`	`67`	`oOpts = append(oOpts, overlay.WithMountOptions(config.MountOptions))`
`68`	`68`	`}`
`69`	`69`
`70`		`- ic.Meta.Exports["root"] = root`
	`70`	`+ ic.Meta.Exports[plugin.SnapshotterRootDir] = root`
`71`	`71`	`return overlay.NewSnapshotter(root, oOpts...)`
`72`	`72`	`},`
`73`	`73`	`})`