stackup 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e09ac6d57442b2d3c00a71be836fd7763a2fb05
-  data.tar.gz: 403250844ca02c15cc39cd49b7e5f26763ef463b
+  metadata.gz: bd4fb7b89612636d7c12bf5de9df53b33d426706
+  data.tar.gz: 0efb356c797b510c3c73be0feb46f64b883ca5d7
 SHA512:
-  metadata.gz: f4dc9a1390519780f2c42e131827ec5b7c634653cd9ff95df6acc7f308b865c1334976330bcf0c826a14f6965b78f6d5a025a828360ddc4d6e18fc53fbdd284d
-  data.tar.gz: 383e9d2680d21408badbee0f00de41a46c2ba1b75cb71f2ade798f486049f11dac3a972e26f09b12c3154a0295137404c4c0792f7a794b08756eecd6bd8f297b
+  metadata.gz: 6820c01014c27659f323943935b8914c17f2d77be132d5e407c696216a90dce0cc188ed8d6f1e20aaebc4fcf1142b2ced902be47de5c091677c7f1f074e24131
+  data.tar.gz: 386304c7efb13945816d072f1348ce13fc01da0d3c42a551c637c57ecadcc43baa0a3e90b83b8ad0234c71762cd550edf08a5c6dc73b2a3fb9be3344b89370f3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackup (0.0.8)
+    stackup (0.0.9)
       aws-sdk (~> 2.0)
       clamp (~> 1.0)
 

data/bin/stackup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-require "clamp"
+
 $LOAD_PATH << File.expand_path("../../lib", __FILE__)
-require File.expand_path("../../lib/stackup", __FILE__)
-require File.expand_path("../../lib/stackup/cli", __FILE__)
+
+require "stackup/cli"
 
 Stackup::CLI.run

data/lib/stackup.rb

@@ -1,4 +1 @@
-require "aws-sdk"
-require_relative "stackup/monitor"
-require_relative "stackup/stack"
-require "json"
+require "stackup/stack"

data/lib/stackup/cli.rb

@@ -1,34 +1,54 @@
+require "clamp"
+require "json"
+require "stackup/stack"
+
 module Stackup
+
   class CLI < Clamp::Command
 
-    subcommand ["stack"], "Manage a stack." do
-      parameter "STACK-NAME", "Name of stack", :attribute_name => :stack_name
+    subcommand "stack", "Manage a stack." do
+
+      parameter "NAME", "Name of stack", :attribute_name => :stack_name
+
+      private
+
+      def stack
+        Stackup::Stack.new(stack_name)
+      end
+
+      subcommand "status", "Print stack status." do
+
+        def execute
+          puts stack.status
+        end
+
+      end
 
       subcommand "deploy", "Create/update the stack" do
-        parameter "TEMPLATE", "CloudFormation template (.json)", :attribute_name => :template
-        parameter "PARAMETERS", "CloudFormation parameters (.json)", :attribute_name => :parameters
+
+        parameter "TEMPLATE", "CloudFormation template (.json)", :attribute_name => :template_file
 
         def execute
-          params = JSON.parse(parameters)
-          stack = Stackup::Stack.new(stack_name)
-          stack.create(template, params)
+          template = File.read(template_file)
+          stack.deploy(template)
         end
+
       end
 
       subcommand "delete", "Remove the stack." do
         def execute
-          stack = Stackup::Stack.new(stack_name)
           stack.delete
         end
       end
 
       subcommand "outputs", "Stack outputs." do
         def execute
-          stack = Stackup::Stack.new(stack_name)
           stack.outputs
         end
       end
+
     end
 
   end
+
 end

data/lib/stackup/monitor.rb

@@ -1,3 +1,5 @@
+require "aws-sdk-core"
+
 module Stackup
   class Monitor
 
@@ -18,7 +20,7 @@ module Stackup
     private
 
     def seen?(event)
-      event_id = event.event_id
+      event_id = event.id
       if events.include?(event_id)
         true
       else

data/lib/stackup/stack.rb

