wombat-cli 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6a1a2f8fb637c2d25dd3126f74592d8112e1e7
-  data.tar.gz: 957f61652039515b6f3a072f0846b02e8d195c2a
+  metadata.gz: 3a1385b339efd13cc101dba5b385915f2cb21265
+  data.tar.gz: 327d68edbc797dce831d4e3ae53101f3625a0826
 SHA512:
-  metadata.gz: 81f88a7148288add492bf6026bfdc22a13d3f7b607d65ffc3fe30e606a4b451320a46fc27696c58fb769974ac7a8d462dd07795d3e85953dee48ab76f1bae722
-  data.tar.gz: 47b7e2ff045a4b939c4ab83f5251bfdbd24021278fe62fc7eb4178fa4d23310651f9566b14fbadea7727be5a0492c5171c4e5080feadc419646db4b9609f1de3
+  metadata.gz: 6134c463249083075e7bd4ba5b9c16ee5883af1d744509aa5206e3935c48bd6a8d3af9df5953797a6bf6700842243f83cb10da863f5f06cb2d786be044695ce3
+  data.tar.gz: 364be3f32ffdac77f61a9d2405eba09527041fc47088242080ca2aacd4e092b96eaded8195612cd00f2dd04494dc92076c5527c52788fdcbcf00bc742ae8c405

data/DESIGN.md

@@ -26,11 +26,19 @@ The core of wombat is the binary `bin/wombat`.
 
 * If the TEMPLATE argument is not provided it will execute against all templates in `./packer/`
 
-`wombat deploy STACK`
+`wombat update lock`
 
 1. Create/update wombat.lock based on most recent Packer logs
-2. Create cfn/gdm configuration from lock data fed through template
-3. Deploy cfn/gdm stack
+
+`wombat update template`
+
+1. Create cfn/gdm configuration from lock
+
+* If no argument is  provided it will update _both_ lock and template
+
+`wombat deploy STACK`
+
+1. Deploy cfn/gdm stack
 
 `wombat outputs STACK`
 

data/{cookbooks → generator_files/cookbooks}/workstation/recipes/browser.rb

@@ -43,3 +43,17 @@ registry_key 'Set Chrome as default HTTPS protocol association' do
     {:name => 'ProgId', :type => :string, :data => 'ChromeHTML'}
   ]
 end
+
+# Enable ClearType for Chrome 52+
+registry_key "HKEY_CURRENT_USER\\Control Panel\\Desktop" do
+  values [{
+      :name => "FontSmoothing",
+      :type => :string,
+      :data => 2
+  },{
+      :name => "FontSmoothingType",
+      :type => :dword,
+      :data => 2
+  }]
+  action :create
+end

data/{templates → generator_files/templates}/cfn.json.erb

