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

Commit 8ad971e

Browse files
kindermoumoutekindermoumoute
committed
Add an arbitrary separator for plugin keys
This separator is arbitrary enough to be unused in a plugin name. 🐢
1 parent dda8bab commit 8ad971e

File tree

12 files changed

+67
-58
lines changed

12 files changed

+67
-58
lines changed

‎control/available_plugin.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func newAvailablePlugin(resp plugin.Response, emitter gomit.Emitter, ep executab
9494
lastHitTime: time.Now(),
9595
ePlugin: ep,
9696
}
97-
ap.key = fmt.Sprintf("%s:%s:%d", ap.pluginType.String(), ap.name, ap.version)
97+
ap.key = fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", ap.pluginType.String(), ap.name, ap.version)
9898

9999
listenURL := fmt.Sprintf("http://%v/rpc", resp.ListenAddress)
100100
// Create RPC Client
@@ -327,7 +327,7 @@ func (ap *availablePlugins) insert(pl *availablePlugin) error {
327327
ap.Lock()
328328
defer ap.Unlock()
329329

330-
key := fmt.Sprintf("%s:%s:%d", pl.TypeName(), pl.name, pl.version)
330+
key := fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", pl.TypeName(), pl.name, pl.version)
331331
_, exists := ap.table[key]
332332
if !exists {
333333
p, err := strategy.NewPool(key, pl)
@@ -348,7 +348,7 @@ func (ap *availablePlugins) getPool(key string) (strategy.Pool, serror.SnapError
348348
defer ap.RUnlock()
349349
pool, ok := ap.table[key]
350350
if !ok {
351-
tnv := strings.Split(key, ":")
351+
tnv := strings.Split(key, core.Separator)
352352
if len(tnv) != 3 {
353353
return nil, serror.New(ErrBadKey, map[string]interface{}{
354354
"key": key,
@@ -441,7 +441,7 @@ func (ap *availablePlugins) collectMetrics(pluginKey string, metricTypes []core.
441441

442442
func (ap *availablePlugins) publishMetrics(metrics []core.Metric, pluginName string, pluginVersion int, config map[string]ctypes.ConfigValue, taskID string) []error {
443443
var errs []error
444-
key := strings.Join([]string{plugin.PublisherPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, ":")
444+
key := strings.Join([]string{plugin.PublisherPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, core.Separator)
445445
pool, serr := ap.getPool(key)
446446
if serr != nil {
447447
errs = append(errs, serr)
@@ -476,7 +476,7 @@ func (ap *availablePlugins) publishMetrics(metrics []core.Metric, pluginName str
476476

477477
func (ap *availablePlugins) processMetrics(metrics []core.Metric, pluginName string, pluginVersion int, config map[string]ctypes.ConfigValue, taskID string) ([]core.Metric, []error) {
478478
var errs []error
479-
key := strings.Join([]string{plugin.ProcessorPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, ":")
479+
key := strings.Join([]string{plugin.ProcessorPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, core.Separator)
480480
pool, serr := ap.getPool(key)
481481
if serr != nil {
482482
errs = append(errs, serr)
@@ -512,15 +512,15 @@ func (ap *availablePlugins) findLatestPool(pType, name string) (strategy.Pool, s
512512
// see if there exists a pool at all which matches name version.
513513
var latest strategy.Pool
514514
for key, pool := range ap.table {
515-
tnv := strings.Split(key, ":")
515+
tnv := strings.Split(key, core.Separator)
516516
if tnv[0] == pType && tnv[1] == name {
517517
latest = pool
518518
break
519519
}
520520
}
521521
if latest != nil {
522522
for key, pool := range ap.table {
523-
tnv := strings.Split(key, ":")
523+
tnv := strings.Split(key, core.Separator)
524524
if tnv[0] == pType && tnv[1] == name && pool.Version() > latest.Version() {
525525
latest = pool
526526
}

‎control/available_plugin_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828

2929
"github.com/intelsdi-x/snap/control/fixtures"
3030
"github.com/intelsdi-x/snap/control/plugin"
31+
"github.com/intelsdi-x/snap/core"
3132
. "github.com/smartystreets/goconvey/convey"
3233
)
3334

@@ -84,7 +85,7 @@ func TestAvailablePlugins(t *testing.T) {
8485
err := aps.insert(ap)
8586
So(err, ShouldBeNil)
8687

87-
pool, err := aps.getPool("collector:test:1")
88+
pool, err := aps.getPool("collector" + core.Separator + "test" + core.Separator + "1")
8889
So(err, ShouldBeNil)
8990
nap, ok := pool.Plugins()[ap.id]
9091
So(ok, ShouldBeTrue)

‎control/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ func (p *pluginConfig) deletePluginConfigDataNodeField(pluginType core.PluginTyp
433433

434434
func (p *pluginConfig) getPluginConfigDataNode(pluginType core.PluginType, name string, ver int) *cdata.ConfigDataNode {
435435
// check cache
436-
key := fmt.Sprintf("%d:%s:%d", pluginType, name, ver)
436+
key := fmt.Sprintf("%d"+core.Separator+"%s"+core.Separator+"%d", pluginType, name, ver)
437437
if res, ok := p.pluginCache[key]; ok {
438438
return res
439439
}

‎control/control_test.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ func TestMetricConfig(t *testing.T) {
812812
So(errs, ShouldBeNil)
813813
})
814814
Convey("So mock should have name: bob config from defaults", func() {
815-
So(c.Config.Plugins.pluginCache["0:mock:1"].Table()["name"], ShouldResemble, ctypes.ConfigValueStr{Value: "bob"})
815+
So(c.Config.Plugins.pluginCache["0"+core.Separator+"mock"+core.Separator+"1"].Table()["name"], ShouldResemble, ctypes.ConfigValueStr{Value: "bob"})
816816
})
817817

818818
c.Stop()
@@ -892,10 +892,10 @@ func TestRoutingCachingStrategy(t *testing.T) {
892892
cdt.Add([]string{"intel", "mock"}, node)
893893

894894
Convey("Start the plugins", func() {
895-
lp, err := c.pluginManager.get("collector:mock:2")
895+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
896896
So(err, ShouldBeNil)
897897
So(lp, ShouldNotBeNil)
898-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
898+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
899899
So(errp, ShouldBeNil)
900900
So(pool, ShouldNotBeNil)
901901
tasks := []string{
@@ -964,10 +964,10 @@ func TestRoutingCachingStrategy(t *testing.T) {
964964
cdt.Add([]string{"intel", "mock"}, node)
965965

966966
Convey("Start the plugins", func() {
967-
lp, err := c.pluginManager.get("collector:mock:1")
967+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
968968
So(err, ShouldBeNil)
969969
So(lp, ShouldNotBeNil)
970-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
970+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
971971
time.Sleep(1 * time.Second)
972972
So(errp, ShouldBeNil)
973973
So(pool, ShouldNotBeNil)
@@ -1055,10 +1055,10 @@ func TestCollectDynamicMetrics(t *testing.T) {
10551055
cdt := cdata.NewTree()
10561056

10571057
Convey("collects metrics from plugin using native client", func() {
1058-
lp, err := c.pluginManager.get("collector:mock:2")
1058+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
10591059
So(err, ShouldBeNil)
10601060
So(lp, ShouldNotBeNil)
1061-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1061+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
10621062
So(errp, ShouldBeNil)
10631063
So(pool, ShouldNotBeNil)
10641064
taskID := uuid.New()
@@ -1149,12 +1149,12 @@ func TestFailedPlugin(t *testing.T) {
11491149
So(serrs, ShouldBeNil)
11501150

11511151
// retrieve loaded plugin
1152-
lp, err := c.pluginManager.get("collector:mock:2")
1152+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
11531153
So(err, ShouldBeNil)
11541154
So(lp, ShouldNotBeNil)
11551155

11561156
Convey("create a pool, add subscriptions and start plugins", func() {
1157-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1157+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
11581158
So(errp, ShouldBeNil)
11591159
Convey("collect metrics against a plugin that will panic", func() {
11601160
So(pool.Count(), ShouldEqual, 1)
@@ -1230,7 +1230,7 @@ func TestCollectMetrics(t *testing.T) {
12301230
}
12311231

12321232
// retrieve loaded plugin
1233-
lp, err := c.pluginManager.get("collector:mock:1")
1233+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
12341234
So(err, ShouldBeNil)
12351235
So(lp, ShouldNotBeNil)
12361236

@@ -1250,7 +1250,7 @@ func TestCollectMetrics(t *testing.T) {
12501250
serrs = c.SubscribeDeps(taskNonHit, r, []core.SubscribedPlugin{subscribedPlugin{typeName: "collector", name: "mock", version: 1}}, cdt)
12511251
So(serrs, ShouldBeNil)
12521252

1253-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1253+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
12541254
So(errp, ShouldBeNil)
12551255

12561256
Convey("collect metrics", func() {
@@ -1298,7 +1298,7 @@ func TestPublishMetrics(t *testing.T) {
12981298
So(err, ShouldBeNil)
12991299
<-lpe.done
13001300
So(len(c.pluginManager.all()), ShouldEqual, 1)
1301-
lp, err2 := c.pluginManager.get("publisher:mock-file:3")
1301+
lp, err2 := c.pluginManager.get("publisher" + core.Separator + "mock-file" + core.Separator + "3")
13021302
So(err2, ShouldBeNil)
13031303
So(lp.Name(), ShouldResemble, "mock-file")
13041304
So(lp.ConfigPolicy, ShouldNotBeNil)
@@ -1345,7 +1345,7 @@ func TestProcessMetrics(t *testing.T) {
13451345
So(err, ShouldBeNil)
13461346
<-lpe.done
13471347
So(len(c.pluginManager.all()), ShouldEqual, 1)
1348-
lp, err2 := c.pluginManager.get("processor:passthru:1")
1348+
lp, err2 := c.pluginManager.get("processor" + core.Separator + "passthru" + core.Separator + "1")
13491349
So(err2, ShouldBeNil)
13501350
So(lp.Name(), ShouldResemble, "passthru")
13511351
So(lp.ConfigPolicy, ShouldNotBeNil)
@@ -1427,7 +1427,7 @@ func TestMetricSubscriptionToNewVersion(t *testing.T) {
14271427
<-lpe.load
14281428
So(err, ShouldBeNil)
14291429
So(len(c.pluginManager.all()), ShouldEqual, 1)
1430-
lp, err2 := c.pluginManager.get("collector:mock:1")
1430+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
14311431
So(err2, ShouldBeNil)
14321432
So(lp.Name(), ShouldResemble, "mock")
14331433
//Subscribe deps to create pools.
@@ -1464,11 +1464,11 @@ func TestMetricSubscriptionToNewVersion(t *testing.T) {
14641464
So(false, ShouldEqual, true)
14651465
}
14661466

1467-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1467+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
14681468
So(errp, ShouldBeNil)
14691469
So(pool1.SubscriptionCount(), ShouldEqual, 0)
14701470

1471-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1471+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
14721472
So(errp, ShouldBeNil)
14731473
So(pool2.SubscriptionCount(), ShouldEqual, 1)
14741474

@@ -1493,7 +1493,7 @@ func TestMetricSubscriptionToOlderVersion(t *testing.T) {
14931493
<-lpe.load
14941494
So(err, ShouldBeNil)
14951495
So(len(c.pluginManager.all()), ShouldEqual, 1)
1496-
lp, err2 := c.pluginManager.get("collector:mock:2")
1496+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
14971497
So(err2, ShouldBeNil)
14981498
So(lp.Name(), ShouldResemble, "mock")
14991499
requestedMetric := fixtures.NewMockRequestedMetric(
@@ -1539,11 +1539,11 @@ func TestMetricSubscriptionToOlderVersion(t *testing.T) {
15391539
var pool1 strategy.Pool
15401540
var errp error
15411541
ap := c.pluginRunner.AvailablePlugins()
1542-
pool1, errp = ap.getOrCreatePool("collector:mock:2")
1542+
pool1, errp = ap.getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
15431543
So(errp, ShouldBeNil)
15441544
So(pool1.SubscriptionCount(), ShouldEqual, 0)
15451545

1546-
pool2, errp := ap.getOrCreatePool("collector:mock:1")
1546+
pool2, errp := ap.getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
15471547
So(errp, ShouldBeNil)
15481548
So(pool2.SubscriptionCount(), ShouldEqual, 1)
15491549

@@ -1570,7 +1570,7 @@ func TestDynamicMetricSubscriptionLoad(t *testing.T) {
15701570
_, err := load(c, path.Join(fixtures.SnapPath, "plugin", "snap-plugin-collector-mock1"))
15711571
So(err, ShouldBeNil)
15721572
So(len(c.pluginManager.all()), ShouldEqual, 1)
1573-
lp, err2 := c.pluginManager.get("collector:mock:1")
1573+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
15741574
So(err2, ShouldBeNil)
15751575
So(lp.Name(), ShouldResemble, "mock")
15761576
//Subscribe deps to create pools.
@@ -1599,11 +1599,11 @@ func TestDynamicMetricSubscriptionLoad(t *testing.T) {
15991599
<-lpe.load // wait for load event
16001600
<-lpe.sub // wait for subscription event
16011601

1602-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1602+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
16031603
So(errp, ShouldBeNil)
16041604
So(pool1.SubscriptionCount(), ShouldEqual, 1)
16051605

1606-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:anothermock:1")
1606+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "anothermock" + core.Separator + "1")
16071607
So(errp, ShouldBeNil)
16081608
So(pool2.SubscriptionCount(), ShouldEqual, 1)
16091609

@@ -1627,10 +1627,10 @@ func TestDynamicMetricSubscriptionUnload(t *testing.T) {
16271627
_, err = load(c, path.Join(fixtures.SnapPath, "plugin", "snap-plugin-collector-anothermock1"))
16281628
So(err, ShouldBeNil)
16291629
So(len(c.pluginManager.all()), ShouldEqual, 2)
1630-
lpMock, err2 := c.pluginManager.get("collector:mock:1")
1630+
lpMock, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
16311631
So(err2, ShouldBeNil)
16321632
So(lpMock.Name(), ShouldResemble, "mock")
1633-
lpAMock, err3 := c.pluginManager.get("collector:anothermock:1")
1633+
lpAMock, err3 := c.pluginManager.get("collector" + core.Separator + "anothermock" + core.Separator + "1")
16341634
So(err3, ShouldBeNil)
16351635
So(lpAMock.Name(), ShouldResemble, "anothermock")
16361636

@@ -1665,15 +1665,15 @@ func TestDynamicMetricSubscriptionUnload(t *testing.T) {
16651665
So(errs, ShouldBeNil)
16661666
So(len(mts1), ShouldBeGreaterThan, 1)
16671667
Convey("Unloading mock plugin should remove its subscriptions", func() {
1668-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1668+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
16691669
So(errp, ShouldBeNil)
16701670
So(pool1.SubscriptionCount(), ShouldEqual, 1)
16711671
_, err = c.Unload(lpMock)
16721672
So(err, ShouldBeNil)
16731673
<-lpe.unsub
16741674
<-lpe.sub
16751675
So(pool1.SubscriptionCount(), ShouldEqual, 0)
1676-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:anothermock:1")
1676+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "anothermock" + core.Separator + "1")
16771677
So(errp, ShouldBeNil)
16781678
So(pool2.SubscriptionCount(), ShouldEqual, 1)
16791679
mts2, errs := c.CollectMetrics("testTaskID", nil)
@@ -1703,7 +1703,7 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17031703
_, err := load(c, path.Join(fixtures.SnapPath, "plugin", "snap-plugin-collector-mock1"))
17041704
So(err, ShouldBeNil)
17051705
So(len(c.pluginManager.all()), ShouldEqual, 1)
1706-
lp, err2 := c.pluginManager.get("collector:mock:1")
1706+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
17071707
So(err2, ShouldBeNil)
17081708
So(lp.Name(), ShouldResemble, "mock")
17091709
//Subscribe deps to create pools.
@@ -1719,7 +1719,7 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17191719
<-lpe.load // wait for load event
17201720
<-lpe.sub // wait for subscription event
17211721
So(serr, ShouldBeNil)
1722-
lpMock, err2 := c.pluginManager.get("collector:mock:1")
1722+
lpMock, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
17231723
So(err2, ShouldBeNil)
17241724
So(lpMock.Name(), ShouldResemble, "mock")
17251725
// collect metrics as a sanity check that everything is setup correctly
@@ -1747,11 +1747,11 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17471747
<-lpe.load // wait for load event
17481748
<-lpe.sub // wait for subscription event
17491749

1750-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1750+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
17511751
So(errp, ShouldBeNil)
17521752
So(pool1.SubscriptionCount(), ShouldEqual, 1)
17531753

1754-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1754+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
17551755
So(errp, ShouldBeNil)
17561756
So(pool2.SubscriptionCount(), ShouldEqual, 1)
17571757

@@ -1778,11 +1778,11 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17781778
So(err, ShouldBeNil)
17791779
<-lpe.unsub
17801780

1781-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1781+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
17821782
So(errp, ShouldBeNil)
17831783
So(pool1.SubscriptionCount(), ShouldEqual, 0)
17841784

1785-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1785+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
17861786
So(errp, ShouldBeNil)
17871787
So(pool2.SubscriptionCount(), ShouldEqual, 1)
17881788

‎control/plugin_manager.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (l *loadedPlugins) get(key string) (*loadedPlugin, error) {
106106

107107
lp, ok := l.table[key]
108108
if !ok {
109-
tnv := strings.Split(key, ":")
109+
tnv := strings.Split(key, core.Separator)
110110
if len(tnv) != 3 {
111111
return nil, ErrBadKey
112112
}
@@ -191,7 +191,7 @@ func (lp *loadedPlugin) PluginPath() string {
191191

192192
// Key returns plugin type, name and version
193193
func (lp *loadedPlugin) Key() string {
194-
return fmt.Sprintf("%s:%s:%d", lp.TypeName(), lp.Name(), lp.Version())
194+
return fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", lp.TypeName(), lp.Name(), lp.Version())
195195
}
196196

197197
// Version returns plugin version
@@ -496,7 +496,7 @@ func (p *pluginManager) LoadPlugin(details *pluginDetails, emitter gomit.Emitter
496496

497497
// UnloadPlugin unloads a plugin from the LoadedPlugins table
498498
func (p *pluginManager) UnloadPlugin(pl core.Plugin) (*loadedPlugin, serror.SnapError) {
499-
plugin, err := p.loadedPlugins.get(fmt.Sprintf("%s:%s:%d", pl.TypeName(), pl.Name(), pl.Version()))
499+
plugin, err := p.loadedPlugins.get(fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", pl.TypeName(), pl.Name(), pl.Version()))
500500
if err != nil {
501501
se := serror.New(ErrPluginNotFound, map[string]interface{}{
502502
"plugin-name": pl.Name(),

‎control/plugin_manager_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestLoadedPlugins(t *testing.T) {
5858
Convey("returns an error when index is out of range", func() {
5959
lp := newLoadedPlugins()
6060

61-
_, err := lp.get("not:found:1")
61+
_, err := lp.get("not" + core.Separator + "found" + core.Separator + "1")
6262
So(err, ShouldResemble, errors.New("plugin not found"))
6363

6464
})
@@ -183,7 +183,7 @@ func TestUnloadPlugin(t *testing.T) {
183183

184184
numPluginsLoaded := len(p.all())
185185
So(numPluginsLoaded, ShouldEqual, 1)
186-
lp, _ := p.get("collector:mock:2")
186+
lp, _ := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
187187
_, err = p.UnloadPlugin(lp)
188188

189189
So(err, ShouldBeNil)
@@ -196,7 +196,7 @@ func TestUnloadPlugin(t *testing.T) {
196196
p := newPluginManager()
197197
p.SetMetricCatalog(newMetricCatalog())
198198
lp, err := loadPlugin(p, fixtures.PluginPath)
199-
glp, err2 := p.get("collector:mock:2")
199+
glp, err2 := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
200200
So(err2, ShouldBeNil)
201201
glp.State = DetectedState
202202
_, err = p.UnloadPlugin(lp)
@@ -210,7 +210,7 @@ func TestUnloadPlugin(t *testing.T) {
210210
p.SetMetricCatalog(newMetricCatalog())
211211
_, err := loadPlugin(p, fixtures.PluginPath)
212212

213-
lp, err2 := p.get("collector:mock:2")
213+
lp, err2 := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
214214
So(err2, ShouldBeNil)
215215
_, err = p.UnloadPlugin(lp)
216216

0 commit comments

Comments
 (0)