gaptool-server 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddb439ba551286b15caaccf7ba3990faec9dcbb
-  data.tar.gz: 3e4e425e4cb7d018903ed538a367af4f736dd83d
+  metadata.gz: 6323ce0f24d59f15f894675c6cf76724f5b8ace1
+  data.tar.gz: 4af7e863c6b3527d54ff458fa29cdaebf09583eb
 SHA512:
-  metadata.gz: 5fd00e76e360031a00389f6ab31735007e70e31366b230430055825417cbaaf99534c64b5ef3498e39484883cbcf082f41e76cf21777ab957959812a75b50005
-  data.tar.gz: 5894bb1f4762abbb4fed353324dc8ae5f4c00179c098d9dcd789f370362da914be9df30b06e33909dafc4c330ca95942e0746eb68b4b77179e651cf46cbf099d
+  metadata.gz: 8bb6202e2fc26965a53acad59625830ea198cd7c930414d005b4977291a49c1a79823e5a29ad00c8c97ed68f0a979ab047f93d5933203455f199138d29f7a1b0
+  data.tar.gz: 97cdc9abf27d57332ef261dac8b7919bd732102362d6b5a79bf70b26df9870ab4e1c8911edfe8c2c59a3cf050036f1a9f77477a355988f6f82a2cc82f25fcc31

data/Rakefile

@@ -4,10 +4,12 @@ Dir.chdir(File.dirname(__FILE__))
 require 'shellwords'
 require 'rspec/core/rake_task'
 require_relative 'lib/helpers/redis'
+require_relative 'lib/helpers/ec2'
 require_relative 'lib/helpers/init'
 require_relative 'lib/helpers/rehash'
 
 DH = Gaptool::Data
+EC2 = Gaptool::EC2
 $stdout.sync = true
 
 def sys(cmd)

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.6

data/bin/gaptool_migrate_security_groups

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+#
+# convert the old data model for the gaptool server
+# to the new struct
+
+libpath = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(libpath)
+require "#{libpath}/helpers/redis"
+require "#{libpath}/helpers/data"
+DH = Gaptool::Data
+
+$redis.keys("role:*").each do |k|
+  next if k.end_with?('instances') || k.end_with?('apps') || k.end_with?('amis')
+  puts "Migrating #{k}"
+  sgroup = $redis.hget(k, "security_group")
+  $redis.hset("#{k}:sg", "production", sgroup)
+  $redis.del(k)
+end

data/lib/app.rb

@@ -9,14 +9,16 @@ require 'openssl'
 require 'net/ssh'
 require 'peach'
 require 'airbrake'
+require 'logger'
 require_relative 'exceptions'
 
 class GaptoolServer < Sinatra::Application
   helpers Sinatra::JSON
+  use Airbrake::Sinatra
 
   def error_response msg=''
-    message = "#{env['sinatra.error'].message}"
-    message = "#{msg} #{message}" unless msg.empty?
+    message = env['sinatra_error'].nil? ? "" : " #{env['sinatra.error'].message}"
+    message = "#{msg}#{message}" unless msg.empty?
     json result: 'error', message: message
   end
 
@@ -30,6 +32,10 @@ class GaptoolServer < Sinatra::Application
     error_response
   end
 
+  def unauthenticated
+    halt(401, error_response("Unauthenticated"))
+  end
+
   error do
     status 500
     error_response
@@ -39,8 +45,8 @@ class GaptoolServer < Sinatra::Application
     unless ENV['AIRBRAKE_API_KEY'].nil?
       Airbrake.configure do |cfg|
         cfg.api_key = ENV['AIRBRAKE_API_KEY']
+        cfg.logger = Logger.new(STDOUT)
       end
-      use Airbrake::Sinatra
     end
     disable :sessions
     enable  :dump_errors
@@ -50,8 +56,8 @@ class GaptoolServer < Sinatra::Application
   before do
     if request.path_info != '/ping' && ENV['GAPTOOL_DISABLE_AUTH'].nil?
       user = Gaptool::Data.user(env['HTTP_X_GAPTOOL_USER'])
-      raise Unauthenticated if user.nil?
-      raise Unauthenticated unless user[:key] == env['HTTP_X_GAPTOOL_KEY']
+      return unauthenticated if user.nil?
+      return unauthenticated unless user[:key] == env['HTTP_X_GAPTOOL_KEY']
     end
   end
 

