luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Update go-envparse to allow dots in env vars

Browse source 
Includes hashicorp/go-envparse#2
This commit is contained in:
Michael Schurter 2018-01-22 14:02:39 -08:00
parent 0f782acfda
commit 2fb69d33c4
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
vendor/github.com/hashicorp/go-envparse/envparse.go generated vendored
View file

@ -5,7 +5,7 @@
// //
// KEY=value // KEY=value
// //
// While extraneous characters are discouraged, an "export" prefix, preceeding // While extraneous characters are discouraged, an "export" prefix, preceding
// whitespace, and trailing whitespace are all removed: // whitespace, and trailing whitespace are all removed:
// //
// KEY = This is ok! # Parses to {"KEY": "This is ok!"} // KEY = This is ok! # Parses to {"KEY": "This is ok!"}
@ -135,11 +135,12 @@ func parseLine(ln []byte) ([]byte, []byte, error) {
for _, v := range key[1:] { for _, v := range key[1:] {
switch { switch {
case v == '_': case v == '_':
case v == '.':
case v >= 'A' && v <= 'Z': case v >= 'A' && v <= 'Z':
case v >= 'a' && v <= 'z': case v >= 'a' && v <= 'z':
case v >= '0' && v <= '9': case v >= '0' && v <= '9':
default: default:
return nil, nil, fmt.Errorf("key characters must be [A-Za-z0-9_] but found %q", v) return nil, nil, fmt.Errorf("key characters must be [A-Za-z0-9_.] but found %q", v)
} }
} }
@ -152,7 +153,7 @@ func parseLine(ln []byte) ([]byte, []byte, error) {
// Scratch buffer for unescaped value // Scratch buffer for unescaped value
newv := make([]byte, len(value)) newv := make([]byte, len(value))
newi := 0 newi := 0
// Track last significant character for trimming unquoted whitespace preceeding a trailing comment // Track last significant character for trimming unquoted whitespace preceding a trailing comment
lastSig := 0 lastSig := 0
// Parser State // Parser State

2
vendor/vendor.json vendored
View file

@ -134,7 +134,7 @@
{"path":"github.com/hashicorp/errwrap","revision":"7554cd9344cec97297fa6649b055a8c98c2a1e55"}, {"path":"github.com/hashicorp/errwrap","revision":"7554cd9344cec97297fa6649b055a8c98c2a1e55"},
{"path":"github.com/hashicorp/go-checkpoint","checksumSHA1":"D267IUMW2rcb+vNe3QU+xhfSrgY=","revision":"1545e56e46dec3bba264e41fde2c1e2aa65b5dd4","revisionTime":"2017-10-09T17:35:28Z"}, {"path":"github.com/hashicorp/go-checkpoint","checksumSHA1":"D267IUMW2rcb+vNe3QU+xhfSrgY=","revision":"1545e56e46dec3bba264e41fde2c1e2aa65b5dd4","revisionTime":"2017-10-09T17:35:28Z"},
{"path":"github.com/hashicorp/go-cleanhttp","checksumSHA1":"6ihdHMkDfFx/rJ1A36com2F6bQk=","revision":"a45970658e51fea2c41445ff0f7e07106d007617","revisionTime":"2017-02-11T00:33:01Z"}, {"path":"github.com/hashicorp/go-cleanhttp","checksumSHA1":"6ihdHMkDfFx/rJ1A36com2F6bQk=","revision":"a45970658e51fea2c41445ff0f7e07106d007617","revisionTime":"2017-02-11T00:33:01Z"},
{"path":"github.com/hashicorp/go-envparse","checksumSHA1":"mB5JzxaVCPIvbwADY0acdnkhmT8=","revision":"7953113a2936d8e5f7e2a0a3dd8089565c39ef21","revisionTime":"2017-06-02T22:43:19Z"}, {"path":"github.com/hashicorp/go-envparse","checksumSHA1":"FKmqR4DC3nCXtnT9pe02z5CLNWo=","revision":"310ca1881b22af3522e3a8638c0b426629886196","revisionTime":"2018-01-19T21:58:41Z"},
{"path":"github.com/hashicorp/go-getter","checksumSHA1":"wCKbbnwvVEoKAE5TWunloLhErm4=","revision":"994f50a6f071b07cfbea9eca9618c9674091ca51","revisionTime":"2017-12-04T19:28:26Z"}, {"path":"github.com/hashicorp/go-getter","checksumSHA1":"wCKbbnwvVEoKAE5TWunloLhErm4=","revision":"994f50a6f071b07cfbea9eca9618c9674091ca51","revisionTime":"2017-12-04T19:28:26Z"},
{"path":"github.com/hashicorp/go-getter/helper/url","checksumSHA1":"9J+kDr29yDrwsdu2ULzewmqGjpA=","revision":"994f50a6f071b07cfbea9eca9618c9674091ca51","revisionTime":"2017-12-04T19:28:26Z"}, {"path":"github.com/hashicorp/go-getter/helper/url","checksumSHA1":"9J+kDr29yDrwsdu2ULzewmqGjpA=","revision":"994f50a6f071b07cfbea9eca9618c9674091ca51","revisionTime":"2017-12-04T19:28:26Z"},
{"path":"github.com/hashicorp/go-hclog","checksumSHA1":"miVF4/7JP0lRwZvFJGKwZWk7aAQ=","revision":"b4e5765d1e5f00a0550911084f45f8214b5b83b9","revisionTime":"2017-07-16T17:45:23Z"}, {"path":"github.com/hashicorp/go-hclog","checksumSHA1":"miVF4/7JP0lRwZvFJGKwZWk7aAQ=","revision":"b4e5765d1e5f00a0550911084f45f8214b5b83b9","revisionTime":"2017-07-16T17:45:23Z"},