@@ -1,32 +1,53 @@
-require "set"
+require "aws-sdk-resources"
+require "stackup/monitor"
 
 module Stackup
   class Stack
 
-    attr_reader :stack, :name, :cf, :monitor
     SUCESS_STATES = ["CREATE_COMPLETE", "DELETE_COMPLETE", "UPDATE_COMPLETE"]
     FAILURE_STATES = ["CREATE_FAILED", "DELETE_FAILED", "ROLLBACK_COMPLETE", "ROLLBACK_FAILED", "UPDATE_ROLLBACK_COMPLETE", "UPDATE_ROLLBACK_FAILED"]
     END_STATES = SUCESS_STATES + FAILURE_STATES
 
-    def initialize(name)
+    def initialize(name, client_options = {})
       @cf = Aws::CloudFormation::Client.new
       @stack = Aws::CloudFormation::Stack.new(:name => name, :client => cf)
       @monitor = Stackup::Monitor.new(@stack)
+      @monitor.new_events # drain previous events
       @name = name
     end
 
+    attr_reader :stack, :name, :cf, :monitor
+
+    def status
+      stack.stack_status
+    rescue Aws::CloudFormation::Errors::ValidationError
+      nil
+    end
+
+    def exists?
+      !!status
+    end
+
     def create(template, parameters)
-      response = cf.create_stack(:stack_name => name,
-                                 :template_body => template,
-                                 :disable_rollback => true,
-                                 :capabilities => ["CAPABILITY_IAM"],
-                                 :parameters => parameters)
-      wait_for_events
-      !response[:stack_id].nil?
+      cf.create_stack(:stack_name => name,
+                      :template_body => template,
+                      :disable_rollback => true,
+                      :capabilities => ["CAPABILITY_IAM"],
+                      :parameters => parameters)
+      status = wait_for_events
+
+      fail CreateError, "stack creation failed" unless status == "CREATE_COMPLETE"
+      true
+
+    rescue ::Aws::CloudFormation::Errors::ValidationError
+      return false
+    end
+
+    class CreateError < StandardError
     end
 
     def update(template, parameters)
-      return false unless deployed?
+      return false unless exists?
       if stack.stack_status == "CREATE_FAILED"
         puts "Stack is in CREATE_FAILED state so must be manually deleted before it can be updated"
         return false
@@ -35,13 +56,25 @@ module Stackup
         deleted = delete
         return false if !deleted
       end
-      response = cf.update_stack(:stack_name => name, :template_body => template, :parameters => parameters, :capabilities => ["CAPABILITY_IAM"])
-      wait_for_events
-      !response[:stack_id].nil?
+      cf.update_stack(:stack_name => name, :template_body => template, :parameters => parameters, :capabilities => ["CAPABILITY_IAM"])
+
+      status = wait_for_events
+      fail UpdateError, "stack update failed" unless status == "UPDATE_COMPLETE"
+      true
+
+    rescue ::Aws::CloudFormation::Errors::ValidationError => e
+      if e.message == "No updates are to be performed."
+        puts e.message
+        return false
+      end
+      raise e
+    end
+
+    class UpdateError < StandardError
     end
 
     def delete
-      return false unless deployed?
+      return false unless exists?
       cf.delete_stack(:stack_name => name)
       status = wait_for_events
       fail UpdateError, "stack delete failed" unless status == "DELETE_COMPLETE"
@@ -51,7 +84,7 @@ module Stackup
     end
 
     def deploy(template, parameters = [])
-      if deployed?
+      if exists?
         update(template, parameters)
       else
         create(template, parameters)
@@ -64,20 +97,11 @@ module Stackup
       puts stack.outputs.flat_map { |output| "#{output.output_key} - #{output.output_value}" }
     end
 
-    def deployed?
-      !stack.stack_status.nil?
-    rescue Aws::CloudFormation::Errors::ValidationError => e
-      false
-    end
-
     def valid?(template)
       response = cf.validate_template(template)
       response[:code].nil?
     end
 
-    class UpdateError < StandardError
-    end
-
     private
 
     # Wait (displaying stack events) until the stack reaches a stable state.
@@ -85,9 +109,9 @@ module Stackup
     def wait_for_events
       loop do
         display_new_events
-        status = stack.stack_status
-        return status if status =~ /_(COMPLETE|FAILED)$/
-        sleep(5)
+        stack.reload
+        return status if status.nil? || status =~ /_(COMPLETE|FAILED)$/
+        sleep(2)
       end
     end
 

data/spec/stackup/monitor_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper"
 
 describe Stackup::Monitor do
-  let(:stack) { Stackup::Stack.new("name") }
-  let(:monitor) { Stackup::Monitor.new(stack) }
-  let(:event) { double(Aws::CloudFormation::Event.new(:id => "1")) }
+
+  let(:stack) { instance_double(Aws::CloudFormation::Stack, :events => events) }
+  let(:monitor) { described_class.new(stack) }
+
+  let(:event) { instance_double(Aws::CloudFormation::Event, :id => "1") }
   let(:events) { [event] }
 
   before do
-    Aws.config[:region] = "ap-southeast-2"
     allow(event).to receive(:event_id).and_return("1")
-    allow(stack).to receive(:events).and_return(events)
   end
 
   it "should add the event if it is non-existent" do
@@ -20,4 +20,5 @@ describe Stackup::Monitor do
     expect(monitor.new_events.size).to eq(1)
     expect(monitor.new_events.size).to eq(0)
   end
+
 end

data/spec/stackup/stack_spec.rb

@@ -4,17 +4,20 @@ describe Stackup::Stack do
 
   let(:stack) { described_class.new("stack_name") }
 
-  let(:cf_stack) { instance_double("Aws::CloudFormation::Stack") }
+  let(:cf_stack) { instance_double("Aws::CloudFormation::Stack",
+                                  :stack_status => stack_status) }
   let(:cf_client) { instance_double("Aws::CloudFormation::Client") }
 
   let(:template) { double(String) }
   let(:parameters) { [] }
+  let(:stack_status) { nil }
 
   let(:response) { Seahorse::Client::Http::Response.new }
 
   before do
     allow(Aws::CloudFormation::Client).to receive(:new).and_return(cf_client)
     allow(Aws::CloudFormation::Stack).to receive(:new).and_return(cf_stack)
+    allow(cf_stack).to receive(:events).and_return([])
   end
 
   describe "#create" do
@@ -23,21 +26,20 @@ describe Stackup::Stack do
 
     before do
       allow(cf_client).to receive(:create_stack).and_return(response)
-      allow(stack).to receive(:wait_for_events).and_return(true)
     end
 
     context "when stack gets successfully created" do
       before do
-        allow(response).to receive(:[]).with(:stack_id).and_return("1")
+        allow(stack).to receive(:wait_for_events).and_return("CREATE_COMPLETE")
       end
       it { expect(created).to be true }
     end
 
     context "when stack creation fails" do
       before do
-        allow(response).to receive(:[]).with(:stack_id).and_return(nil)
+        allow(stack).to receive(:wait_for_events).and_return("CREATE_FAILED")
       end
-      it { expect(created).to be false }
+      it { expect{ created }.to raise_error Stackup::Stack::CreateError }
     end
 
   end
@@ -47,16 +49,16 @@ describe Stackup::Stack do
 
     context "when there is no existing stack" do
       before do
-        allow(stack).to receive(:deployed?).and_return(false)
+        allow(stack).to receive(:exists?).and_return(false)
       end
       it { expect(updated).to be false }
     end
 
     context "when there is an existing stack" do
       before do
-        allow(stack).to receive(:deployed?).and_return(true)
+        allow(stack).to receive(:exists?).and_return(true)
         allow(cf_client).to receive(:update_stack).and_return(response)
-        allow(stack).to receive(:wait_for_events).and_return(true)
+        allow(stack).to receive(:wait_for_events).and_return("UPDATE_COMPLETE")
       end
 
       context "in a successfully deployed state" do
@@ -65,17 +67,14 @@ describe Stackup::Stack do
         end
 
         context "when stack gets successfully updated" do
-          before do
-            allow(response).to receive(:[]).with(:stack_id).and_return("1")
-          end
           it { expect(updated).to be true }
         end
 
         context "when stack update fails" do
           before do
-            allow(response).to receive(:[]).with(:stack_id).and_return(nil)
+            allow(stack).to receive(:wait_for_events).and_return("UPDATE_FAILED")
           end
-          it { expect(updated).to be false }
+          it { expect{ updated }.to raise_error Stackup::Stack::UpdateError }
         end
       end
 
@@ -144,7 +143,7 @@ describe Stackup::Stack do
     context "when stack already exists" do
 
       before do
-        allow(stack).to receive(:deployed?).and_return(true)
+        allow(stack).to receive(:exists?).and_return(true)
         allow(cf_stack).to receive(:stack_status).and_return("CREATE_COMPLETE")
         allow(cf_client).to receive(:update_stack).and_return({ stack_id: "stack-name" })
       end
@@ -158,7 +157,7 @@ describe Stackup::Stack do
     context "when stack does not exist" do
 
       before do
-        allow(stack).to receive(:deployed?).and_return(false)
+        allow(stack).to receive(:exists?).and_return(false)
         allow(cf_client).to receive(:create_stack).and_return({ stack_id: "stack-name" })
       end
 
@@ -176,7 +175,7 @@ describe Stackup::Stack do
 
     context "there is no existing stack" do
       before do
-        allow(stack).to receive(:deployed?).and_return false
+        allow(stack).to receive(:exists?).and_return false
       end
 
       it { expect(deleted).to be false }
@@ -188,7 +187,7 @@ describe Stackup::Stack do
 
     context "there is an existing stack" do
       before do
-        allow(stack).to receive(:deployed?).and_return true
+        allow(stack).to receive(:exists?).and_return true
         allow(cf_client).to receive(:delete_stack)
       end
 
@@ -225,12 +224,12 @@ describe Stackup::Stack do
   context "deployed" do
     it "should be true if it is already deployed" do
       allow(cf_stack).to receive(:stack_status).and_return("CREATE_COMPLETE")
-      expect(stack.deployed?).to be true
+      expect(stack.exists?).to be true
     end
 
     it "should be false if it is not deployed" do
       allow(cf_stack).to receive(:stack_status).and_raise(Aws::CloudFormation::Errors::ValidationError.new("1", "2"))
-      expect(stack.deployed?).to be false
+      expect(stack.exists?).to be false
     end
   end
 end

data/stackup.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
 
   spec.name          = "stackup"
-  spec.version       = "0.0.8"
+  spec.version       = "0.0.9"
   spec.authors       = ["Arvind Kunday", "Mike Williams"]
   spec.email         = ["arvind.kunday@rea-group.com", "mike.williams@rea-group.com"]
   spec.summary       = "Tools for deployment to AWS"

data/woollyams/sample-template.json

@@ -0,0 +1,39 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "A sample template",
+  "Resources": {
+    "role": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Version" : "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Principal": {
+                "Service": [ "ec2.amazonaws.com" ]
+              },
+              "Action": [ "sts:AssumeRole" ]
+            }
+          ]
+        },
+        "Path": "/",
+        "Policies": [
+          {
+            "PolicyName": "rooty",
+            "PolicyDocument": {
+              "Version" : "2012-10-17",
+              "Statement": [
+                {
+                  "Effect": "Allow",
+                  "Action": "*",
+                  "Resource": "*"
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stackup
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Arvind Kunday
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -58,10 +58,12 @@ files:
 - lib/stackup/monitor.rb
 - lib/stackup/stack.rb
 - pkg/stackup-0.0.1.gem
+- pkg/stackup-0.0.8.gem
 - spec/spec_helper.rb
 - spec/stackup/monitor_spec.rb
 - spec/stackup/stack_spec.rb
 - stackup.gemspec
+- woollyams/sample-template.json
 homepage: https://github.com/realestate-com-au/stackup
 licenses:
 - MIT