data/lib/exceptions.rb

@@ -18,10 +18,6 @@ class BadRequest < ClientError
   @code = 400
 end
 
-class Unauthenticated < ClientError
-  @code = 401
-end
-
 class Forbidden < ClientError
   @code = 403
 end

data/lib/helpers/data.rb

@@ -49,6 +49,11 @@ module Gaptool
       $redis.hset("instance:#{instance}", attr, value)
     end
 
+    def self.set_server_data_attributes(instance, attrs)
+      return if attrs.values.any? {|v| v.nil? || (v.is_a?(String) && v.empty?) || !!v == v}
+      $redis.hmset("instance:#{instance}", *attrs.flatten)
+    end
+
     def self.save_server_data(instance, data)
 
       unless data['chef_runlist'].nil?
@@ -151,8 +156,9 @@ module Gaptool
         rs['chef_runlist'] = default_runlist
       end
 
-      rs['apps'] = apps_in_role(rs['role'])
       rs.delete_if {|k,v| v.nil? || (!!v != v && v.empty?)}
+      rs['apps'] = apps_in_role(rs['role'])
+      rs
     end
 
     def self.save_role_data(role, data)
@@ -161,6 +167,10 @@ module Gaptool
         amis = data.delete("amis") || {}
         overwrite_hash("role:#{role}:amis", amis)
       end
+      if data['sg']
+        sgs = data.delete("sg") || {}
+        overwrite_hash("role:#{role}:sg", sgs)
+      end
       if data['apps']
         apps = data.delete("apps") || []
         apps.each {|a| add_app(a, role)}
@@ -173,14 +183,18 @@ module Gaptool
       res = $redis.hgetall("role:#{role}")
       res['apps'] = apps_in_role(role)
       res['amis'] = $redis.hgetall("role:#{role}:amis")
+      res['sg'] = $redis.hgetall("role:#{role}:sg")
       res
     end
 
     def self.get_ami_for_role(role, region=nil)
-
       $redis.hget("role:#{role}:amis", region) || $redis.hget("amis", region)
     end
 
+    def self.get_sg_for_role(role, environment)
+      $redis.hget("role:#{role}:sg", environment) || "#{role}-#{environment}"
+    end
+
     def self.get_runlist_for_role(role)
       rl = $redis.hget("role:#{role}", "chef_runlist")
       return nil if rl.nil?
@@ -257,7 +271,7 @@ module Gaptool
     end
 
     def self.stringify_apps(rs)
-      unless rs['apps'].nil?
+      if !rs.nil? && !rs['apps'].nil?
         rs['apps'] = rs['apps'].to_json
       end
       rs

data/lib/helpers/ec2.rb

@@ -1,9 +1,12 @@
 require 'aws-sdk'
 require 'securerandom'
+require 'logger'
+require 'airbrake'
 
 # encoding: utf-8
 module Gaptool
   module EC2
+    @@logger = Logger.new(STDERR)
 
     def self.configure_ec2 zone
       return if ENV['DRYRUN']
@@ -45,28 +48,79 @@ module Gaptool
       return sg.id
     end
 
-    def self.create_ec2_instance(ec2opts, data)
+    def self.create_ec2_instance(ec2opts, data, retries=3, sleeptime=0.5)
       if ENV['DRYRUN']
         id = "i-test#{SecureRandom.hex(2)}"
         return {id: id,
                 hostname: "test-#{id}.#{data[:zone].chop}.compute.amazonaws.com",
+                instance: nil,
                 launch_time: Time.now.to_s}
       end
       configure_ec2 data[:zone].chop
       ec2 = AWS::EC2.new
 
-      instance = ec2.instances.create(ec2opts)
-      instance.add_tag('Name', value: "#{data[:role]}-#{data[:env]}-#{instance.id}")
-      instance.add_tag('gaptool', :value => "yes")
-      launch_time = instance.launch_time.to_s
-      launch_time = launch_time.empty? ? Time.now.to_s : launch_time
+      i = 0
+      begin
+        instance = ec2.instances.create(ec2opts)
+        @@logger.debug("Spawned instance #{instance.id}")
+      rescue => e
+        i += 1
+        raise if i > retries
+        @@logger.error("Error while creating instance: #{e}: sleeping #{sleeptime}s and retrying (#{i}/#{retries})")
+        sleep sleeptime
+        retry
+      end
+
+      begin
+        launch_time = instance.launch_time.to_s
+        launch_time = launch_time.empty? ? Time.now.to_s : launch_time
+      rescue
+        launch_time = Time.now.to_s
+      end
+
+      i = 0
+      begin
+        hostname = instance.public_dns_name
+      rescue => e
+        i += 1
+        if i > retries
+          @@logger.error("Could not get hostname for instance #{instance} after #{retries} retries, setting to nil")
+          hostname = nil
+          Airbrake.notify_or_ignore(
+            e,
+            error_class: "EC2 public dns fail",
+            parameters: {instance: instance[:id], role: data['role'], environment: data['environment'], hostname: nil}
+          )
+        else
+          @@logger.error("Error getting hostname for instance: #{e}: sleeping #{sleeptime}s and retrying (#{i}/#{retries})")
+          sleep sleeptime
+          retry
+        end
+      end
       {
         id: instance.id,
-        hostname: instance.public_dns_name,
+        instance: instance,
+        hostname: hostname,
         launch_time: launch_time
       }
     end
 
+    def self.tag_ec2_instance(instance, key, value, retries=5, sleeptime=0.5)
+      return true if ENV['DRYRUN']
+      i = 0
+      begin
+        instance.add_tag(key, value: value)
+        @@logger.debug("Added tag #{key}=#{value} to #{instance.id}")
+        true
+      rescue => e
+        i += 1
+        raise if i > retries
+        @@logger.error("Error adding tag #{key} to #{instance.id}: #{e}: sleeping #{sleeptime}s and retrying (#{i}/#{retries})")
+        sleep sleeptime
+        retry
+      end
+    end
+
     def self.terminate_ec2_instance(zone, id)
       return if ENV['DRYRUN']
       configure_ec2 zone

data/lib/helpers/rehash.rb

@@ -1,5 +1,6 @@
 require_relative "ec2"
 require_relative "data"
+require "logger"
 
 module Gaptool
   module EC2
@@ -27,12 +28,54 @@ module Gaptool
             "hostname" => instance.public_dns_name,
             "launch_time" => instance.launch_time.to_s,
             "apps" => roles[role].to_s,
-            "instance"=> instance.instance_id
+            "instance"=> instance.instance_id,
+            "security_group" => instance.security_groups[0].name
           }
           Gaptool::Data::addserver(iid, data, nil)
         end
       end
       return {"action" => "complete"}
     end
+
+    def self.rehash_property(property)
+      Gaptool::Data::servers.each do |id|
+        rehash_property_for_instance(property, id)
+      end
+    end
+
+    def self.rehash_properties_for_instance(instance_id)
+      res = {}
+      %w[hostname itype security_group].each do |property|
+        res[property] = self.rehash_property_for_instance(property, instance_id, false)
+      end
+      Gaptool::set_server_data_attributes(instance_id, res)
+    end
+
+    def self.rehash_property_for_instance(property, instance_id, save=true)
+      logger = Logger.new(STDOUT)
+      data = Gaptool::Data.get_server_data(instance_id)
+      return false if data.nil? || data['zone'].nil? || data['zone'].empty?
+      Gaptool::EC2::configure_ec2 data['zone'].chop
+      ec2 = AWS::EC2.new(region: data['zone'].chop)
+      logger.info("Updating #{property} for #{instance_id} in zone #{data['zone'].chop}")
+      instance = ec2.instances[instance_id]
+      return false if instance.nil?
+      case property
+      when "hostname"
+        value = instance.public_dns_name
+      when "itype"
+        value = instance.instance_type
+      when "security_group"
+        value = instance.security_groups[0].name
+      else
+        return false
+      end
+      if save
+        logger.info("Setting #{property} to #{value} for #{instance_id}")
+        Gaptool::Data.set_server_data_attr(instance_id, property, value)
+      else
+        value
+      end
+    end
   end
 end

data/lib/routes.rb

@@ -2,6 +2,7 @@
 require 'securerandom'
 require 'set'
 require_relative 'exceptions'
+
 class GaptoolServer < Sinatra::Application
 
   def require_parameters(required_keys, data)
@@ -27,8 +28,8 @@ class GaptoolServer < Sinatra::Application
                               JSON.parse(request.body.read))
 
     secret = SecureRandom.hex(12)
