seiso-import_master 3.0.0.M1 → 3.0.0.M2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTk2ZjJlYzk0YTA2YzVhN2IwOWEyZWM3NWM3Y2MwMjc3MjI0ZTNkOA==
+    ZWZjNDQ1MTc4NmM3MmQ4M2Q2YTU3YzkyZGVmYTQ5YjU1MTE3OTcyZA==
   data.tar.gz: !binary |-
-    ZTM0NDk1MTQ1YmIxM2Y5OTdmMzc4ZTE4MWY5ZmU0NjM4MjcxYmY3Ng==
+    MzhmMDM3ODMwMGViYWYwMmRlNjdjMjY0ZGQ4YjFkYjMyMmViODgwYg==
 SHA512:
   metadata.gz: !binary |-
-    YTkwNmE2N2E5M2FlMzZkN2FmNGZjOGEyODFjNmNmOTJmMWMxMThiYmJmMTY2
-    ZGY2YmQwZTIxMjU3MTkwYWJjMGFlYjU0YWI3ZjM3MjRlYmVlYTUyMGVkY2Ux
-    MDQ0NDUzODhlZmVjYjFkNDJhNGQ5Mjk3N2Q5YjRmNTNjMTc5MDM=
+    NDI4NjIxOTA2NmI0NGNiMmI5MzRlZDg1Mzk4YzNlZGQzN2VhOTIzMDFjYTcz
+    ODVlY2Y5MzhiY2M3ZDNjMWYwNzg1ZDY1Mzc2NjRmZGZmMDNjMGJlNTA3MTEx
+    Y2VkNjE1MzU5YzMzMTBmNGVkZGM3YzNlNTkyNTJjNDVlNDAzMDc=
   data.tar.gz: !binary |-
-    MTI5ZGI3Y2E4NmFkMzg4YjlkMGRjNWQwMDcyODMxMWQxZGU0ZTIxNjU2OWQw
-    OGE5YjM4YTEwNzhlNzM1NjhjMDcyMTdjNGNjNzM3YzA4MDMzNTcxMmM4M2Yx
-    MmZmMjFmOTk4MDRlMDFlZjllN2I3NTRhOThjMDk3YWNmYzBjNTc=
+    OWE3MGExNzY1NjMzMmM2OTBiODRmNTQ2YmNkOGYxMzI0OGJhNDg0ODBhYTFl
+    MzAzNDY5ZDJmMTVlOTVkYmJkZjI0MGZiMjA2OGRjNjE1ODBjNzgzYjZmMjBl
+    YTE4ZGM3ZmE3NDYwMGRjNWFiMDlmMzg5ODE0N2U0N2EyNjgwZTc=

data/README.md

@@ -50,6 +50,10 @@ Build and install the gem using Rake:
 
 For local snapshot installations, you may want to clear out existing versions of the gem first.
 
+To push the gem:
+
+    $ gem push pkg/[whichever_gem]
+
 ## TODO
 
 Figure out whether we want to use dependency injection for this project. There's debate within the Ruby community

data/lib/seiso/import_master.rb

@@ -83,7 +83,11 @@ module Seiso
 
       # Rescue StandardError here, not Exception, since we want ctrl-c to stop the program.
       rescue StandardError => e
-        @log.error "Failed to import file #{file}: #{e.message}"
+
+        # IMPORTANT: Don't display the message, because Faraday includes the request headers, which include the base64
+        # encoded password.
+#        @log.error "Failed to import file #{file}: #{e.message}"
+        @log.error "Failed to import file #{file}"
 
         # FIXME For now, just re-raise the exception, as we want to see where the bugs are.
         return false

data/lib/seiso/import_master/util/item_resolver.rb

@@ -2,6 +2,8 @@ class Seiso::ImportMaster
 
   # Resolves item keys to their URIs.
   #
+  # TODO Rename to UriResolver.
+  #
   # Author:: Willie Wheeler
   # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
   # License:: Apache 2.0
@@ -19,10 +21,15 @@ class Seiso::ImportMaster
         'machines' => ->(k) { @api.machines.search.findByName(name: k) },
         'persons' => ->(k) { @api.persons.search.findByUsername(username: k) }
       }
+
+      @uri_cache = {}
     end
 
     # Returns the item URI, or nil if either key is nil or the item doesn't exist.
     def item_uri(type, key)
+      cached_uri = get_cached_uri(type, key)
+      return cached_uri unless cached_uri.nil?
+
       @log.info "Getting item URI: type=#{type}, key=#{key}"
       return nil if key.nil?
       search = @special_searches[type]
@@ -35,7 +42,9 @@ class Seiso::ImportMaster
 
       begin
         # This returns the item's canonical URI, which is what we want.
-        item.links.self.href
+        item_uri = item.links.self.href
+        put_cached_uri(type, key, item_uri)
+        item_uri
       rescue HyperResource::ClientError => e
         status = e.response.status
         body = e.response.body
@@ -50,5 +59,20 @@ class Seiso::ImportMaster
       @log.info "Getting item URL: type=#{type}, key=#{key}"
       # TODO
     end
+
+    def get_cached_uri(type, key)
+      type_cache = @cache[type]
+      return nil if type_cache.nil?
+      type_cache[key]
+    end
+
+    def put_cached_uri(type, key, uri)
+      type_cache = @cache[type]
+      if type_cache.nil?
+        type_cache = {}
+        @cache[type] = type_cache
+      end
+      type[key] = uri
+    end
   end
 end

data/seiso-import_master.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'seiso-import_master'
-  spec.version       = '3.0.0.M1'
+  spec.version       = '3.0.0.M2'
   spec.authors       = ['Willie Wheeler']
   spec.email         = ['wwheeler@expedia.com']
   spec.summary       = 'Imports Seiso data master files into Seiso.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_master
 version: !ruby/object:Gem::Version
-  version: 3.0.0.M1
+  version: 3.0.0.M2
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler