Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upgrade go-ucfg to version 0.8.2 #16199

Merged
merged 5 commits into from
Feb 11, 2020
Merged

Upgrade go-ucfg to version 0.8.2 #16199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f2408c8
Upgrade go-ucfg to master, for testing before 0.8.2 release.
blakerouse Feb 7, 2020
05fe93a
Update notice.
blakerouse Feb 7, 2020
6223cbe
Fix tests.
blakerouse Feb 7, 2020
c967caa
Update to the v0.8.2 release tag and remake NOTICE.txt.
blakerouse Feb 10, 2020
7f67e7e
Improve test name.
blakerouse Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1391,8 +1391,8 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: github.com/elastic/go-ucfg
Version: v0.8.1
Revision: 093a6898c440d2e5e93abf09850068c60428b2cd
Version: v0.8.2
Revision: ab69586e10820006b250d04c98cc3b848e227808
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/go-ucfg/LICENSE:
--------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions filebeat/fileset/modules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ func TestMcfgFromConfig(t *testing.T) {
Filesets: map[string]*FilesetConfig{
"error": {
Enabled: &falseVar,
Var: map[string]interface{}{},
Input: map[string]interface{}{},
Var: nil,
Input: nil,
},
},
},
Expand All @@ -366,7 +366,7 @@ func TestMcfgFromConfig(t *testing.T) {
Var: map[string]interface{}{
"test": false,
},
Input: map[string]interface{}{},
Input: nil,
},
},
},
Expand Down
12 changes: 6 additions & 6 deletions metricbeat/mb/lightmodules_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,22 +194,22 @@ func TestNewModuleFromConfig(t *testing.T) {
"normal module": {
config: common.MapStr{"module": "foo", "metricsets": []string{"bar"}},
expectedOption: "default",
expectedQuery: QueryParams{},
expectedQuery: nil,
},
"light module": {
config: common.MapStr{"module": "service", "metricsets": []string{"metricset"}},
expectedOption: "test",
expectedQuery: QueryParams{},
expectedQuery: nil,
},
"light module default metricset": {
config: common.MapStr{"module": "service"},
expectedOption: "test",
expectedQuery: QueryParams{},
expectedQuery: nil,
},
"light module override option": {
config: common.MapStr{"module": "service", "option": "overriden"},
expectedOption: "overriden",
expectedQuery: QueryParams{},
expectedQuery: nil,
},
"light module with query": {
config: common.MapStr{"module": "service", "query": common.MapStr{"param": "foo"}},
Expand All @@ -220,7 +220,7 @@ func TestNewModuleFromConfig(t *testing.T) {
config: common.MapStr{"module": "service", "period": "42s"},
expectedOption: "test",
expectedPeriod: 42 * time.Second,
expectedQuery: QueryParams{},
expectedQuery: nil,
},
"light module is broken": {
config: common.MapStr{"module": "broken"},
Expand All @@ -237,7 +237,7 @@ func TestNewModuleFromConfig(t *testing.T) {
"mixed module with standard and light metricsets": {
config: common.MapStr{"module": "mixed", "metricsets": []string{"standard", "light"}},
expectedOption: "default",
expectedQuery: QueryParams{},
expectedQuery: nil,
},
"mixed module with unregistered and light metricsets": {
config: common.MapStr{"module": "mixedbroken", "metricsets": []string{"unregistered", "light"}},
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/mb/mb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ func TestModuleConfig(t *testing.T) {
err string
}{
{
name: "missing required field",
name: "string value is not set on required field",
in: map[string]interface{}{},
err: "missing required field accessing 'module'",
err: "string value is not set accessing 'module'",
},
{
name: "valid config",
Expand All @@ -97,7 +97,7 @@ func TestModuleConfig(t *testing.T) {
Enabled: true,
Period: time.Second * 10,
Timeout: 0,
Query: QueryParams{},
Query: nil,
},
},
{
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/prometheus/collector/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"address": "127.0.0.1:55555",
"type": "prometheus"
}
}
}
10 changes: 9 additions & 1 deletion vendor/github.com/elastic/go-ucfg/CHANGELOG.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/github.com/elastic/go-ucfg/error.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions vendor/github.com/elastic/go-ucfg/reify.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 28 additions & 6 deletions vendor/github.com/elastic/go-ucfg/validator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 35 additions & 35 deletions vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3268,76 +3268,76 @@
"versionExact": "v0.0.7"
},
{
"checksumSHA1": "a1x0prr3ix+QFOdJpNfM3Q4G6Es=",
"checksumSHA1": "VPcK6uPDligSrbdi1yVeGivPvno=",
"path": "github.com/elastic/go-ucfg",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "X+R/CD8SokJrmlxFTx2nSevRDhQ=",
"path": "github.com/elastic/go-ucfg/cfgutil",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "B58nBBiUIstpkXfr9yaYN9GzdLE=",
"path": "github.com/elastic/go-ucfg/diff",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "E6k6DWkpI+LOKDIFRqRmNH9GORc=",
"path": "github.com/elastic/go-ucfg/flag",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "NhiQQjYMs/ViCbmEq9tll2uCaYo=",
"path": "github.com/elastic/go-ucfg/hjson",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "esXpiQlEvTOUwsE0nNesso8albo=",
"path": "github.com/elastic/go-ucfg/internal/parse",
"revision": "0539807037ce820e147797f051ff32b05f4f9288",
"revisionTime": "2019-01-28T11:18:48Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "cfMNsyQm0gZOV0hRJrBSdKDQSBo=",
"path": "github.com/elastic/go-ucfg/json",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "ZISq+zzSb0OLzvwLlf1ObdgnFmM=",
"path": "github.com/elastic/go-ucfg/parse",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "cnJVnptTvXNLzxVhd266k19/pQg=",
"path": "github.com/elastic/go-ucfg/yaml",
"revision": "093a6898c440d2e5e93abf09850068c60428b2cd",
"revisionTime": "2020-01-31T13:55:22Z",
"version": "v0.8.1",
"versionExact": "v0.8.1"
"revision": "ab69586e10820006b250d04c98cc3b848e227808",
"revisionTime": "2020-02-07T21:56:35Z",
"version": "v0.8.2",
"versionExact": "v0.8.2"
},
{
"checksumSHA1": "iI1JCWsrAPpoKcEo/i6G3lRLIVs=",
Expand Down