invalidate hash if files does not have hash

Author: anandkumarpatel

lib/models/mongo/infra-code-version.js

@@ -10,6 +10,7 @@ var regexpQuote = require('regexp-quote');
 var bcrypt = require('bcrypt');
 var jsonHash = require('json-stable-stringify');
 var dogstatsd = require('models/datadog');
+var uuid = require('uuid');
 
 var path = require('path');
 var join = path.join;
@@ -581,18 +582,26 @@ InfraCodeVersionSchema.methods.getHash = function (cb) {
   }, function (err, infraCodeVersion) {
     if (err) { return cb(err); }
     var hashMap = {};
+    var invalidate = false;
     infraCodeVersion.files.forEach(function(item) {
       var filePath = item.Key.substr(item.Key.indexOf('/'));
-      if (item.hash) {
-        // remove context version from Key
-        hashMap[filePath] = item.hash;
-      } else { // item.isDir === true
+      if (item.isDir) {
         // ensure dirs have some hash
         hashMap[filePath] = '1';
+      } else if (item.hash) {
+        hashMap[filePath] = item.hash;
+      } else {
+        // file without hash. this should not happen.
+        // skip dedup by returning something that will never match
+        invalidate = true;
       }
     });
 
-    hashString(jsonHash(hashMap), cb);
+    if (invalidate) {
+      cb(null, uuid());
+    } else {
+      hashString(jsonHash(hashMap), cb);
+    }
   });
 };