@@ -77,6 +77,15 @@
     }
   },
   "Resources": {
+<% if @iam_roles -%>
+    "InstanceProfile" : {
+      "Type" : "AWS::IAM::InstanceProfile",
+      "Properties" : {
+        "Path" : "/",
+        "Roles" : <%= @iam_roles %>
+      }
+    },
+<% end -%>
     "VPC": {
       "Type": "AWS::EC2::VPC",
       "Properties": {
@@ -341,6 +350,9 @@
       "Type": "AWS::EC2::Instance",
       "Properties": {
         "InstanceType": "m3.large",
+<% if @iam_roles -%>
+        "IamInstanceProfile" : {"Ref" : "InstanceProfile"},
+<% end -%>
         "AvailabilityZone": { "Ref": "AvailabilityZone" },
         "NetworkInterfaces": [
           {

data/lib/wombat/build.rb

@@ -10,13 +10,16 @@ class BuildRunner
   attr_reader :templates, :builder, :config, :parallel
 
   def initialize(opts)
-    @templates = opts.templates
+    @templates = opts.templates.nil? ? calculate_templates : opts.templates
     @builder = opts.builder.nil? ? "amazon-ebs" : opts.builder
     @config = opts.config
     @parallel = opts.parallel
   end
 
   def start
+    if which('packer').nil?
+      raise "packer binary not found in path, exiting..."
+    end
     banner("Generating certs (if necessary)")
     wombat['certs'].each do |hostname|
       gen_x509_cert(hostname)
@@ -70,19 +73,19 @@ class BuildRunner
             }
           }
         end
-      elsif template_name == 'build-node'
+      elsif template_name =~ /build-node/
         build_nodes.each do |name, num|
           proc_hash[name] = {
-            'template' => 'build-node',
+            'template' => template_name,
             'options' => {
               'node-number' => num
             }
           }
         end
-      elsif template_name == 'workstation'
+      elsif template_name =~ /workstation/
         workstations.each do |name, num|
           proc_hash[name] = {
-            'template' => 'workstation',
+            'template' => template_name,
             'options' => {
               'os' => wombat['workstations']['platform'],
               'workstation-number' => num
@@ -117,7 +120,7 @@ class BuildRunner
   end
 
   def shell_out_command(command)
-    cmd = Mixlib::ShellOut.new(a_to_s(command), :timeout => timeout, live_stream: STDOUT)
+    cmd = Mixlib::ShellOut.new(a_to_s(command), :timeout => conf['timeout'], live_stream: STDOUT)
     cmd.run_command
     cmd
   end
@@ -139,18 +142,18 @@ class BuildRunner
     else
       base = template.split('.json')[0].tr('-', '_')
     end
-    rm_cmd = "rm -rf #{cookbook_dir}/#{base}/Berksfile.lock vendored-cookbooks/#{base}"
+    rm_cmd = "rm -rf #{conf['cookbook_dir']}/#{base}/Berksfile.lock vendored-cookbooks/#{base}"
     shell_out_command(rm_cmd)
-    vendor_cmd = "berks vendor -q -b #{cookbook_dir}/#{base}/Berksfile vendored-cookbooks/#{base}"
+    vendor_cmd = "berks vendor -q -b #{conf['cookbook_dir']}/#{base}/Berksfile vendored-cookbooks/#{base}"
     shell_out_command(vendor_cmd)
   end
 
   def log(template, builder, options)
     cloud = b_to_c(builder)
     case template
-    when 'build-node'
+    when /build-node/
       log_name = "#{cloud}-build-node-#{options['node-number']}-#{linux}"
-    when 'workstation'
+    when /workstation/
       log_name = "#{cloud}-workstation-#{options['workstation-number']}-#{linux}"
     when /infranodes/
       if options['os'] =~ /windows/
@@ -161,13 +164,24 @@ class BuildRunner
     else
      log_name = "#{cloud}-#{template}-#{linux}"
     end
-    log_file = "#{log_dir}/#{log_name}.log"
+    log_file = "#{conf['log_dir']}/#{log_name}.log"
+  end
+
+  def which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      }
+    end
+    return nil
   end
 
   def packer_build_cmd(template, builder, options)
     create_infranodes_json
 
-    if template == 'workstation'
+    if template =~ /workstation/
       source_ami = wombat['aws']['source_ami']['windows']
       source_image = wombat['gce']['source_image']['windows']
     elsif template =~ /infranodes/
@@ -183,8 +197,9 @@ class BuildRunner
       source_image = wombat['gce']['source_image'][linux]
     end
 
-    # TODO: fail if packer isn't found in a graceful way
-    cmd = %W(packer build #{packer_dir}/#{template}.json | tee #{log(template, builder, options)})
+    Dir.mkdir(conf['log_dir'], 0755) unless File.exist?(conf['log_dir'])
+
+    cmd = %W(packer build #{conf['packer_dir']}/#{template}.json | tee #{log(template, builder, options)})
     cmd.insert(2, "--only #{builder}")
     cmd.insert(2, "--var org=#{wombat['org']}")
     cmd.insert(2, "--var domain=#{wombat['domain']}")

data/lib/wombat/cli.rb

@@ -7,6 +7,8 @@ require 'wombat/build'
 require 'wombat/deploy'
 require 'wombat/output'
 require 'wombat/delete'
+require 'wombat/update'
+require 'wombat/init'
 
 class Options
 
@@ -14,7 +16,6 @@ class Options
 
   def self.parse(args)
     options = OpenStruct.new
-    options.templates = calculate_templates("*.json")
 
     global = OptionParser.new do |opts|
       opts.banner = "Usage: #{NAME} [SUBCOMMAND [options]]"
@@ -22,23 +23,18 @@ class Options
       opts.version = Wombat::VERSION
       opts.separator <<-COMMANDS.gsub(/^ {8}/, "")
         build        :   build one or more templates
+        delete       :   delete a stack
+        deploy       :   deploy a stack
         help         :   prints this help message
+        init         :   create wombat skeleton project
         list         :   list all templates in project
-        deploy       :   deploy a stack
         outputs      :   get outputs for a stack
-        delete       :   delete a stack
+        update       :   update lock and/or cloud template
       COMMANDS
     end
 
     templates_argv_proc = proc { |options|
-      options.templates = calculate_templates(args) unless args.empty?
-
-      options.templates.each do |t|
-        if !File.exists?("packer/#{t}.json")
-          $stderr.puts "File packer/#{t}.json does not exist for template '#{t}'"
-          exit(1)
-        end
-      end
+      options.templates = ARGV unless args.empty?
     }
 
     box_version_argv_proc = proc { |options|
@@ -50,14 +46,11 @@ class Options
       options.stack = ARGV[0]
     }
 
+    file_argv_proc = proc { |options|
+      options.file = ARGV[0]
+    }
+
     subcommand = {
-      help: {
-        parser: OptionParser.new {},
-        argv: proc { |options|
-          puts global
-          exit(0)
-        }
-      },
       build: {
         class: BuildRunner,
         parser: OptionParser.new { |opts|
@@ -77,17 +70,14 @@ class Options
         },
         argv: templates_argv_proc
       },
-      list: {
-        class: ListRunner,
-        parser: OptionParser.new { |opts|
-          opts.banner = "Usage: #{NAME} list [TEMPLATE ...]"
-        },
-        argv: templates_argv_proc
-      },
-      outputs: {
-        class: OutputRunner,
+      delete: {
+        class: DeleteRunner,
         parser: OptionParser.new { |opts|
-          opts.banner = "Usage: #{NAME} outputs [TEMPLATE ...]"
+          opts.banner = "Usage: #{NAME} delete STACK"
+
+          opts.on("-c CLOUD", "--cloud CLOUD", "Select cloud") do |opt|
+            options.cloud = opt
+          end
         },
         argv: stack_argv_proc
       },
@@ -104,23 +94,54 @@ class Options
             options.update_lock = opt
           end
 
-          opts.on("--create-template", "Create template") do |opt|
+          opts.on("--update-template", "Update template") do |opt|
             options.create_template = opt
           end
         },
         argv: stack_argv_proc
       },
-      delete: {
-        class: DeleteRunner,
+      help: {
+        parser: OptionParser.new {},
+        argv: proc { |options|
+          puts global
+          exit(0)
+        }
+      },
+      init: {
+        class: InitRunner,
         parser: OptionParser.new { |opts|
-          opts.banner = "Usage: #{NAME} delete STACK"
+          opts.banner = "Usage: #{NAME} init"
+
+          opts.on("-p PATH", "--path PATH", "Path to copy skeleton") do |opt|
+            options.path = opt
+          end
+        },
+        argv: stack_argv_proc
+      },
+      list: {
+        class: ListRunner,
+        parser: OptionParser.new { |opts|
+          opts.banner = "Usage: #{NAME} list [TEMPLATE ...]"
+        },
+        argv: templates_argv_proc
+      },
+      outputs: {
+        class: OutputRunner,
+        parser: OptionParser.new { |opts|
+          opts.banner = "Usage: #{NAME} outputs [TEMPLATE ...]"
+        },
+        argv: stack_argv_proc
+      },
+      update: {
+        class: UpdateRunner,
+        parser: OptionParser.new { |opts|
+          opts.banner = "Usage: #{NAME} update [lock || template]"
 
           opts.on("-c CLOUD", "--cloud CLOUD", "Select cloud") do |opt|
             options.cloud = opt
           end
         },
-
-        argv: stack_argv_proc
+        argv: file_argv_proc
       }
     }
 
@@ -135,17 +156,6 @@ class Options
 
     options
   end
-
-  def self.calculate_templates(globs)
-    Dir.chdir('packer') do
-      Array(globs).
-        map { |glob| result = Dir.glob("#{glob}"); result.empty? ? glob : result }.
-        flatten.
-        sort.
-        delete_if { |file| file =~ /\.variables\./ }.
-        map { |template| template.sub(/\.json$/, '') }
-    end
-  end
 end
 
 class ListRunner
@@ -155,11 +165,18 @@ class ListRunner
   attr_reader :templates
 
   def initialize(opts)
-    @templates = opts.templates
+    @templates = opts.templates.nil? ? calculate_templates : opts.templates
   end
 
   def start
-    templates.each { |template| puts template }
+    templates.each do |t|
+      if !File.exists?("#{conf['packer_dir']}/#{t}.json")
+        $stderr.puts "File #{conf['packer_dir']}/#{t}.json does not exist for template '#{t}'"
+        exit(1)
+      else
+        puts t
+      end
+    end
   end
 end
 

data/lib/wombat/common.rb

@@ -4,6 +4,7 @@ require 'erb'
 require 'openssl'
 require 'net/ssh'
 require 'benchmark'
+require 'fileutils'
 
 module Common
 
@@ -28,22 +29,28 @@ module Common
 
   def wombat
     if !File.exists?('wombat.yml')
-      File.open('wombat.yml', 'w') do |f|
-        f.puts File.read('wombat.example.yml')
-      end
+      warn('No wombat.yml found, copying example')
+      gen_dir = "#{File.expand_path("../..", File.dirname(__FILE__))}/generator_files"
+      FileUtils.cp_r "#{gen_dir}/wombat.yml", Dir.pwd
     end
     YAML.load(File.read('wombat.yml'))
   end
 
   def lock
-    JSON.parse(File.read('wombat.lock'))
+    if !File.exists?('wombat.lock')
+      warn('No wombat.lock found')
+      return 1
+    else
+      JSON.parse(File.read('wombat.lock'))
+    end
   end
 
   def bootstrap_aws
     @workstation_passwd = wombat['workstations']['password']
-    rendered = ERB.new(File.read('templates/bootstrap-aws.erb'), nil, '-').result(binding)
-    File.open("#{packer_dir}/scripts/bootstrap-aws.txt", 'w') { |file| file.puts rendered }
-    banner("Generated: #{packer_dir}/scripts/bootstrap-aws.txt")
+    rendered = ERB.new(File.read("#{conf['template_dir']}/bootstrap-aws.erb"), nil, '-').result(binding)
+    Dir.mkdir("#{conf['packer_dir']}/scripts", 0755) unless File.exist?("#{conf['packer_dir']}/scripts")
+    File.open("#{conf['packer_dir']}/scripts/bootstrap-aws.txt", 'w') { |file| file.puts rendered }
+    banner("Generated: #{conf['packer_dir']}/scripts/bootstrap-aws.txt")
   end
 
   def gen_x509_cert(hostname)
@@ -72,12 +79,14 @@ module Common
                                            'keyid:always,issuer:always')
 
     cert.sign(rsa_key, OpenSSL::Digest::SHA256.new)
+    
+    Dir.mkdir(conf['key_dir'], 0755) unless File.exist?(conf['key_dir'])
 
-    if File.exist?("#{key_dir}/#{hostname}.crt") && File.exist?("#{key_dir}/#{hostname}.key")
+    if File.exist?("#{conf['key_dir']}/#{hostname}.crt") && File.exist?("#{conf['key_dir']}/#{hostname}.key")
       puts "An x509 certificate already exists for #{hostname}"
     else
-      File.open("#{key_dir}/#{hostname}.crt", 'w') { |file| file.puts cert.to_pem }
-      File.open("#{key_dir}/#{hostname}.key", 'w') { |file| file.puts rsa_key.to_pem }
+      File.open("#{conf['key_dir']}/#{hostname}.crt", 'w') { |file| file.puts cert.to_pem }
+      File.open("#{conf['key_dir']}/#{hostname}.key", 'w') { |file| file.puts rsa_key.to_pem }
       puts "Certificate created for #{wombat['domain_prefix']}#{hostname}.#{wombat['domain']}"
     end
   end
@@ -90,11 +99,13 @@ module Common
 
     openssh_format = "#{type} #{data}"
 
-    if File.exist?("#{key_dir}/public.pub") && File.exist?("#{key_dir}/private.pem")
+    Dir.mkdir(conf['key_dir'], 0755) unless File.exist?(conf['key_dir'])
+
+    if File.exist?("#{conf['key_dir']}/public.pub") && File.exist?("#{conf['key_dir']}/private.pem")
       puts 'An SSH keypair already exists'
     else
-      File.open("#{key_dir}/public.pub", 'w') { |file| file.puts openssh_format }
-      File.open("#{key_dir}/private.pem", 'w') { |file| file.puts rsa_key.to_pem }
+      File.open("#{conf['key_dir']}/public.pub", 'w') { |file| file.puts openssh_format }
+      File.open("#{conf['key_dir']}/private.pem", 'w') { |file| file.puts rsa_key.to_pem }
       puts 'SSH Keypair created'
     end
   end
@@ -129,13 +140,13 @@ module Common
   end
 
   def create_infranodes_json
-    if File.exists?("#{packer_dir}/file/infranodes-info.json")
+    if File.exists?("#{conf['packer_dir']}/file/infranodes-info.json")
       current_state = JSON(File.read('files/infranodes-info.json'))
     else
       current_state = nil
     end
     return if current_state == infranodes # yay idempotence
-    File.open("#{packer_dir}/files/infranodes-info.json", 'w') do |f|
+    File.open("#{conf['packer_dir']}/files/infranodes-info.json", 'w') do |f|
       f.puts JSON.pretty_generate(infranodes)
     end
   end
@@ -144,35 +155,112 @@ module Common
     wombat['linux'].nil? ? 'ubuntu' : wombat['linux']
   end
 
-  def key_dir
-    wombat['conf'].nil? ? 'keys' : wombat['conf']['key_dir']
+  def conf
+    conf = wombat['conf']
+    conf ||= {}
+    conf['key_dir'] ||= 'keys'
+    conf['cookbook_dir'] ||= 'cookbooks'
+    conf['packer_dir'] ||= 'packer'
+    conf['log_dir'] ||= 'logs'
+    conf['stack_dir'] ||= 'stacks'
+    conf['template_dir'] ||= 'templates'
+    conf['timeout'] ||= 7200
+    conf['audio'] ||= false
+    conf
   end
 
-  def cookbook_dir
-    wombat['conf'].nil? ? 'cookbooks' : wombat['conf']['cookbook_dir']
+  def is_mac?
+    (/darwin/ =~ RUBY_PLATFORM) != nil
   end
 
-  def packer_dir
-    wombat['conf'].nil? ? 'packer' : wombat['conf']['packer_dir']
+  def audio?
+    is_mac? && conf['audio']
   end
 
-  def log_dir
-    wombat['conf'].nil? ? 'logs' : wombat['conf']['log_dir']
+  def logs
+    Dir.glob("#{conf['log_dir']}/#{cloud}*.log").reject { |l| !l.match(wombat['linux']) }
   end
 
-  def stack_dir
-    wombat['conf'].nil? ? 'stacks' : wombat['conf']['stack_dir']
+  def calculate_templates
+  globs = "*.json"
+    Dir.chdir(conf['packer_dir']) do
+      Array(globs).
+        map { |glob| result = Dir.glob("#{glob}"); result.empty? ? glob : result }.
+        flatten.
+        sort.
+        delete_if { |file| file =~ /\.variables\./ }.
+        map { |template| template.sub(/\.json$/, '') }
+    end
   end
 
-  def timeout
-    wombat['conf']['timeout'] ||= 7200
-  end
+  def update_lock(cloud)
+    copy = {}
+    copy = wombat
+    region = copy[cloud]['region']
+    linux = copy['linux']
+    copy['amis'] = { region => {} }
 
-  def is_mac?
-    (/darwin/ =~ RUBY_PLATFORM) != nil
+    if logs.length == 0
+      warn('No logs found - skipping lock update')
+    else
+      logs.each do |log|
+        case log
+        when /build-node/
+          copy['amis'][region]['build-node'] ||= {}
+          num = log.split('-')[3]
+          copy['amis'][region]['build-node'].store(num, parse_log(log, cloud))
+        when /workstation/
+          copy['amis'][region]['workstation'] ||= {}
+          num = log.split('-')[2]
+          copy['amis'][region]['workstation'].store(num, parse_log(log, cloud))
+        when /infranodes/
+          copy['amis'][region]['infranodes'] ||= {}
+          name = log.split('-')[2]
+          copy['amis'][region]['infranodes'].store(name, parse_log(log, cloud))
+        else
+          instance = log.match("#{cloud}-(.*)-(.*)\.log")[1]
+          copy['amis'][region].store(instance, parse_log(log, cloud))
+        end
+      end
+      copy['last_updated'] = Time.now.gmtime.strftime('%Y%m%d%H%M%S')
+      banner('Updating wombat.lock')
+      File.open('wombat.lock', 'w') do |f|
+        f.write(JSON.pretty_generate(copy))
+      end
+    end
   end
 
-  def audio?
-    is_mac? && wombat['conf']['audio']
+  def update_template(cloud)
+    if lock == 1
+      warn('No lock - skipping template creation')
+    else
+      region = lock['aws']['region']
+      @chef_server_ami = lock['amis'][region]['chef-server']
+      @automate_ami = lock['amis'][region]['automate']
+      @compliance_ami = lock['amis'][region]['compliance']
+      @build_nodes = lock['build-nodes']['count'].to_i
+      @build_node_ami = {}
+      1.upto(@build_nodes) do |i|
+        @build_node_ami[i] = lock['amis'][region]['build-node'][i.to_s]
+      end
+      @infra = {}
+      infranodes.each do |name, _rl|
+        @infra[name] = lock['amis'][region]['infranodes'][name]
+      end
+      @workstations = lock['workstations']['count'].to_i
+      @workstation_ami = {}
+      1.upto(@workstations) do |i|
+        @workstation_ami[i] = lock['amis'][region]['workstation'][i.to_s]
+      end
+      @availability_zone = lock['aws']['az']
+      @iam_roles = lock['aws']['iam_roles']
+      @demo = lock['name']
+      @version = lock['version']
+      @ttl = lock['ttl']
+      rendered_cfn = ERB.new(File.read("#{conf['template_dir']}/cfn.json.erb"), nil, '-').result(binding)
+      Dir.mkdir(conf['stack_dir'], 0755) unless File.exist?(conf['stack_dir'])
+      File.open("#{conf['stack_dir']}/#{@demo}.json", 'w') { |file| file.puts rendered_cfn }
+      banner("Generated: #{conf['stack_dir']}/#{@demo}.json")
+    end
   end
 end