Merge pull request #133 from cloudfoundry-incubator/pr/simplify-depen…

…dencies Simplify Dependencies
cloudfoundry · May 4, 2016 · 8afa659 · 8afa659
2 parents 66a7e47 + cf40307
commit 8afa659
Show file tree

Hide file tree

Showing 106 changed files with 43 additions and 247 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .blobs
+.bundle
 .dev_builds
 .final_builds/jobs/**/*.tgz
 .final_builds/packages/**/*.tgz
@@ -9,6 +10,7 @@ config/private.yml
 dev_releases
 releases/*.tgz
 releases/**/*.tgz
+src/bosh_azure_cpi/vendor/cache
 .DS_Store
 .vagrant
 *.swp

diff --git a/packages/bosh_azure_cpi/packaging b/packages/bosh_azure_cpi/packaging
@@ -4,11 +4,13 @@ BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
 
 cp -a bosh_azure_cpi/* ${BOSH_INSTALL_TARGET}
 
+export BUNDLE_CACHE_PATH="vendor/package"
+export BUNDLE_WITHOUT="development:test"
 bundle_cmd="$BOSH_PACKAGES_DIR/ruby_azure_cpi/bin/bundle"
 
 cd ${BOSH_INSTALL_TARGET}
 
 $bundle_cmd install \
   --local           \
   --no-prune        \
-  --deployment
+  --deployment
diff --git a/packages/bosh_azure_cpi/spec b/packages/bosh_azure_cpi/spec
@@ -3,4 +3,8 @@ name: bosh_azure_cpi
 dependencies:
 - ruby_azure_cpi
 files:
-- bosh_azure_cpi/**/*
+- bosh_azure_cpi/Gemfile
+- bosh_azure_cpi/Gemfile.lock
+- bosh_azure_cpi/bin/**/*
+- bosh_azure_cpi/lib/**/*
+- bosh_azure_cpi/vendor/package/**/*
diff --git a/src/bosh_azure_cpi/.gitignore b/src/bosh_azure_cpi/.gitignore
diff --git a/src/bosh_azure_cpi/Gemfile b/src/bosh_azure_cpi/Gemfile
@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
-gemspec
+gem 'bosh_common', '1.3215.3.0'
+gem 'bosh_cpi',    '1.3215.3.1'
+gem 'azure',       '~>0.7.4'
+gem 'vhd',         '~>0.0.4'
+gem 'httpclient',  '=2.4.0'
 
 group :development, :test do
   gem 'rspec', '~>3.0.0'

diff --git a/src/bosh_azure_cpi/Gemfile.lock b/src/bosh_azure_cpi/Gemfile.lock
@@ -1,26 +1,7 @@
-PATH
-  remote: .
-  specs:
-    bosh_azure_cpi (2.0.0)
-      azure (~> 0.7.4)
-      bosh-registry
-      bosh_common
-      bosh_cpi
-      httpclient (= 2.4.0)
-      vhd (~> 0.0.4)
-      yajl-ruby (>= 0.8.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.2)
     addressable (2.3.8)
-    aws-sdk (2.2.35)
-      aws-sdk-resources (= 2.2.35)
-    aws-sdk-core (2.2.35)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.2.35)
-      aws-sdk-core (= 2.2.35)
     azure (0.7.4)
       addressable (~> 2.3)
       azure-core (~> 0.1)
@@ -37,170 +18,22 @@ GEM
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6)
     bit-struct (0.15.0)
-    bosh-registry (1.3215.4.0)
-      aws-sdk
-      bosh_cpi (~> 1.3215.4.0)
-      fog
-      sequel (~> 3.43.0)
-      sinatra (~> 1.4.2)
-      thin (~> 1.5.0)
-      yajl-ruby (~> 1.2.0)
-    bosh_common (1.3215.4.0)
+    bosh_common (1.3215.3.0)
       logging (~> 1.8.2)
       semi_semantic (~> 1.1.0)
-    bosh_cpi (1.3215.4.0)
-      bosh_common (~> 1.3215.4.0)
+    bosh_cpi (1.3215.3.1)
       logging (~> 1.8.2)
       membrane (~> 1.1.0)
-    builder (3.2.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    daemons (1.2.3)
     diff-lcs (1.2.5)
-    eventmachine (1.2.0.1)
-    excon (0.49.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.38.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-cloudatcost (~> 0.1.0)
-      fog-core (~> 1.32)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-json
-      fog-local
-      fog-openstack
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-rackspace
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-vsphere (>= 0.4.0)
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-    fog-aliyun (0.1.0)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-cloudatcost (0.1.2)
-      fog-core (~> 1.36)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (1.37.0)
-      builder
-      excon (~> 0.45)
-      formatador (~> 0.2)
-    fog-dynect (0.0.3)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-local (0.3.0)
-      fog-core (~> 1.27)
-    fog-openstack (0.1.3)
-      fog-core (>= 1.37)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-powerdns (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-    fog-profitbricks (0.0.5)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-rackspace (0.1.1)
-      fog-core (>= 1.35)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.1.0)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-vsphere (0.6.3)
-      fog-core
-      rbvmomi (~> 1.8)
-    fog-xenserver (0.2.3)
-      fog-core
-      fog-xml
-    fog-xml (0.1.2)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
     hashdiff (0.2.2)
     httpclient (2.4.0)
-    inflecto (0.0.2)
-    ipaddress (0.8.3)
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
     json (1.8.3)
-    json_pure (1.8.3)
     little-plugger (1.1.4)
     logging (1.8.2)
       little-plugger (>= 1.1.3)
@@ -214,14 +47,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
     rake (10.3.2)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -236,19 +62,8 @@ GEM
     rspec-support (3.0.4)
     safe_yaml (1.0.4)
     semi_semantic (1.1.0)
-    sequel (3.43.0)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     systemu (2.6.5)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.19.1)
-    tilt (2.0.2)
-    trollop (2.1.2)
     uuid (2.3.8)
       macaddr (~> 1.0)
     vhd (0.0.4)
@@ -257,14 +72,19 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    xml-simple (1.1.5)
-    yajl-ruby (1.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bosh_azure_cpi!
+  azure (~> 0.7.4)
+  bosh_common (= 1.3215.3.0)
+  bosh_cpi (= 1.3215.3.1)
+  httpclient (= 2.4.0)
   rake (~> 10.3.2)
   rspec (~> 3.0.0)
+  vhd (~> 0.0.4)
   webmock
+
+BUNDLED WITH
+   1.11.2
diff --git a/src/bosh_azure_cpi/bin/azure_cpi b/src/bosh_azure_cpi/bin/azure_cpi
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'yaml'
 require 'ostruct'
@@ -31,4 +32,4 @@ $stdout = STDERR
 
 cli = Bosh::Cpi::Cli.new(cpi_lambda, cpi_log, STDOUT)
 
-cli.run(ARGF.read)
+cli.run(ARGF.read)
diff --git a/src/bosh_azure_cpi/bin/bosh_azure_console b/src/bosh_azure_cpi/bin/bosh_azure_console
@@ -1,14 +1,5 @@
 #!/usr/bin/env ruby
-
-# Copyright (c) 2009-2012 VMware, Inc.
-
-# Usage example:
-# irb(main):001:0> cpi.create_vm("test",
-#                                "b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04-LTS-amd64-server-20140528-en-us-30GB",
-#                                {"instance_type" => "Standard_D1"},
-#                                {"default" => {"type" => "dynamic", "cloud_properties" => {"virtual_network_name"=>"abel-boshvnet", "subnet_name"=>"BOSH"}},
-#                                [],
-#                                {"foo" =>"bar"})
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require "bosh_azure_cpi"
 require "irb"

diff --git a/src/bosh_azure_cpi/bosh_azure_cpi.gemspec b/src/bosh_azure_cpi/bosh_azure_cpi.gemspec
diff --git a/src/bosh_azure_cpi/lib/cloud/azure.rb b/src/bosh_azure_cpi/lib/cloud/azure.rb
@@ -7,7 +7,7 @@ module AzureCloud; end
 require 'set'
 require 'tmpdir'
 require 'securerandom'
-require 'yajl'
+require 'json'
 require 'digest/md5'
 require 'base64'
 require 'yaml'
@@ -28,7 +28,7 @@ module AzureCloud; end
 require 'common/thread_formatter'
 require 'common/common'
 
-require 'bosh/registry/client'
+require 'bosh/cpi/registry_client'
 
 require 'cloud'
 require 'cloud/azure/helpers'
@@ -52,4 +52,4 @@ module Bosh
   module Clouds
     Azure = Bosh::AzureCloud::Cloud
   end
-end
+end