From f2d145992924555a4d2dae483918947a9ab79979 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 14 Sep 2017 20:49:22 -0700 Subject: [PATCH] Remove omitempty from toml tags The encoder only support changing the name of the key. Signed-off-by: Kenfe-Mickael Laventure --- linux/runtime.go | 10 +++++----- services/diff/service.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/runtime.go b/linux/runtime.go index 3ee8bf635..93938fab2 100644 --- a/linux/runtime.go +++ b/linux/runtime.go @@ -67,15 +67,15 @@ var _ = (runtime.Runtime)(&Runtime{}) type Config struct { // Shim is a path or name of binary implementing the Shim GRPC API - Shim string `toml:"shim,omitempty"` + Shim string `toml:"shim"` // Runtime is a path or name of an OCI runtime used by the shim - Runtime string `toml:"runtime,omitempty"` + Runtime string `toml:"runtime"` // RuntimeRoot is the path that shall be used by the OCI runtime for its data - RuntimeRoot string `toml:"runtime_root,omitempty"` + RuntimeRoot string `toml:"runtime_root"` // NoShim calls runc directly from within the pkg - NoShim bool `toml:"no_shim,omitempty"` + NoShim bool `toml:"no_shim"` // Debug enable debug on the shim - ShimDebug bool `toml:"shim_debug,omitempty"` + ShimDebug bool `toml:"shim_debug"` } func New(ic *plugin.InitContext) (interface{}, error) { diff --git a/services/diff/service.go b/services/diff/service.go index af6326b60..d20f3ecd4 100644 --- a/services/diff/service.go +++ b/services/diff/service.go @@ -19,7 +19,7 @@ type config struct { // respected for which is choosen. Each differ should return the same // correct output, allowing any ordering to be used to prefer // more optimimal implementations. - Order []string `toml:"default,omitempty"` + Order []string `toml:"default"` } func init() {