seiso-import_master 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFiZGMwNjdkYjNiZmEzMzk1Mzk3MDcyZTZjNTdlNmU2ZWVkN2VmYw==
+    OTcxYjBhNzczYjI0YmEyMGRjYjQ5NjVmYWE5NzIzYWQyODhhOTc1Zg==
   data.tar.gz: !binary |-
-    OWE5YTljODk0YTk2NTNmMjJjYTY0MzU4MjhiNzk4Y2E4MTI5ZTRlZA==
+    ZTgwZTZlY2Y4ZTFiNGZhOGFkMDEzYzRmNjYyOWZhMDE4YWI3OTUwMw==
 SHA512:
   metadata.gz: !binary |-
-    NDg4Mjk5YWFkZTI4MjgxMWZhODU0MTc4MTc5Y2U5NGViODg0ZmI4YjY1MDQw
-    Nzk2MzczMGIxOTI4ZjM1MzI4NTcwNmY5ZjdkNGYyOGUyZDJjZjdhYTY3Nzky
-    YzRkNTY3MTRhOWQzMGVmNzg3ZTBjMjg3ZTM4OWY2ZDVmOWE1NmQ=
+    M2MwZTkxNzhiYTY0ZWIwOWI4OGJhYTFmODU4MmQ5YjU3ZGFkY2I3Y2NmMWUw
+    MmM5OThmY2M1OGY1Yzg1M2U4NTU4ZjcwOGVkYjBmNmNmNGZiNzZlMGQxMDBi
+    ZjNiNGNjZTg0OGQzOGU1MTJhY2MyODFlODQ0MmYwMGE5ODJlZTM=
   data.tar.gz: !binary |-
-    NzA0ZmUyMWVkMjQzNzI1Y2FmMTk4YWU0ODUxMWI3YWIxMDYxNmFlZjhlZmY0
-    YjYzYzRjMjQyYzRjZTQ0NDM1ZDBjYjc0NTZlYTE2ZjVhNWI0YWQ1MDgwYWM3
-    ZWZmMzViZmNjNDcxYjY0MTI5ODRjODEyZjVkZWRhMGMxOWU0ZjU=
+    ZGJkOWQyZGNlNmUwNTIxNGE2NDYwYTFmYjFhMDEwNGM4OTBhMGJkM2JjYWY5
+    MTczZDA2YTFjY2VhNjIzZTkwMjNiYjIyMjZjZmQzOTZjYjFhNTllOWRmMjM3
+    NWJjNmJkMGJmZTA4ODIwYjZkNDAyMGRjM2UzYzYxNzFiNWYzMjc=

data/lib/seiso/import_master/master_item_mapper.rb

@@ -3,13 +3,12 @@ module Seiso
 
     # Maps the data master format to the Seiso API format.
     #
-    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Author:: Willie Wheeler
     # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
     # License:: Apache 2.0
     class MasterItemMapper
     
