Skip to content
This repository has been archived by the owner on Nov 8, 2022. It is now read-only.

Commit

Permalink
Update config policy rules in plugin examples
Browse files Browse the repository at this point in the history
This concern only 3 plugins that use the new Go library. It's an
update after this PR got merged
intelsdi-x/snap-plugin-lib-go#31
  • Loading branch information
kindermoumoute committed Sep 30, 2016
1 parent e9d9821 commit 5908fc7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 24 deletions.
2 changes: 1 addition & 1 deletion glide.lock

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

12 changes: 3 additions & 9 deletions plugin/collector/snap-plugin-collector-mock2-grpc/mock/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,14 @@ func (f *Mock) GetMetricTypes(cfg plugin.Config) ([]plugin.Metric, error) {
func (f *Mock) GetConfigPolicy() (plugin.ConfigPolicy, error) {
p := plugin.NewConfigPolicy()

rule1, err := plugin.NewStringRule("name", false, plugin.SetDefaultString("bob"))
err := p.AddNewStringRule([]string{"intel", "mock", "foo"}, "name", false, plugin.SetDefaultString("bob"))
if err != nil {
return *p, err
}

rule2, err := plugin.NewStringRule("password", true)
if err != nil {
return *p, err
}

p.AddStringRule([]string{"intel", "mock", "foo"}, rule1)
p.AddStringRule([]string{"intel", "mock", "foo"}, rule2)
err = p.AddNewStringRule([]string{"intel", "mock", "foo"}, "password", true)

return *p, nil
return *p, err
}

// contains reports whether a given item is found in a slice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,7 @@ type passthruProcessor struct{}

func (p *passthruProcessor) GetConfigPolicy() (plugin.ConfigPolicy, error) {
policy := plugin.NewConfigPolicy()
rule, err := plugin.NewBoolRule(debug, false)
if err != nil {
return *policy, err
}
policy.AddBoolRule([]string{""}, rule)
return *policy, nil
return *policy, policy.AddNewBoolRule([]string{""}, debug, false)
}

func (p *passthruProcessor) Process(metrics []plugin.Metric, config plugin.Config) ([]plugin.Metric, error) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,15 @@ func (f *filePublisher) Publish(metrics []plugin.Metric, config plugin.Config) e

func (f *filePublisher) GetConfigPolicy() (plugin.ConfigPolicy, error) {
policy := plugin.NewConfigPolicy()
rule1, err := plugin.NewStringRule("file", true)
if err != nil {
return *policy, err
}

rule2, err := plugin.NewBoolRule(debug, false)
err := policy.AddNewStringRule([]string{""}, "file", true)
if err != nil {
return *policy, err
}

policy.AddStringRule([]string{""}, rule1)
policy.AddBoolRule([]string{}, rule2)
err = policy.AddNewBoolRule([]string{}, debug, false)

return *policy, nil
return *policy, err
}

// formatMetricTagsAsString returns metric's tags as a string in the following format tagKey:tagValue where the next tags are separated by semicolon
Expand Down

0 comments on commit 5908fc7

Please sign in to comment.