seiso-import_master 0.0.12 → 3.0.0.M1

data/sample_conf/seiso3.yml.sample

@@ -0,0 +1,6 @@
+%YAML 1.1
+---
+base_uri: https://seiso.example.com/api/
+username: some_username
+password: some_p@ssword
+---

data/seiso-import_master.gemspec

@@ -3,25 +3,28 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "seiso-import_master"
-  spec.version       = "0.0.12"
-  spec.authors       = ["Willie Wheeler"]
-  spec.email         = ["wwheeler@expedia.com"]
-  spec.summary       = "Imports Seiso data master files into Seiso."
-  spec.description   = "Supports self-service data management via version control, e.g. by using GitHub."
-  spec.homepage      = "http://seiso.io"
-  spec.license       = "Apache-2.0"
+  spec.name          = 'seiso-import_master'
+  spec.version       = '3.0.0.M1'
+  spec.authors       = ['Willie Wheeler']
+  spec.email         = ['wwheeler@expedia.com']
+  spec.summary       = 'Imports Seiso data master files into Seiso.'
+  spec.description   = 'Supports self-service data management via version control, e.g. by using GitHub.'
+  spec.homepage      = 'http://seiso.io'
+  spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '~> 1.9.3'
+#  spec.required_ruby_version = '~> 2.3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+#  spec.add_development_dependency 'bundler', '~> 1.7.6'
+  spec.add_development_dependency 'bundler', '~> 1.11.2'
+  spec.add_development_dependency 'rake', '~> 10.5.0'
 
-  spec.add_runtime_dependency "seiso-connector", "~> 0.1.6"
-  spec.add_runtime_dependency "require_all", "~> 1.3.2"
+  spec.add_runtime_dependency 'awesome_print', '~> 1.6.1'
+  spec.add_runtime_dependency 'hyperresource', '~> 0.9.4'
+  spec.add_runtime_dependency 'require_all', '~> 1.3.3'
 end

data/test/seiso/import_master/importers/test_node_importer.rb

@@ -0,0 +1,21 @@
+require 'minitest/autorun'
+#require 'seiso/import_master/importers/node_importer'
+require 'require_all'
+require_all 'lib'
+
+module Seiso
+  class ImportMaster
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class Importers::TestNodeImporter < MiniTest::Unit::TestCase
+
+      def setup
+      end
+
+      def test_dummy
+        puts 'TODO test_dummy'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiso-import_master
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 3.0.0.M1
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: seiso-connector
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: hyperresource
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
 description: Supports self-service data management via version control, e.g. by using
   GitHub.
 email:
@@ -83,23 +97,55 @@ files:
 - Rakefile
 - bin/seiso-import-master
 - lib/seiso/import_master.rb
-- lib/seiso/import_master/errors/invalid_document_error.rb
+- lib/seiso/import_master/importers.rb
 - lib/seiso/import_master/importers/base_importer.rb
+- lib/seiso/import_master/importers/data_center_importer.rb
+- lib/seiso/import_master/importers/environment_importer.rb
+- lib/seiso/import_master/importers/health_status_importer.rb
+- lib/seiso/import_master/importers/infrastructure_provider_importer.rb
+- lib/seiso/import_master/importers/ip_address_role_importer.rb
+- lib/seiso/import_master/importers/load_balancer_importer.rb
+- lib/seiso/import_master/importers/machine_importer.rb
 - lib/seiso/import_master/importers/node_importer.rb
+- lib/seiso/import_master/importers/node_ip_address_importer.rb
+- lib/seiso/import_master/importers/region_importer.rb
+- lib/seiso/import_master/importers/rotation_status_importer.rb
+- lib/seiso/import_master/importers/service_group_importer.rb
 - lib/seiso/import_master/importers/service_importer.rb
 - lib/seiso/import_master/importers/service_instance_importer.rb
