ironfan 5.0.3 → 5.0.4

data/VERSION

@@ -1 +1 @@
-5.0.3
+5.0.4

data/ironfan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "5.0.3"
+  s.version = "5.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]

data/lib/ironfan/dsl/component.rb

@@ -86,7 +86,7 @@ module Ironfan
 
       module ClassMethods
         def default_to_bidirectional default=true
-          fields[:bidirectional].default = default
+          magic :bidirectional, :boolean, default: default
         end
       end
 
@@ -109,9 +109,9 @@ module Ironfan
         # FIXME: This is Ec2-specific and probably doesn't belong here.
         client_group_v = client_group(compute)
         server_group_v = server_group(cluster_name, facet_name)
-        
-        group_edge(compute.cloud(:ec2), client_group_v, server_group_v)
-        group_edge(compute.cloud(:ec2), server_group_v, client_group_v) if bidirectional
+
+        group_edge(compute.cloud(:ec2), client_group_v, :authorized_by_group, server_group_v)
+        group_edge(compute.cloud(:ec2), client_group_v, :authorize_group,     server_group_v) if bidirectional
 
         Chef::Log.debug("discovered #{announce_name} for #{cluster_name}: #{discovery}")
       end
@@ -126,8 +126,8 @@ module Ironfan
         "#{realm_name}_#{server_cluster}"
       end
 
-      def group_edge(cloud, group_1, group_2)
-        cloud.security_group(group_1).authorize_group(group_2)
+      def group_edge(cloud, group_1, method, group_2)
+        cloud.security_group(group_1).send(method, group_2)
         Chef::Log.debug("component.rb: allowing access from security group #{group_1} to #{group_2}")
       end
 

data/spec/ironfan/plugin_spec.rb

@@ -87,11 +87,16 @@ describe Ironfan::Dsl::Component do
 
   context 'when announcing' do
     before (:each) do
-      def make_plugin(name, server_b)
+      def make_plugin(name, server_b, bidirectional)
         Ironfan::Dsl::Component.template([name, server_b ? 'server' : 'client']) do
           include Ironfan::Dsl::Component::Announcement if server_b
           include Ironfan::Dsl::Component::Discovery    if not server_b
 
+          if bidirectional and not server_b
+            STDERR.puts("defaulting #{name} to bidirectional")
+            default_to_bidirectional
+          end
+
           if server_b
             def project(compute)
             end
@@ -103,9 +108,63 @@ describe Ironfan::Dsl::Component do
         end
       end
 
-      def make_plugin_pair(name) make_plugin(name, true); make_plugin(name, false); end
+      def make_plugin_pair(name, bidirectional = false)
+        make_plugin(name, true,  bidirectional);
+        make_plugin(name, false, bidirectional);
+      end
+
+      make_plugin_pair(:bam)
+      make_plugin_pair(:pow)
+      make_plugin_pair(:zap, true)
+
+      Ironfan.realm(:wap) do
+        cloud(:ec2)
+
+        cluster(:foo) do
+          bam_client{ server_cluster :bar }
+          pow_server
+        end
+
+        cluster(:bar) do
+          bam_server
+          pow_client{ server_cluster :foo }
+        end
+
+        cluster(:baz) do
+          zap_client{ server_cluster :bif }
+        end
+
+        cluster(:bif) do
+          zap_server
+        end
+      end.resolve!
+    end
+
+    after(:each) do
+      [:BamServer, :BamClient, :PowServer,
+       :PowClient, :ZapClient, :ZapServer].each do |class_name|
+        Ironfan::Dsl::Component.send(:remove_const, class_name)
+      end
+    end
+
+    it 'configures the correct security groups during discovery' do
+      foo_group = Ironfan.realm(:wap).cluster(:foo).cloud(:ec2).security_group('wap_foo')
+      bar_group = Ironfan.realm(:wap).cluster(:bar).cloud(:ec2).security_group('wap_bar')
+
+      foo_group.group_authorized_by.should include('wap_bar')
+      bar_group.group_authorized_by.should include('wap_foo')
+    end
+
+    it 'configures the correct security groups during bidirectional discovery' do
+      baz_group = Ironfan.realm(:wap).cluster(:baz).cloud(:ec2).security_group('wap_baz')
+      bif_group = Ironfan.realm(:wap).cluster(:bif).cloud(:ec2).security_group('wap_bif')
+
+      baz_group.group_authorized_by.should include('wap_bif')
+      baz_group.group_authorized.should    include('wap_bif')
+    end
 
-      make_plugin_pair(:bam); make_plugin_pair(:pow)
+    it 'does not configure extra security groups during bidirectional discovery' do
+      Ironfan.realm(:wap).cluster(:baz).cloud(:ec2).security_groups.keys.should_not include('wap_bif')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -410,7 +410,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -590095215980804344
+      hash: -19121079596515349
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: