Upgrade camshaft to 0.25.0

Use new configuration with user for nodes.
2016-07-03 10:49:45 +02:00
parent 4c557be2c2
commit 616aac9771
7 changed files with 76 additions and 63 deletions
@@ -1,9 +1,13 @@
 # Changelog

-## 2.54.1
+## 2.55.0

 Released 2016-mm-dd

+Announcements:
+ - Uses new configuration for camshaft: analysis node has an associated user/owner.
+ - Upgrades camshaft to [0.25.0](https://github.com/CartoDB/camshaft/releases/tag/0.25.0).
+

 ## 2.54.0

@@ -56,6 +56,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
            assert.ifError(err);

            var analysisConfiguration = {
+                user: user,
                db: {
                    host: params.dbhost,
                    port: params.dbport,
@@ -201,6 +202,7 @@ DataviewBackend.prototype.search = function (mapConfigProvider, user, params, ca
            assert.ifError(err);

            var analysisConfiguration = {
+                user: user,
                db: {
                    host: params.dbhost,
                    port: params.dbport,
@@ -135,6 +135,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn) {
        function prepareAdapterMapConfig(err, requestMapConfig) {
            assert.ifError(err);
            context.analysisConfiguration = {
+                user: req.context.user,
                db: {
                    host: req.params.dbhost,
                    port: req.params.dbport,
@@ -95,6 +95,7 @@ NamedMapMapConfigProvider.prototype.getMapConfig = function(callback) {
        function prepareAdapterMapConfig(err, requestMapConfig) {
            assert.ifError(err);
            context.analysisConfiguration = {
+                user: self.owner,
                db: {
                    host: rendererParams.dbhost,
                    port: rendererParams.dbport,
@@ -1,6 +1,6 @@
 {
  "name": "windshaft-cartodb",
-  "version": "2.54.1",
+  "version": "2.55.0",
  "dependencies": {
    "body-parser": {
      "version": "1.14.2",
@@ -90,7 +90,7 @@
            },
            "mime-types": {
              "version": "2.1.11",
-              "from": "mime-types@>=2.1.11 <2.2.0",
+              "from": "mime-types@>=2.1.2 <2.2.0",
              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
@@ -105,9 +105,9 @@
      }
    },
    "camshaft": {
-      "version": "0.23.0",
-      "from": "camshaft@0.23.0",
-      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.23.0.tgz",
+      "version": "0.24.0",
+      "from": "camshaft@0.24.0",
+      "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.24.0.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
@@ -584,7 +584,7 @@
          "dependencies": {
            "mime-types": {
              "version": "2.1.11",
-              "from": "mime-types@>=2.1.6 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
@@ -814,7 +814,7 @@
            },
            "mime-types": {
              "version": "2.1.11",
-              "from": "mime-types@>=2.1.6 <2.2.0",
+              "from": "mime-types@>=2.1.11 <2.2.0",
              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
              "dependencies": {
                "mime-db": {
@@ -1017,7 +1017,7 @@
          "dependencies": {
            "async": {
              "version": "1.5.2",
-              "from": "async@>=1.0.0 <2.0.0",
+              "from": "async@>=1.5.2 <2.0.0",
              "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
            }
          }
@@ -3021,26 +3021,26 @@
                      "from": "balanced-match@>=0.4.1 <0.5.0",
                      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz"
                    },
-                    "block-stream": {
-                      "version": "0.0.9",
-                      "from": "block-stream@*",
-                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
-                    },
                    "boom": {
                      "version": "2.10.1",
                      "from": "boom@>=2.0.0 <3.0.0",
                      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
                    },
-                    "caseless": {
-                      "version": "0.11.0",
-                      "from": "caseless@>=0.11.0 <0.12.0",
-                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    "block-stream": {
+                      "version": "0.0.9",
+                      "from": "block-stream@*",
+                      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
                    },
                    "brace-expansion": {
                      "version": "1.1.4",
                      "from": "brace-expansion@>=1.0.0 <2.0.0",
                      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
                    },
+                    "caseless": {
+                      "version": "0.11.0",
+                      "from": "caseless@>=0.11.0 <0.12.0",
+                      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+                    },
                    "chalk": {
                      "version": "1.1.3",
                      "from": "chalk@>=1.1.1 <2.0.0",
@@ -3101,16 +3101,16 @@
                      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
                    },
-                    "extend": {
-                      "version": "3.0.0",
-                      "from": "extend@>=3.0.0 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
-                    },
                    "extsprintf": {
                      "version": "1.0.2",
                      "from": "extsprintf@1.0.2",
                      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
                    },
+                    "extend": {
+                      "version": "3.0.0",
+                      "from": "extend@>=3.0.0 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+                    },
                    "forever-agent": {
                      "version": "0.6.1",
                      "from": "forever-agent@>=0.6.1 <0.7.0",
@@ -3306,16 +3306,16 @@
                      "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
                      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
                    },
-                    "mkdirp": {
-                      "version": "0.5.1",
-                      "from": "mkdirp@>=0.5.0 <0.6.0",
-                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-                    },
                    "minimist": {
                      "version": "0.0.8",
                      "from": "minimist@0.0.8",
                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                    },
+                    "mkdirp": {
+                      "version": "0.5.1",
+                      "from": "mkdirp@>=0.5.0 <0.6.0",
+                      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+                    },
                    "ms": {
                      "version": "0.7.1",
                      "from": "ms@0.7.1",
@@ -3326,11 +3326,6 @@
                      "from": "node-uuid@>=1.4.7 <1.5.0",
                      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
                    },
-                    "nopt": {
-                      "version": "3.0.6",
-                      "from": "nopt@>=3.0.1 <3.1.0",
-                      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-                    },
                    "npmlog": {
                      "version": "2.0.3",
                      "from": "npmlog@>=2.0.0 <2.1.0",
@@ -3341,6 +3336,11 @@
                      "from": "oauth-sign@>=0.8.1 <0.9.0",
                      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
                    },
+                    "nopt": {
+                      "version": "3.0.6",
+                      "from": "nopt@>=3.0.1 <3.1.0",
+                      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
+                    },
                    "once": {
                      "version": "1.3.3",
                      "from": "once@>=1.3.0 <2.0.0",
@@ -3451,16 +3451,16 @@
                      "from": "util-deprecate@>=1.0.1 <1.1.0",
                      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
                    },
-                    "wrappy": {
-                      "version": "1.0.1",
-                      "from": "wrappy@>=1.0.0 <2.0.0",
-                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
-                    },
                    "verror": {
                      "version": "1.3.6",
                      "from": "verror@1.3.6",
                      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
                    },
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    },
                    "xtend": {
                      "version": "4.0.1",
                      "from": "xtend@>=4.0.0 <5.0.0",
@@ -3490,18 +3490,6 @@
                        }
                      }
                    },
-                    "getpass": {
-                      "version": "0.1.6",
-                      "from": "getpass@>=0.1.1 <0.2.0",
-                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
-                      "dependencies": {
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "from": "assert-plus@>=1.0.0 <2.0.0",
-                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
-                        }
-                      }
-                    },
                    "rc": {
                      "version": "1.1.6",
                      "from": "rc@>=1.1.0 <1.2.0",
@@ -3514,15 +3502,15 @@
                        }
                      }
                    },
-                    "tar-pack": {
-                      "version": "3.1.3",
-                      "from": "tar-pack@>=3.1.0 <3.2.0",
-                      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.3.tgz",
+                    "getpass": {
+                      "version": "0.1.6",
+                      "from": "getpass@>=0.1.1 <0.2.0",
+                      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
                      "dependencies": {
-                        "readable-stream": {
-                          "version": "2.0.6",
-                          "from": "readable-stream@>=2.0.4 <2.1.0",
-                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+                        "assert-plus": {
+                          "version": "1.0.0",
+                          "from": "assert-plus@>=1.0.0 <2.0.0",
+                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
                        }
                      }
                    },
@@ -3537,6 +3525,18 @@
                          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
                        }
                      }
+                    },
+                    "tar-pack": {
+                      "version": "3.1.3",
+                      "from": "tar-pack@>=3.1.0 <3.2.0",
+                      "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.3.tgz",
+                      "dependencies": {
+                        "readable-stream": {
+                          "version": "2.0.6",
+                          "from": "readable-stream@>=2.0.4 <2.1.0",
+                          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+                        }
+                      }
                    }
                  }
                },
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "windshaft-cartodb",
-  "version": "2.54.1",
+  "version": "2.55.0",
  "description": "A map tile server for CartoDB",
  "keywords": [
    "cartodb"
@@ -20,7 +20,7 @@
  ],
  "dependencies": {
    "body-parser": "~1.14.0",
-    "camshaft": "0.23.0",
+    "camshaft": "0.25.0",
    "cartodb-psql": "~0.6.1",
    "cartodb-query-tables": "~0.1.0",
    "cartodb-redis": "~0.13.0",
@@ -3,8 +3,8 @@ require('../../support/test_helper');
 var assert = require('../../support/assert');
 var TestClient = require('../../support/test-client');

-describe('analysis-layers error cases', function() {
-    it('should handle missing analysis nodes for layers', function(done) {
+describe('analysis-layers regressions', function() {
+    it('should return a complete list of nodes from analysis', function(done) {
        var mapConfig = {
            "version": "1.5.0",
            "layers": [
@@ -98,7 +98,12 @@ describe('analysis-layers error cases', function() {
            var analyses = layergroupResult.metadata.analyses;
            assert.ok(analyses);
            assert.equal(analyses.length, 1);
-            assert.equal(Object.keys(analyses[0].nodes).length, 5);
+
+            var expectedIds = ['customer_home_locations', 'b0', 'b1', 'a2', 'a3', 'a4'];
+            assert.equal(Object.keys(analyses[0].nodes).length, expectedIds.length);
+            expectedIds.forEach(function(expectedId) {
+                analyses[0].nodes.hasOwnProperty(expectedId);
+            });

            testClient.drain(done);
        });