vm_shepherd 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db947ff086cec29ff5a2565d8e54041203a97b1
-  data.tar.gz: 6caa24f8e4508aa51a0c73a72c54e738a05afb93
+  metadata.gz: 7a51063e75ce1a10f12e746299821c382150bd4d
+  data.tar.gz: 013d846fff397f280bf6ef7b28a0517c530dcd19
 SHA512:
-  metadata.gz: df565e43afea2322d0f018b4a38485ec9edea318bfa90020b605ea584771a94da433c5239db5b077e4fd9aed6d0ccf26fcf728f69c968fcaf33d2edeb4932e53
-  data.tar.gz: 0ac5752d872b82b6fcfbd5c3b1bbc3d55ce00d34baa77d35ebc0b0ad3496d6ef9343b7aa94b2d8e730818d1f69d259c5530e1d4b446dda79a2caaabb9cfc095b
+  metadata.gz: 40c881a78a01d8263536e58a36312d8310e63807985a11a880e90c0c00f3a4e5a7f632359544f01525287418fffd890a479c089bbbdc32b24e352d30ada080fa
+  data.tar.gz: 95480a3391d27a8e8b6fe93265d7a4d460a6a5c00d17cfc524f51f68e67aa8cba4b4b35b93d97ebd9ec1067d5401ff0e1ad5a6dbed35f8c39e380190b3abc57e

data/lib/vm_shepherd/aws_manager.rb

@@ -16,9 +16,7 @@ module VmShepherd
     DELETE_IN_PROGRESS = 'DELETE_IN_PROGRESS'
     DELETE_COMPLETE = 'DELETE_COMPLETE'
 
-    attr_writer :logger
-
-    def initialize(env_config)
+    def initialize(env_config:, logger:)
       AWS.config(
         access_key_id: env_config.fetch(:aws_access_key),
         secret_access_key: env_config.fetch(:aws_secret_key),

data/lib/vm_shepherd/shepherd.rb

@@ -37,6 +37,7 @@ module VmShepherd
               vm_shepherd_config.vcenter_creds.username,
               vm_shepherd_config.vcenter_creds.password,
               vm_shepherd_config.vsphere.datacenter,
+              error_logger,
             ).deploy(
               path,
               {
@@ -87,6 +88,7 @@ module VmShepherd
               vm_shepherd_config.vcenter_creds.username,
               vm_shepherd_config.vcenter_creds.password,
               vm_shepherd_config.vsphere.datacenter,
+              error_logger,
             ).prepare_environment
           end
         when VmShepherd::AWS_IAAS_TYPE then
@@ -121,6 +123,7 @@ module VmShepherd
               vm_shepherd_config.vcenter_creds.username,
               vm_shepherd_config.vcenter_creds.password,
               vm_shepherd_config.vsphere.datacenter,
+              error_logger,
             ).destroy(vm_shepherd_config.vm.ip, vm_shepherd_config.vsphere.resource_pool)
           when VmShepherd::AWS_IAAS_TYPE then
             ami_manager.destroy(vm_shepherd_config.to_h)
@@ -155,6 +158,7 @@ module VmShepherd
               vm_shepherd_config.vcenter_creds.username,
               vm_shepherd_config.vcenter_creds.password,
               vm_shepherd_config.cleanup.datacenter,
+              error_logger,
             ).clean_environment(
               datacenter_folders_to_clean: vm_shepherd_config.cleanup.datacenter_folders_to_clean,
               datastores: vm_shepherd_config.cleanup.datastores,
@@ -195,17 +199,19 @@ module VmShepherd
     end
 
     def ami_manager
-      @ami_manager ||= VmShepherd::AwsManager.new(
-        {
-          stack_name: settings.vm_shepherd.env_config.stack_name,
-          aws_access_key: settings.vm_shepherd.env_config.aws_access_key,
-          aws_secret_key: settings.vm_shepherd.env_config.aws_secret_key,
-          region: settings.vm_shepherd.env_config.region,
-          json_file: settings.vm_shepherd.env_config.json_file,
-          parameters: settings.vm_shepherd.env_config.parameters_as_a_hash,
-          outputs: settings.vm_shepherd.env_config.outputs.to_h,
-        }.merge(ami_elb_config)
-      )
+      @ami_manager ||=
+        VmShepherd::AwsManager.new(
+          env_config: {
+            stack_name: settings.vm_shepherd.env_config.stack_name,
+            aws_access_key: settings.vm_shepherd.env_config.aws_access_key,
+            aws_secret_key: settings.vm_shepherd.env_config.aws_secret_key,
+            region: settings.vm_shepherd.env_config.region,
+            json_file: settings.vm_shepherd.env_config.json_file,
+            parameters: settings.vm_shepherd.env_config.parameters_as_a_hash,
+            outputs: settings.vm_shepherd.env_config.outputs.to_h,
+          }.merge(ami_elb_config),
+          logger: error_logger,
+        )
     end
 
     def ami_elb_config

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.3'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -7,14 +7,12 @@ module VmShepherd
     VALID_FOLDER_REGEX = /\A([\w-]{1,80}\/)*[\w-]{1,80}\/?\z/
     VALID_DISK_FOLDER_REGEX = /\A[\w-]{1,80}\z/
 
-    attr_writer :logger
-
-    def initialize(host, username, password, datacenter_name)
+    def initialize(host, username, password, datacenter_name, logger)
       @host = host
       @username = username
       @password = password
       @datacenter_name = datacenter_name
-      @logger = Logger.new(STDERR)
+      @logger = logger
     end
 
     def deploy(ova_path, vm_config, vsphere_config)

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -41,8 +41,9 @@ module VmShepherd
         vm_name: 'some-vm-name',
       }
     end
