mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
File Path Configuration TTL Validation (#4376)
* compatibility patch for csi driver * added namespace to all component parameters * added namespace to all component parameters * dereference in range * added namespace to values.yml defaults * added namespace to s3 component * added helm chart to github pages * added helm chart to github pages * added helm chart to github pages * added helm chart to github pages * added helm chart to github pages * push on all tags * push on all tags * push on all tags * push on all tags * push on all tags * changed helm directory structure * update charts location * fixed dereference * updated permissions * updated permissions * match current action schema * added helm chart liniting CI * modified chart list changed * fixed nodejs warning * standardized a few defaults * added chart dirs * lowerd period seconds for volume startup to test chart lint changes * lowerd period seconds for volume startup to test chart lint changes * test * changed back * adjustment * debug ls statment * removed change detection * remvoed change detection * always lint the charts * added missing ) * fixed typo * added spaces in front of all comments * pdated values.yaml * pdated values.yaml * don't validate maintainers for now * update helm_ci.yml * update helm_ci.yml * update helm_ci.yml * update helm_ci.yml * update helm_ci.yml * - adds helm chart lint on changes - adds test helm chart install on k8s * updated helm chart readme.md * added artifact hub * added artifact hub * added ttl validation
This commit is contained in:
parent
efef6e94bf
commit
2d213d87e1
|
@ -5,6 +5,7 @@ import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/seaweedfs/seaweedfs/weed/filer"
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
||||||
|
@ -51,7 +52,7 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io
|
||||||
locationPrefix := fsConfigureCommand.String("locationPrefix", "", "path prefix, required to update the path-specific configuration")
|
locationPrefix := fsConfigureCommand.String("locationPrefix", "", "path prefix, required to update the path-specific configuration")
|
||||||
collection := fsConfigureCommand.String("collection", "", "assign writes to this collection")
|
collection := fsConfigureCommand.String("collection", "", "assign writes to this collection")
|
||||||
replication := fsConfigureCommand.String("replication", "", "assign writes with this replication")
|
replication := fsConfigureCommand.String("replication", "", "assign writes with this replication")
|
||||||
ttl := fsConfigureCommand.String("ttl", "", "assign writes with this ttl")
|
ttl := fsConfigureCommand.String("ttl", "", "assign writes with this ttl (e.g., 1m, 1h, 1d, 1w, 1y)")
|
||||||
diskType := fsConfigureCommand.String("disk", "", "[hdd|ssd|<tag>] hard drive or solid state drive or any tag")
|
diskType := fsConfigureCommand.String("disk", "", "[hdd|ssd|<tag>] hard drive or solid state drive or any tag")
|
||||||
fsync := fsConfigureCommand.Bool("fsync", false, "fsync for the writes")
|
fsync := fsConfigureCommand.Bool("fsync", false, "fsync for the writes")
|
||||||
isReadOnly := fsConfigureCommand.Bool("readOnly", false, "disable writes")
|
isReadOnly := fsConfigureCommand.Bool("readOnly", false, "disable writes")
|
||||||
|
@ -102,6 +103,16 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// check ttl
|
||||||
|
if *ttl != "" {
|
||||||
|
regex := "^[1-9][0-9]*[mhdwMy]$"
|
||||||
|
match, _ := regexp.MatchString(regex, *ttl)
|
||||||
|
|
||||||
|
if !match {
|
||||||
|
return fmt.Errorf("ttl should be of the following format (e.g., 1m, 1h, 1d, 1w, 1y)")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// save it
|
// save it
|
||||||
if *isDelete {
|
if *isDelete {
|
||||||
fc.DeleteLocationConf(*locationPrefix)
|
fc.DeleteLocationConf(*locationPrefix)
|
||||||
|
|
Loading…
Reference in a new issue