chapp 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7400e9bd5d239d51f9da4e50f7e59b750f0f4c
-  data.tar.gz: a640f10a2332bc0611be364cb5a4ddd2e051e0f9
+  metadata.gz: a55bf03c52c00bafbe28fa2f50706f45b0bdf0f5
+  data.tar.gz: 5a386ad53a944249f1915531c3edd8eb53789a38
 SHA512:
-  metadata.gz: fe6fedbfcd25cf6c73851ac1f623582ad9a2c6ab66127090dec2194b33f43ca02478aa57ec9baa27fdcb9f3c1804ecc66e94790cc7fb4c381d14c81a570c57af
-  data.tar.gz: 798403528dd3f6d8e31d21ae258bb4fb29c8e5c91767ae22801bd251c1ca3b2bcc743a2a5756f14cb835065f63c08bfbfa764a7d498146377be7bf5e68189443
+  metadata.gz: 69b6a02ba6e2cd304007a3721ee56aa3cc9360e0b145010e0527a4b6fdb82413d0a616d2992afef06c9ab27077d60db664b3d78a5304ffe927d97fcd8d4bffdb
+  data.tar.gz: e74ced9f3850c76c3fc8b075dc3a88fc03935fa8971ff337500a8187d7a5de759d628dc7e3b0ae2b9753c7db57ed77711647f20b6e80fbd1ed6f3df8a73d8dc1

data/lib/chapp.rb

@@ -4,7 +4,7 @@ require 'chapp/app_config'
 require 'chapp/wiring'
 require 'chapp/database'
 require 'chapp/provisioner'
-require 'chapp/provisioner/property_provisioner'
+require 'chapp/provisioner/ec2_provisioner'
 
 module Chapp
   
@@ -14,7 +14,7 @@ module Chapp
   
   def self.provisioner
     # TODO: Make configurable
-    Chapp::PropertyProvisioner.new
+    Chapp::EC2Provisioner.new
   end
   
 end

data/lib/chapp/app.rb

@@ -3,55 +3,37 @@ require 'chef/node/attribute'
 
 module Chapp
   class App
-    
-    def initialize id, db, config=nil, attributes=nil
+
+    attr_reader :id, :attributes, :instances
+
+    def initialize id, attributes, instances, db
       @id = id
       @db = db
-      @config = config
       @attributes = attributes
-      @instances = nil
+      @instances = instances
+      @config = nil
       @connected_apps = nil
     end
-    
-    def id
-      @id
-    end
-    
+
     def config
       unless @config
         @config = @db.app_config @id
       end
-      
+
       @config
     end
-    
-    def instances
-      unless @instances
-        @instances = @db.app_instances @id
-      end
-      
-      @instances
-    end
-    
-    def attributes
-      unless @attributes
-        @attributes = @db.app_attributes @id
-      end
-      
-      @attributes
-    end
-    
+
     def connected_apps
       unless @connected_apps
         @connected_apps = Array.new
-      
+
         @db.connected_app_ids(@id).each do |app_id|
-          @connected_apps << App.new(app_id, @db)
+          @connected_apps << @db.app(app_id)
         end
       end
-      
+
       @connected_apps
     end
-    
+
   end
-end
+end

data/lib/chapp/app/node_app.rb

@@ -0,0 +1,45 @@
+require 'chapp'
+
+module Chapp
+  class NodeApp < Chapp::App
+
+    def initialize id, db, config, attributes, node_name, fqdn
+      @id = id
+      @db = db
+      @config = config
+      @fqdn = fqdn
+      @node_name = node_name
+      @attributes = attributes
+
+      @instances = nil
+      @connected_apps = nil
+    end
+
+    def instances
+      unless @instances
+        app = @db.app id
+        app_instances = app.instances
+        @instances = []
+
+        # If we can't find our own instance add it to the list
+        found_node = false
+        app_instances.each do |instance|
+          if instance.node_name == @node_name
+            found_node = true
+            @instances << Chapp::AppInstance.new(id, @node_name, @fqdn)
+            break
+          else
+            @instances << instance
+          end
+        end
+
+        unless found_node
+          @instances << Chapp::AppInstance.new(id, @node_name, @fqdn)
+        end
+      end
+
+      @instances
+    end
+
+  end
+end

data/lib/chapp/app_config.rb

@@ -41,6 +41,8 @@ module Chapp
         end
       end
       
+      app.cloud app_hash["cloud"]
+      
       app.node Chef::Node::Attribute.new({}, app_hash["node"], {}, {}).default
       app.environment app_hash["environment"]
       
@@ -63,6 +65,7 @@ module Chapp
       @group = nil
       @name = nil
       @used_apps = Hash.new
