feat(cloudwatch): code refactoring and cleanup, trying to rewrite so the code uses promises instead of ccallbacks, #684

public/app/plugins/datasource/cloudwatch/datasource.js

@@ -2,7 +2,7 @@ define([
   'angular',
   'lodash',
   'moment',
-  './queryCtrl',
+  './query_ctrl',
   './directives',
 ],
 function (angular, _) {
@@ -278,37 +278,28 @@ function (angular, _) {
         Period: query.period
       };
 
-      var d = $q.defer();
+      return cloudwatch.getMetricStatistics(params);
-      cloudwatch.getMetricStatistics(params, function(err, data) {
-        if (err) {
-          return d.reject(err);
-        }
-        return d.resolve(data);
-      });
-
-      return d.promise;
     };
 
-    CloudWatchDatasource.prototype.performSuggestRegion = function() {
+    CloudWatchDatasource.prototype.getRegions = function() {
-      return this.supportedRegion;
+      return $q.when(this.supportedRegion);
     };
 
-    CloudWatchDatasource.prototype.performSuggestNamespace = function() {
+    CloudWatchDatasource.prototype.getNamespaces = function() {
-      console.log(this.supportMetrics);
+      return $q.when(_.keys(this.supportedMetrics));
-      return _.keys(this.supportedMetrics);
     };
 
-    CloudWatchDatasource.prototype.performSuggestMetrics = function(namespace) {
+    CloudWatchDatasource.prototype.getMetrics = function(namespace) {
       namespace = templateSrv.replace(namespace);
-      return this.supportedMetrics[namespace] || [];
+      return $q.when(this.supportedMetrics[namespace] || []);
     };
 
-    CloudWatchDatasource.prototype.performSuggestDimensionKeys = function(namespace) {
+    CloudWatchDatasource.prototype.getDimensionKeys = function(namespace) {
       namespace = templateSrv.replace(namespace);
-      return this.supportedDimensions[namespace] || [];
+      return $q.when(this.supportedDimensions[namespace] || []);
     };
 
-    CloudWatchDatasource.prototype.performSuggestDimensionValues = function(region, namespace, metricName, dimensions) {
+    CloudWatchDatasource.prototype.getDimensionValues = function(region, namespace, metricName, dimensions) {
       region = templateSrv.replace(region);
       namespace = templateSrv.replace(namespace);
       metricName = templateSrv.replace(metricName);
@@ -323,26 +314,15 @@ function (angular, _) {
         params.Dimensions = convertDimensionFormat(dimensions);
       }
 
-      var d = $q.defer();
+      return cloudwatch.listMetrics(params).then(function(data) {
-
+        var suggestData = _.chain(data.Metrics).map(function(metric) {
-      cloudwatch.listMetrics(params, function(err, data) {
-        if (err) {
-          return d.reject(err);
-        }
-
-        var suggestData = _.chain(data.Metrics)
-        .map(function(metric) {
           return metric.Dimensions;
-        })
+        }).reject(function(metric) {
-        .reject(function(metric) {
           return _.isEmpty(metric);
-        })
+        }).value();
-        .value();
 
-        return d.resolve(suggestData);
+        return suggestData;
       });
-
-      return d.promise;
     };
 
     CloudWatchDatasource.prototype.performEC2DescribeInstances = function(region, filters, instanceIds) {
@@ -356,26 +336,7 @@ function (angular, _) {
         params.InstanceIds = instanceIds;
       }
 
-      var d = $q.defer();
+      return ec2.describeInstances(params);
-
-      ec2.describeInstances(params, function(err, data) {
-        if (err) {
-          return d.reject(err);
-        }
-
-        return d.resolve(data);
-      });
-
-      return d.promise;
-    };
-
-    CloudWatchDatasource.prototype.getTemplateVariableNames = function() {
-      var variables = [];
-      templateSrv.fillVariableValuesForUrl(variables);
-
-      return _.map(_.keys(variables), function(k) {
-        return k.replace(/var-/, '$');
-      });
     };
 
     CloudWatchDatasource.prototype.metricFindQuery = function(query) {
@@ -389,32 +350,26 @@ function (angular, _) {
         });
       };
 
-      var d = $q.defer();
-
       var regionQuery = query.match(/^region\(\)/);
       if (regionQuery) {
-        d.resolve(transformSuggestData(this.performSuggestRegion()));
+        return this.getRegions().then(transformSuggestData);
-        return d.promise;
       }
 
       var namespaceQuery = query.match(/^namespace\(\)/);
       if (namespaceQuery) {
-        d.resolve(transformSuggestData(this.performSuggestNamespace()));
+        return this.getNamespaces().then(transformSuggestData);
-        return d.promise;
       }
 
       var metricNameQuery = query.match(/^metrics\(([^\)]+?)\)/);
       if (metricNameQuery) {
         namespace = templateSrv.replace(metricNameQuery[1]);
-        d.resolve(transformSuggestData(this.performSuggestMetrics(namespace)));
+        return this.getMetrics(namespace).then(transformSuggestData);
-        return d.promise;
       }
 
       var dimensionKeysQuery = query.match(/^dimension_keys\(([^\)]+?)\)/);
       if (dimensionKeysQuery) {
         namespace = templateSrv.replace(dimensionKeysQuery[1]);
-        d.resolve(transformSuggestData(this.performSuggestDimensionKeys(namespace)));
+        return this.getDimensionKeys(namespace).then(transformSuggestData);
-        return d.promise;
       }
 
       var dimensionValuesQuery = query.match(/^dimension_values\(([^,]+?),\s?([^,]+?),\s?([^,]+?)(,\s?([^)]*))?\)/);
@@ -435,7 +390,7 @@ function (angular, _) {
           });
         }
 
-        return this.performSuggestDimensionValues(region, namespace, metricName, dimensions)
+        return this.getDimensionValues(region, namespace, metricName, dimensions)
         .then(function(suggestData) {
           return _.map(suggestData, function(dimensions) {
             var result = _.chain(dimensions)
@@ -460,8 +415,7 @@ function (angular, _) {
           instanceId
         ];
 
-        return this.performEC2DescribeInstances(region, [], instanceIds)
+        return this.performEC2DescribeInstances(region, [], instanceIds).then(function(result) {
-        .then(function(result) {
           var volumeIds = _.map(result.Reservations[0].Instances[0].BlockDeviceMappings, function(mapping) {
             return mapping.EBS.VolumeID;
           });
@@ -488,7 +442,7 @@ function (angular, _) {
     CloudWatchDatasource.prototype.getAwsClient = function(region, service) {
       var self = this;
       var generateRequestProxy = function(service, action) {
-        return function(params, callback) {
+        return function(params) {
           var data = {
             region: region,
             service: service,
@@ -502,11 +456,7 @@ function (angular, _) {
             data: data
           };
 
-          $http(options).then(function(response) {
+          return $http(options);
-            callback(null, response.data);
-          }, function(err) {
-            callback(err, []);
-          });
         };
       };
 

public/app/plugins/datasource/cloudwatch/query_ctrl.js

@@ -81,31 +81,30 @@ function (angular, _) {
     };
 
     $scope.suggestDimensionKeys = function(query, callback) { // jshint unused:false
-      return _.union($scope.datasource.performSuggestDimensionKeys($scope.target.namespace), $scope.datasource.getTemplateVariableNames());
+      $scope.datasource.getDimensionKeys($scope.target.namespace).then(function(result) {
+        callback(result);
+      });
     };
 
+    // TODO: Removed template variables from the suggest
+    // add this feature back after improving the editor
     $scope.suggestDimensionValues = function(query, callback) {
       if (!$scope.target.namespace || !$scope.target.metricName) {
         return callback([]);
       }
 
-      $scope.datasource.performSuggestDimensionValues(
+      return $scope.datasource.getDimensionValues(
         $scope.target.region,
         $scope.target.namespace,
         $scope.target.metricName,
         $scope.target.dimensions
-      )
+      ).then(function(result) {
-      .then(function(result) {
         var suggestData = _.chain(result)
         .flatten(true)
-        .filter(function(dimension) {
-          return dimension.Name === templateSrv.replace($scope.target.currentDimensionKey);
-        })
         .pluck('Value')
         .uniq()
         .value();
 
-        suggestData = _.union(suggestData, $scope.datasource.getTemplateVariableNames());
         callback(suggestData);
       }, function() {
         callback([]);

public/app/plugins/datasource/cloudwatch/specs/datasource_specs.ts

@@ -55,9 +55,9 @@ describe('CloudWatchDatasource', function() {
     beforeEach(function() {
       ctx.ds.getAwsClient = function() {
         return {
-          getMetricStatistics: function(params, callback) {
+          getMetricStatistics: function(params) {
             requestParams = params;
-            callback(null, response);
+            return ctx.$q.when(response);
           }
         };
       };
@@ -89,7 +89,6 @@ describe('CloudWatchDatasource', function() {
 
   describe('When performing CloudWatch metricFindQuery', function() {
     var requestParams;
-
     var response = {
       Metrics: [
         {
@@ -108,9 +107,9 @@ describe('CloudWatchDatasource', function() {
     beforeEach(function() {
       ctx.ds.getAwsClient = function() {
         return {
-          listMetrics: function(params, callback) {
+          listMetrics: function(params) {
             requestParams = params;
-            callback(null, response);
+            return ctx.$q.when(response);
           }
         };
       };
@@ -119,8 +118,7 @@ describe('CloudWatchDatasource', function() {
     it('should return suggest list for region()', function(done) {
       var query = 'region()';
       ctx.ds.metricFindQuery(query).then(function(result) {
-        result = result.map(function(v) { return v.text; });
+        expect(result[0].text).to.contain('us-east-1');
-        expect(result).to.contain('us-east-1');
         done();
       });
       ctx.$rootScope.$apply();

tasks/options/watch.js

@@ -13,13 +13,13 @@ module.exports = function(config) {
     copy_to_gen: {
       files: ['<%= srcDir %>/**/*'],
       tasks: [
-        'jshint',
-        'jscs',
-        'tslint',
         'clean:gen',
         'copy:public_to_gen',
         'css',
         'typescript:build',
+        'jshint',
+        'jscs',
+        'tslint',
         'karma:test'
       ],
       options: {