mirror of
https://github.com/dokku/dokku.git
synced 2026-07-11 21:10:52 +02:00
e9160db769
The `storage:list <app> --format json` payload conflated the attachment's `Readonly` flag and its `VolumeOptions` field into a single derived `volume_options` string that rendered as `ro`, `<options>`, or `ro,<options>` depending on which fields were set on the underlying attachment. That shape is fine for the legacy `host:container[:options]` text view but it leaves drift-detection tooling unable to tell whether a `ro` token came from `Attachment.Readonly == true` or from the operator setting `Attachment.VolumeOptions = "ro"` directly. The JSON now exposes `readonly` (boolean) and `volume_options` (string) as separate omitempty keys populated straight from the attachment, and `formatStorageListEntry` combines them at format time for the colon- form text view. `ParseMountPath` was extended in lockstep so callers of the legacy `host:container:opts` form no longer have to special- case the `ro` token themselves.
110 lines
3.3 KiB
Go
110 lines
3.3 KiB
Go
package storage
|
|
|
|
import (
|
|
"testing"
|
|
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
func TestVerifyPathsAbsolutePath(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
Expect(VerifyPaths("/host/path:/container/path")).To(Succeed())
|
|
Expect(VerifyPaths("/var/lib/dokku/data/storage/test:/app/data")).To(Succeed())
|
|
}
|
|
|
|
func TestVerifyPathsNamedVolume(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
Expect(VerifyPaths("volume_name:/container/path")).To(Succeed())
|
|
Expect(VerifyPaths("my-volume:/app/data")).To(Succeed())
|
|
Expect(VerifyPaths("my.volume:/app/data")).To(Succeed())
|
|
}
|
|
|
|
func TestVerifyPathsInvalid(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
err := VerifyPaths("/host/path")
|
|
Expect(err).To(HaveOccurred())
|
|
Expect(err.Error()).To(ContainSubstring("Storage path must be two valid paths divided by colon"))
|
|
|
|
err = VerifyPaths("a:/container")
|
|
Expect(err).To(HaveOccurred())
|
|
Expect(err.Error()).To(ContainSubstring("Volume name must be two characters or more"))
|
|
|
|
err = VerifyPaths("-invalid:/container")
|
|
Expect(err).To(HaveOccurred())
|
|
}
|
|
|
|
func TestValidateDirectoryName(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
Expect(ValidateDirectoryName("myapp")).To(Succeed())
|
|
Expect(ValidateDirectoryName("my-app")).To(Succeed())
|
|
Expect(ValidateDirectoryName("my_app")).To(Succeed())
|
|
Expect(ValidateDirectoryName("MyApp123")).To(Succeed())
|
|
}
|
|
|
|
func TestValidateDirectoryNameInvalid(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
err := ValidateDirectoryName("")
|
|
Expect(err).To(HaveOccurred())
|
|
Expect(err.Error()).To(ContainSubstring("Please specify a directory"))
|
|
|
|
err = ValidateDirectoryName("@invalid")
|
|
Expect(err).To(HaveOccurred())
|
|
Expect(err.Error()).To(ContainSubstring("Directory can only contain"))
|
|
|
|
err = ValidateDirectoryName("my/app")
|
|
Expect(err).To(HaveOccurred())
|
|
|
|
err = ValidateDirectoryName("my app")
|
|
Expect(err).To(HaveOccurred())
|
|
}
|
|
|
|
func TestParseMountPath(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
entry := ParseMountPath("/host/path:/container/path")
|
|
Expect(entry.HostPath).To(Equal("/host/path"))
|
|
Expect(entry.ContainerPath).To(Equal("/container/path"))
|
|
Expect(entry.Readonly).To(BeFalse())
|
|
Expect(entry.VolumeOptions).To(BeEmpty())
|
|
|
|
entry = ParseMountPath("/host/path:/container/path:ro")
|
|
Expect(entry.HostPath).To(Equal("/host/path"))
|
|
Expect(entry.ContainerPath).To(Equal("/container/path"))
|
|
Expect(entry.Readonly).To(BeTrue())
|
|
Expect(entry.VolumeOptions).To(BeEmpty())
|
|
|
|
entry = ParseMountPath("/host/path:/container/path:Z")
|
|
Expect(entry.HostPath).To(Equal("/host/path"))
|
|
Expect(entry.ContainerPath).To(Equal("/container/path"))
|
|
Expect(entry.Readonly).To(BeFalse())
|
|
Expect(entry.VolumeOptions).To(Equal("Z"))
|
|
|
|
entry = ParseMountPath("/host/path:/container/path:ro,Z")
|
|
Expect(entry.HostPath).To(Equal("/host/path"))
|
|
Expect(entry.ContainerPath).To(Equal("/container/path"))
|
|
Expect(entry.Readonly).To(BeTrue())
|
|
Expect(entry.VolumeOptions).To(Equal("Z"))
|
|
|
|
entry = ParseMountPath("/host/path:/container/path:noexec,nosuid,ro")
|
|
Expect(entry.Readonly).To(BeTrue())
|
|
Expect(entry.VolumeOptions).To(Equal("noexec,nosuid"))
|
|
|
|
entry = ParseMountPath("volume_name:/container/path")
|
|
Expect(entry.HostPath).To(Equal("volume_name"))
|
|
Expect(entry.ContainerPath).To(Equal("/container/path"))
|
|
Expect(entry.Readonly).To(BeFalse())
|
|
Expect(entry.VolumeOptions).To(BeEmpty())
|
|
}
|
|
|
|
func TestGetStorageDirectory(t *testing.T) {
|
|
RegisterTestingT(t)
|
|
|
|
dir := GetStorageDirectory()
|
|
Expect(dir).To(ContainSubstring("data/storage"))
|
|
}
|