-    security_group = data['security_group'] || Gaptool::Data::get_role_data(data['role'])["security_group"]
-    sgid = Gaptool::EC2::get_or_create_securitygroup(data['role'], data['environment'], data['zone'], security_group)
+    data['security_group'] = data['security_group'] || Gaptool::Data::get_sg_for_role(data['role'], data['environment'])
+    sgid = Gaptool::EC2::get_or_create_securitygroup(data['role'], data['environment'], data['zone'], data['security_group'])
     image_id = data['ami'] || Gaptool::Data::get_ami_for_role(data['role'], data['zone'].chop)
     data['terminable'] = data['terminable'].nil? ? true : !!data['terminable']
     data['secret'] = secret
@@ -47,8 +48,26 @@ class GaptoolServer < Sinatra::Application
        zone: data['zone']
      }
     )
+
+    # Tag instance
+    role = data['role']
+    env = data['environment']
+    name = "#{role}-#{env}-#{instance[:id]}"
+    {'Name' => name, 'gaptool' => 'yes', 'role' => role, 'environment' => env}.each do |tag, value|
+      begin
+        Gaptool::EC2::tag_ec2_instance(instance[:instance], tag, value)
+      rescue => e
+        logger.error("Error while tagging: #{e}. Skipping tag")
+        Airbrake.notify_or_ignore(
+          e,
+          error_class: "EC2 Tag failed",
+          parameters: {instance: instance[:id], name: name, role: role, environment: env}
+        )
+      end
+    end
+
     # Add host tag
