From 3d0a42cbbc58db7d0ac234cf2bc42ebd6c1f4c3e Mon Sep 17 00:00:00 2001
From: Leonardo Di Donato <leodidonato@gmail.com>
Date: Wed, 9 Jan 2019 22:01:37 +0100
Subject: [PATCH] fix(http): filtering telegraf configs only by organization ID

Signed-off-by: Leonardo Di Donato <leodidonato@gmail.com>
---
 http/telegraf.go      |  5 ++--
 http/telegraf_test.go | 58 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/http/telegraf.go b/http/telegraf.go
index 5713421cbb..1480395103 100644
--- a/http/telegraf.go
+++ b/http/telegraf.go
@@ -194,10 +194,9 @@ func (h *TelegrafHandler) handleGetTelegraf(w http.ResponseWriter, r *http.Reque
 func decodeTelegrafConfigFilter(ctx context.Context, r *http.Request) (*platform.TelegrafConfigFilter, error) {
 	f := &platform.TelegrafConfigFilter{}
 	urm, err := decodeUserResourceMappingFilter(ctx, r)
-	if err == nil {
-		return f, err
+	if err != nil {
+		f.UserResourceMappingFilter = *urm
 	}
-	f.UserResourceMappingFilter = *urm
 
 	q := r.URL.Query()
 	if orgIDStr := q.Get("orgID"); orgIDStr != "" {
diff --git a/http/telegraf_test.go b/http/telegraf_test.go
index 78731b2d31..511216feca 100644
--- a/http/telegraf_test.go
+++ b/http/telegraf_test.go
@@ -3,6 +3,7 @@ package http
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -28,6 +29,57 @@ func TestTelegrafHandler_handleGetTelegrafs(t *testing.T) {
 		r     *http.Request
 		wants wants
 	}{
+		{
+			name: "get telegraf configs by organization id",
+			r:    httptest.NewRequest("GET", "http://any.url/api/v2/telegrafs?orgID=0000000000000002", nil),
+			svc: &mock.TelegrafConfigStore{
+				FindTelegrafConfigsF: func(ctx context.Context, filter platform.TelegrafConfigFilter, opt ...platform.FindOptions) ([]*platform.TelegrafConfig, int, error) {
+					if filter.OrganizationID != nil && *filter.OrganizationID == platform.ID(2) {
+						return []*platform.TelegrafConfig{
+							&platform.TelegrafConfig{
+								ID:             platform.ID(1),
+								OrganizationID: platform.ID(2),
+								Name:           "tc1",
+								Plugins: []platform.TelegrafPlugin{
+									{
+										Config: &inputs.CPUStats{},
+									},
+								},
+							},
+						}, 1, nil
+					}
+
+					return []*platform.TelegrafConfig{}, 0, fmt.Errorf("not found")
+				},
+			},
+			wants: wants{
+				statusCode:  http.StatusOK,
+				contentType: "application/json; charset=utf-8",
+				body: `
+				{
+					"configurations":[
+					  {
+						"id":"0000000000000001",
+						"organizationID":"0000000000000002",
+						"name":"tc1",
+						"agent":{
+						  "collectionInterval":0
+						},
+						"plugins":[
+						  {
+							"name":"cpu",
+							"type":"input",
+							"comment":"",
+							"config":{
+				  
+							}
+						  }
+						]
+					  }
+					]
+				}`,
+			},
+		},
 		{
 			name: "return CPU plugin for telegraf",
 			r:    httptest.NewRequest("GET", "http://any.url/api/v2/telegrafs", nil),
@@ -102,12 +154,8 @@ func TestTelegrafHandler_handleGetTelegrafs(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			logger := zaptest.NewLogger(t)
-			mapping := mock.NewUserResourceMappingService()
-			labels := mock.NewLabelService()
-			users := mock.NewUserService()
 			w := httptest.NewRecorder()
-			h := NewTelegrafHandler(logger, mapping, labels, tt.svc, users)
+			h := NewTelegrafHandler(zaptest.NewLogger(t), mock.NewUserResourceMappingService(), mock.NewLabelService(), tt.svc, mock.NewUserService())
 			h.ServeHTTP(w, tt.r)
 
 			res := w.Result()