vcloud-launcher 0.2.0 → 0.3.0

data/.gitignore

@@ -1,13 +1,9 @@
 *.gem
 *.rbc
-*.swp
-*.un~
 /.bundle/
 /.ruby-version
 /Gemfile.lock
-/bundle/
 /coverage/
 /pkg/
 fog_integration_test.config
-.idea
 /spec/integration/vcloud_tools_testing_config.yaml

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.3.0 (2014-08-08)
+
+This release bumps the dependency to vCloud Core 0.9.0:
+
+  - New vcloud-login tool for fetching session tokens without the need to
+    store your password in a plaintext FOG_RC file.
+  - Deprecates the use of :vcloud_director_password in a plaintext FOG_RC
+    file. A warning will be printed to STDERR at load time. Please use
+    vcloud-login instead.
+  - This gem no longer directly references fog, instead using vCloud Core's
+    API for its interaction with the vCloud API.
+
 ## 0.2.0 (2014-07-14)
 
 Features:

data/README.md

@@ -51,40 +51,7 @@ Configuration schemas can be found in [`lib/vcloud/launcher/schema/`][schema].
 
 ## Credentials
 
-vCloud Launcher is based around [fog](http://fog.io/). To use it you'll need to give it
-credentials that allow it to talk to a vCloud Director environment.
-
-1. Create a '.fog' file in your home directory.
-
-  For example:
-
-      test_credentials:
-        vcloud_director_host: 'host.api.example.com'
-        vcloud_director_username: 'username@org_name'
-        vcloud_director_password: ''
-
-2. Obtain a session token. First, curl the API:
-
-        curl -D- -d '' \
-            -H 'Accept: application/*+xml;version=5.1' -u '<username>@<org_name>' \
-            https://<host.api.example.com>/api/sessions
-
-  This will prompt for your password.
-
-  From the headers returned, the value of the `x-vcloud-authorization` header is your
-  session token, and this will be valid for 30 minutes idle - any activity will extend
-  its life by another 30 minutes.
-
-3. Specify your credentials and session token at the beginning of the command. For example:
-
-        FOG_CREDENTIAL=test_credentials \
-            FOG_VCLOUD_TOKEN=AAAABBBBBCCCCCCDDDDDDEEEEEEFFFFF= \
-            vcloud-launch node.yaml
-
-  You may find it easier to export one or both of the values as environment variables.
-
-  **NB** It is also possible to sidestep the need for the session token by saving your
-  password in the fog file. This is **not recommended**.
+Please see the [vcloud-tools usage documentation](http://gds-operations.github.io/vcloud-tools/usage/).
 
 ## Contributing
 

data/jenkins.sh

@@ -1,16 +1,5 @@
-#!/bin/bash -x
+#!/bin/bash
 set -e
 
-git clean -ffdx
-
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec rake
-
-# Obtain the integration test parameters
-git clone git@github.gds:gds/vcloud-tools-testing-config.git
-mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
-rm -rf vcloud-tools-testing-config
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration:all
-
+./jenkins_tests.sh
 bundle exec rake publish_gem

data/jenkins_tests.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -eu
+
+function cleanup {
+  rm $FOG_RC
+}
+
+# Override default of ~/.fog and delete afterwards.
+export FOG_RC=$(mktemp /tmp/vcloud_fog_rc.XXXXXXXXXX)
+trap cleanup EXIT
+
+cat <<EOF >${FOG_RC}
+${FOG_CREDENTIAL}:
+  vcloud_director_host: '${API_HOST}'
+  vcloud_director_username: '${API_USERNAME}'
+  vcloud_director_password: ''
+EOF
+
+git clean -ffdx
+
+bundle install --path "${HOME}/bundles/${JOB_NAME}"
+bundle exec rake
+
+# Obtain the integration test parameters
+git clone git@github.gds:gds/vcloud-tools-testing-config.git
+mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
+rm -rf vcloud-tools-testing-config
+
+# Never log token to STDOUT.
+set +x
+eval $(printenv API_PASSWORD | bundle exec vcloud-login)
+
+bundle exec rake integration:all

data/lib/vcloud/launcher/vapp_orchestrator.rb

@@ -18,7 +18,7 @@ module Vcloud
 
         network_names = extract_vm_networks(vapp_config)
         vapp = Vcloud::Core::Vapp.instantiate(name, network_names, template_id, vdc_name)
-        Vcloud::Launcher::VmOrchestrator.new(vapp.fog_vms.first, vapp).customize(vapp_config[:vm]) if vapp_config[:vm]
+        Vcloud::Launcher::VmOrchestrator.new(vapp.vms.first, vapp).customize(vapp_config[:vm]) if vapp_config[:vm]
 
         vapp
       end

data/lib/vcloud/launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Launcher
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/vcloud/launcher/vm_orchestrator.rb

@@ -2,8 +2,8 @@ module Vcloud
   module Launcher
     class VmOrchestrator
 
-      def initialize fog_vm, vapp
-        vm_id = fog_vm[:href].split('/').last
+      def initialize vcloud_vm, vapp
+        vm_id = vcloud_vm[:href].split('/').last
         @vm = Core::Vm.new(vm_id, vapp)
       end
 

data/spec/integration/launcher/launch_spec.rb

@@ -10,13 +10,13 @@ describe Vcloud::Launcher::Launch do
       test_data_1 = define_test_data
       minimum_data_erb = File.join(File.dirname(__FILE__), 'data/minimum_data_setup.yaml.erb')
       @minimum_data_yaml = ErbHelper.convert_erb_template_to_yaml(test_data_1, minimum_data_erb)
-      @fog_interface = Vcloud::Fog::ServiceInterface.new
+      @api_interface = Vcloud::Core::ApiInterface.new
 
       Vcloud::Launcher::Launch.new.run(@minimum_data_yaml, {"dont-power-on" => true})
 
-      vapp_query_result = @fog_interface.get_vapp_by_name_and_vdc_name(test_data_1[:vapp_name], test_data_1[:vdc_name])
+      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
-      provisioned_vapp = @fog_interface.get_vapp @provisioned_vapp_id
+      provisioned_vapp = @api_interface.get_vapp @provisioned_vapp_id
 
       expect(provisioned_vapp).not_to be_nil
       expect(provisioned_vapp[:name]).to eq(test_data_1[:vapp_name])
@@ -26,7 +26,7 @@ describe Vcloud::Launcher::Launch do
     after(:each) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
         File.delete @minimum_data_yaml
-        expect(@fog_interface.delete_vapp(@provisioned_vapp_id)).to eq(true)
+        expect(@api_interface.delete_vapp(@provisioned_vapp_id)).to eq(true)
       end
     end
   end
@@ -35,13 +35,13 @@ describe Vcloud::Launcher::Launch do
     before(:all) 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'))
-      @fog_interface = Vcloud::Fog::ServiceInterface.new
+      @api_interface = Vcloud::Core::ApiInterface.new
       Vcloud::Launcher::Launch.new.run(@config_yaml, { "dont-power-on" => true })
 
-      @vapp_query_result = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name], @test_data[:vdc_name])
+      @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
 