-    data.merge(instance.reject { |k, v| k == :id })
+    data.merge(instance.reject { |k, v| [:id, :instance].include?(k) })
     Gaptool::Data::addserver(instance[:id], data, secret)
     json({instance: instance[:id],
           ami: image_id,
@@ -139,7 +158,13 @@ class GaptoolServer < Sinatra::Application
   end
 
   get '/instance/:id' do
-    json Gaptool::Data::stringify_apps(Gaptool::Data::get_server_data(params[:id]))
+    rs = Gaptool::Data::get_server_data(params[:id])
+    if rs.nil?
+      status 404
+      error_response "instance with id '#{params[:id]}' not found"
+    else
+      json Gaptool::Data::stringify_apps(rs)
+    end
   end
 
   get '/hosts/:role/:environment' do

data/tasks/ec2.rb

@@ -0,0 +1,44 @@
+namespace :ec2 do
+  desc "Rehash instances"
+  task :rehash do |t|
+    EC2.rehash
+  end
+
+  desc "Rehash single attribute of all instances"
+  task :rehash_attr_all, [:property] do |t, args|
+    if args[:property].nil?
+      puts "Missing property"
+      return 1
+    end
+    EC2.rehash_property(args[:property])
+  end
+
+  desc "Rehash ec2 attributes for a single instance"
+  task :rehash_attrs_for, [:instance] do |t, args|
+    if args[:instance].nil?
+      puts "Missing instance"
+      return 1
+    end
+    res = EC2.rehash_properties_for_instance(args[:instance])
+    return 1 unless res
+  end
+
+  desc "Rehash a single property for an instance"
+  task :rehash_attr_for, [:instance, :property] do |t, args|
+    if args[:instance].nil?
+      puts "Missing instance"
+      return 1
+    end
+    if args[:property].nil?
+      puts "Missing property"
+      return 1
+    end
+    res = EC2.rehash_property_for_instance(args[:property], args[:instance])
+    if res
+      puts "#{property} for instance #{instance} set to '#{res}'"
+    else
+      return 1
+    end
+  end
+
+end

data/tasks/role.rb

@@ -0,0 +1,9 @@
+namespace :role do
+  desc "Set security group for a role"
+  task :set_sg, [:role, :environment, :security_group] do |t, args|
+    abort("Missing parameters") if args[:role].nil? || args[:environment].nil? || args[:role].empty? || args[:environment].empty? || args[:security_group].nil? || args[:security_group].empty?
+    role = DH.get_role_data(args[:role])
+    role['sg'].merge!(args[:environment] => args[:security_group])
+    DH.save_role_data(args[:role], role)
+  end
+end

data/tasks/server.rb

@@ -8,4 +8,13 @@ namespace :server do
     DH.set_server_data_attr args[:instance], 'terminable', (args[:value] == "true" ? "true" : "false")
     puts DH.get_server_data args[:instance]
   end
+
+  desc "Remove a server from the gaptool database (no actions on AWS)"
+  task :rm, [:instance] do |t, args|
+    if args[:instance].nil?
+      puts "You must select an instance"
+      return 1
+    end
+    DH.rmserver(args[:instance])
+  end
 end

data/test/api_test.rb

@@ -79,6 +79,23 @@ describe "Test API" do
     expect(resp['chef_runlist']).to eq(['recipe[other]'])
   end
 
+  it "should get the security group from the role" do
+    DH.save_role_data(host_data['role'], "sg" => {host_data['environment'] => "mysg-in-role"})
+    id = add_and_register_server(host_data.reject{|k,v| k == 'security_group'})['instance']
+    get "/host/testrole/testenv/#{id}"
+    resp = JSON.parse(last_response.body)
+    expect(resp.keys).to include("security_group")
+    expect(resp['security_group']).to eq("mysg-in-role")
+  end
+
+  it "should get the default security group" do
+    id = add_and_register_server(host_data.reject{|k,v| k == 'security_group'})['instance']
+    get "/host/testrole/testenv/#{id}"
+    resp = JSON.parse(last_response.body)
+    expect(resp.keys).to include("security_group")
+    expect(resp['security_group']).to eq("#{host_data['role']}-#{host_data['environment']}")
+  end
+
   it "should remove default runlist" do
     id = add_and_register_server(host_data.merge("chef_runlist"=> ['recipe[init]']))['instance']
     get "/host/testrole/testenv/#{id}"
@@ -93,7 +110,6 @@ describe "Test API" do
     resp = JSON.parse(last_response.body)
     expect(resp.keys).not_to include("chef_runlist")
     expect(resp['chef_runlist']).to be(nil)
-
   end
 
   it "should get the ami from the role" do
@@ -188,7 +204,8 @@ describe "Test API" do
     id = add_and_register_server()['instance']
     get '/hosts'
     expect(last_response.status).to eq(200)
-    exp_data = host_data.reject{|k,v| k == 'terminable'}.merge('chef_runlist' => expanded_runlist)
+    exp_data = host_data.reject{|k,v| k == 'terminable'}.merge('chef_runlist' => expanded_runlist,
+                                                               'apps'=> [])
     exp_data['instance'] = id
     expect(JSON.parse(last_response.body)).to eq([exp_data])
   end
@@ -200,9 +217,11 @@ describe "Test API" do
     expect(last_response.status).to eq(200)
     exp_data = [
       host_data.reject{|k,v| k == 'terminable'}.merge({'instance' => id1,
-                                                      'chef_runlist' => expanded_runlist}),
+                                                      'chef_runlist' => expanded_runlist,
+                                                      'apps' => []}),
       host_data.reject{|k,v| k == 'terminable'}.merge({'instance' => id2,
-                                                      'chef_runlist' => expanded_runlist})
+                                                      'chef_runlist' => expanded_runlist,
+                                                      'apps' => []})
     ].to_set
     expect(JSON.parse(last_response.body).to_set).to eq(exp_data)
   end
@@ -215,7 +234,8 @@ describe "Test API" do
     get '/hosts/otherrole'
     expect(last_response.status).to eq(200)
     exp_data = [other.reject{|k,v| k == 'terminable'}.merge({'instance'=> id1,
-                                                    'chef_runlist' => expanded_runlist})]
+                                                    'chef_runlist' => expanded_runlist,
+                                                    'apps' => []})]
     expect(JSON.parse(last_response.body)).to eq(exp_data)
   end
 
@@ -226,11 +246,21 @@ describe "Test API" do
       expect(last_response.status).to eq(200)
       exp_data = host_data.reject{|k,v| k == 'terminable'}.merge({
         'instance'=> id,
-        'chef_runlist' => expanded_runlist})
+        'chef_runlist' => expanded_runlist,
+        'apps' => "[]"})
       expect(JSON.parse(last_response.body)).to eq(exp_data)
     end
   end
 
+  it "should not find an host by id" do
+    add_and_register_server()['instance']
+    get '/instance/other'
+    expect(last_response.status).to eq(404)
+    expect(JSON.parse(last_response.body)).to eq(
+      {"result" => "error",
+       "message" => "instance with id 'other' not found"})
+  end
+
   it "should find all hosts by environment and role" do
     id1 = add_and_register_server()['instance']
     id2 = add_and_register_server()['instance']
@@ -238,7 +268,7 @@ describe "Test API" do
     id4 = add_and_register_server(host_data.merge({'role' => 'otherrole'}))['instance']
     get '/hosts/testrole/testenv'
     expect(last_response.status).to eq(200)
-    d = host_data.reject{|k,v| k == 'terminable'}.merge('chef_runlist' => expanded_runlist)
+    d = host_data.reject{|k,v| k == 'terminable'}.merge('chef_runlist' => expanded_runlist, 'apps'=> '[]')
     exp_data = [
       d.merge({'instance' => id1}),
       d.merge({'instance' => id2})

data/test/data_test.rb

@@ -36,7 +36,8 @@ describe "data helpers" do
       'chef_repo' => 'myrepo',
       'chef_branch' => 'master',
       'registered' => 'false',
-      'secret' => 'secret'
+      'secret' => 'secret',
+      'apps' => []
     }))
   end
 
@@ -46,7 +47,8 @@ describe "data helpers" do
     expect(server).to eq(data.merge({
       'instance' => instid,
       'chef_repo' => 'myrepo',
-      'chef_branch' => 'master'
+      'chef_branch' => 'master',
+      'apps' => []
     }))
   end
 
@@ -61,7 +63,8 @@ describe "data helpers" do
     expect(server).to eq(data.merge({
       'instance' => instid,
       'chef_repo' => 'myrepo',
-      'chef_branch' => 'master'
+      'chef_branch' => 'master',
+      'apps' => []
     }))
   end
 
@@ -94,7 +97,8 @@ describe "data helpers" do
       'instance' => instid,
       'chef_repo' => 'myrepo',
       'chef_branch' => 'master',
-      'initkey' => 'FAKEKEY'
+      'initkey' => 'FAKEKEY',
+      'apps' => []
     }))
   end
 
@@ -104,12 +108,14 @@ describe "data helpers" do
     role = DH.get_role_data("role")
     expect(role).to eq({"chef_runlist"=> ["recipe[myrecipe]"].to_json,
                         "apps" => [],
-                        "amis" => {}})
+                        "amis" => {},
+                        "sg" => {}})
     server = DH.get_server_data(instid)
     expect(server).to eq(data.merge("instance" => instid,
                                     "chef_runlist" => ["recipe[myrecipe]"],
                                     "chef_repo" => "myrepo",
-                                    "chef_branch" => "master" ))
+                                    "chef_branch" => "master",
+                                    "apps" => [] ))
   end
 
   it "shoud get the ami for a node from the role" do
@@ -118,6 +124,16 @@ describe "data helpers" do
     role = DH.get_role_data("role")
     expect(role).to eq({'ami' => 'ami-1234567',
                         "apps" => [],
-                        "amis" => {}})
+                        "amis" => {},
+                        "sg" => {}})
+  end
+
+    it "shoud get the sg for a node from the role" do
+      DH.save_role_data("role", ami: 'ami-1234567', "sg" => {"test" => "my_role"})
+      role = DH.get_role_data("role")
+      expect(role).to eq({'ami' => 'ami-1234567',
+                          "apps" => [],
+                          "amis" => {},
+                          "sg" => {"test" => "my_role"}})
   end
 end

data/test/test_helper.rb

@@ -6,7 +6,8 @@ if ENV['COVERAGE']
     add_group 'helpers', 'lib/helpers'
   end
 end
