-
Notifications
You must be signed in to change notification settings - Fork 8
✨ Generic map and slice serialisers #622
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -265,5 +265,5 @@ | |
| } | ||
| ] | ||
| }, | ||
| "generated_at": "2025-05-12T17:01:47Z" | ||
| "generated_at": "2025-05-30T10:38:21Z" | ||
| } | ||
This file contains hidden or 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 @@ | ||
| :camel: Upgrade dependencies |
This file contains hidden or 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 @@ | ||
| :gear: Move dependency on mapstructure to use https://github.com/go-viper/mapstructure as https://github.com/mitchellh/mapstructure is [no longer maintained](https://github.com/go-viper/mapstructure?tab=readme-ov-file#migrating-from-githubcommitchellhmapstructure) |
This file contains hidden or 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 @@ | ||
| :sparkles: [serialization] Added ways to serialise structs into maps or slice |
This file contains hidden or 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 @@ | ||
| :sparkles: [maps] Added ways to expand and flatten maps in a similar fashion to https://github.com/krakend/flatmap and no longer available https://pkg.go.dev/github.com/hashicorp/terraform/flatmap |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,4 @@ | ||
| This module was initially created to vendor https://pkg.go.dev/github.com/hashicorp/terraform/flatmap which has been | ||
| removed from the terraform project. | ||
|
|
||
| code has been updated and is also inspired from https://github.com/astaxie/flatmap |
This file contains hidden or 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,143 @@ | ||
| package maps | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "sort" | ||
| "strconv" | ||
| "strings" | ||
| ) | ||
|
|
||
| func Expand(value map[string]string) (expandedMap any, err error) { | ||
| if len(value) == 0 { | ||
| return | ||
| } | ||
| m := make(map[string]any, len(value)) | ||
| for k := range value { | ||
| key, _, found := strings.Cut(k, separator) | ||
| if found { | ||
| subMap, subErr := ExpandPrefixed(value, key) | ||
| if subErr != nil { | ||
| err = subErr | ||
| return | ||
| } | ||
| m[key] = subMap | ||
| } else { | ||
| m[k] = value[k] | ||
| } | ||
| } | ||
| expandedMap = m | ||
| return | ||
| } | ||
|
|
||
| // ExpandPrefixed takes a maps and a prefix and expands that value into | ||
| // a more complex structure. This is the reverse of the Flatten operation. | ||
| func ExpandPrefixed(m map[string]string, key string) (result any, err error) { | ||
| // If the key is exactly a key in the maps, just return it | ||
| if v, ok := m[key]; ok { | ||
| if v == "true" { | ||
| result = true | ||
| return | ||
| } else if v == "false" { | ||
| result = false | ||
| return | ||
| } | ||
|
|
||
| result = v | ||
| return | ||
| } | ||
|
|
||
| // Check if the key is an array, and if so, expand the array | ||
| arrayKey := fmt.Sprintf("%v%v%d", key, separator, 0) | ||
| if _, ok := m[arrayKey]; ok { | ||
| result, err = expandArray(m, key) | ||
| return | ||
| } | ||
| arrayKey = fmt.Sprintf("%v%v", arrayKey, separator) | ||
| for k := range m { | ||
| if strings.HasPrefix(k, arrayKey) { | ||
| result, err = expandArray(m, key) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| // Check if this is a prefix in the maps | ||
| prefix := key + separator | ||
| for k := range m { | ||
| if strings.HasPrefix(k, prefix) { | ||
| result, err = expandMap(m, prefix) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| result = nil | ||
| return | ||
| } | ||
|
|
||
| func expandArray(m map[string]string, prefix string) (result []any, err error) { | ||
| keySet := map[int]bool{} | ||
| for k := range m { | ||
| if !strings.HasPrefix(k, prefix+separator) { | ||
| continue | ||
| } | ||
|
|
||
| key := k[len(prefix)+1:] | ||
| idx := strings.Index(key, separator) | ||
| if idx != -1 { | ||
| key = key[:idx] | ||
| } | ||
|
|
||
| k, subErr := strconv.Atoi(key) | ||
| if subErr != nil { | ||
| err = subErr | ||
| return | ||
| } | ||
| keySet[k] = true | ||
| } | ||
|
|
||
| var keysList []int | ||
| for key := range keySet { | ||
| keysList = append(keysList, key) | ||
| } | ||
| sort.Ints(keysList) | ||
|
|
||
| r := make([]any, len(keysList)) | ||
| for i, key := range keysList { | ||
| keyString := strconv.Itoa(key) | ||
| item, subErr := ExpandPrefixed(m, fmt.Sprintf("%s.%s", prefix, keyString)) | ||
| r[i] = item | ||
| if subErr != nil { | ||
| err = subErr | ||
| return | ||
| } | ||
| } | ||
| result = r | ||
| return | ||
| } | ||
|
|
||
| func expandMap(m map[string]string, prefix string) (r map[string]any, err error) { | ||
| result := make(map[string]any) | ||
| for k := range m { | ||
| if !strings.HasPrefix(k, prefix) { | ||
| continue | ||
| } | ||
|
|
||
| key := k[len(prefix):] | ||
| idx := strings.Index(key, separator) | ||
| if idx != -1 { | ||
| key = key[:idx] | ||
| } | ||
| if _, ok := result[key]; ok { | ||
| continue | ||
| } | ||
|
|
||
| item, subErr := ExpandPrefixed(m, k[:len(prefix)+len(key)]) | ||
| if subErr != nil { | ||
| err = subErr | ||
| return | ||
| } | ||
| result[key] = item | ||
| } | ||
|
|
||
| r = result | ||
| return | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.