vcloud-launcher 0.3.1 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.0 (2014-09-11)
+
+  - Upgrade dependency on vCloud Core to 0.11.0 which prevents plaintext
+    passwords in FOG_RC. Please use tokens via vcloud-login as per
+    the documentation: http://gds-operations.github.io/vcloud-tools/usage/
+
 ## 0.3.1 (2014-08-11)
 
 Maintenance:

data/lib/vcloud/launcher/cli.rb

@@ -19,7 +19,8 @@ module Vcloud
 
       def run
         begin
-          Vcloud::Launcher::Launch.new.run(@config_file, @options)
+          launch = Vcloud::Launcher::Launch.new(@config_file, @options)
+          launch.run
         rescue => error_msg
           $stderr.puts(error_msg)
           exit 1

data/lib/vcloud/launcher/launch.rb

@@ -5,23 +5,23 @@ module Vcloud
       class MissingPreambleError < RuntimeError ; end
       class MissingConfigurationError < RuntimeError ; end
 
-      attr_reader :config
+      attr_reader :config, :cli_options
 
-      def initialize
-        @config_loader = Vcloud::Core::ConfigLoader.new
-      end
+      def initialize(config_file, cli_options = {})
+        config_loader = ::Vcloud::Core::ConfigLoader.new
+        @cli_options = cli_options
 
-      def run(config_file = nil, cli_options = {})
-        set_logging_level(cli_options)
-        @config = @config_loader.load_config(config_file, Vcloud::Launcher::Schema::LAUNCHER_VAPPS)
+        set_logging_level
+        @config = config_loader.load_config(config_file, Vcloud::Launcher::Schema::LAUNCHER_VAPPS)
 
         validate_config
+      end
 
-        config[:vapps].each do |vapp_config|
+      def run
+        @config[:vapps].each do |vapp_config|
           Vcloud::Core.logger.info("Provisioning vApp #{vapp_config[:name]}.")
           begin
             vapp = ::Vcloud::Launcher::VappOrchestrator.provision(vapp_config)
-            #methadone sends option starting with 'no' as false.
             vapp.power_on unless cli_options["dont-power-on"]
             Vcloud::Core.logger.info("Provisioned vApp #{vapp_config[:name]} successfully.")
           rescue RuntimeError => e
@@ -32,7 +32,9 @@ module Vcloud
         end
       end
 
-      def set_logging_level(cli_options)
+      private
+
+      def set_logging_level
         if cli_options[:verbose]
           Vcloud::Core.logger.level = Logger::DEBUG
         elsif cli_options[:quiet]
@@ -42,8 +44,6 @@ module Vcloud
         end
       end
 
-      private
-
       def validate_config
         @config[:vapps].each do |vapp_config|
           validate_vapp_config(vapp_config)

data/lib/vcloud/launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Launcher
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/spec/integration/launcher/launch_spec.rb

@@ -12,7 +12,7 @@ describe Vcloud::Launcher::Launch do
       @minimum_data_yaml = ErbHelper.convert_erb_template_to_yaml(test_data_1, minimum_data_erb)
       @api_interface = Vcloud::Core::ApiInterface.new
 
-      Vcloud::Launcher::Launch.new.run(@minimum_data_yaml, {"dont-power-on" => true})
+      Vcloud::Launcher::Launch.new(@minimum_data_yaml, {"dont-power-on" => true}).run
 
       vapp_query_result = @api_interface.get_vapp_by_name_and_vdc_name(test_data_1[:vapp_name], test_data_1[:vdc_name])
       @provisioned_vapp_id = vapp_query_result[:href].split('/').last
@@ -36,7 +36,7 @@ describe Vcloud::Launcher::Launch do
       @test_data = define_test_data
       @config_yaml = ErbHelper.convert_erb_template_to_yaml(@test_data, File.join(File.dirname(__FILE__), 'data/happy_path.yaml.erb'))
       @api_interface = Vcloud::Core::ApiInterface.new
-      Vcloud::Launcher::Launch.new.run(@config_yaml, { "dont-power-on" => true })
+      Vcloud::Launcher::Launch.new(@config_yaml, { "dont-power-on" => true }).run
 
       @vapp_query_result = @api_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name], @test_data[:vdc_name])
       @vapp_id = @vapp_query_result[:href].split('/').last

data/spec/integration/launcher/storage_profile_integration_spec.rb

@@ -7,7 +7,7 @@ describe Vcloud::Launcher::Launch do
       @test_data = define_test_data
       @config_yaml = ErbHelper.convert_erb_template_to_yaml(@test_data, File.join(File.dirname(__FILE__), 'data/storage_profile.yaml.erb'))
       @api_interface = Vcloud::Core::ApiInterface.new
