bosh_cli_plugin_micro 1.5.0.pre.1113 → 1.5.0.pre.1114

data/lib/bosh/cli/commands/micro.rb

@@ -1,23 +1,23 @@
 require 'pp'
-require 'deployer'
+require 'bosh/deployer'
 
 module Bosh::Cli::Command
   class Micro < Base
     include Bosh::Deployer::Helpers
 
     MICRO_DIRECTOR_PORT = 25555
-    DEFAULT_CONFIG_PATH = File.expand_path("~/.bosh_deployer_config")
-    MICRO_BOSH_YAML = "micro_bosh.yml"
+    DEFAULT_CONFIG_PATH = File.expand_path('~/.bosh_deployer_config')
+    MICRO_BOSH_YAML = 'micro_bosh.yml'
 
     def initialize(runner)
       super(runner)
       options[:config] ||= DEFAULT_CONFIG_PATH #hijack Cli::Config
     end
 
-    usage "micro"
-    desc  "show micro bosh sub-commands"
+    usage 'micro'
+    desc 'show micro bosh sub-commands'
     def micro_help
-      say("bosh micro sub-commands:")
+      say('bosh micro sub-commands:')
       nl
       cmds = Bosh::Cli::Config.commands.values.find_all {|c|
         c.usage =~ /^micro/
@@ -25,8 +25,8 @@ module Bosh::Cli::Command
       Bosh::Cli::Command::Help.list_commands(cmds)
     end
 
-    usage "micro deployment"
-    desc  "Choose micro deployment to work with, or display current deployment"
+    usage 'micro deployment'
+    desc 'Choose micro deployment to work with, or display current deployment'
     def micro_deployment(name=nil)
       if name
         set_current(name)
@@ -45,11 +45,11 @@ module Bosh::Cli::Command
       manifest = load_yaml_file(manifest_filename)
 
       unless manifest.is_a?(Hash)
-        err "Invalid manifest format"
+        err 'Invalid manifest format'
       end
 
-      if manifest["network"].blank?
-        err "network is not defined in deployment manifest"
+      if manifest['network'].blank?
+        err 'network is not defined in deployment manifest'
       end
       ip = deployer(manifest_filename).discover_bosh_ip || name
 
@@ -61,7 +61,7 @@ module Bosh::Cli::Command
 
       if old_director_ip != ip
         set_target(ip)
-        say "#{"WARNING!".make_red} Your target has been changed to `#{target.make_red}'!"
+        say "#{'WARNING!'.make_red} Your target has been changed to `#{target.make_red}'!"
       end
 
       say "Deployment set to '#{manifest_filename.make_green}'"
@@ -70,51 +70,51 @@ module Bosh::Cli::Command
     end
 
     def show_current
-      say(deployment ? "Current deployment is '#{deployment.make_green}'" : "Deployment not set")
+      say(deployment ? "Current deployment is '#{deployment.make_green}'" : 'Deployment not set')
     end
 
-    usage "micro status"
-    desc  "Display micro BOSH deployment status"
+    usage 'micro status'
+    desc 'Display micro BOSH deployment status'
     def status
       stemcell_cid = deployer_state(:stemcell_cid)
       stemcell_name = deployer_state(:stemcell_name)
       vm_cid = deployer_state(:vm_cid)
       disk_cid = deployer_state(:disk_cid)
-      deployment = config.deployment ? config.deployment.make_green : "not set".make_red
+      deployment = config.deployment ? config.deployment.make_green : 'not set'.make_red
 
-      say("Stemcell CID".ljust(15) + stemcell_cid)
-      say("Stemcell name".ljust(15) + stemcell_name)
-      say("VM CID".ljust(15) + vm_cid)
-      say("Disk CID".ljust(15) + disk_cid)
-      say("Micro BOSH CID".ljust(15) + Bosh::Deployer::Config.uuid)
-      say("Deployment".ljust(15) + deployment)
+      say('Stemcell CID'.ljust(15) + stemcell_cid)
+      say('Stemcell name'.ljust(15) + stemcell_name)
+      say('VM CID'.ljust(15) + vm_cid)
+      say('Disk CID'.ljust(15) + disk_cid)
+      say('Micro BOSH CID'.ljust(15) + Bosh::Deployer::Config.uuid)
+      say('Deployment'.ljust(15) + deployment)
 
       update_target
 
-      target_name = target ? target.make_green : "not set".make_red
-      say("Target".ljust(15) + target_name)
+      target_name = target ? target.make_green : 'not set'.make_red
+      say('Target'.ljust(15) + target_name)
     end
 
-    usage  "micro deploy"
-    desc   "Deploy a micro BOSH instance to the currently selected deployment"
-    option "--update", "update existing instance"
-    option "--update-if-exists", "create new or update existing instance"
+    usage 'micro deploy'
+    desc 'Deploy a micro BOSH instance to the currently selected deployment'
+    option '--update', 'update existing instance'
+    option '--update-if-exists', 'create new or update existing instance'
     def perform(stemcell=nil)
       update = !!options[:update]
 
-      err "No deployment set" unless deployment
+      err 'No deployment set' unless deployment
 
       manifest = load_yaml_file(deployment)
 
       if stemcell.nil?
         unless manifest.is_a?(Hash)
-          err("Invalid manifest format")
+          err('Invalid manifest format')
         end
 
-        stemcell = dig_hash(manifest, "resources", "cloud_properties", "image_id")
+        stemcell = dig_hash(manifest, 'resources', 'cloud_properties', 'image_id')
 
         if stemcell.nil?
-          err "No stemcell provided"
+          err 'No stemcell provided'
         end
       end
 
@@ -126,26 +126,26 @@ module Bosh::Cli::Command
 
       if deployer.exists?
         if !options[:update_if_exists] && !update
-          err "Instance exists. Did you mean to --update?"
+          err 'Instance exists. Did you mean to --update?'
         end
-        confirmation = "Updating"
+        confirmation = 'Updating'
         method = :update_deployment
       else
         prefered_dir = File.dirname(File.dirname(deployment))
 
         unless prefered_dir == Dir.pwd
           confirm_deployment("\n#{'No `bosh-deployments.yml` file found in current directory.'.make_red}\n\n" +
-                                 "Conventionally, `bosh-deployments.yml` should be saved in " +
+                               'Conventionally, `bosh-deployments.yml` should be saved in ' +
                                  "#{prefered_dir.make_green}.\n" +
                                  "Is #{Dir.pwd.make_yellow} a directory where you can save state?")
         end
 
-        err "No existing instance to update" if update
-        confirmation = "Deploying new micro BOSH instance"
+        err 'No existing instance to update' if update
+        confirmation = 'Deploying new micro BOSH instance'
         method = :create_deployment
 
         # make sure the user knows a persistent disk is required
-        unless dig_hash(manifest, "resources", "persistent_disk")
+        unless dig_hash(manifest, 'resources', 'persistent_disk')
           quit("No persistent disk configured in #{MICRO_BOSH_YAML}".make_red)
         end
       end
@@ -160,7 +160,7 @@ module Bosh::Cli::Command
         say("\n")
 
         unless stemcell_file.valid?
-          err("Stemcell is invalid, please fix, verify and upload again")
+          err('Stemcell is invalid, please fix, verify and upload again')
         end
       end
 
@@ -172,7 +172,7 @@ module Bosh::Cli::Command
 
       deployer.send(method, stemcell)
 
-      renderer.finish("done")
+      renderer.finish('done')
 
       duration = renderer.duration || (Time.now - start_time)
 
@@ -181,11 +181,11 @@ module Bosh::Cli::Command
       say("Deployed #{desc}, took #{format_time(duration).make_green} to complete")
     end
 
-    usage  "micro delete"
-    desc   "Delete micro BOSH instance (including persistent disk)"
+    usage 'micro delete'
+    desc 'Delete micro BOSH instance (including persistent disk)'
     def delete
       unless deployer.exists?
-        err "No existing instance to delete"
+        err 'No existing instance to delete'
       end
 
       name = deployer.state.name
@@ -194,7 +194,7 @@ module Bosh::Cli::Command
       "THIS IS A VERY DESTRUCTIVE OPERATION AND IT CANNOT BE UNDONE!\n".make_red
 
       unless confirmed?
-        say "Canceled deleting deployment".make_green
+        say 'Canceled deleting deployment'.make_green
         return
       end
 
@@ -206,29 +206,29 @@ module Bosh::Cli::Command
 
       deployer.delete_deployment
 
-      renderer.finish("done")
+      renderer.finish('done')
 
       duration = renderer.duration || (Time.now - start_time)
 
       say("Deleted deployment '#{name}', took #{format_time(duration).make_green} to complete")
     end
 
-    usage "micro deployments"
-    desc  "Show the list of deployments"
+    usage 'micro deployments'
+    desc 'Show the list of deployments'
     def list
       file = File.join(work_dir, DEPLOYMENTS_FILE)
       if File.exists?(file)
-        deployments = load_yaml_file(file)["instances"]
+        deployments = load_yaml_file(file)['instances']
       else
         deployments = []
       end
 
-      err("No deployments") if deployments.size == 0
+      err('No deployments') if deployments.size == 0
 
-      na = "n/a"
+      na = 'n/a'
 
       deployments_table = table do |t|
-        t.headings = [ "Name", "VM name", "Stemcell name" ]
+        t.headings = [ 'Name', 'VM name', 'Stemcell name']
         deployments.each do |r|
           t << [ r[:name], r[:vm_cid] || na, r[:stemcell_cid] || na  ]
         end
@@ -237,10 +237,10 @@ module Bosh::Cli::Command
       say("\n")
       say(deployments_table)
       say("\n")
-      say("Deployments total: %d" % deployments.size)
+      say('Deployments total: %d' % deployments.size)
     end
 
-    usage "micro agent <args>"
+    usage 'micro agent <args>'
     desc  <<-AGENT_HELP
 Send agent messages
 
@@ -285,8 +285,8 @@ AGENT_HELP
       say(deployer.agent.send(message.to_sym, *args).pretty_inspect)
     end
 
-    usage "micro apply"
-    desc  "Apply spec"
+    usage 'micro apply'
+    desc 'Apply spec'
     def apply(spec)
       deployer.apply(Bosh::Deployer::Specification.new(load_yaml_file(spec)))
     end
@@ -305,12 +305,12 @@ AGENT_HELP
 
         manifest = load_yaml_file(manifest_filename)
 
-        manifest["dir"] ||= work_dir
-        manifest["logging"] ||= {}
-        unless manifest["logging"]["file"]
+        manifest['dir'] ||= work_dir
+        manifest['logging'] ||= {}
+        unless manifest['logging']['file']
           log_file = File.join(File.dirname(manifest_filename),
-                               "bosh_micro_deploy.log")
-          manifest["logging"]["file"] = log_file
+                               'bosh_micro_deploy.log')
+          manifest['logging']['file'] = log_file
         end
 
         @deployer = Bosh::Deployer::InstanceManager.create(manifest)
