From 474506f986d5ef25cc6f25c8e42ccc1b6b87ae28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 4 Oct 2018 15:44:01 +0200 Subject: [PATCH 1/2] update github.com/elastic/go-ucfg to v0.6.3 --- vendor/github.com/elastic/go-ucfg/CHANGELOG.md | 17 ++++++++++++++++- vendor/github.com/elastic/go-ucfg/merge.go | 2 +- vendor/github.com/elastic/go-ucfg/types.go | 9 +++++---- vendor/vendor.json | 10 +++++----- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/vendor/github.com/elastic/go-ucfg/CHANGELOG.md b/vendor/github.com/elastic/go-ucfg/CHANGELOG.md index 53a0e6169d6..89b82866312 100644 --- a/vendor/github.com/elastic/go-ucfg/CHANGELOG.md +++ b/vendor/github.com/elastic/go-ucfg/CHANGELOG.md @@ -14,6 +14,19 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +## [0.6.3] + +### Changed +- Remove UUID lib and use pseudo-random IDs instead. #118 + +## [0.6.2] + +### Changed +- New UUID lib: github.com/gofrs/uuid. #116 + +### Fixed +- Fix escape character not removed from escaped string #115 + ## [0.6.1] ### Fixed @@ -202,7 +215,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Introduced CHANGELOG.md for documenting changes to ucfg. -[Unreleased]: https://github.com/elastic/go-ucfg/compare/v0.6.1...HEAD +[Unreleased]: https://github.com/elastic/go-ucfg/compare/v0.6.3...HEAD +[0.6.3]: https://github.com/elastic/go-ucfg/compare/v0.6.2...v0.6.3 +[0.6.2]: https://github.com/elastic/go-ucfg/compare/v0.6.1...v0.6.2 [0.6.1]: https://github.com/elastic/go-ucfg/compare/v0.6.0...v0.6.1 [0.6.0]: https://github.com/elastic/go-ucfg/compare/v0.5.1...v0.6.0 [0.5.1]: https://github.com/elastic/go-ucfg/compare/v0.5.0...v0.5.1 diff --git a/vendor/github.com/elastic/go-ucfg/merge.go b/vendor/github.com/elastic/go-ucfg/merge.go index d83721cb9b0..fa2dd074566 100644 --- a/vendor/github.com/elastic/go-ucfg/merge.go +++ b/vendor/github.com/elastic/go-ucfg/merge.go @@ -508,7 +508,7 @@ func normalizeString(ctx context, opts *options, str string) (value, Error) { switch p := varexp.(type) { case constExp: - return newString(ctx, opts.meta, str), nil + return newString(ctx, opts.meta, string(p)), nil case *reference: return newRef(ctx, opts.meta, p), nil } diff --git a/vendor/github.com/elastic/go-ucfg/types.go b/vendor/github.com/elastic/go-ucfg/types.go index d9eeab729e7..7ed109e7353 100644 --- a/vendor/github.com/elastic/go-ucfg/types.go +++ b/vendor/github.com/elastic/go-ucfg/types.go @@ -24,8 +24,7 @@ import ( "strconv" "strings" "sync/atomic" - - uuid "github.com/satori/go.uuid" + "time" "github.com/elastic/go-ucfg/internal/parse" ) @@ -186,8 +185,10 @@ func newSplice(ctx context, m *Meta, s varEvaler) *cfgDynamic { } func newDyn(ctx context, m *Meta, val dynValue) *cfgDynamic { - id := string(atomic.AddInt32(&spliceSeq, 1)) + uuid.NewV4().String() - return &cfgDynamic{cfgPrimitive{ctx, m}, cacheID(id), val} + seq := atomic.AddInt32(&spliceSeq, 1) + dyn := &cfgDynamic{cfgPrimitive: cfgPrimitive{ctx, m}, dyn: val} + dyn.id = cacheID(fmt.Sprintf("%8X-%4X-%p", time.Now().Unix(), seq, dyn)) + return dyn } func (p *cfgPrimitive) Context() context { return p.ctx } diff --git a/vendor/vendor.json b/vendor/vendor.json index 128bbe12385..421a821ddb5 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -678,12 +678,12 @@ "versionExact": "v0.0.3" }, { - "checksumSHA1": "MK8/w0Idj7kRBUiBabARPdm9hOo=", + "checksumSHA1": "iDwobXpQKcBspkKWlOeCUQERhu4=", "path": "github.com/elastic/go-ucfg", - "revision": "581f7b1fe9d84f4c18ef0694d6e0eb944a925dae", - "revisionTime": "2018-07-13T14:04:29Z", - "version": "v0.6.1", - "versionExact": "v0.6.1" + "revision": "089963619f26689fe29ebd5ddb97b8df9c42fc06", + "revisionTime": "2018-10-04T13:31:04Z", + "version": "v0.6.3", + "versionExact": "v0.6.3" }, { "checksumSHA1": "X+R/CD8SokJrmlxFTx2nSevRDhQ=", From 100dc76cef1c7f68a9c326737307d8dd3abde94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 4 Oct 2018 16:44:19 +0200 Subject: [PATCH 2/2] add missing notice changes --- NOTICE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index d84c831b651..33333e13f5a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -476,8 +476,8 @@ Apache License 2.0 -------------------------------------------------------------------- Dependency: github.com/elastic/go-ucfg -Version: v0.6.1 -Revision: 581f7b1fe9d84f4c18ef0694d6e0eb944a925dae +Version: v0.6.3 +Revision: 089963619f26689fe29ebd5ddb97b8df9c42fc06 License type (autodetected): Apache-2.0 ./vendor/github.com/elastic/go-ucfg/LICENSE: --------------------------------------------------------------------