puppetdb_query 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe43dde7f253acd669b4482bc7cb1b952bd62c9
-  data.tar.gz: 726bb2a347d54ceb2b21510044385d7b70d6b7aa
+  metadata.gz: 2c321779c7c9b60e57efba9fda1a71e122770a77
+  data.tar.gz: 4740cdf7ac990def716168c2a4aad7bdef4bf30f
 SHA512:
-  metadata.gz: e0382ae312d52f98fdd34e2ac6aa734b5db99c3ff2cd03ee369eeee7ab384f809ff055b104339fbdf9cd8cb5f485ee192ccdec6e76bb29e6a64bfda9e9ef1c92
-  data.tar.gz: 140778b75a73b53bdd0725e3378539e936f12c3ca8aa53c0e255308e86de4e26361d9586529d4fe9779072f6648adfdcebfd9bc3fd8aa212f8d07807ebb3b2e8
+  metadata.gz: 8f25e946d438bedd94d26afcc27c11428fbffdf156d3279c6a914370b5378c6aee44af90fe15c1d428879cc808bd9ac541bad1aa4e5349e32d12382c1c02b7e5
+  data.tar.gz: ce06b58cb677afd03c073f49317325bdecc8352f7f47e07025f6d2e8fef4c376ab97d391cfe6a2e75da6f2a08b159fc6c374ef48300830894e4e8ebee5a38497

data/lib/puppetdb_query/mongodb.rb

@@ -2,6 +2,18 @@ require 'time'
 
 require_relative "logging"
 
+# monkey patch mongodb to get rid of
+# ".. is an illegal key in MongoDB. Keys may not start with '$' or contain a '.'. (BSON::String::IllegalKey)"
+module Mongo
+  module Protocol
+    class Message
+      def validating_keys?
+        false
+      end
+    end
+  end
+end
+
 module PuppetDBQuery
   # access nodes and their facts from mongo database
   # rubocop:disable Metrics/ClassLength
@@ -151,17 +163,27 @@ module PuppetDBQuery
     # update or insert facts for given node name
     #
     # @param node [String] node name
-    # @param facts [Array<String>] get these facts in the result, eg ['fqdn'], empty for all
+    # @param facts [Hash] facts for the node
     def node_update(node, facts)
-      connection[nodes_collection].find(_id: node).replace_one(facts, upsert: true)
+      logger.debug "  updating #{node}"
+      connection[nodes_collection].find(_id: node).replace_one(facts, upsert: true,
+        bypass_document_validation: true, check_keys: false, validating_keys: false)
     rescue ::Mongo::Error::OperationFailure => e
+      logger.warn "  updating #{node} failed with: #{e.message}"
       # mongodb doesn't support keys with a dot
       # see https://docs.mongodb.com/manual/reference/limits/#Restrictions-on-Field-Names
       # as a dirty workaround we delete the document and insert it ;-)
       # The dotted field .. in .. is not valid for storage. (57)
-      raise e unless e.message =~ /The dotted field /
-      connection[nodes_collection].find(_id: node).delete_one
-      connection[nodes_collection].insert_one(facts.merge(_id: node))
+      # .. is an illegal key in MongoDB. Keys may not start with '$' or contain a '.'. (BSON::String::IllegalKey)
+      raise e unless (e.message =~ /The dotted field / || e.message =~ /is an illegal key/)
+      logger.warn "    we try again deleting and inserting the node"
+      begin
+        connection[nodes_collection].find(_id: node).delete_one
+        connection[nodes_collection].insert_one(facts.merge(_id: node),
+          bypass_document_validation: true, check_keys: false, validating_keys: false)
+      rescue
+        logger.error "  updating #{node} failed with: #{e.message}"
+      end
     end
 
     # delete node data for given node name

data/lib/puppetdb_query/sync.rb

@@ -32,7 +32,7 @@ module PuppetDBQuery
             updater.update3(timestamp - seconds_back)
             timestamp = ts
           rescue Timeout::Error
-            logger.info "syncing puppetdb nodes: now our time is up, we finsh"
+            logger.info "syncing puppetdb nodes: now our time is up, we finish"
             return
           rescue
             logger.error $!

data/lib/puppetdb_query/version.rb

@@ -1,3 +1,3 @@
 module PuppetDBQuery
-  VERSION = "0.0.36".freeze
+  VERSION = "0.0.37".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetdb_query
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Michael Meyling