@@ -360,15 +360,15 @@ AGENT_HELP
             err("Cannot talk to director at '#{target}', please set correct target")
           end
         else
-          status = { "name" => "Unknown Director", "version" => "n/a" }
+          status = { 'name' => 'Unknown Director', 'version' => 'n/a' }
         end
       else
         status = {}
       end
 
-      config.target_name = status["name"]
-      config.target_version = status["version"]
-      config.target_uuid = status["uuid"]
+      config.target_name = status['name']
+      config.target_version = status['version']
+      config.target_uuid = status['uuid']
 
       config.save
     end
@@ -383,7 +383,7 @@ AGENT_HELP
       if value = deployer.state.send(column)
         value.make_green
       else
-        "n/a".make_red
+        'n/a'.make_red
       end
     end
 
@@ -422,14 +422,14 @@ AGENT_HELP
 
       def update(state, task)
         event = {
-          "time"     => Time.now,
-          "stage"    => @stage,
-          "task"     => task,
-          "tags"     => [],
-          "index"    => @index+1,
-          "total"    => @total,
-          "state"    => state.to_s,
-          "progress" => state == :finished ? 100 : 0
+          'time' => Time.now,
+          'stage' => @stage,
+          'task' => task,
+          'tags' => [],
+          'index' => @index+1,
+          'total' => @total,
+          'state' => state.to_s,
+          'progress' => state == :finished ? 100 : 0
         }
 
         add_event(event)

