Merge pull request #2350 from skriss/allow-plugins-dir

allow plugins/ as a valid directory in the BSL bucket

changelogs/unreleased/2350-skriss

@@ -0,0 +1 @@
+Allow `plugins/` as a valid top-level directory within backup storage locations. This directory is a place for plugin authors to store arbitrary data as needed. It is recommended to create an additional subdirectory under `plugins/` specifically for your plugin, e.g. `plugins/my-plugin-data/`.

pkg/persistence/object_store_layout.go

@@ -39,6 +39,7 @@ func NewObjectStoreLayout(prefix string) *ObjectStoreLayout {
 		"restores": path.Join(prefix, "restores") + "/",
 		"restic":   path.Join(prefix, "restic") + "/",
 		"metadata": path.Join(prefix, "metadata") + "/",
+		"plugins":  path.Join(prefix, "plugins") + "/",
 	}
 
 	return &ObjectStoreLayout{

pkg/persistence/object_store_test.go

@@ -138,6 +138,13 @@ func TestIsValid(t *testing.T) {
 			},
 			expectErr: false,
 		},
+		{
+			name: "backup store with plugins directory is valid",
+			storageData: map[string][]byte{
+				"plugins/vsphere/foo": {},
+			},
+			expectErr: false,
+		},
 	}
 
 	for _, tc := range tests {