-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
containers.conf: appendable string arrays, Part 1
Signed-off-by: Valentin Rothberg <[email protected]>
- Loading branch information
Showing
8 changed files
with
103 additions
and
92 deletions.
There are no files selected for viewing
73 changes: 0 additions & 73 deletions
73
internal/attributed-string-slice/attributed_string_slice.go
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
|
|
||
| "github.com/BurntSushi/toml" | ||
| ) | ||
|
|
||
| // attributedStringSlice allows for extending a TOML string array with custom | ||
| // attributes that control how the array is marshaled into a Go string. | ||
| // | ||
| // Specifically, an attributedStringSlice can be configured to avoid it being | ||
| // overridden by a subsequent unmarshal sequence. When the `append` attribute | ||
| // is specified, the array will be appended instead (e.g., `array=["9", | ||
| // {append=true}]`). | ||
| type attributedStringSlice struct { // A "mixed-type array" in TOML. | ||
| // Note that the fields below _must_ be exported. Otherwise the TOML | ||
| // encoder would fail during type reflection. | ||
| Slice []string | ||
| Attributes struct { // Using a struct allows for adding more attributes in the feature. | ||
| Append *bool // Nil if not set by the user | ||
| } | ||
| } | ||
|
|
||
| // UnmarshalTOML is the custom unmarshal method for attributedStringSlice. | ||
| func (a *attributedStringSlice) UnmarshalTOML(data interface{}) error { | ||
| iFaceSlice, ok := data.([]interface{}) | ||
| if !ok { | ||
| return fmt.Errorf("unable to cast to interface array: %v", data) | ||
| } | ||
|
|
||
| var loadedStrings []string | ||
| for _, x := range iFaceSlice { // Iterate over each item in the slice. | ||
| switch val := x.(type) { | ||
| case string: // Strings are directly appended to the slice. | ||
| loadedStrings = append(loadedStrings, val) | ||
| case map[string]interface{}: // The attribute struct is represented as a map. | ||
| for k, v := range val { // Iterate over all _supported_ keys. | ||
| switch k { | ||
| case "append": | ||
| boolVal, ok := v.(bool) | ||
| if !ok { | ||
| return fmt.Errorf("unable to cast append to bool: %v", k) | ||
| } | ||
| a.Attributes.Append = &boolVal | ||
| default: // Unsupported map key. | ||
| return fmt.Errorf("unsupported key %q in map: %v", k, val) | ||
| } | ||
| } | ||
| default: // Unsupported item. | ||
| return fmt.Errorf("unsupported item in attributed string slice: %v", x) | ||
| } | ||
| } | ||
|
|
||
| if a.Attributes.Append != nil && *a.Attributes.Append { // If _explicitly_ configured, append the loaded slice. | ||
| a.Slice = append(a.Slice, loadedStrings...) | ||
| } else { // Default: override the existing Slice. | ||
| a.Slice = loadedStrings | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // MarshalTOML is the custom marshal method for attributedStringSlice. | ||
| func (a *attributedStringSlice) MarshalTOML() ([]byte, error) { | ||
| iFaceSlice := make([]interface{}, 0, len(a.Slice)) | ||
|
|
||
| for _, x := range a.Slice { | ||
| iFaceSlice = append(iFaceSlice, x) | ||
| } | ||
|
|
||
| if a.Attributes.Append != nil { | ||
| Attributes := make(map[string]any) | ||
| Attributes["append"] = *a.Attributes.Append | ||
| iFaceSlice = append(iFaceSlice, Attributes) | ||
| } | ||
|
|
||
| buf := new(bytes.Buffer) | ||
| enc := toml.NewEncoder(buf) | ||
| if err := enc.Encode(iFaceSlice); err != nil { | ||
| return nil, err | ||
| } | ||
| return buf.Bytes(), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
pkg/config/testdata/modules/usr/share/containers/containers.conf.modules/sub/share-only.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| [containers] | ||
| env=["usr share only"] | ||
| env=["usr share only", {append=true}] |