data/lib/bosh/deployer/config.rb

@@ -0,0 +1,5 @@
+require 'bosh/deployer/configuration'
+
+module Bosh::Deployer
+  Config = Configuration.new
+end

data/lib/bosh/deployer/configuration.rb

@@ -0,0 +1,149 @@
+module Bosh::Deployer
+  class Configuration
+    include Helpers
+
+    attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
+                  :spec_properties, :agent_properties, :bosh_ip, :env, :name, :net_conf
+
+    def configure(config)
+      plugin = cloud_plugin(config)
+
+      config = deep_merge(load_defaults(plugin), config)
+
+      @base_dir = config['dir']
+      FileUtils.mkdir_p(@base_dir)
+
+      @name = config['name']
+      @cloud_options = config['cloud']
+      @net_conf = config['network']
+      @bosh_ip = @net_conf['ip']
+      @resources = config['resources']
+      @env = config['env']
+
+      @logger = Logger.new(config['logging']['file'] || STDOUT)
+      @logger.level = Logger.const_get(config['logging']['level'].upcase)
+      @logger.formatter = ThreadFormatter.new
+
+      apply_spec = config['apply_spec']
+      @spec_properties = apply_spec['properties']
+      @agent_properties = apply_spec['agent']
+
+      @db = Sequel.sqlite
+
+      migrate_cpi
+
+      @db.create_table :instances do
+        primary_key :id
+        column :name, :text, :unique => true, :null => false
+        column :uuid, :text
+        column :stemcell_cid, :text
+        column :stemcell_name, :text
+        column :vm_cid, :text
+        column :disk_cid, :text
+      end
+
+      Sequel::Model.plugin :validation_helpers
+
+      Bosh::Clouds::Config.configure(self)
+
+      require 'bosh/deployer/models/instance'
+
+      @cloud_options['properties']['agent']['mbus'] ||=
+        'https://vcap:b00tstrap@0.0.0.0:6868'
+
+      @disk_model = nil
+      @cloud = nil
+      @networks = nil
+    end
+
+    def cloud
+      if @cloud.nil?
+        @cloud = Bosh::Clouds::Provider.create(@cloud_options['plugin'],
+                                               @cloud_options['properties'])
+      end
+      @cloud
+    end
+
+    def agent
+      uri = URI.parse(agent_url)
+      user, password = uri.userinfo.split(':', 2)
+      uri.userinfo = nil
+      uri.host = bosh_ip
+      Bosh::Agent::HTTPClient.new(uri.to_s,
+                                  { 'user' => user,
+                                    'password' => password,
+                                    'reply_to' => uuid })
+    end
+
+    def agent_url
+      @cloud_options['properties']['agent']['mbus']
+    end
+
+    def networks
+      return @networks if @networks
+
+      @networks = {
+        'bosh' => {
+          'cloud_properties' => @net_conf['cloud_properties'],
+          'netmask' => @net_conf['netmask'],
+          'gateway' => @net_conf['gateway'],
+          'ip' => @net_conf['ip'],
+          'dns' => @net_conf['dns'],
+          'type' => @net_conf['type'],
+          'default' => ['dns', 'gateway']
+        }
+      }
+      if @net_conf['vip']
+        @networks['vip'] = {
+          'ip' => @net_conf['vip'],
+          'type' => 'vip',
+          'cloud_properties' => {}
+        }
+      end
+
+      @networks
+    end
+
+    def task_checkpoint
+      # Bosh::Clouds::Config (bosh_cli >= 0.5.1) delegates task_checkpoint
+      # method to periodically check if director task is cancelled,
+      # so we need to define a void method in Bosh::Deployer::Config to avoid
+      # NoMethodError exceptions.
+    end
+
+    private
+
+    def migrate_cpi
+      cpi = @cloud_options['plugin']
+      require_path = File.join('cloud', cpi)
+      cpi_path = $LOAD_PATH.find { |p| File.exist?(
+        File.join(p, require_path)) }
+      migrations = File.expand_path('../db/migrations', cpi_path)
+
+      if File.directory?(migrations)
+        Sequel.extension :migration
+        Sequel::TimestampMigrator.new(
+          @db, migrations, :table => "#{cpi}_cpi_schema").run
+      end
+    end
+
+    def deep_merge(src, dst)
+      src.merge(dst) do |key, old, new|
+        if new.respond_to?(:blank) && new.blank?
+          old
+        elsif old.kind_of?(Hash) and new.kind_of?(Hash)
+          deep_merge(old, new)
+        elsif old.kind_of?(Array) and new.kind_of?(Array)
+          old.concat(new).uniq
+        else
+          new
+        end
+      end
+    end
+
+    def load_defaults(provider)
+      file = File.join(File.dirname(File.expand_path(__FILE__)), "../../../config/#{provider}_defaults.yml")
+      Psych.load_file(file)
+    end
+  end
+end