-- lib/seiso/import_master/importers/simple_importer.rb
-- lib/seiso/import_master/mappers/master_item_mapper.rb
+- lib/seiso/import_master/importers/service_instance_port_importer.rb
+- lib/seiso/import_master/importers/service_type_importer.rb
+- lib/seiso/import_master/importers/status_type_importer.rb
+- lib/seiso/import_master/mappers.rb
+- lib/seiso/import_master/mappers/data_center_mapper.rb
+- lib/seiso/import_master/mappers/environment_mapper.rb
+- lib/seiso/import_master/mappers/health_status_mapper.rb
+- lib/seiso/import_master/mappers/infrastructure_provider_mapper.rb
+- lib/seiso/import_master/mappers/ip_address_role_mapper.rb
+- lib/seiso/import_master/mappers/load_balancer_mapper.rb
+- lib/seiso/import_master/mappers/machine_mapper.rb
+- lib/seiso/import_master/mappers/node_ip_address_mapper.rb
 - lib/seiso/import_master/mappers/node_mapper.rb
+- lib/seiso/import_master/mappers/region_mapper.rb
+- lib/seiso/import_master/mappers/rotation_status_mapper.rb
+- lib/seiso/import_master/mappers/service_group_mapper.rb
 - lib/seiso/import_master/mappers/service_instance_mapper.rb
+- lib/seiso/import_master/mappers/service_instance_port_mapper.rb
 - lib/seiso/import_master/mappers/service_mapper.rb
+- lib/seiso/import_master/mappers/service_type_mapper.rb
+- lib/seiso/import_master/mappers/status_type_mapper.rb
+- lib/seiso/import_master/util.rb
+- lib/seiso/import_master/util/invalid_document_error.rb
+- lib/seiso/import_master/util/item_resolver.rb
+- lib/seiso/import_master/util/logger.rb
+- lib/seiso/import_master/util/rest_util.rb
+- lib/seiso/import_master/validators.rb
 - lib/seiso/import_master/validators/base_validator.rb
 - lib/seiso/import_master/validators/node_validator.rb
 - lib/seiso/import_master/validators/service_validator.rb
-- sample_conf/seiso.yml.sample
+- sample_conf/seiso3.yml.sample
 - seiso-import_master.gemspec
-- test/test_master_item_mapper.rb
-- test/test_node_mapper.rb
+- test/seiso/import_master/importers/test_node_importer.rb
 homepage: http://seiso.io
 licenses:
 - Apache-2.0
@@ -115,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6
@@ -125,5 +171,4 @@ signing_key:
 specification_version: 4
 summary: Imports Seiso data master files into Seiso.
 test_files:
-- test/test_master_item_mapper.rb
-- test/test_node_mapper.rb
+- test/seiso/import_master/importers/test_node_importer.rb

data/lib/seiso/import_master/errors/invalid_document_error.rb

@@ -1,11 +0,0 @@
-module Seiso
-	class ImportMaster
-		module Errors
-      
-      # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-      # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-      # License:: Apache 2.0
-			class InvalidDocumentError < StandardError; end
-		end
-	end
-end

data/lib/seiso/import_master/importers/simple_importer.rb

@@ -1,28 +0,0 @@
-require_relative "base_importer"
-
-module Seiso
-	class ImportMaster
-		module Importers
-
-      # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
-      # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-      # License:: Apache 2.0
-			class SimpleImporter < BaseImporter
-
-				def initialize(mapper, seiso, uri_factory_v1, rest_connector_v1)
-					@mapper = mapper
-					@seiso = seiso
-          @uri_factory_v1 = uri_factory_v1
-          @rest_connector_v1 = rest_connector_v1
-				end
-
-				def import(doc)
-					type = doc['type']
-					items = doc['items']
-		      seiso_items = @mapper.map_all(type, items)
-		      @seiso.post_items(type, seiso_items)
-				end
-			end
-		end
-	end
-end

data/lib/seiso/import_master/mappers/master_item_mapper.rb