-      @vapp = @fog_interface.get_vapp @vapp_id
+      @vapp = @api_interface.get_vapp @vapp_id
       @vm = @vapp[:Children][:Vm].first
       @vm_id = @vm[:href].split('/').last
 
@@ -120,7 +120,7 @@ describe Vcloud::Launcher::Launch do
     after(:all) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
         File.delete @config_yaml
-        expect(@fog_interface.delete_vapp(@vapp_id)).to eq(true)
+        expect(@api_interface.delete_vapp(@vapp_id)).to eq(true)
       end
     end
 

data/spec/integration/launcher/storage_profile_integration_spec.rb

@@ -6,22 +6,22 @@ describe Vcloud::Launcher::Launch do
     before(:all) 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'))
-      @fog_interface = Vcloud::Fog::ServiceInterface.new
+      @api_interface = Vcloud::Core::ApiInterface.new
       Vcloud::Launcher::Launch.new.run(@config_yaml, {'dont-power-on' => true})
 
-      @vapp_query_result_1 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_1], @test_data[:vdc_1_name])
+      @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
-      @vapp_1 = @fog_interface.get_vapp @vapp_id_1
+      @vapp_1 = @api_interface.get_vapp @vapp_id_1
       @vm_1 = @vapp_1[:Children][:Vm].first
 
-      @vapp_query_result_2 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_2], @test_data[:vdc_2_name])
+      @vapp_query_result_2 = @api_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_2], @test_data[:vdc_2_name])
       @vapp_id_2 = @vapp_query_result_2[:href].split('/').last
-      @vapp_2 = @fog_interface.get_vapp @vapp_id_2
+      @vapp_2 = @api_interface.get_vapp @vapp_id_2
       @vm_2 = @vapp_2[:Children][:Vm].first
 
-      @vapp_query_result_3 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_3], @test_data[:vdc_1_name])
+      @vapp_query_result_3 = @api_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_3], @test_data[:vdc_1_name])
       @vapp_id_3 = @vapp_query_result_3[:href].split('/').last
-      @vapp_3 = @fog_interface.get_vapp @vapp_id_3
+      @vapp_3 = @api_interface.get_vapp @vapp_id_3
       @vm_3 = @vapp_3[:Children][:Vm].first
 
     end
@@ -50,9 +50,9 @@ describe Vcloud::Launcher::Launch do
     after(:all) do
       unless ENV['VCLOUD_TOOLS_RSPEC_NO_DELETE_VAPP']
         File.delete @config_yaml
-        expect(@fog_interface.delete_vapp(@vapp_id_1)).to eq(true)
-        expect(@fog_interface.delete_vapp(@vapp_id_2)).to eq(true)
-        expect(@fog_interface.delete_vapp(@vapp_id_3)).to eq(true)
+        expect(@api_interface.delete_vapp(@vapp_id_1)).to eq(true)
+        expect(@api_interface.delete_vapp(@vapp_id_2)).to eq(true)
+        expect(@api_interface.delete_vapp(@vapp_id_3)).to eq(true)
       end
     end
 

data/spec/vcloud/launcher/preamble_spec.rb

@@ -36,8 +36,8 @@ module Vcloud
             vars: { bob: 'Hello', mary: 'Hola' }
           },
           extra_disks: [
-            { size:  5120, fs_file: '/opt/test_disk1' },
-            { size: 10240, fs_file: '/opt/test_disk2' },
+            { name: 'test_disk1', size:  5120 },
+            { name: 'test_disk2', size: 10240 },
           ]
         }
       end

data/spec/vcloud/launcher/vapp_orchestrator_spec.rb

@@ -6,11 +6,11 @@ describe Vcloud::Launcher::VappOrchestrator do
 
   context "provision a vapp" do
 
-    let(:mock_fog_vm) {
+    let(:mock_vcloud_vm) {
       double(:vm)
     }
     let(:mock_vapp) {
-      double(:vapp, :fog_vms => [mock_fog_vm], :reload => self)
+      double(:vapp, :vms => [mock_vcloud_vm], :reload => self)
     }
     let(:mock_vm_orchestrator) {
       double(:vm_orchestrator, :customize => true)
@@ -46,7 +46,7 @@ describe Vcloud::Launcher::VappOrchestrator do
 
       expect(Vcloud::Core::Vapp).to receive(:instantiate).with('test-vapp-1', ['org-vdc-1-net-1'], 1, 'test-vdc-1')
       .and_return(mock_vapp)
-      expect(Vcloud::Launcher::VmOrchestrator).to receive(:new).with(mock_fog_vm, mock_vapp).and_return(mock_vm_orchestrator)
+      expect(Vcloud::Launcher::VmOrchestrator).to receive(:new).with(mock_vcloud_vm, mock_vapp).and_return(mock_vm_orchestrator)
 
       new_vapp = subject.provision @config
       expect(new_vapp).to eq(mock_vapp)

data/spec/vcloud/launcher/vm_orchestrator_spec.rb

@@ -6,14 +6,14 @@ describe Vcloud::Launcher::VmOrchestrator do
     @vm_id = "vm-12345678-1234-1234-1234-123456712312"
   end
 
-  let(:fog_vm) {
+  let(:vcloud_vm) {
     { :href => "/#{@vm_id}" }
   }
   let(:vapp) {
     double(:vapp, :name => 'web-app1')
   }
   subject {
-    Vcloud::Launcher::VmOrchestrator.new(fog_vm, vapp)
+    Vcloud::Launcher::VmOrchestrator.new(vcloud_vm, vapp)
   }
 
   it "orchestrates customization" do
@@ -26,10 +26,9 @@ describe Vcloud::Launcher::VmOrchestrator do
             :shutdown => true
         },
         :extra_disks => [
-            {:size => '1024', :name => 'Hard disk 2', :fs_file => 'mysql', :fs_mntops => 'mysql-something'},
-            {:size => '2048', :name => 'Hard disk 3', :fs_file => 'solr', :fs_mntops => 'solr-something'}
+            {:name => 'Hard disk 2', :size => '1024'},
+            {:name => 'Hard disk 3', :size => '2048'},
         ],
-
         :network_connections => [
             {:name => "network1", :ip_address => "198.12.1.21"},
         ],

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.6.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.9.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.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ files:
 - examples/vcloud-launch/multiple_vapps_simple.yaml
 - examples/vcloud-launch/yaml_anchors_example.yaml
 - jenkins.sh
-- jenkins_integration_tests.sh
+- jenkins_tests.sh
 - lib/vcloud/launcher.rb
 - lib/vcloud/launcher/cli.rb
 - lib/vcloud/launcher/launch.rb
@@ -189,7 +189,6 @@ files:
 - spec/vcloud/launcher/preamble_spec.rb
 - spec/vcloud/launcher/vapp_orchestrator_spec.rb
 - spec/vcloud/launcher/vm_orchestrator_spec.rb
-- tools/fog_credentials.rb
 - vcloud-launcher.gemspec
 homepage: https://github.com/gds-operations/vcloud-launcher
 licenses:
@@ -212,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -851694776577848026
+      hash: -4262802596274003381
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/jenkins_integration_tests.sh

@@ -1,13 +0,0 @@
-#!/bin/bash -x
-set -e
-
-git clean -ffdx
-
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-
-# Obtain the integration test parameters
-git clone git@github.gds:gds/vcloud-tools-testing-config.git
-mv vcloud-tools-testing-config/vcloud_tools_testing_config.yaml spec/integration/
-rm -rf vcloud-tools-testing-config
-
-RUBYOPT="-r ./tools/fog_credentials" bundle exec rake integration:all

data/tools/fog_credentials.rb

@@ -1,17 +0,0 @@
-# Initialiser for getting vCloud credentials into Fog from Jenkins build
-# parameters, without needing to write them to disk. To be used with:
-#
-#     RUBYOPT="-r ./tools/fog_credentials" bundle exec integration
-#
-# Replace with FOG_VCLOUD_TOKEN support when we have a tool:
-#
-#     https://www.pivotaltracker.com/story/show/68989754
-#
-require 'bundler/setup'
-require 'fog'
-
-Fog.credentials = {
-  :vcloud_director_host     => ENV['API_HOST'],
-  :vcloud_director_username => ENV['API_USERNAME'],
-  :vcloud_director_password => ENV['API_PASSWORD'],
-}