+      @cloud = Hash.new
       @dependencies = Hash.new
       @pre_run_list = Array.new
       @post_run_list = Array.new
@@ -139,6 +142,10 @@ module Chapp
       set_or_return :node, node
     end
     
+    def cloud cloud=nil
+      set_or_return :cloud, cloud
+    end
+    
     def run_list run_list=nil
       set_or_return :run_list, run_list
     end
@@ -154,6 +161,8 @@ module Chapp
       hash.store "name", name
       hash.store "used_apps", used_apps
       
+      hash.store "cloud", cloud
+      
       hash.store "pre_run_list", pre_run_list
       hash.store "post_run_list", post_run_list
       

data/lib/chapp/database.rb

@@ -7,167 +7,151 @@ require 'chef/search/query'
 
 module Chapp
   class Database
-  
+
     APPS_CONFIG_DATA_BAG_NAME = "chapp_apps_config"
     APP_ATTRIBUTES_DATA_BAG_NAME = "chapp_app_attributes"
-    
+
     def app_ids
       apps_config_databag.keys
     end
-    
+
     def app_config app_id
-      
+
       unless app_exists? app_id
         raise AppNotExistsException.new, "App [#{app_id}] does not exist"
       end
-      
+
       AppConfig.from_hash apps_config_databag_item(app_id).raw_data["app"]
     end
-    
+
     def app_exists? app_id
       apps_config_databag.has_key? app_id
     end
-    
+
     def connected_app_ids app_id
       app_ids = Array.new
-      
+
       query = Chef::Search::Query.new
       query.search APPS_CONFIG_DATA_BAG_NAME, "used_apps:#{app_id}" do |databag_item|
         app_config = AppConfig.from_hash databag_item.raw_data["app"]
         app_ids.push app_config.id
       end
-      
+
       app_ids
     end
 
     def write_app_config app_config
-      
+
       # TODO Verify used_apps exist
       # TODO Verify cookbooks exist
-      
+
       app_role_name = app_config.role_name
-      
+
       attributes = app_config.node
       attributes["chapp"]["app_id"] = app_config.id
-      
+
       # Build/Save role
       role = Chef::Role.new
       role.name app_role_name
       role.description "Used to define the App [#{app_config.id}]"
       role.default_attributes attributes.to_hash
-      role.run_list "recipe[chapp]", *app_config.pre_run_list, "recipe[#{app_config.cookbook}::#{app_config.recipe}]", *app_config.post_run_list, "recipe[chapp::publish_app_attributes]"
+      role.run_list "recipe[chapp]", *app_config.pre_run_list, "recipe[#{app_config.cookbook}::#{app_config.recipe}]", *app_config.post_run_list
       role.save
-      
+
       # Set run_list of app to role
       app_config.run_list ["role[#{app_role_name}]"]
-      
+
       environment_name = app_config.environment_name
-      
+
       # Build/Save environment
       environment = Chef::Environment.new
       environment.name environment_name
       environment.description "Used to define the dependencies of App [#{app_config.id}]"
-      
+
       app_config.dependencies.each do |cookbook, version|
         environment.cookbook cookbook, version
       end
-      
+
       environment.save
-      
-       # Set environment of app
+
+      # Set environment of app
       app_config.environment environment_name
-      
+
       # Update app databag item
       databag_item = apps_config_databag_item app_config.id
       databag_item.raw_data["app"] = app_config.to_hash
       databag_item.save
-      
+
     end
-    
+
     def delete_app app_name
       # TODO (not necessary for now)
       # Delete role/environment, app config databag item, app attribute databag item, app instances
     end
-    
-    def app_instances app_id
-      app_instances = Array.new
-      
+
+    def app app_id
+      app_instances = []
+      app_attributes = {}
+      latest_time = 0
+
       query = Chef::Search::Query.new
       # TODO Figure out how to get role name more appropriately
       query.search(:node, "role:chapp_#{app_id}") do |node|
         app_instances.push Chapp::AppInstance.new(app_id, node.name, node["fqdn"])
+
+        if node.has_key?("ohai_time") && node.has_key?("chapp") && node["chapp"].has_key?("app_attributes") && node["ohai_time"] > latest_time
+          latest_time = node["ohai_time"]
+          app_attributes = node["chapp"]["app_attributes"].to_hash
+        end
       end
-      
-      app_instances
+
+      Chapp::App.new app_id, app_attributes, app_instances, self
     end
-    
+
     def write_app_instance app_instance
       # NOOP (uses Chef Search)
     end
-    
+
     def delete_app_instance app_instance
       # TODO: Delete node/client (not necessary for now)
     end
