From 8243ac39c235278800db564fac911fb3987bf031 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Sun, 24 Sep 2017 12:25:52 +0900
Subject: [PATCH] fix parameter format

---
 pkg/tsdb/cloudwatch/cloudwatch.go                   |  2 +-
 .../app/plugins/datasource/cloudwatch/datasource.js | 12 +++++-------
 .../datasource/cloudwatch/specs/datasource_specs.ts | 13 ++++++-------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkg/tsdb/cloudwatch/cloudwatch.go b/pkg/tsdb/cloudwatch/cloudwatch.go
index 08f62c691e7..1890e538d4a 100644
--- a/pkg/tsdb/cloudwatch/cloudwatch.go
+++ b/pkg/tsdb/cloudwatch/cloudwatch.go
@@ -87,7 +87,7 @@ func (e *CloudWatchExecutor) executeTimeSeriesQuery(ctx context.Context, queryCo
 		}
 		currentlyExecuting++
 		go func(refId string, index int) {
-			queryRes, err := e.executeQuery(ctx, queryContext.Queries[index].Model.Get("parameters"), queryContext)
+			queryRes, err := e.executeQuery(ctx, queryContext.Queries[index].Model, queryContext)
 			currentlyExecuting--
 			if err != nil {
 				errCh <- err
diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index 52074cf9a8c..370f1f971d5 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -48,14 +48,13 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
         item.dimensions = dimensions;
         item.period = self.getPeriod(item, options);
 
-        return {
+        return _.extend({
           refId: item.refId,
           intervalMs: options.intervalMs,
           maxDataPoints: options.maxDataPoints,
           datasourceId: self.instanceSettings.id,
           type: 'timeSeriesQuery',
-          parameters: item
-        };
+        }, item);
       });
 
       // No valid targets, return the empty result to save a round trip.
@@ -147,15 +146,14 @@ function (angular, _, moment, dateMath, kbn, templatingVariable, CloudWatchAnnot
         from: range.from,
         to: range.to,
         queries: [
-          {
+          _.extend({
             refId: 'metricFindQuery',
             intervalMs: 1, // dummy
             maxDataPoints: 1, // dummy
             datasourceId: this.instanceSettings.id,
             type: 'metricFindQuery',
-            subtype: subtype,
-            parameters: parameters
-          }
+            subtype: subtype
+          }, parameters)
         ]
       }).then(function (r) { return transformSuggestDataFromTable(r); });
     };
diff --git a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
index 15eafadbb8f..8642cc871f6 100644
--- a/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
+++ b/public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts
@@ -1,4 +1,3 @@
-
 import "../datasource";
 import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
 import helpers from 'test/specs/helpers';
@@ -76,11 +75,11 @@ describe('CloudWatchDatasource', function() {
     it('should generate the correct query', function(done) {
       ctx.ds.query(query).then(function() {
         var params = requestParams.queries[0];
-        expect(params.parameters.namespace).to.be(query.targets[0].namespace);
-        expect(params.parameters.metricName).to.be(query.targets[0].metricName);
-        expect(params.parameters.dimensions['InstanceId']).to.be('i-12345678');
-        expect(params.parameters.statistics).to.eql(query.targets[0].statistics);
-        expect(params.parameters.period).to.be(query.targets[0].period);
+        expect(params.namespace).to.be(query.targets[0].namespace);
+        expect(params.metricName).to.be(query.targets[0].metricName);
+        expect(params.dimensions['InstanceId']).to.be('i-12345678');
+        expect(params.statistics).to.eql(query.targets[0].statistics);
+        expect(params.period).to.be(query.targets[0].period);
         done();
       });
       ctx.$rootScope.$apply();
@@ -110,7 +109,7 @@ describe('CloudWatchDatasource', function() {
 
       ctx.ds.query(query).then(function() {
         var params = requestParams.queries[0];
-        expect(params.parameters.period).to.be(600);
+        expect(params.period).to.be(600);
         done();
       });
       ctx.$rootScope.$apply();