data/lib/bosh/deployer/director_gateway_error.rb

@@ -0,0 +1,3 @@
+module Bosh::Deployer
+  class DirectorGatewayError < RuntimeError; end
+end

data/lib/{deployer → bosh/deployer}/helpers.rb

@@ -6,17 +6,17 @@ module Bosh::Deployer
 
   module Helpers
 
-    DEPLOYMENTS_FILE = "bosh-deployments.yml"
+    DEPLOYMENTS_FILE = 'bosh-deployments.yml'
 
     def is_tgz?(path)
-      File.extname(path) == ".tgz"
+      File.extname(path) == '.tgz'
     end
 
     def cloud_plugin(config)
-      err "No cloud properties defined" if config["cloud"].nil?
-      err "No cloud plugin defined" if config["cloud"]["plugin"].nil?
+      err 'No cloud properties defined' if config['cloud'].nil?
+      err 'No cloud plugin defined' if config['cloud']['plugin'].nil?
 
-      config["cloud"]["plugin"]
+      config['cloud']['plugin']
     end
 
     def dig_hash(hash, *path)
@@ -80,7 +80,7 @@ module Bosh::Deployer
         end
       end
 
-      lo = "127.0.0.1"
+      lo = '127.0.0.1'
       @sessions[port].forward.remote(port, lo, port)
 
       logger.info("SSH forwarding for port #{port} started: OK")

data/lib/{deployer → bosh/deployer}/instance_manager/aws.rb

@@ -10,32 +10,32 @@ module Bosh::Deployer
 
         # pick from micro_bosh.yml the aws settings in `apply_spec` section (apply_spec.properties.aws),
         # and if it doesn't exist, use the bosh deployer aws properties (cloud.properties.aws)
-        properties["aws"] = Config.spec_properties["aws"] || Config.cloud_options["properties"]["aws"].dup
+        properties['aws'] = Config.spec_properties['aws'] || Config.cloud_options['properties']['aws'].dup
 
-        properties["aws"]["registry"] = Config.cloud_options["properties"]["registry"]
-        properties["aws"]["stemcell"] = Config.cloud_options["properties"]["stemcell"]
+        properties['aws']['registry'] = Config.cloud_options['properties']['registry']
+        properties['aws']['stemcell'] = Config.cloud_options['properties']['stemcell']
 
-        spec.delete("networks")
+        spec.delete('networks')
       end
 
       def configure
-        properties = Config.cloud_options["properties"]
-        @ssh_user = properties["aws"]["ssh_user"]
-        @ssh_port = properties["aws"]["ssh_port"] || 22
-        @ssh_wait = properties["aws"]["ssh_wait"] || 60
+        properties = Config.cloud_options['properties']
+        @ssh_user = properties['aws']['ssh_user']
+        @ssh_port = properties['aws']['ssh_port'] || 22
+        @ssh_wait = properties['aws']['ssh_wait'] || 60
 