-    
+
     def app_attributes app_id
       databag = app_attributes_databag
-      
+
       unless databag.has_key? app_id
         raise AppAttributesNotExistsException.new, "Attributes for app [#{app_id}] do not exist"
       end
-      
+
       app_attributes_databag_item(app_id).raw_data["app_attributes"]
     end
-    
-    def write_app_attributes app_id, app_attributes
-      databag_item = app_attributes_databag_item app_id
-      databag_item.raw_data["app_attributes"] = app_attributes
-      databag_item.save
-    end
-    
-    def delete_app_attributes app_id
-      databag = app_attributes_databag
-      
-      if databag.has_key? app_id
-        app_attributes_databag_item(app_id).destroy
-      end
-      
-    end
-    
+
     class AppAttributesNotExistsException < StandardError; end
     class AppNotExistsException < StandardError; end
-    
+
     private
-    
+
     def apps_config_databag
       get_or_create_databag APPS_CONFIG_DATA_BAG_NAME
     end
-    
+
     def apps_config_databag_item app_id
       load_or_build_databag_item apps_config_databag, APPS_CONFIG_DATA_BAG_NAME, app_id
     end
-    
-    def app_attributes_databag
-      get_or_create_databag APP_ATTRIBUTES_DATA_BAG_NAME
-    end
-    
-    def app_attributes_databag_item app_id
-      load_or_build_databag_item app_attributes_databag, APP_ATTRIBUTES_DATA_BAG_NAME, app_id
-    end
-    
+
     def get_or_create_databag databag_name
       databags = Chef::DataBag.list
-      
+
       unless databags.include? databag_name
         # Create databag if it does not exist
         databag = Chef::DataBag.new
         databag.name databag_name
         databag.save
       end
-      
+
       Chef::DataBag.load databag_name
     end
-    
+
     def load_or_build_databag_item databag, databag_name, databag_item_name
       if databag.keys.include? databag_item_name
         databag_item = Chef::DataBagItem.load databag_name, databag_item_name
@@ -176,10 +160,10 @@ module Chapp
         databag_item = Chef::DataBagItem.new
         databag_item.data_bag databag_name
         databag_item.raw_data["id"] = databag_item_name
-        
+
         databag_item
       end
     end
-    
+
   end
 end

data/lib/chapp/provisioner/ec2_provisioner.rb

@@ -0,0 +1,67 @@
+require 'chapp'
+require 'aws'
+
+module Chapp
+  class EC2Provisioner < Chapp::Provisioner
+    
+    # Knife config
+    ACCESS_KEY = "ec2_access_key_id"
+    SECRET_KEY = "ec2_secret_access_key"
+    KEY_PAIR = "ec2_key_pair"
+    
+    # App config
+    IMAGE_ID = "image_id"
+    INSTANCE_TYPE = "instance_type"
+    
+    def build_server app_config, properties
+      
+      errors = []
+      
+      access_key = Chef::Config[ACCESS_KEY]
+      secret_key = Chef::Config[SECRET_KEY]
+      key_pair = Chef::Config[KEY_PAIR]
+      
+      if access_key.nil?
+        errors << "#{ACCESS_KEY} must be specified in your knife config"
+      end
+      
+      if secret_key.nil?
+        errors << "#{SECRET_KEY} must be specified in your knife config"
+      end
+      
+      if key_pair.nil?
+        errors << "#{KEY_PAIR} must be specified in your knife config"
+      end
+      
+      unless app_config.cloud.has_key? IMAGE_ID
+        errors << "#{IMAGE_ID} must be specified in your app's cloud config"
+      end
+      
+      unless app_config.cloud.has_key? INSTANCE_TYPE
+        errors << "#{INSTANCE_TYPE} must be specified in your app's cloud config"
+      end
+      
+      image_id = app_config.cloud[IMAGE_ID]
+      instance_type = app_config.cloud[INSTANCE_TYPE]
+      
+      ec2 = AWS::EC2.new(:access_key_id => access_key, :secret_access_key => secret_key)
+      
+      instance = ec2.instances.create(
+        :image_id => image_id,
+        :instance_type => instance_type,
+        :key_pair => ec2.key_pairs[key_pair]
+      )
+      
+      puts "Waiting for new instance with id #{instance.id} to become available..."
+      sleep 1 while instance.status == :pending
+      
+      puts "#{instance.dns_name} is ready"
+
+      # TODO: Wait for SSH to become available
+      sleep 70
+
+      instance.dns_name
+    end
+    
+  end
+end

data/lib/chapp/wiring.rb

@@ -1,19 +1,19 @@
 require 'chapp'
+require 'chapp/app/node_app'
 
 module Chapp
   
   class Wiring
     
-    attr_reader :announcements
     attr_reader :node
     
     def initialize app_config, db, node
-      @announcements = Hash.new
       @used_apps = Hash.new
       
       @db = db
       @node = node
-      @app = App.new app_config.id, db, app_config, @announcements
+      @app = Chapp::NodeApp.new app_config.id, db, app_config, node.default["chapp"]["app_attributes"],
+       Chef::Config[:node_name], node["fqdn"]
       
       app_config.used_apps.each do |type, app_ids|
         unless @used_apps.has_key? type
@@ -21,7 +21,7 @@ module Chapp
         end
         
         app_ids.each do |app_id|
-          @used_apps[type] << App.new(app_id, db)
+          @used_apps[type] << app_id
         end
       end
     end
@@ -38,7 +38,7 @@ module Chapp
           raise "App uses many apps of [#{type}]"
         end
         
-        @used_apps[type].first
+        @db.app @used_apps[type].first
       end
     end
     
@@ -47,7 +47,7 @@ module Chapp
         raise "App does not use app of type [#{type}]"
       end
       
-      @used_apps[type]
+      @db.app @used_apps[type]
     end
     
   end

data/lib/chef/knife/app_instance_create.rb

@@ -40,12 +40,13 @@ class Chef
         
         app_config = db.app_config app_id
         
-        # TODO: May need something better than Time
-        node_name = "chapp_#{app_id}_#{Time.now.to_i}"
-        
         # Provision the server and retrieve the host name
         host = provisioner.build_server app_config, properties
         
+        properties.each do |key, value|
+          @config[key.to_sym] = value
+        end
+        
         # Tells bootstrap what environment to use
         Chef::Config[:environment] = app_config.environment_name
         
@@ -53,7 +54,7 @@ class Chef
         @config[:run_list] = "role[#{app_config.role_name}]"
         
         # Tells bootstrap what node name to use
-        @config[:chef_node_name] = node_name
+        @config[:chef_node_name] = host
         
         # Tells bootstrap what ip/fqdn to use
         @name_args = host
@@ -63,7 +64,7 @@ class Chef
         
         # We have to save the node here since bootstrap wont actually assign the run_list
         node = Node.new
-        node.name node_name
+        node.name host
         node.run_list = Chef::RunList.new "role[#{app_config.role_name}]"
         node.chef_environment = app_config.environment_name
         node.save

data/lib/chef/knife/app_show.rb

@@ -20,9 +20,9 @@ class Chef
         
         app_id = @name_args[0]
         
-        db = Chapp.database
+        app = Chapp.database.app app_id
         
-        app_config = db.app_config app_id
+        app_config = app.config
         
         puts "App :"
         puts "  id : #{app_config.id}"
@@ -31,6 +31,7 @@ class Chef
         puts "  type : #{app_config.type}"
         puts "  cookbook : #{app_config.cookbook}"
         puts "  recipe : #{app_config.recipe}"
+        puts "  cloud : #{app_config.cloud}"
         
         puts "  used_apps :"
         app_config.used_apps.each do |type, used_app_ids|
@@ -61,15 +62,10 @@ class Chef
         puts ""
         
         puts "App Attributes :"
-        begin
-          attributes = db.app_attributes app_id
-          print_hash attributes, 2
-        rescue Chapp::Database::AppAttributesNotExistsException => e
-          puts "  NONE"
-        end
+        print_hash app.attributes, 2
         
         puts "App Instances :"
-        db.app_instances(app_id).each do |app_instance|
+        app.instances.each do |app_instance|
           puts "  #{app_instance.fqdn}"
         end
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chapp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bryan Baugher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,19 +59,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- lib/chapp.rb
+- lib/chapp/app/node_app.rb
 - lib/chapp/app.rb
 - lib/chapp/app_config.rb
 - lib/chapp/app_instance.rb
 - lib/chapp/database.rb
-- lib/chapp/provisioner.rb
+- lib/chapp/provisioner/ec2_provisioner.rb
 - lib/chapp/provisioner/property_provisioner.rb
+- lib/chapp/provisioner.rb
 - lib/chapp/wiring.rb
+- lib/chapp.rb
 - lib/chef/knife/app_instance_create.rb
 - lib/chef/knife/app_list.rb
 - lib/chef/knife/app_show.rb
 - lib/chef/knife/app_upload.rb
+- Gemfile
 homepage: http://github.com/bbaugher/chapp
 licenses:
 - The MIT License (MIT)
@@ -78,8 +94,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nowarning
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A Chef knife plugin for creating Chef Apps
 test_files: []
+has_rdoc: