From 91285baea50b7a784ff9445ea08aa3a8430e2e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 2 Oct 2015 07:32:21 +0200
Subject: [PATCH] feat(cloudwatch): fixed failing unit tests

---
 public/app/plugins/datasource/cloudwatch/datasource.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/cloudwatch/datasource.js b/public/app/plugins/datasource/cloudwatch/datasource.js
index a2715489e0d..03b81ddc428 100644
--- a/public/app/plugins/datasource/cloudwatch/datasource.js
+++ b/public/app/plugins/datasource/cloudwatch/datasource.js
@@ -254,7 +254,7 @@ function (angular, _) {
         var result = [];
 
         _.each(allResponse, function(response, index) {
-          var metrics = transformMetricData(response.data, options.targets[index]);
+          var metrics = transformMetricData(response, options.targets[index]);
           result = result.concat(metrics);
         });
 
@@ -309,7 +309,7 @@ function (angular, _) {
       }
 
       return cloudwatch.listMetrics(params).then(function(result) {
-        return _.chain(result.data.Metrics).map(function(metric) {
+        return _.chain(result.Metrics).map(function(metric) {
           return metric.Dimensions;
         }).reject(function(metric) {
           return _.isEmpty(metric);
@@ -448,7 +448,9 @@ function (angular, _) {
             data: data
           };
 
-          return $http(options);
+          return $http(options).then(function(result) {
+            return result.data;
+          });
         };
       };