new api

Author: Ilya Volodarsky

History.md

@@ -1,4 +1,8 @@
 
+1.0.0 - January 7, 2015
+-------------------------
+- change the billing API per product
+
 0.0.1 - February 28, 2014
 -------------------------
 :sparkles:

Readme.md

@@ -29,14 +29,22 @@ billing(function (err, costs) {
 });
 ```
 
-The `costs` variable estimates your 30 day rolling billing costs for ec2 and non-ec2 costs:
+The `costs` variable shows the costs for the current billing period by product.
 
 ```js
-{
-    ec2: 13393,
-    nonEc2: 2493,
-    total: 15886
-}
+{ total: 4839.25,
+  start: Thu Jan 01 2015 00:00:00 GMT+0000 (UTC),
+  end: Thu Jan 08 2015 02:34:50 GMT+0000 (UTC),
+  products:
+   { 'data transfer': 432.12,
+     'elastic mapreduce': 864.43,
+     'cloudfront': 124.42,
+     'support (business)': 120.12,
+     'elasticache': 124.12,
+     'simple storage service': 172.46,
+     'redshift': 423.77,
+     'elastic compute cloud': 123.32,
+     'route 53': 454.73 } }
 ```
 
 ## License

lib/index.js index.jslib/index.js renamed to index.js

@@ -1,12 +1,10 @@
 
-var Batch = require('batch');
 var bind = require('bind');
 var csv = require('csv');
 var debug = require('debug')('aws-billing');
 var Ec2 = require('awssum-amazon-ec2').Ec2;
 var knox = require('knox');
-var once = require('once');
-var prices = require('./ec2-prices');
+var Dates = require('date-math');
 
 /**
  * Expose `AWSBilling`.
@@ -47,52 +45,28 @@ function AWSBilling (accountId, key, secret, bucket, region) {
  */
 
 AWSBilling.prototype.get = function (callback) {
-  new Batch(this.getEc2, this.getNonEc2).end(function (err, results) {
+  this.products(function (err, products) {
     if (err) return callback(err);
-    callback(null, {
-      ec2: results[0],
-      nonEc2: results[1],
-      total: results[0] + results[1]
+    var total = 0.0;
+    Object.keys(products).forEach(function (product) {
+      total += products[product];
     });
-  });
-};
-
-/**
- * Get the current cost of EC2 instances.
- *
- * @param {Function} callback
- */
-
-AWSBilling.prototype.getEc2 = function (callback) {
-  callback = once(callback); // hack: get rid of a horrible AWS sdk bug
-  var self = this;
-  debug('describing ec2 instances ..');
-  this.ec2.DescribeInstances(function(err, res) {
-    if (err) return callback(err);
-    var reservations = res.Body.DescribeInstancesResponse.reservationSet.item; // wow, wtf?
-    var instances = [];
-    reservations.forEach(function (r) {
-      var item = r.instancesSet.item;
-      if (Array.isArray(item)) instances.push.apply(instances, item);
-      else instances.push(item);
+    callback(null, {
+      total: total,
+      start: Dates.month.floor(new Date()),
+      end: new Date(),
+      products: products
     });
-    debug('described ec2 instances');
-    var cost = instances
-        .filter(function (i) { return i.instanceState.name === 'running'; })
-        .map(function (i) { return prices[i.instanceType] * 24 * 30; })
-        .reduce(function (memo, cost) { return memo + parseFloat(cost); }, 0);
-    debug('monthly ec2 cost: $%d', cost);
-    callback(null, cost);
   });
 };
 
 /**
- * Get the cost of non-EC2 AWS stuff.
+ * Get the cost of AWS products
  *
  * @param {Function} callback
  */
 
-AWSBilling.prototype.getNonEc2 = function (callback) {
+AWSBilling.prototype.products = function (callback) {
   var accountId = this.accountId.replace(/-/g, '');
   var now = new Date();
   var file = accountId + '-aws-billing-csv-' +
@@ -104,19 +78,21 @@ AWSBilling.prototype.getNonEc2 = function (callback) {
     csv()
       .from.stream(stream)
       .to.array(function (data) {
-        var productCol = data[0].indexOf('ProductCode');
+        var products = {};
+        var productCol = data[0].indexOf('ProductCode') + 1;
         var costCol = data[0].indexOf('TotalCost');
-        var cost = data
-          .filter(function (row) {
-            return row[productCol] &&
-                   row[productCol] !== 'AmazonEC2' &&
-                   !isNaN(row[costCol]);
-          })
-          .reduce(function (memo, row) { return memo + parseFloat(row[costCol]); }, 0);
-        var monthFraction = new Date().getDate() / 30;
-        var rolling30DayCost = cost / monthFraction;
-        debug('rolling 30 days non-ec2 cost: %d', rolling30DayCost);
-        callback(err, rolling30DayCost);
+        data.forEach(function (row) {
+          var product = row[productCol].toLowerCase()
+            .replace(/amazon /, '')
+            .replace(/aws /, '');
+          var cost = parseFloat(row[costCol]);
+          if (product && cost > 0) {
+            if (!products[product]) products[product] = 0;
+            products[product] += cost;
+          }
+        });
+        debug('parsed AWS product costs');
+        callback(err, products);
       });
   });
 };

lib/ec2-prices.json

@@ -1,7 +1,6 @@
 {
   "name": "aws-billing",
-  "version": "0.0.2",
-  "main": "./lib",
+  "version": "1.0.0",
   "repository": "git://github.com/segmentio/aws-billing.git",
   "license": "MIT",
   "description": "AWS billing API for node",
@@ -13,15 +12,14 @@
     "API"
   ],
   "dependencies": {
-    "bind": "git://github.com/ianstormtaylor/bind",
-    "debug": "~0.7.4",
-    "csv": "~0.3.7",
-    "knox": "~0.8.9",
-    "batch": "~0.5.0",
-    "once": "~1.3.0",
     "awssum": "~1.2.0",
     "awssum-amazon": "~1.3.0",
-    "awssum-amazon-ec2": "~1.4.0"
+    "awssum-amazon-ec2": "~1.4.0",
+    "bind": "git://github.com/ianstormtaylor/bind",
+    "csv": "~0.3.7",
+    "date-math": "0.0.1",
+    "debug": "~0.7.4",
+    "knox": "~0.8.9"
   },
   "devDependencies": {
     "mocha": "~1.17.1"