+    let(:fake_logger) { instance_double(Logger).as_null_object }
 
-    subject(:ami_manager) { AwsManager.new(env_config). tap { |manager| manager.logger = Logger.new(StringIO.new) } }
+    subject(:ami_manager) { AwsManager.new(env_config: env_config, logger: fake_logger) }
 
     before do
       expect(AWS).to receive(:config).with(

data/spec/vm_shepherd/shepherd_spec.rb

@@ -119,14 +119,15 @@ module VmShepherd
               first_config.vcenter_creds.username,
               first_config.vcenter_creds.password,
               first_config.vsphere.datacenter,
+              instance_of(Logger),
             ).and_return(first_ova_manager)
 
-
           expect(VsphereManager).to receive(:new).with(
               last_config.vcenter_creds.ip,
               last_config.vcenter_creds.username,
               last_config.vcenter_creds.password,
               last_config.vsphere.datacenter,
+              instance_of(Logger),
             ).and_return(last_ova_manager)
 
           expect(first_ova_manager).to receive(:deploy).with(
@@ -182,7 +183,7 @@ module VmShepherd
         let(:last_aws_options) { {vm_name: 'vm-name-2'} }
 
         it 'uses AwsManager to launch a VM' do
-          expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+          expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
           expect(aws_manager).to receive(:deploy).with(ami_file_path: first_ami_file_path, vm_config: first_aws_options)
           expect(aws_manager).to receive(:deploy).with(ami_file_path: last_ami_file_path, vm_config: last_aws_options)
 
@@ -198,7 +199,7 @@ module VmShepherd
           let(:aws_elb_config) { {} }
 
           it 'uses AwsManager to launch a VM' do
-            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+            expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
             expect(aws_manager).to receive(:deploy).with(ami_file_path: first_ami_file_path, vm_config: first_aws_options)
             expect(aws_manager).to receive(:deploy).with(ami_file_path: last_ami_file_path, vm_config: last_aws_options)
 
@@ -338,6 +339,7 @@ module VmShepherd
               first_config.vcenter_creds.username,
               first_config.vcenter_creds.password,
               first_config.vsphere.datacenter,
+              instance_of(Logger),
             ).and_return(first_ova_manager)
           expect(first_ova_manager).to receive(:destroy).with(first_config.vm.ip, first_config.vsphere.resource_pool)
 
@@ -346,6 +348,7 @@ module VmShepherd
               last_config.vcenter_creds.username,
               last_config.vcenter_creds.password,
               last_config.vsphere.datacenter,
+              instance_of(Logger),
             ).and_return(last_ova_manager)
           expect(last_ova_manager).to receive(:destroy).with(last_config.vm.ip, last_config.vsphere.resource_pool)
 
@@ -360,7 +363,7 @@ module VmShepherd
         let(:last_ami_options) { {vm_name: 'vm-name-2'} }
 
         it 'uses AwsManager to destroy a VM' do
-          expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+          expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
           expect(aws_manager).to receive(:destroy).with(first_ami_options)
           expect(aws_manager).to receive(:destroy).with(last_ami_options)
 
@@ -372,7 +375,7 @@ module VmShepherd
           let(:aws_elb_config) {{}}
 
           it 'uses AwsManager to destroy a VM' do
-            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+            expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
             expect(aws_manager).to receive(:destroy).with(first_ami_options)
             expect(aws_manager).to receive(:destroy).with(last_ami_options)
 
@@ -521,6 +524,7 @@ module VmShepherd
               first_config.vcenter_creds.username,
               first_config.vcenter_creds.password,
               first_config.cleanup.datacenter,
+              instance_of(Logger),
             ).and_return(first_ova_manager)
           expect(first_ova_manager).to receive(:clean_environment).with(first_clean_environment_options)
           expect(VsphereManager).to receive(:new).with(
@@ -528,6 +532,7 @@ module VmShepherd
               last_config.vcenter_creds.username,
               last_config.vcenter_creds.password,
               last_config.cleanup.datacenter,
+              instance_of(Logger),
             ).and_return(last_ova_manager)
           expect(last_ova_manager).to receive(:clean_environment).with(last_clean_environment_options)
 
@@ -540,7 +545,7 @@ module VmShepherd
         let(:aws_manager) { instance_double(AwsManager) }
 
         it 'uses AwsManager to destroy a VM' do
-          expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+          expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
           expect(aws_manager).to receive(:clean_environment)
           manager.clean_environment
         end
@@ -550,7 +555,7 @@ module VmShepherd
           let(:aws_elb_config) {{}}
 
           it 'uses AwsManager to destroy a VM' do
-            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
+            expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(aws_manager)
             expect(aws_manager).to receive(:clean_environment)
             manager.clean_environment
           end
@@ -603,7 +608,7 @@ module VmShepherd
         let(:ams_manager) { instance_double(AwsManager) }
 
         it 'uses AwsManager to create an environment' do
-          expect(AwsManager).to receive(:new).with(aws_env_config).and_return(ams_manager)
+          expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(ams_manager)
           expect(ams_manager).to receive(:prepare_environment).with('cloudformation.json')
           manager.prepare_environment
         end
@@ -613,7 +618,7 @@ module VmShepherd
           let(:aws_elb_config) {{}}
 
           it 'uses AwsManager to create an environment' do
-            expect(AwsManager).to receive(:new).with(aws_env_config).and_return(ams_manager)
+            expect(AwsManager).to receive(:new).with(env_config: aws_env_config, logger: instance_of(Logger)).and_return(ams_manager)
             expect(ams_manager).to receive(:prepare_environment).with('cloudformation.json')
             manager.prepare_environment
           end
@@ -666,6 +671,7 @@ module VmShepherd
               first_config.vcenter_creds.username,
               first_config.vcenter_creds.password,
               first_config.vsphere.datacenter,
+              instance_of(Logger),
             ).and_return(first_ova_manager)
           expect(first_ova_manager).to receive(:prepare_environment)
           expect(VsphereManager).to receive(:new).with(
@@ -673,6 +679,7 @@ module VmShepherd
               last_config.vcenter_creds.username,
               last_config.vcenter_creds.password,
               last_config.vsphere.datacenter,
+              instance_of(Logger),
             ).and_return(last_ova_manager)
           expect(last_ova_manager).to receive(:prepare_environment)
 

data/spec/vm_shepherd/vsphere_manager_spec.rb

@@ -10,12 +10,9 @@ module VmShepherd
     let(:vm2) { instance_double(RbVmomi::VIM::VirtualMachine, name: 'vm_name2', resourcePool: instance_double(RbVmomi::VIM::ResourcePool, name: 'second_resource_pool')) }
     let(:vm3) { instance_double(RbVmomi::VIM::VirtualMachine, name: 'vm_name3', resourcePool: instance_double(RbVmomi::VIM::ResourcePool, name: 'second_resource_pool')) }
     let(:vms) { [vm1, vm2, vm3] }
+    let(:fake_logger) { instance_double(Logger).as_null_object }
 
-    subject(:vsphere_manager) do
-      manager = VsphereManager.new(host, username, password, datacenter_name)
-      manager.logger = Logger.new(StringIO.new)
-      manager
-    end
+    subject(:vsphere_manager) { VsphereManager.new(host, username, password, datacenter_name, fake_logger) }
 
     it 'loads' do
       expect { vsphere_manager }.not_to raise_error

data/vm_shepherd.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-v1'
   spec.add_dependency 'fog'
 
-  spec.add_dependency 'ruby_vcloud_sdk'
+  spec.add_dependency 'ruby_vcloud_sdk', '0.7.2'
 
   spec.add_dependency 'rbvmomi'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -42,16 +42,16 @@ dependencies:
   name: ruby_vcloud_sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement