ec2launcher 1.3.1 → 1.3.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.2
+
+* Added support for specifying per-environment IAM profiles in Applications.
+
 ## 1.3.1
 
 * Kludge around log4r issue with Route53.

data/lib/ec2launcher/dsl/application.rb

@@ -41,7 +41,6 @@ module EC2Launcher
 			dsl_accessor :availability_zone
 			dsl_accessor :basename
 			dsl_accessor :inherit
-			dsl_accessor :iam_profile
 			dsl_accessor :instance_type
 			dsl_accessor :name_suffix
 			dsl_accessor :subnet
@@ -61,8 +60,9 @@ module EC2Launcher
 
 			def initialize(name)
 				@name = name
+				
 				@email_notifications = nil
-
+				@iam_profile = Hash.new
 				@use_rvm = true
 			end
 
@@ -141,6 +141,31 @@ module EC2Launcher
 				end
 			end
 
+			# IAM profile role name to use for new instances.
+			#
+			# Expects one param in the form of either:
+			#   * A string containing the name of the IAM profile
+			#   * A Hash mapping environment names (as strings) to IAM profile names (as strings)
+			def iam_profile(*data)
+				if data.empty?
+					@iam_profile
+				else
+					if data[0].kind_of? Hash
+						@iam_profile = data[0]
+					else
+						@iam_profile["default"] = data[0]
+					end
+				end
+			end
+
+			# Retrieves the IAM profile for a given environment. Or
+			# returns the default profile name.
+			def iam_profile_for_environment(environment)
+				iam_profile = @iam_profile[environment]
+				iam_profile ||= @iam_profile["default"]
+				iam_profile
+			end
+
 			# Takes values from the other server type and merges them into this one
 			def merge(other_server)
 				@name = other_server.name

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/lib/ec2launcher.rb

@@ -189,8 +189,8 @@ module EC2Launcher
       ##############################
       # IAM PROFILE
       ##############################
-      iam_profile = @environment.iam_profile
-      iam_profile ||= @application.iam_profile
+      iam_profile = @application.iam_profile_for_environment(@environment.name)
+      iam_profile ||= @environment.iam_profile
 
       ##############################
       # INSTANCE TYPE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk