ironfan 4.4.1 → 4.4.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.4.2:
+* Support for intra-cluster ICMP and specs to prove it (thanks @nickmarden)
+* Knife bash completion script: see config/knife.bash.README.md for installation (thanks @schade)
+
 # v4.4.1:
 * Re-enables integration specs, explicitly excluding them from "rake spec" (@nickmarden)
 

data/VERSION

@@ -1 +1 @@
-4.4.1
+4.4.2

data/config/knife.bash

@@ -0,0 +1,153 @@
+# Original Author: Avishai Ish-Shalom <avishai@fewbytes.com>
+# Minor Ironfan-esque additions: Jerry Jackson <jerry.w.jackson@gmail.com>
+
+# first argument set the command level
+_get_knife_completions() {
+    n=$1
+    shift
+    # first argument is knife, so shift it
+    #[ "$1" == "knife" ] && shift
+    local opts
+    opts="$($@ --help | grep -E '^knife' | cut -f$n -d" " | grep -v -E '[][[:upper:].]+' |grep -v '(options)' | sort -u)"
+    _upvar opts "$opts"
+    return 0
+}
+
+_flatten_knife_command() {
+    echo ${words[*]:0:$(( ${#words[*]} -1 ))} | tr ' ' '_'
+}
+# Check cache file for category in file ( passed as $1 ) and run command if cache is empty
+# Designed to be used with _get_knife_completions() and use the opts variables for options
+_completion_cache() {
+    local flag COMMAND
+    local OPTIND=1
+    while getopts "c" flag "$@"; do
+        case $flag in
+        c)
+            COMMAND=yes
+            ;;
+        *)
+            ;;
+        esac
+    done
+    shift $(( $OPTIND - 1 ))
+
+    local CACHE_FILE="$1"
+    shift
+    if [ ! -f "$CACHE_FILE" ]; then
+        if [[ "$COMMAND" == "yes" ]]; then
+            opts=$( eval $@ 2>/dev/null )
+            RET=$?
+        else
+            $@ 2>/dev/null
+            RET=$?
+        fi
+        if [[ $RET -eq 0 ]]; then
+            [ -d "$(dirname "$CACHE_FILE")" ] && echo $opts >"$CACHE_FILE"
+        else
+            unset opts
+        fi
+    else
+        opts=$(cat "$CACHE_FILE")
+    fi
+    _upvar opts "$opts"
+}
+
+_chef_completion_cache() {
+    local CACHE_DIR=${CHEF_HOME:-"$HOME/.chef"}/.completion_cache
+    unset C
+    local C
+    if [[ "$1" == "-c" ]]; then
+        C="-c"
+        shift
+    fi
+    CACHE_FILE="$CACHE_DIR/$1"; shift
+    _completion_cache $C "$CACHE_FILE" "$@"
+    _upvar opts "$opts"
+}
+
+_knife() {
+    if [[ ${cur} =~ /^-/ ]]; then
+        return 0
+    fi
+    local opts cur prev cword words flattened_knife_command
+    _chef_completion_cache knife_commands _get_knife_completions 2 knife
+    _get_comp_words_by_ref cur prev cword words
+    flattened_knife_command=$(_flatten_knife_command)
+    COMPREPLY=()
+    case $flattened_knife_command in
+    *from_file|from_file_*)
+        COMPREPLY=( $(compgen -f -- ${cur} ) )
+        return 0
+        ;;
+    *knife_cookbook_upload|*knife_cookbook_test)
+        local chef_repos
+        if [[ -z $CHEF_REPOS ]]; then
+            CHEF_CONFIG="${CHEF_HOME:-$HOME/.chef}/knife.rb"
+            chef_repos=( $( ruby -e "def cookbook_path(*args); args.each{|a| puts a }; end; eval(File.open('$CHEF_CONFIG','r').lines.select{|l| l =~ /cookbook_path/}.first)" ) )
+        else
+            chef_repos=( ${CHEF_REPOS[@]} )
+        fi
+        if [[ -n "$chef_repos" ]]; then
+            opts=$( ls -1p ${chef_repos[@]} | sort -u | ${SED} -n 's/\/$//p' )
+            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        fi
+        ;;
+    *knife_data)
+        opts="bag"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_search)
+        _chef_completion_cache -c ${words[0]}_data_bags "${words[0]} data bag list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
+        OPTS="node ${opts}"
+        COMPREPLY=( $(compgen -W "${OPTS}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_node_show|*knife_node_edit|*knife_node_delete|*knife_tag_*)
+        _chef_completion_cache -c ${words[0]}_nodes "${words[0]} node list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_role_edit|*knife_role_show|*knife_role_delete)
+        _chef_completion_cache -c ${words[0]}_roles "${words[0]} role list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_data_bag_delete|*knife_data_bag_show|*knife_data_bag_edit)
+        _chef_completion_cache -c ${words[0]}_data_bags "${words[0]} data bag list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_data_bag_delete_*|*knife_data_bag_show_*|*knife_data_bag_edit_*)
+        _chef_completion_cache -c ${words[0]}_data_bag_$prev "${words[0]} data bag show $prev 2>/dev/null|${SED} -r -e 's/[\"\ ,]//g' -e '/^[^0-9A-Za-z._-]+/d'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_client_list|*knife_client_show|*knife_client_edit)
+        _chef_completion_cache -c ${words[0]}_clients "${words[0]} client list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *knife_environment_show|*knife_environment_edit|*knife_environment_delete)
+        _chef_completion_cache -c ${words[0]}_environments "${words[0]} environment list|${SED} -r -e 's/[\"\ ,]//g' -e '/[^0-9A-Za-z._-]+/d'"
+        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        return 0
+        ;;
+    *)
+        case $cword in
+        1)
+            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+            return 0
+            ;;
+        *)
+            _chef_completion_cache $flattened_knife_command _get_knife_completions $(( $cword + 1 )) ${words[*]}
+            COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+            return 0
+            ;;
+        esac
+        ;;
+    esac
+    [[ ${#COMPREPLY[@]} -ge 1 ]] && return 0
+}
+complete -F _knife knife

data/config/knife.bash.README.md

@@ -0,0 +1,13 @@
+# knife bash completion
+
+## Installation
+=================
+1)	Place the file knife.bash where bash expects to find it's autocompletion scripts.
+		On most modern unices this would equate to '/etc/bash_completion.d/'. This has
+		been verified in, at least, Ubuntu and Gentoo.
+2)	Restart your shell.
+3)	Enjoy tab-completion of your knife commands.
+
+## Overview
+=================
+Credit goes to the original author; Avishai Ish-Shalom <avishai@fewbytes.com>. I have made and will continue to make needed changes; eg. things present in Ironfan but not in vanilla Chef.

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.4.1"
+  s.version = "4.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-10-23"
+  s.date = "2012-10-24"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "chefignore",
     "config/client.rb",
+    "config/knife.bash",
+    "config/knife.bash.README.md",
     "config/proxy.pac",
     "config/ubuntu10.04-ironfan.erb",
     "config/ubuntu11.10-ironfan.erb",
@@ -129,6 +131,7 @@ Gem::Specification.new do |s|
     "spec/integration/minimal-chef-repo/knife/knife.rb",
     "spec/integration/minimal-chef-repo/roles/systemwide.rb",
     "spec/integration/spec/elb_build_spec.rb",
+    "spec/integration/spec/simple_cluster_spec.rb",
     "spec/integration/spec_helper.rb",
     "spec/integration/spec_helper/launch_cluster.rb",
     "spec/ironfan/cluster_spec.rb",
@@ -145,7 +148,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"
   s.summary = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
-  s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/knife/credentials/knife-user-ironfantester.rb", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
+  s.test_files = ["spec/spec_helper/dummy_chef.rb", "spec/integration/spec_helper/launch_cluster.rb", "spec/integration/minimal-chef-repo/roles/systemwide.rb", "spec/integration/minimal-chef-repo/environments/_default.json", "spec/integration/minimal-chef-repo/chefignore", "spec/integration/minimal-chef-repo/knife/knife.rb", "spec/integration/minimal-chef-repo/knife/credentials/knife-user-ironfantester.rb", "spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb", "spec/integration/spec/simple_cluster_spec.rb", "spec/integration/spec/elb_build_spec.rb", "spec/integration/spec_helper.rb", "spec/ironfan/cluster_spec.rb", "spec/ironfan/ec2/cloud_provider_spec.rb", "spec/ironfan/ec2/elb_spec.rb", "spec/ironfan/ec2/security_group_spec.rb", "spec/chef/cluster_bootstrap_spec.rb", "spec/fixtures/gunbai_slice.json", "spec/fixtures/ec2/elb/snakeoil.key", "spec/fixtures/ec2/elb/snakeoil.crt", "spec/fixtures/gunbai.rb", "spec/spec_helper.rb", "spec/test_config.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/ironfan/provider/ec2/security_group.rb

@@ -3,6 +3,9 @@ module Ironfan
     class Ec2
 
       class SecurityGroup < Ironfan::Provider::Resource
+
+        WIDE_OPEN = Range.new(1,65535)
+
         delegate :_dump, :authorize_group_and_owner, :authorize_port_range,
             :collection, :collection=, :connection, :connection=, :description,
             :description=, :destroy, :group_id, :group_id=, :identity,
@@ -114,14 +117,14 @@ module Ironfan
               other_group_fog = recall_with_vpc(other_group,cloud.vpc)
               Ironfan.step(dsl_group.name, "  ensuring access from #{other_group}", :blue)
               options = {:group => other_group_fog.group_id}
-              safely_authorize(dsl_group_fog, 1..65535, options)
+              safely_authorize(dsl_group_fog, WIDE_OPEN, options)
             end
 
             dsl_group.group_authorized_by.each do |other_group|
               other_group_fog = recall_with_vpc(other_group,cloud.vpc)
               Ironfan.step(dsl_group.name, "  ensuring access to #{other_group}", :blue)
               options = {:group => dsl_group_fog.group_id}
-              safely_authorize(other_group_fog, 1..65535, options)
+              safely_authorize(other_group_fog, WIDE_OPEN, options)
             end
 
             dsl_group.range_authorizations.each do |range_auth|
@@ -156,6 +159,7 @@ module Ironfan
           unless options[:ip_protocol]
             safely_authorize(fog_group,range,options.merge(:ip_protocol => 'tcp'))
             safely_authorize(fog_group,range,options.merge(:ip_protocol => 'udp'))
+            safely_authorize(fog_group,Range.new(-1,-1),options.merge(:ip_protocol => 'icmp')) if(range == WIDE_OPEN)
             return
           end
 

data/spec/integration/spec/simple_cluster_spec.rb

@@ -0,0 +1,82 @@
+require_relative '../spec_helper'
+
+Ironfan.cluster "simple" do
+
+  cloud(:ec2) do
+    availability_zones ('b'..'d').map { |z| "us-east-1#{z}" }
+    flavor              't1.micro'
+    backing             'ebs'
+    image_name          'alestic-precise'
+    chef_client_script  'client.rb'
+    security_group      :systemwide
+    security_group      :ssh do
+      authorize_port_range(22..22)
+    end
+    mount_ephemerals
+  end
+
+  facet :web do
+    instances 1
+  end
+
+  facet :db do
+    instances 1
+  end
+end
+
+
+launch_cluster 'simple' do |cluster, computers|
+  describe "the simple cluster" do
+
+    it "should have the correct number of running computers" do
+      computers.size.should == cluster.facets.keys.inject(0) { |size, facet| size + cluster.facets[facet].instances }
+      computers.values.reject { |c| c.running? }.should be_empty
+    end
+
+    describe "the web facet security groups" do
+      subject { cluster.facets[:web].server(0).cloud(:ec2).security_groups.keys.map(&:to_s).sort }
+      it { should == %w[ simple simple-web ssh systemwide ] }
+    end
+
+    describe "the db facet security groups" do
+      subject { cluster.facets[:db].server(0).cloud(:ec2).security_groups.keys.map(&:to_s).sort }
+      it { should == %w[ simple simple-db ssh systemwide ] }
+    end
+
+    describe "the cluster-wide security group" do
+      before :each do
+        @sg = Ironfan::Provider::Ec2::SecurityGroup.recall('simple')
+        @ordered_ipp = Hash[ @sg.ip_permissions.map { |s| [ s['ipProtocol'], s ] } ]
+      end
+
+      it "has the right number of inbound security rules" do
+        @ordered_ipp.keys.size == 3
+      end
+
+      it "allows TCP connections on all ports between all servers in the security group" do
+        @ordered_ipp['tcp']['groups'].size.should                == 1
+        @ordered_ipp['tcp']['groups'][0]['groupId'].should       == @sg.group_id
+        @ordered_ipp['tcp']['groups'][0]['groupName'].should     == 'simple'
+        @ordered_ipp['tcp']['fromPort'].to_i.should              == 1
+        @ordered_ipp['tcp']['toPort'].to_i.should                == 65535
+      end
+
+      it "allows UDP connections on all ports between all servers in the security group" do
+        @ordered_ipp['udp']['groups'].size.should                == 1
+        @ordered_ipp['udp']['groups'][0]['groupId'].should       == @sg.group_id
+        @ordered_ipp['udp']['groups'][0]['groupName'].should     == 'simple'
+        @ordered_ipp['udp']['fromPort'].to_i.should              == 1
+        @ordered_ipp['udp']['toPort'].to_i.should                == 65535
+      end
+
+      it "allows ICMP connections between all servers in the security group" do
+        @ordered_ipp['icmp']['groups'].size.should                == 1
+        @ordered_ipp['icmp']['groups'][0]['groupId'].should       == @sg.group_id
+        @ordered_ipp['icmp']['groups'][0]['groupName'].should     == 'simple'
+        @ordered_ipp['icmp']['fromPort'].to_i.should              == -1
+        @ordered_ipp['icmp']['toPort'].to_i.should                == -1
+      end
+
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-23 00:00:00 Z
+date: 2012-10-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -157,6 +157,8 @@ files:
 - VERSION
 - chefignore
 - config/client.rb
+- config/knife.bash
+- config/knife.bash.README.md
 - config/proxy.pac
 - config/ubuntu10.04-ironfan.erb
 - config/ubuntu11.10-ironfan.erb
@@ -255,6 +257,7 @@ files:
 - spec/integration/minimal-chef-repo/knife/knife.rb
 - spec/integration/minimal-chef-repo/roles/systemwide.rb
 - spec/integration/spec/elb_build_spec.rb
+- spec/integration/spec/simple_cluster_spec.rb
 - spec/integration/spec_helper.rb
 - spec/integration/spec_helper/launch_cluster.rb
 - spec/ironfan/cluster_spec.rb
@@ -278,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 688283162375062517
+      hash: -2266640739538756460
       segments: 
       - 0
       version: "0"
@@ -304,6 +307,7 @@ test_files:
 - spec/integration/minimal-chef-repo/knife/knife.rb
 - spec/integration/minimal-chef-repo/knife/credentials/knife-user-ironfantester.rb
 - spec/integration/minimal-chef-repo/knife/credentials/knife-org.rb
+- spec/integration/spec/simple_cluster_spec.rb
 - spec/integration/spec/elb_build_spec.rb
 - spec/integration/spec_helper.rb
 - spec/ironfan/cluster_spec.rb