-      Vcloud::Launcher::Launch.new.run(@config_yaml, {'dont-power-on' => true})
+      Vcloud::Launcher::Launch.new(@config_yaml, {'dont-power-on' => true}).run
 
       @vapp_query_result_1 = @api_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_1], @test_data[:vdc_1_name])
       @vapp_id_1 = @vapp_query_result_1[:href].split('/').last

data/spec/vcloud/launcher/cli_spec.rb

@@ -38,9 +38,8 @@ describe Vcloud::Launcher::Cli do
     shared_examples "a good CLI command" do
       it "passes the right CLI options and exits normally" do
         expect(Vcloud::Launcher::Launch).to receive(:new).
-          and_return(mock_launch)
-        expect(mock_launch).to receive(:run).
-          with(config_file, cli_options)
+          with(config_file, cli_options).and_return(mock_launch)
+
         expect(subject.exitstatus).to eq(0)
       end
     end
@@ -156,6 +155,24 @@ describe Vcloud::Launcher::Cli do
     end
   end
 
+  describe '.run' do
+    let(:mock_launch) { double(:launch, :run => true) }
+
+    subject { Vcloud::Launcher::Cli.new([ config_file ]) }
+
+    it 'calls Vcloud::Launcher::Launch.run' do
+      allow( Vcloud::Launcher::Launch).to receive(:new).and_return(mock_launch)
+
+      expect(mock_launch).to receive(:run)
+
+      begin
+        subject.run
+      rescue SystemExit => e
+        e.exitstatus
+      end
+    end
+  end
+
   describe "incorrect usage" do
     shared_examples "print usage and exit abnormally" do |error|
       it "does not call Launch" do

data/spec/vcloud/launcher/launch_spec.rb

@@ -1,72 +1,141 @@
 require 'spec_helper'
 
 describe Vcloud::Launcher::Launch do
-  context "#run" do
-    before(:each) do
-      config_loader = double(:config_loader)
-      expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
-      @successful_app_1 = {
-          :name => "successful app 1",
-          :vdc_name => "Test Vdc",
-          :catalog_name => "default",
-          :vapp_template_name => "ubuntu-precise"
-      }
-      @fake_failing_app = {
-          :name => "fake failing app",
-          :vdc_name => "wrong vdc",
-          :catalog_name => "default",
-          :vapp_template_name => "ubuntu-precise"
-      }
-      @successful_app_2 = {
-          :name => "successful app 2",
-          :vdc_name => "Test Vdc",
-          :catalog_name => "default",
-          :vapp_template_name => "ubuntu-precise"
-      }
-      expect(config_loader).to receive(:load_config).
-        and_return({:vapps => [@successful_app_1, @fake_failing_app, @successful_app_2]})
+  let(:good_vapp_one) do
+    {
+      name: "successful app 1",
+      vdc_name: "Test Vdc",
+      catalog_name: "default",
+      vapp_template_name: "ubuntu-precise"
+    }
+  end
+  let(:good_vapp_two) do
+    {
+      name: "successful app 2",
+      vdc_name: "Test Vdc",
+      catalog_name: "default",
+      vapp_template_name: "ubuntu-precise"
+    }
+  end
+  let(:bad_vapp_one) do
+    {
+      name: "fake failing app",
+      vdc_name: "wrong vdc",
+      catalog_name: "default",
+      vapp_template_name: "ubuntu-precise"
+    }
+  end
+
+  let(:config) do
+    { vapps: [ good_vapp_one, bad_vapp_one, good_vapp_two ] }
+  end
+
+  let(:config_file) { 'foo.yml' }
+  let(:config_loader) { double(:config_loader) }
+
+  before do
+    allow(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
+    allow(config_loader).to receive(:load_config).and_return(config)
+  end
+
+  describe '#new' do
+    subject { Vcloud::Launcher::Launch }
+
+    context 'with minimally correct configuration' do
+      it 'does not raise an error' do
+        expect{ subject.new(config_file) }.not_to raise_error
+      end
+
+      it 'loads configuration' do
+        config_loader.should_receive(:load_config).and_return(config)
+        subject.new(config_file)
+      end
+
+      it 'validates the configuration' do
+        subject.any_instance.should_receive(:validate_config)
+        subject.new(config_file)
+      end
+    end
+
+    context 'without a configuration file' do
+      it 'raises an error' do
+        expect { subject.new }.to raise_error(ArgumentError)
+      end
     end
+  end
 
-    it "should stop on failure by default" do
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
-      expect(Vcloud::Launcher::VappOrchestrator).not_to receive(:provision).with(@successful_app_2)
+  context "#run" do
+    subject { Vcloud::Launcher::Launch.new(config_file, cli_options) }
 
-      cli_options = {}
-      subject.run('input_config_yaml', cli_options)
+    before do
+      allow(Vcloud::Launcher::VappOrchestrator).to receive(:provision).
+        with(good_vapp_one).and_return(double(:vapp, power_on: true))
     end
 
-    it "should continue on error if cli option continue-on-error is set" do
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
-      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_2).and_return(double(:vapp, :power_on => true))
+    context "default behaviour on failure" do
+      let(:cli_options) { {} }
+
+      it "should stop" do
+        allow(Vcloud::Launcher::VappOrchestrator).to receive(:provision).
+          with(bad_vapp_one).and_raise(RuntimeError.new('failed to find vdc'))
+
+        expect(Vcloud::Launcher::VappOrchestrator).not_to receive(:provision).with(good_vapp_two)
 
-      cli_options = {"continue-on-error" => true}
-      subject.run('input_config_yaml', cli_options)
+        subject.run
+      end
     end
 
+    context "with continue-on-error set" do
+      let(:cli_options) { {"continue-on-error" => true} }
+
+      it "should continue" do
+        allow(Vcloud::Launcher::VappOrchestrator).to receive(:provision).
+          with(bad_vapp_one).and_raise(RuntimeError.new('failed to find vdc'))
+
+        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(good_vapp_two).and_return(double(:vapp, :power_on => true))
+
+        subject.run
+      end
+    end
   end
 
   context "#set_logging_level" do
+    subject { Vcloud::Launcher::Launch.new(config_file, cli_options) }
+
+    describe "default log level" do
+      let(:cli_options) { {} }
 
-    it "sets the logging level to DEBUG when :verbose is specified" do
-      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
-      subject.set_logging_level(:verbose => true)
+      it "sets the logging level to INFO" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::INFO)
+        subject
+      end
     end
 
-    it "sets the logging level to ERROR when :quiet is specified" do
-      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::ERROR)
-      subject.set_logging_level(:quiet => true)
+    describe "when :verbose is specified" do
+      let(:cli_options) { { verbose: true } }
+
+      it "sets the logging level to DEBUG" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
+        subject
+      end
     end
 
-    it "sets the logging level to DEBUG when :quiet and :verbose are specified" do
-      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
-      subject.set_logging_level(:quiet => true, :verbose => true)
+    describe "when :quiet is specified" do
+      let(:cli_options) { { quiet: true } }
+
+      it "sets the logging level to ERROR" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::ERROR)
+        subject
+      end
     end
 
-    it "sets the logging level to INFO by default" do
-      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::INFO)
-      subject.set_logging_level({})
+    describe "when :quiet and :verbose are specified" do
+      let(:cli_options) { { quiet: true, verbose: true } }
+
+      it "sets the logging level to DEBUG when :quiet and :verbose are specified" do
+        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
+        subject
+      end
     end
   end
 
@@ -80,7 +149,7 @@ describe Vcloud::Launcher::Launch do
         to receive(:provision).and_return(double(:vapp, :power_on => true))
     end
 
-    subject { Vcloud::Launcher::Launch.new }
+    subject { Vcloud::Launcher::Launch.new(config_file) }
 
     context "when bootstrap configuration is supplied" do
       context "script_path is missing" do
@@ -100,7 +169,7 @@ describe Vcloud::Launcher::Launch do
         end
 
         it "raises MissingConfigurationError" do
-          expect{ subject.run(config_file) }.
+          expect{ subject }.
             to raise_error(Vcloud::Launcher::Launch::MissingConfigurationError)
         end
       end
@@ -123,7 +192,7 @@ describe Vcloud::Launcher::Launch do
         end
 
         it "raises MissingPreambleError" do
-          expect{ subject.run(config_file) }.
+          expect{ subject }.
             to raise_error(Vcloud::Launcher::Launch::MissingPreambleError)
         end
       end
@@ -154,7 +223,7 @@ describe Vcloud::Launcher::Launch do
           # A rather overly specific test to find the message of
           # interest amongst other log messages.
           expect(Vcloud::Core.logger).to receive(:info).with(/without variables to template/)
-          subject.run(config_file)
+          subject
         end
       end
     end
@@ -173,7 +242,7 @@ describe Vcloud::Launcher::Launch do
       end
 
       it "should not raise an error" do
-        expect{ subject.run(config_file) }.not_to raise_error
+        expect{ subject }.not_to raise_error
       end
     end
   end

data/vcloud-launcher.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'vcloud-core', '~> 0.10.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.11.0'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-launcher
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,43 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5183540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+  version_requirements: *5183540
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5182780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+  version_requirements: *5182780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5182260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *5182260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5181560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *5181560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5180780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.14.1
+  version_requirements: *5180780
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5179260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: 0.23.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.23.0
+  version_requirements: *5179260
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5177520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+  version_requirements: *5177520
 - !ruby/object:Gem::Dependency
   name: vcloud-tools-tester
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &5192280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,12 +98,7 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+  version_requirements: *5192280
 description: 
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -211,10 +171,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4291001892380431135
+      hash: -1721812803548595572
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Tool to launch and configure vCloud vApps