@@ -1,194 +0,0 @@
-module Seiso
-  class ImportMaster
-    module Mappers
-
-      # Maps the data master format to the Seiso API format.
-      #
-      # Author:: Willie Wheeler
-      # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
-      # License:: Apache 2.0
-      class MasterItemMapper
-      
-        def initialize
-          @mappers = {
-            'data-centers' => data_center_mapper,
-            'doc-links' => doc_link_mapper,
-            'environments' => environment_mapper,
-            'health-statuses' => health_status_mapper,
-            'infrastructure-providers' => infrastructure_provider_mapper,
-            'load-balancers' => load_balancer_mapper,
-            'machines' => machine_mapper,
-            'regions' => region_mapper,
-            'rotation-statuses' => rotation_status_mapper,
-            'service-groups' => service_group_mapper,
-            'service-types' => service_type_mapper,
-            'status-types' => status_type_mapper
-          }
-        end
-
-        # Maps a list of items.
-        # - type: Item type
-        # - items: Item list
-        def map_all(type, items)
-          mapper = mapper_for type
-          result = []
-          items.each { |i| result << mapper.call(i) }
-          result
-        end
-        
-        # Maps a single item.
-        # - type: Item type
-        # - item: Item
-        def map_one(type, item)
-          mapper_for(type).call item
-        end
-        
-        private
-        
-        # Returns a mapper lambda for the specified type.
-        def mapper_for(type)
-          mapper = @mappers[type]
-          raise ArgumentError, "Unknown type: #{type}" if mapper.nil?
-          mapper
-        end
-        
-        def data_center_mapper
-          ->(dc) {
-            {
-              'key' => dc['key'],
-              'name' => dc['name'],
-              'region' => { 'key' => dc['region'] }
-            }
-          }
-        end
-        
-        def doc_link_mapper
-          ->(dl) {
-            {
-              'title' => dl['title'],
-              'href' => dl['href'],
-              'description' => dl['description']
-            }
-          }
-        end
-
-        def environment_mapper
-          ->(e) {
-            {
-              'key' => e['key'],
-              'name' => e['name'],
-              'aka' => e['aka'],
-              'description' => e['description'],
-              
-              # FIXME Deprecated, don't use.
-              'rank' => e['rank']
-            }
-          }
-        end
-        
-        def health_status_mapper
-          ->(hs) {
-            {
-              'key' => hs['key'],
-              'name' => hs['name'],
-              'description' => hs['description'],
-              'statusType' => { 'key' => hs['statusType'] }
-            }
-          }
-        end
-        
-        def infrastructure_provider_mapper
-          ->(ip) {
-            {
-              'key' => ip['key'],
-              'name' => ip['name']
-            }
-          }
-        end
-                
-        def load_balancer_mapper
-          ->(lb) {
-            seiso_lb = {
-              'name' => lb['name'],
-              'type' => lb['type'],
-              'ipAddress' => lb['ipAddress'],
-              'apiUrl' => lb['apiUrl']
-            }
-            
-            dc = lb['dataCenter']
-            seiso_lb['dataCenter'] = { 'key' => dc } unless dc.nil?
-            
-            seiso_lb
-          }
-        end
-        
-        def machine_mapper
-          ->(m) {
-            {
-              'name' => m['name'],
-              'ipAddress' => m['ipAddress'],
-              'fqdn' => m['fqdn'],
-              'hostname' => m['hostname'],
-              'domain' => m['domain'],
-              'os' => m['os'],
-              'platform' => m['platform'],
-              'platformVersion' => m['platformVersion']
-            }
-          }
-        end
-        
-        def region_mapper
-          ->(r) {
-            {
-              'key' => r['key'],
-              'name' => r['name'],
-              'regionKey' => r['regionKey'],
-              'infrastructureProvider' => { 'key' => r['infrastructureProvider'] }
-            }
-          }
-        end
-        
-        def rotation_status_mapper
-          ->(rs) {
-            {
-              'key' => rs['key'],
-              'name' => rs['name'],
-              'description' => rs['description'],
-              'statusType' => { 'key' => rs['statusType'] }
-            }
-          }
-        end
-        
-        def service_group_mapper
-          ->(sg) {
-            {
-              'key' => sg['key'],
-              'name' => sg['name'],
-              'description' => sg['description']
-            }
-          }
-        end
-        
-        def service_type_mapper
-          ->(st) {
-            {
-              'key' => st['key'],
-              'name' => st['name'],
-              'description' => st['description']
-            }
-          }
-        end
-                
-        def status_type_mapper
-          ->(st) {
-            {
-              'key' => st['key'],
-              'name' => st['name'],
-              'description' => st['description']
-            }
-          }
-        end
-      end
-    end
-  end
-end