stackit 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8c6a01eb2f776f3dc9b07da21438f845d30b2a
-  data.tar.gz: 153b483a190bf79a2261c7244513be5e3c978326
+  metadata.gz: 4ae87dceb69b924c250e0520eb60e133cdd96d55
+  data.tar.gz: 66b8268399565686f4abdc904b14e4360df71a5b
 SHA512:
-  metadata.gz: 49b7af4f76385afd375420684a70ec2d8172d8daf749135e6fe98c1d7ab785c9cf4dae4f525143e176cd7e9eaf9fe496f5aa95e36b538f2e9886db85c59a254c
-  data.tar.gz: 2b6ee87c56dc20dfe2ca7cb70fd7d407c022c60dcc590bd379c38ffec2d23d95ed0c936e49183b0212a109f5280e142903b52dadd4d640055bc5223a301fb16a
+  metadata.gz: 6f74864e0c51bb6c9699d8b5a2cba475b88a2d922e62e2b4ac084125207c3219e66548157551142f2d4cc147c958c72fb63fdf581526c4c09a206ce057db882e
+  data.tar.gz: 1ce70a217a4bba624bdf2c4c399aac5df0b9992a760ef404632594bfe010bb22dc934a0f78006c5ce917d2b3690175b2d75e4a4c73a7e57afdd6e2df678e319f

data/lib/stackit/mixin/availability_zone.rb

@@ -0,0 +1,7 @@
+module Stackit::Mixin::AvailabilityZone
+
+  def random_az(keys = [:VpcAvailabilityZone1, :VpcAvailabilityZone2, :VpcAvailabilityZone3])
+    resolve_parameters(keys).split(',').sample
+  end
+
+end

data/lib/stackit/mixin/opsworks.rb

@@ -0,0 +1,12 @@
+module Stackit::Mixin::OpsWorks
+
+  def opsworks_service_role_arn(key = :OpsWorksServiceRole)
+    "arn:aws:iam::#{Stackit.aws.account_id}:role/#{resolve_parameter(key)}"
+  end
+
+  def opsworks_cookbook_source(key = :DevOpsBucket, cookbook_archive = 'cookbooks.tar.gz')
+    "https://s3.amazonaws.com/#{resolve_parameter(key)}/#{cookbook_archive}"
+  end
+
+end
+

data/lib/stackit/stack/managed_stack_service.rb

@@ -10,27 +10,33 @@ module Stackit
     end
 
     def create!
-      stack.create!
+      final_stack.create!
     end
 
     def update!
-      stack.update!
+      final_stack.update!
     end
 
     def delete!
-      stack.delete!
+      final_stack.delete!
     end
 
   protected
 
     def stack_name
-      return options[:stack_name] ||  
-        "#{Stackit.environment}-#{options[:stack_name]}"
+      options[:stack_name] || "#{Stackit.environment}-#{options[:stack_name]}"
     end
 
     def template
-      return options[:template] ||
-        File.expand_path("#{options[:stack_name]}.json", template_dir)
+      options[:template] || File.expand_path("#{options[:stack_name]}.json", template_dir)
+    end
+
+    def stack_policy
+      options[:template]
+    end
+
+    def stack_policy_during_update
+      options[:stack_policy_during_update]
     end
 
     def parameters_file
@@ -38,6 +44,10 @@ module Stackit
         File.expand_path("#{options[:stack_name]}.parameters", template_dir)
     end
 
+    def depends
+      options[:depends]
+    end
+
     def parameter_mappings
       {}
     end
@@ -51,43 +61,84 @@ module Stackit
     end
 
     def disable_rollback
-      true
+      !!options[:debug] ? true : !!options[:disable_rollback]
+    end
+
+    def wait
+      options[:wait]
+    end
+
+    def force
+      options[:force]
+    end
+
+    def dry_run
+       options[:dry_run]
+    end
+
+    def debug
+      !!options[:debug]
+    end
+
+    def timeout_in_minutes
+      options[:timeout_in_minutes]
+    end
+
+    def notification_arns
+      options[:notification_arns]
+    end
+
+    def capabilities
+      options[:capabilities]
+    end
+
+    def tags
+      options[:tags]
+    end
+
+    def on_failure
+      options[:on_failure]
+    end
+
+    def retain_resources
+      options[:retain_resources]
+    end
+
+    def use_previous_template
+      options[:use_previous_template]
     end
 
     def stack
-      params = user_defined_parameters
-      params.merge!(options[:parameters]) if options[:parameters]
-      ManagedStack.new(
+      @stack ||= ManagedStack.new(
         template: template,
         stack_name: stack_name,
-        stack_policy: options[:stack_policy],
-        stack_policy_during_update: options[:stack_policy_during_update],
-        depends: options[:depends],
-        user_defined_parameters: params,
+        stack_policy: stack_policy,
+        stack_policy_during_update: stack_policy_during_update,
+        depends: depends,
         parameters_file: parameters_file,
         parameter_map: parameter_mappings,
-        disable_rollback: !!options[:debug] ? true : (!!options[:disable_rollback] || disable_rollback),
-        wait: options[:wait],
-        force: options[:force],
-        dry_run: options[:dry_run],
-        debug: !!options[:debug],
-        timeout_in_minutes: options[:timeout_in_minutes],
-        notification_arns: options[:notification_arns],
-        capabilities: options[:capabilities],
-        tags: options[:tags],
-        on_failure: options[:on_failure],
-        use_previous_template: options[:use_previous_template],
-        retain_resources: options[:retain_resources]
+        disable_rollback: disable_rollback,
+        wait: wait,
+        force: force,
+        dry_run: dry_run,
+        debug: debug,
+        timeout_in_minutes: timeout_in_minutes,
+        notification_arns: notification_arns,
+        capabilities: capabilities,
+        tags: tags,
+        on_failure: on_failure,
+        use_previous_template: use_previous_template,
+        retain_resources: retain_resources
       )
     end
 
     def depends_stacks
-      stacks = []
-      return stacks unless options[:depends]
+      return @depends_stacks unless @depends_stacks.nil?
+      @depends_stacks = []
+      return @depends_stacks unless options[:depends]
       options[:depends].each do |stack|
-        stacks << Stackit::Stack.new(stack_name: stack)
+        @depends_stacks << Stackit::Stack.new(stack_name: stack)
       end
-      stacks
     end
 
     def stacks
@@ -96,7 +147,7 @@ module Stackit
 
     def resolve_parameter(key)
       depends_stacks.each do |s|
-        value = s[key]
+        value = s[key.to_s]
         return value unless value.nil?
       end
     end
@@ -105,19 +156,20 @@ module Stackit
       values = []
       depends_stacks.each do |s|
         keys.each do |key|
-          value = s[key]
+          value = s[key.to_s]
           values << value unless value.nil?
         end
       end
       values.join(',')
     end
 
-    def opsworks_service_role_arn(key = :OpsWorksServiceRole)
-      "arn:aws:iam::#{Stackit.aws.account_id}:role/#{resolve_parameter(key)}"
-    end
+  private
 
-    def opsworks_cookbook_source(key = :DevOpsBucket)
-      "https://s3.amazonaws.com/#{resolve_parameter(key)}/cookbooks.tar.gz"
+    def final_stack
+      params = user_defined_parameters
+      params.merge!(options[:parameters]) if options[:parameters]
+      stack.instance_variable_set(:@user_defined_parameters, user_defined_parameters)
+      stack
     end
 
   end

data/lib/stackit/version.rb

@@ -1,3 +1,3 @@
 module Stackit
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/lib/stackit.rb

@@ -49,3 +49,5 @@ module Stackit
 
   end
 end
+
+module Stackit::Mixin; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackit
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeremy Hahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,8 @@ files:
 - lib/stackit/cli/base_cli.rb
 - lib/stackit/cli/stack_cli.rb
 - lib/stackit/cli/stackit_cli.rb
+- lib/stackit/mixin/availability_zone.rb
+- lib/stackit/mixin/opsworks.rb
 - lib/stackit/stack.rb
 - lib/stackit/stack/default-stack-policy.json
 - lib/stackit/stack/default_notifier.rb