-
+# Clear airbrake env if set
+ENV['AIRBRAKE_API_KEY'] = nil
 libpath = File.realpath(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'rspec'
 require 'rack/test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-server
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Matt Bailey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -166,6 +166,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +241,7 @@ email: ops@gild.com
 executables:
 - gaptool-server
 - gaptool-shell
-- gaptool_server_migrate_0.5-0.6
+- gaptool_migrate_security_groups
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -241,7 +255,7 @@ files:
 - VERSION
 - bin/gaptool-server
 - bin/gaptool-shell
-- bin/gaptool_server_migrate_0.5-0.6
+- bin/gaptool_migrate_security_groups
 - config.ru
 - lib/app.rb
 - lib/exceptions.rb
@@ -255,7 +269,9 @@ files:
 - tasks/app.rb
 - tasks/config.rb
 - tasks/docker.rb
+- tasks/ec2.rb
 - tasks/gem.rb
+- tasks/role.rb
 - tasks/server.rb
 - tasks/user.rb
 - test/api_test.rb

data/bin/gaptool_server_migrate_0.5-0.6

@@ -1,113 +0,0 @@
-#!/usr/bin/env ruby
-#
-# convert the old data model for the gaptool server
-# to the new struct
-
-libpath = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-$:.unshift(libpath)
-require "#{libpath}/helpers/redis"
-require "#{libpath}/helpers/data"
-DH = Gaptool::Data
-
-puts "Removing cruft"
-# First, remove cruft. Like all servers created but never registered, etc
-['instance:*', '_*', 'apikey:*', 'service:*', 'running', 'ec2*',
- 'failover', 'capacity', 'sg:*'].each do |pattern|
-  $redis.redis.keys(pattern).each do |key|
-    $redis.redis.del key
-  end
-end
-
-puts "Migrating roles..."
-$redis.redis.keys('role:*').each do |key|
-  puts " - #{key}"
-  data = $redis.redis.hgetall(key)
-  role = key.sub('role:', '')
-  unless data['ami'].nil?
-    # We didn't have per-regin ami in roles, so
-    # default to us-west-2
-    data['amis'] = {'us-west-2' => data['ami']}
-    role.delete('ami')
-  end
-  DH.save_role_data(role, data)
-end
-
-puts "Migrating ami info to role..."
-$redis.redis.keys('amis:*').each do |key|
-  role = key.sub("amis:", '')
-  puts " - #{key}"
-  amis = $redis.redis.hgetall(key)
-  roledata = DH.get_role_data(role)
-  roledata['amis'] = amis.merge(roledata['amis'] || {})
-  DH.save_role_data(role, roledata)
-  $redis.redis.del(key)
-end
-
-puts "Migrating apps..."
-$redis.redis.keys('app:*').each do |key|
-  puts " - #{key}"
-  appname = key.sub('app:', '')
-  role = $redis.redis.hget(key, "role")
-  if role.nil? || appname.nil?
-    puts "Missing info for app: #{appname} role: #{role}"
-  end
-  $redis.redis.del(key)
-  DH.add_app(appname, role) unless role.nil?
-end
-
-puts "Migrating instances..."
-$redis.redis.keys('host:*').each do |key|
-  puts " - #{key}"
-  pfx, role, env, iid = key.split(':')
-  data = $redis.redis.hgetall(key)
-  data['role'] = role
-  data['environment'] = env
-  unless data['chef_runlist'].nil?
-    data['chef_runlist'] = JSON.parse data['chef_runlist']
-  end
-  DH.addserver(iid, data, nil)
-  $redis.redis.del(key)
-  # remove stale keys from hsh
-  $redis.hdel "instance:#{iid}", ["capacity", "mirror", "secret", 'instance']
-end
-
-puts "Removing unneeded info from instance data..."
-$redis.smembers('instances').each do |inst|
-  $redis.hdel "instance:#{inst}", ["capacity", "mirror", "secret", "instance"]
-  if $redis.hget("instance:#{inst}", 'chef_runlist') == "recipe[init]"
-    $redis.hdel "instance:#{inst}", "chef_runlist"
-  end
-  term = $redis.hget("instance:#{inst}", "terminate")
-  unless term.nil?
-    unless term == 'true'
-      $redis.hset("instance:#{inst}", "terminable", term)
-    end
-    $redis.hdel("instance:#{inst}", "terminate")
-  end
-end
-
-puts "Rename old config keys"
-$redis.redis.rename('config', 'gt:config')
-$redis.hset('config', 'chef_repo', $redis.hget('config', 'chefrepo'))
-$redis.hset('config', 'chef_branch', $redis.hget('config', 'chefbranch'))
-
-puts "Removing old config keys"
-['remoteredis:host', 'remoteredis:port', 'aws_id', 'aws_secret',
- 'chefrepo', 'chefbranch'].each do |key|
-  $redis.hdel 'config', key
-end
-
-unless ARGV[0].nil?
-  puts "Updating GT_URL to #{ARGV[0]}"
-  $redis.hset('config', 'url', ARGV[0])
-end
-
-puts "Namespace remaining keys"
-['users', 'amis'].each { |k| $redis.redis.rename(k, "gt:#{k}")}
-
-puts "Removing out-of-namespace keys"
-$redis.redis.keys('*').select { |k| !k.start_with? ('gt:')}.each do |k|
-  $redis.redis.del(k)
-end
-
-$redis.save