Merge pull request #27 from terraform-providers/go-modules-2019-02-22

[MODULES] Switch to Go Modules

1 files changed, 34 insertions, 20 deletions

diff --git a/vendor/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go
index 77e0dbd..68d73aa 100644
--- a/vendor/github.com/go-ini/ini/ini.go
+++ b/vendor/github.com/go-ini/ini/ini.go
@@ -37,7 +37,7 @@ const (
 
         // Maximum allowed depth when recursively substituing variable names.
         _DEPTH_VALUES = 99
-        _VERSION      = "1.23.1"
+        _VERSION      = "1.25.4"
 )
 
 // Version returns current package version literal.
@@ -176,6 +176,8 @@ type LoadOptions struct {
         // AllowBooleanKeys indicates whether to allow boolean type keys or treat as value is missing.
         // This type of keys are mostly used in my.cnf.
         AllowBooleanKeys bool
+        // AllowShadows indicates whether to keep track of keys with same name under same section.
+        AllowShadows bool
         // Some INI formats allow group blocks that store a block of raw content that doesn't otherwise
         // conform to key/value pairs. Specify the names of those blocks here.
         UnparseableSections []string
@@ -219,6 +221,12 @@ func InsensitiveLoad(source interface{}, others ...interface{}) (*File, error) {
         return LoadSources(LoadOptions{Insensitive: true}, source, others...)
 }
 
+// InsensitiveLoad has exactly same functionality as Load function
+// except it allows have shadow keys.
+func ShadowLoad(source interface{}, others ...interface{}) (*File, error) {
+        return LoadSources(LoadOptions{AllowShadows: true}, source, others...)
+}
+
 // Empty returns an empty file object.
 func Empty() *File {
         // Ignore error here, we sure our data is good.
@@ -441,6 +449,7 @@ func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
                 }
                 alignSpaces := bytes.Repeat([]byte(" "), alignLength)
 
+        KEY_LIST:
                 for _, kname := range sec.keyList {
                         key := sec.Key(kname)
                         if len(key.Comment) > 0 {
@@ -467,28 +476,33 @@ func (f *File) WriteToIndent(w io.Writer, indent string) (n int64, err error) {
                         case strings.Contains(kname, "`"):
                                 kname = `"""` + kname + `"""`
                         }
-                        if _, err = buf.WriteString(kname); err != nil {
-                                return 0, err
-                        }
 
-                        if key.isBooleanType {
-                                continue
-                        }
+                        for _, val := range key.ValueWithShadows() {
+                                if _, err = buf.WriteString(kname); err != nil {
+                                        return 0, err
+                                }
 
-                        // Write out alignment spaces before "=" sign
-                        if PrettyFormat {
-                                buf.Write(alignSpaces[:alignLength-len(kname)])
-                        }
+                                if key.isBooleanType {
+                                        if kname != sec.keyList[len(sec.keyList)-1] {
+                                                buf.WriteString(LineBreak)
+                                        }
+                                        continue KEY_LIST
+                                }
 
-                        val := key.value
-                        // In case key value contains "\n", "`", "\"", "#" or ";"
-                        if strings.ContainsAny(val, "\n`") {
-                                val = `"""` + val + `"""`
-                        } else if strings.ContainsAny(val, "#;") {
-                                val = "`" + val + "`"
-                        }
-                        if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
-                                return 0, err
+                                // Write out alignment spaces before "=" sign
+                                if PrettyFormat {
+                                        buf.Write(alignSpaces[:alignLength-len(kname)])
+                                }
+
+                                // In case key value contains "\n", "`", "\"", "#" or ";"
+                                if strings.ContainsAny(val, "\n`") {
+                                        val = `"""` + val + `"""`
+                                } else if strings.ContainsAny(val, "#;") {
+                                        val = "`" + val + "`"
+                                }
+                                if _, err = buf.WriteString(equalSign + val + LineBreak); err != nil {
+                                        return 0, err
+                                }
                         }
                 }