-      def initialize(link_factory)
-        @link_factory = link_factory
+      def initialize
         @mappers = {
           'data-centers' => data_center_mapper,
           'environments' => environment_mapper,
@@ -50,12 +49,6 @@ module Seiso
       
       private
       
-      # Returns a link for the specified item, or nil if key_value is nil.
-      def link_for(type, key_name, key_value)
-        # Do nil check here (even though link factory does it too) since the unit test requires this behavior.
-        return key_value.nil? ? nil : @link_factory.link(type, key_name, key_value)
-      end
-      
       # Returns a mapper lambda for the specified type.
       def mapper_for(type)
         mapper = @mappers[type]
@@ -63,18 +56,16 @@ module Seiso
         mapper
       end
       
-      # Returns a mapper lambda.
       def data_center_mapper
         ->(dc) {
           {
             'key' => dc['key'],
             'name' => dc['name'],
-            'region' => link_for('regions', 'key', dc['region'])
+            'region' => { 'key' => dc['region'] }
           }
         }
       end
       
-      # Returns a mapper lambda.
       def environment_mapper
         ->(e) {
           {
@@ -89,18 +80,16 @@ module Seiso
         }
       end
       
-      # Returns a mapper lambda.
       def health_status_mapper
         ->(hs) {
           {
             'key' => hs['key'],
             'name' => hs['name'],
-            'statusType' => link_for('status-types', 'key', hs['statusType'])
+            'statusType' => { 'key' => hs['statusType'] }
           }
         }
       end
       
-      # Returns a mapper lambda.
       def infrastructure_provider_mapper
         ->(ip) {
           {
@@ -110,32 +99,33 @@ module Seiso
         }
       end
       
-      # Returns a mapper lambda.
       def ip_address_role_mapper
         # Suppressing IP addresses since we don't import those from master files.
         ->(r) {
           {
-            'serviceInstance' => link_for('service-instances', 'key', r['serviceInstance']),
+            'serviceInstance' => { 'key' => r['serviceInstance'] },
             'name' => r['name'],
             'description' => r['description']
           }
         }
       end
       
-      # Returns a mapper lambda.
       def load_balancer_mapper
         ->(lb) {
-          {
+          seiso_lb = {
             'name' => lb['name'],
             'type' => lb['type'],
             'ipAddress' => lb['ipAddress'],
-            'dataCenter' => link_for('data-centers', 'key', lb['dataCenter']),
             'apiUrl' => lb['apiUrl']
           }
+          
+          dc = lb['dataCenter']
+          seiso_lb['dataCenter'] = { 'key' => dc } unless dc.nil?
+          
+          seiso_lb
         }
       end
       
-      # Returns a mapper lambda.
       def machine_mapper
         ->(m) {
           {
@@ -151,88 +141,75 @@ module Seiso
         }
       end
       
-      # Returns a mapper lambda.
       def node_mapper
         ->(n) {
-          service_instance = n['serviceInstance']
-          ip_addresses = n['ipAddresses']
-          si_ref = link_for('service-instances', 'key', service_instance)
-          
-          result = {
+          seiso_node = {
             'name' => n['name'],
-            'serviceInstance' => si_ref,
-            'machine' => link_for('machines', 'name', n['machine'])
+            'serviceInstance' => { 'key' => n['serviceInstance'] }
           }
-          
-=begin
-      if ip_addresses
-        result['ipAddresses'] = []
-        ip_addresses.each do |ip|
-          role_name = ip['ipAddressRole']
-          result['ipAddresses'] << {
-            'ipAddressRole' => @link_factory.ip_address_role_link(service_instance, role_name),
-            'ipAddress' => ip['ipAddress']
-          }
-        end
-      end
-=end
-        
-          result
+
+          machine = n['machine']
+          seiso_node['machine'] = { 'name' => machine } unless machine.nil?
+
+          seiso_node
         }
       end
       
-      # Returns a mapper lambda.
       def node_ip_address_mapper
         # Currently suppressing rotation status and endpoints since we don't import those from master files
         ->(nip) {
           {
-            'node' => link_for('nodes', 'name', nip['node']),
-            'ipAddressRole' => link_for('ip-address-roles', 'name', nip['ipAddressRole']),
+            'node' => { 'name' => nip['node'] },
+            'ipAddressRole' => { 'name' => nip['ipAddressRole'] },
             'ipAddress' => nip['ipAddress']
           }
         }
       end
       
-      # Returns a mapper lambda.
       def region_mapper
         ->(r) {
           {
             'key' => r['key'],
             'name' => r['name'],
             'regionKey' => r['regionKey'],
-            'infrastructureProvider' => link_for('infrastructure-providers', 'key', r['infrastructureProvider'])
+            'infrastructureProvider' => { 'key' => r['infrastructureProvider'] }
           }
         }
       end
       
-      # Returns a mapper lambda.
       def rotation_status_mapper
         ->(rs) {
           {
             'key' => rs['key'],
             'name' => rs['name'],
-            'statusType' => link_for('status-types', 'key', rs['statusType'])
+            'statusType' => { 'key' => rs['statusType'] }
           }
         }
       end
       
-      # Returns a mapper lambda.
       def service_mapper
         ->(s) {
-          {
+          seiso_service = {
             'key' => s['key'],
             'name' => s['name'],
             'description' => s['description'],
-            'group' => link_for('service-groups', 'key', s['group']),
-            'type' => link_for('service-types', 'key', s['type']),
-            'owner' => link_for('people', 'username', s['owner']),
             'platform' => s['platform'],
             'scmRepository' => s['scmRepository']
           }
+
+          group = s['group']
+          seiso_service['group'] = { 'key' => group } unless group.nil?
+
+          type = s['type']
+          seiso_service['type'] = { 'key' => type } unless type.nil?
+
+          owner = s['owner']
+          seiso_service['owner'] = { 'username' => owner } unless owner.nil?
+
+          seiso_service
         }
       end
       
-      # Returns a mapper lambda.
       def service_group_mapper
         ->(sg) {
           {
@@ -242,20 +219,17 @@ module Seiso
         }
       end
       
-      # Returns a mapper lambda.
       def service_instance_mapper
         ->(si) {
           key = si['key']
           ip_address_roles = si['ipAddressRoles']
           ports = si['ports']
           
-          result = {
+          seiso_si = {
             'key' => key,
-            'service' => link_for('services', 'key', si['service']),
-            'environment' => link_for('environments', 'key', si['environment']),
-            'dataCenter' => link_for('data-centers', 'key', si['dataCenter']),
+            'service' => { 'key' => si['service'] },
+            'environment' => { 'key' => si['environment'] },
             'loadBalanced' => si['loadBalanced'],
-            'loadBalancer' => link_for('loadBalancer', 'name', si['loadBalancer']),
             'minCapacityDeploy' => si['minCapacityDeploy'],
             'minCapacityOps' => si['minCapacityOps'],
             
@@ -265,42 +239,22 @@ module Seiso
             # FIXME Deprecated. This is the old name for the minCapacityOps field.
             'requiredCapacity' => si['minCapacityOps']
           }
+
+          data_center = si['dataCenter']
+          seiso_si['dataCenter'] = { 'key' => data_center } unless data_center.nil?
           
-=begin
-      if ip_address_roles
-        result['ipAddressRoles'] = []
-        ip_address_roles.each do |role|
-          result['ipAddressRoles'] << {
-            'serviceInstance' => link_for('service-instances', 'key', key),
-            'name' => role['name'],
-            'description' => role['description']
-          }
-        end
-      end
+          load_balancer = si['loadBalancer']
+          seiso_si['loadBalancer'] = { 'name' => load_balancer } unless load_balancer.nil?
 
-      if ports
-        result['ports'] = []
-        ports.each do |port|
-          result['ports'] << {
-            'serviceInstance' => link_for('service-instances', 'key', key),
-            'number' => port['number'],
-            'protocol' => port['protocol'],
-            'description' => port['description']
-          }
-        end
-      end
-=end
-        
-          result
+          seiso_si
         }
       end
       
-      # Returns a mapper lambda.
       def service_instance_port_mapper
         # Suppressing endpoints since we don't import those from master files.
         ->(p) {
           {
-            'serviceInstance' => link_for('service-instances', 'key', p['serviceInstance']),
+            'serviceInstance' => { 'key' => p['serviceInstance'] },
             'number' => p['number'],
             'protocol' => p['protocol'],
             'description' => p['description']
@@ -308,7 +262,6 @@ module Seiso
         }
       end
       
-      # Returns a mapper lambda.
       def service_type_mapper
         ->(st) {
           {
@@ -318,7 +271,6 @@ module Seiso
         }
       end
       
-      # Returns a mapper lambda.
       def status_type_mapper
         ->(st) {
           {

data/lib/seiso/import_master.rb

@@ -1,9 +1,7 @@
 require "json"
 require "seiso/connector"
 require "yaml"
-require_relative "import_master/link_factory"
 require_relative "import_master/master_item_mapper"
-require_relative "import_master/uri_factory"
 
 # Seiso namespace module
 module Seiso
@@ -17,19 +15,26 @@ module Seiso
     
     # Initializes the importer with a Seiso connector.
     def initialize(seiso_settings)
-      @seiso = Seiso::Connector.new seiso_settings
-      
-      # TODO Inject dependencies?
-      @uri_factory = Seiso::ImportMaster::UriFactory.new @seiso.base_uri
-      @link_factory = Seiso::ImportMaster::LinkFactory.new @uri_factory
-      @mapper = Seiso::ImportMaster::MasterItemMapper.new @link_factory
-      
+      @seiso = Seiso::Connector.new(seiso_settings)
+      @mapper = Seiso::ImportMaster::MasterItemMapper.new
       @loaders = {
         'json' => ->(file) { JSON.parse(IO.read(file)) },
         'yaml' => ->(file) { YAML.load_file file }
       }
     end
 
+    def seiso
+      @seiso
+    end
+
+    def mapper
+      @mapper
+    end
+
+    def loaders
+      @loaders
+    end
+    
     # Imports a list of master files in order. Legal formats are 'json' (default) and 'yaml'.
     def import_files(files, format = 'json')
       loop do
@@ -42,7 +47,7 @@ module Seiso
     
     # Imports a data master file. Legal formats are 'json' (default) and 'yaml'.
     def import_file(file, format = 'json')
-      loader = @loaders[format]
+      loader = loaders[format]
       raise ArgumentError, "Illegal format: #{format}" if loader.nil?
       doc = loader.call(file)
       import_doc doc
@@ -66,8 +71,8 @@ module Seiso
     private
     
     def do_import_items(type, items)
-      seiso_items = @mapper.map_all(type, items)
-      @seiso.put_items(type, seiso_items)
+      seiso_items = mapper.map_all(type, items)
+      seiso.post_items(type, seiso_items)
     end
     
     # Imports the nodes, along with their associated IP addresses.

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       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Willie Wheeler"]
   spec.email         = ["wwheeler@expedia.com"]
   spec.summary       = "Imports Seiso data master files into Seiso."
@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_runtime_dependency "seiso-connector", "~> 0.0.1"
+  spec.add_runtime_dependency "seiso-connector", "~> 0.1.0"
 end

data/test/test_master_item_mapper.rb

@@ -8,12 +8,7 @@ require 'seiso/import_master/master_item_mapper'
 class TestMasterItemMapper < MiniTest::Unit::TestCase
 
   def setup
-    link_factory = Class.new do
-      def self.link(type, key_name, key_value)
-        { "foo" => "bar" }
-      end
-    end
-    @mapper = Seiso::ImportMaster::MasterItemMapper.new link_factory
+    @mapper = Seiso::ImportMaster::MasterItemMapper.new
   end
 
   def test_map_all_illegal_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_master
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 description: Supports self-service data management via version control, e.g. by using
   GitHub.
 email:
@@ -69,9 +69,7 @@ files:
 - Rakefile
 - bin/seiso-import-master
 - lib/seiso/import_master.rb
-- lib/seiso/import_master/link_factory.rb
 - lib/seiso/import_master/master_item_mapper.rb
-- lib/seiso/import_master/uri_factory.rb
 - refresh
 - sample_conf/seiso.yml.sample
 - seiso-import_master.gemspec

data/lib/seiso/import_master/link_factory.rb

@@ -1,48 +0,0 @@
-module Seiso
-  class ImportMaster
-    
-    # Link factory, supporting HATEOAS principle.
-    #
-    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-    # License:: Apache 2.0
-    class LinkFactory
-
-      # Creates a new link factory, injecting the URI factory.
-      # - uri_factory: URI factory
-      def initialize(uri_factory)
-        @uri_factory = uri_factory
-      end
-      
-      # Creates a new link. Only for link involving a single key, at least for now.
-      # - type: Item type (e.g., services, service-instances, data-centers, etc.)
-      # - key_name: name of the property the item type uses as a unique key
-      # - key_value: key value
-      def link(type, key_name, key_value)
-        return nil if key_value.nil?
-        
-        {
-          '_self' => @uri_factory.item_uri(type, key_value),
-          
-          # FIXME Deprecated. To replace with _self URI above.
-          key_name => key_value
-        }
-      end
-      
-      # Creates a new IP address role link.
-      # - service_instance_key: Service instance key
-      # - role_name: IP address role name
-      def ip_address_role_link(service_instance_key, role_name)
-        {
-          '_self' => @uri_factory.item_uri('ip-address-roles', service_instance_key, role_name),
-          
-          # FIXME These are deprecated. To replace with _self URI above.
-          'serviceInstance' => {
-            'key' => service_instance_key
-          },
-          'name' => role_name
-        }
-      end
-    end
-  end
-end

data/lib/seiso/import_master/uri_factory.rb

@@ -1,48 +0,0 @@
-module Seiso
-  class ImportMaster
-  
-    # URI factory.
-    #
-    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-    # License:: Apache 2.0
-    class UriFactory
-
-      # Creates a new URI factory for the given base URI.
-      # - base_uri: Base URI (e.g., http://seiso.example.com)
-      def initialize(base_uri)
-        @base_uri = base_uri
-        @v1_uri = "#{@base_uri}/v1"
-      end
-      
-      # Returns the URI for the given item type.
-      # - type: Item type (e.g., services, service-instances, ip-address-roles, etc.)
-      def type_uri(type)
-        if type == 'ip-address-roles'
-          raise ArgumentError, "ip-address-roles is not a top-level type"
-        else
-          return v1_uri type
-        end
-      end
-      
-      # Returns the URI for the given item.
-      # - type: Item type
-      # - keys: One or more item keys, which collectively uniquely identify the item within the type
-      def item_uri(type, *keys)
-        if type == 'ip-address-roles'
-          return v1_uri "service-instances/#{keys[0]}/ip-address-roles/#{keys[1]}"
-        else
-          return v1_uri "#{type}/#{keys[0]}"
-        end
-      end
-      
-      private
-      
-      # Resolves a relative path to the full URI.
-      # - path: relative path
-      def v1_uri(path)
-        "#{@base_uri}/v1/#{path}"
-      end
-    end
-  end
-end