-        key = properties["aws"]["ec2_private_key"]
-        err "Missing properties.aws.ec2_private_key" unless key
+        key = properties['aws']['ec2_private_key']
+        err 'Missing properties.aws.ec2_private_key' unless key
         @ssh_key = File.expand_path(key)
         unless File.exists?(@ssh_key)
           err "properties.aws.ec2_private_key '#{key}' does not exist"
         end
 
-        uri = URI.parse(properties["registry"]["endpoint"])
-        user, password = uri.userinfo.split(":", 2)
+        uri = URI.parse(properties['registry']['endpoint'])
+        user, password = uri.userinfo.split(':', 2)
         @registry_port = uri.port
 
-        @registry_db = Tempfile.new("bosh_registry_db")
+        @registry_db = Tempfile.new('bosh_registry_db')
 
         @registry_connection_settings = {
             'adapter' => 'sqlite',
@@ -43,20 +43,20 @@ module Bosh::Deployer
         }
 
         registry_config = {
-          "logfile" => "./bosh-registry.log",
-          "http" => {
-            "port" => uri.port,
-            "user" => user,
-            "password" => password
+          'logfile' => './bosh-registry.log',
+          'http' => {
+            'port' => uri.port,
+            'user' => user,
+            'password' => password
           },
-          "db" => @registry_connection_settings,
-          "cloud" => {
-            "plugin" => "aws",
-            "aws" => properties["aws"]
+          'db' => @registry_connection_settings,
+          'cloud' => {
+            'plugin' => 'aws',
+            'aws' => properties['aws']
           }
         }
 
-        @registry_config = Tempfile.new("bosh_registry_yml")
+        @registry_config = Tempfile.new('bosh_registry_yml')
         @registry_config.write(Psych.dump(registry_config))
         @registry_config.close
       end
@@ -66,12 +66,12 @@ module Bosh::Deployer
 
         Sequel.connect(@registry_connection_settings) do |db|
           migrate(db)
-          instances = @deployments["registry_instances"]
+          instances = @deployments['registry_instances']
           db[:registry_instances].insert_multiple(instances) if instances
         end
 
         unless has_bosh_registry?
-          err "bosh-registry command not found - " +
+          err 'bosh-registry command not found - ' +
             "run 'gem install bosh-registry'"
         end
 
@@ -106,14 +106,14 @@ module Bosh::Deployer
 
       def stop
         if @registry_pid && process_exists?(@registry_pid)
-          Process.kill("INT", @registry_pid)
+          Process.kill('INT', @registry_pid)
           Process.waitpid(@registry_pid)
         end
 
         return unless @registry_connection_settings
 
         Sequel.connect(@registry_connection_settings) do |db|
-          @deployments["registry_instances"] = db[:registry_instances].map {|row| row}
+          @deployments['registry_instances'] = db[:registry_instances].map {|row| row}
         end
 
         save_state
@@ -162,8 +162,8 @@ module Bosh::Deployer
       private
 
       def has_bosh_registry?(path=ENV['PATH'])
-        path.split(":").each do |dir|
-          return true if File.exist?(File.join(dir, "bosh-registry"))
+        path.split(':').each do |dir|
+          return true if File.exist?(File.join(dir, 'bosh-registry'))
         end
         false
       end