Merge pull request #536 from palourde/per-client-subscriptions

Do not include per-client subscriptions in the subscriptions filter

uchiwa/daemon/subscriptions.go

@@ -1,6 +1,8 @@
 package daemon
 
 import (
+	"strings"
+
 	"github.com/mitchellh/mapstructure"
 	"github.com/sensu/uchiwa/uchiwa/helpers"
 	"github.com/sensu/uchiwa/uchiwa/logger"
@@ -18,6 +20,13 @@ func (d *Daemon) BuildSubscriptions() {
 		}
 
 		for _, subscription := range generic.Subscriptions {
+			// Do not add per-client subscriptions to the slice so we don't pollute
+			// the subscriptions filter in the frontend.
+			// See https://github.com/sensu/sensu-settings/pull/40.
+			if strings.HasPrefix(strings.ToLower(subscription), "client:") {
+				continue
+			}
+
 			if !helpers.IsStringInArray(subscription, d.Data.Subscriptions) {
 				d.Data.Subscriptions = append(d.Data.Subscriptions, subscription)
 			}

uchiwa/daemon/subscriptions_test.go

@@ -0,0 +1,32 @@
+package daemon
+
+import (
+	"testing"
+
+	"github.com/sensu/uchiwa/uchiwa/structs"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBuildSubscriptions(t *testing.T) {
+	// Test basic subscriptions
+	data := structs.Data{
+		Clients: []interface{}{
+			map[string]interface{}{"subscriptions": []string{"foo", "bar"}},
+			map[string]interface{}{"subscriptions": []string{"foo", "qux"}},
+		},
+	}
+	d := Daemon{Data: &data}
+	d.BuildSubscriptions()
+	assert.Equal(t, 3, len(d.Data.Subscriptions))
+
+	// Test per-client subscriptions
+	data = structs.Data{
+		Clients: []interface{}{
+			map[string]interface{}{"subscriptions": []string{"foo", "client:foobar"}},
+			map[string]interface{}{"subscriptions": []string{"CLIENT:BAZ", "qux"}},
+		},
+	}
+	d = Daemon{Data: &data}
+	d.BuildSubscriptions()
+	assert.Equal(t, 2, len(d.Data.Subscriptions))
+}