Datastore namespace fix

datastore: fix namespace isolation
googleapis · Apr 7, 2016 · fc111c1 · fc111c1
1 parent 34d0e3d
commit fc111c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -15,6 +15,7 @@ Anand Suresh <anandsuresh@gmail.com>
 Brett Bergmann <me@brettbergmann.com>
 Burcu Dogan <jbd@google.com>
 Hector Rovira <hrovira@gmail.com>
+Ido Shamun <idoesh1@gmail.com>
 Johan Euphrosine <proppy@google.com>
 Marco Ziccardi <marco.ziccard@gmail.com>
 Patrick Costello <pcostell@google.com>

diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
@@ -452,7 +452,7 @@ function keyFromKeyProto(keyProto) {
   };
 
   if (keyProto.partitionId && keyProto.partitionId.namespaceId) {
-    keyOptions.namespaceId = keyProto.partitionId.namespaceId;
+    keyOptions.namespace = keyProto.partitionId.namespaceId;
   }
 
   keyProto.path.forEach(function(path, index) {

diff --git a/test/datastore/entity.js b/test/datastore/entity.js
@@ -571,7 +571,7 @@ describe('entity', function() {
 
     it('should set the namespace', function(done) {
       entity.Key = function(keyOptions) {
-        assert.strictEqual(keyOptions.namespaceId, NAMESPACE);
+        assert.strictEqual(keyOptions.namespace, NAMESPACE);
         done();
       };
 
@@ -581,7 +581,7 @@ describe('entity', function() {
     it('should create a proper Key', function(done) {
       entity.Key = function(keyOptions) {
         assert.deepEqual(keyOptions, {
-          namespaceId: NAMESPACE,
+          namespace: NAMESPACE,
           path: [
             'Kind',
             111,