mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
2a7c1cc1d6
Taking the same approach as was taken in containerd
The new library has a slightly different output;
- keys at the same level are sorted alphabetically
- empty sections not omitted (`proxy_plugins`, `stream_processors`, `timeouts`),
which could possibly be be addressed with an "omitempty" in containerd's struct.
- empty slices are not omitted (`imports`, `required_plugins`)
After sorting the "before" configuration the diff looks like this:
```patch
diff --git a/config-before-sorted.toml b/config-after.toml
index cc771ce7ab..43a727f589 100644
--- a/config-before-sorted.toml
+++ b/config-after.toml
@@ -1,6 +1,8 @@
disabled_plugins = ["cri"]
+imports = []
oom_score = 0
plugin_dir = ""
+required_plugins = []
root = "/var/lib/docker/containerd/daemon"
state = "/var/run/docker/containerd/daemon"
version = 0
@@ -37,6 +39,12 @@ version = 0
shim = "containerd-shim"
shim_debug = true
+[proxy_plugins]
+
+[stream_processors]
+
+[timeouts]
+
[ttrpc]
address = ""
gid = 0
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
134 lines
1.9 KiB
Go
134 lines
1.9 KiB
Go
package toml
|
|
|
|
import "fmt"
|
|
|
|
// Define tokens
|
|
type tokenType int
|
|
|
|
const (
|
|
eof = -(iota + 1)
|
|
)
|
|
|
|
const (
|
|
tokenError tokenType = iota
|
|
tokenEOF
|
|
tokenComment
|
|
tokenKey
|
|
tokenString
|
|
tokenInteger
|
|
tokenTrue
|
|
tokenFalse
|
|
tokenFloat
|
|
tokenInf
|
|
tokenNan
|
|
tokenEqual
|
|
tokenLeftBracket
|
|
tokenRightBracket
|
|
tokenLeftCurlyBrace
|
|
tokenRightCurlyBrace
|
|
tokenLeftParen
|
|
tokenRightParen
|
|
tokenDoubleLeftBracket
|
|
tokenDoubleRightBracket
|
|
tokenDate
|
|
tokenLocalDate
|
|
tokenKeyGroup
|
|
tokenKeyGroupArray
|
|
tokenComma
|
|
tokenColon
|
|
tokenDollar
|
|
tokenStar
|
|
tokenQuestion
|
|
tokenDot
|
|
tokenDotDot
|
|
tokenEOL
|
|
)
|
|
|
|
var tokenTypeNames = []string{
|
|
"Error",
|
|
"EOF",
|
|
"Comment",
|
|
"Key",
|
|
"String",
|
|
"Integer",
|
|
"True",
|
|
"False",
|
|
"Float",
|
|
"Inf",
|
|
"NaN",
|
|
"=",
|
|
"[",
|
|
"]",
|
|
"{",
|
|
"}",
|
|
"(",
|
|
")",
|
|
"]]",
|
|
"[[",
|
|
"LocalDate",
|
|
"LocalDate",
|
|
"KeyGroup",
|
|
"KeyGroupArray",
|
|
",",
|
|
":",
|
|
"$",
|
|
"*",
|
|
"?",
|
|
".",
|
|
"..",
|
|
"EOL",
|
|
}
|
|
|
|
type token struct {
|
|
Position
|
|
typ tokenType
|
|
val string
|
|
}
|
|
|
|
func (tt tokenType) String() string {
|
|
idx := int(tt)
|
|
if idx < len(tokenTypeNames) {
|
|
return tokenTypeNames[idx]
|
|
}
|
|
return "Unknown"
|
|
}
|
|
|
|
func (t token) String() string {
|
|
switch t.typ {
|
|
case tokenEOF:
|
|
return "EOF"
|
|
case tokenError:
|
|
return t.val
|
|
}
|
|
|
|
return fmt.Sprintf("%q", t.val)
|
|
}
|
|
|
|
func isSpace(r rune) bool {
|
|
return r == ' ' || r == '\t'
|
|
}
|
|
|
|
func isAlphanumeric(r rune) bool {
|
|
return 'a' <= r && r <= 'z' || 'A' <= r && r <= 'Z' || r == '_'
|
|
}
|
|
|
|
func isKeyChar(r rune) bool {
|
|
// Keys start with the first character that isn't whitespace or [ and end
|
|
// with the last non-whitespace character before the equals sign. Keys
|
|
// cannot contain a # character."
|
|
return !(r == '\r' || r == '\n' || r == eof || r == '=')
|
|
}
|
|
|
|
func isKeyStartChar(r rune) bool {
|
|
return !(isSpace(r) || r == '\r' || r == '\n' || r == eof || r == '[')
|
|
}
|
|
|
|
func isDigit(r rune) bool {
|
|
return '0' <= r && r <= '9'
|
|
}
|
|
|
|
func isHexDigit(r rune) bool {
|
|
return isDigit(r) ||
|
|
(r >= 'a' && r <= 'f') ||
|
|
(r >= 'A' && r <= 'F')
|
|
}
|