stack_master 0.6.0 → 0.7.0

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/fixtures/stack_master.yml

@@ -4,6 +4,9 @@ region_aliases:
 stack_defaults:
   tags:
     application: my-awesome-blog
+  s3:
+    bucket: my-bucket
+    region: us-east-1
 template_compilers:
   rb: ruby_dsl
 region_defaults:
@@ -37,4 +40,4 @@ stacks:
     myapp_web:
       template: myapp_web
       tags:
-        test_override: 2
+        test_override: 2

data/spec/stack_master/aws_driver/s3_spec.rb

@@ -0,0 +1,130 @@
+RSpec.describe StackMaster::AwsDriver::S3 do
+  let(:region) { 'us-east-1' }
+  let(:bucket) { 'bucket' }
+  let(:s3) { Aws::S3::Client.new(stub_responses: true) }
+  subject(:s3_driver) { StackMaster::AwsDriver::S3.new }
+
+  before do
+    allow(Aws::S3::Client).to receive(:new).and_return(s3)
+  end
+
+  describe '#upload_files' do
+    before do
+      allow(File).to receive(:read).and_return('file content')
+    end
+
+    context 'when set_region is called' do
+      it 'defaults to that region' do
+        s3_driver.set_region('default')
+        expect(Aws::S3::Client).to receive(:new).with(region: 'default').and_return(s3)
+        files = {
+          'template' => {
+            path: 'spec/fixtures/templates/myapp_vpc.json',
+            body: 'file content'
+          }
+        }
+        s3_driver.upload_files(bucket: 'b',
+                               files: files)
+      end
+    end
+
+    context 'when called with a prefix' do
+      let(:options) do
+        {
+          bucket: 'bucket',
+          region: 'region',
+          prefix: 'prefix',
+          files: {'template' => {
+            path: 'spec/fixtures/templates/myapp_vpc.json',
+            body: 'file content'
+            }
+          }
+        }
+      end
+
+      it 'uploads files under a prefix' do
+        expect(s3).to receive(:put_object).with(bucket: 'bucket',
+                                                       key: 'prefix/template',
+                                                       body: 'file content',
+                                                       metadata: {md5: "d10b4c3ff123b26dc068d43a8bef2d23"})
+        s3_driver.upload_files(options)
+      end
+    end
+
+    context 'when called without a prefix' do
+      let(:options) do
+        {
+          bucket: 'bucket',
+          region: 'region',
+          files: {'template' => {
+            :path => 'spec/fixtures/templates/myapp_vpc.json',
+            :body => 'file content'
+            }
+          }
+        }
+      end
+
+      it 'uploads files under the bucket root' do
+        expect(s3).to receive(:put_object).with(bucket: 'bucket',
+                                                       key: 'template',
+                                                       body: 'file content',
+                                                       metadata: {md5: "d10b4c3ff123b26dc068d43a8bef2d23"})
+        s3_driver.upload_files(options)
+      end
+    end
+
+    context 'when called with files in a subfolder' do
+      let(:options) do
+        {
+          bucket: 'bucket',
+          region: 'region',
+          prefix: 'prefix',
+          files: {'template' => {
+            :path => 'spec/fixtures/templates/myapp_vpc.json',
+            :body => 'file content'
+            }
+          }
+        }
+      end
+
+      it 'uploads files under the prefix' do
+        expect(s3).to receive(:put_object).with(bucket: 'bucket',
+                                                       key: 'prefix/template',
+                                                       body: 'file content',
+                                                       metadata: {md5: "d10b4c3ff123b26dc068d43a8bef2d23"})
+        s3_driver.upload_files(options)
+      end
+    end
+
+    context 'when called with several files' do
+      let(:options) do
+        {
+          bucket: 'bucket',
+          region: 'region',
+          files: {
+            'template1' => {
+              :path => 'spec/fixtures/templates/myapp_vpc.json',
+              :body => 'file content'
+            },
+            'template2' => {
+              :path => 'spec/fixtures/templates/myapp_vpc.json',
+              :body => 'file content'
+            }
+          }
+        }
+      end
+
+      it 'uploads all the files' do
+        expect(s3).to receive(:put_object).with(bucket: 'bucket',
+                                                       key: 'template1',
+                                                       body: 'file content',
+                                                       metadata: {md5: "d10b4c3ff123b26dc068d43a8bef2d23"})
+        expect(s3).to receive(:put_object).with(bucket: 'bucket',
+                                                       key: 'template2',
+                                                       body: 'file content',
+                                                       metadata: {md5: "d10b4c3ff123b26dc068d43a8bef2d23"})
+        s3_driver.upload_files(options)
+      end
+    end
+  end
+end

data/spec/stack_master/commands/apply_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe StackMaster::Commands::Apply do
   let(:cf) { instance_double(Aws::CloudFormation::Client) }
+  let(:s3) { instance_double(Aws::S3::Client) }
   let(:region) { 'us-east-1' }
   let(:stack_name) { 'myapp-vpc' }
   let(:config) { double(find_stack: stack_definition) }
@@ -13,7 +14,9 @@ RSpec.describe StackMaster::Commands::Apply do
   before do
     allow(StackMaster::Stack).to receive(:find).with(region, stack_name).and_return(stack)
     allow(StackMaster::Stack).to receive(:generate).with(stack_definition, config).and_return(proposed_stack)
+    allow(config).to receive(:stack_defaults).and_return({})
     allow(Aws::CloudFormation::Client).to receive(:new).and_return(cf)
+    allow(Aws::S3::Client).to receive(:new).and_return(s3)
     allow(cf).to receive(:create_stack)
     allow(StackMaster::StackDiffer).to receive(:new).with(proposed_stack, stack).and_return double.as_null_object
     allow(StackMaster::StackEvents::Streamer).to receive(:stream)
@@ -55,6 +58,29 @@ RSpec.describe StackMaster::Commands::Apply do
       end
     end
 
+    context 'when using s3' do
+      before do
+        stack_definition.s3 = {
+          'bucket' => 'my-bucket',
+          'prefix' => 'my-prefix',
+          'region' => 'us-east-1',
+        }
+        stack_definition.template = 'my-template.rb'
+        allow(s3).to receive(:list_objects).and_return([])
+        allow(s3).to receive(:put_object)
+      end
+
+      it 'uploads to the correct URL' do
+        apply
+        expect(s3).to have_received(:put_object).with(
+          bucket: 'my-bucket',
+          key: 'my-prefix/my-template.json',
+          body: template_body,
+          metadata: { md5: Digest::MD5.hexdigest(template_body).to_s }
+        )
+      end
+    end
+
     context 'the changeset failed to create' do
       before do
         allow(change_set).to receive(:failed?).and_return(true)

data/spec/stack_master/config_spec.rb

@@ -4,9 +4,11 @@ RSpec.describe StackMaster::Config do
   let(:myapp_vpc_definition) {
     StackMaster::StackDefinition.new(
       region: 'us-east-1',
+      region_alias: 'production',
       stack_name: 'myapp-vpc',
       template: 'myapp_vpc.json',
       tags: { 'application' => 'my-awesome-blog', 'environment' => 'production' },
+      s3: { 'bucket' => 'my-bucket', 'region' => 'us-east-1' },
       notification_arns: ['test_arn', 'test_arn_2'],
       base_dir: base_dir,
       secret_file: 'production.yml.gpg',
@@ -66,7 +68,8 @@ RSpec.describe StackMaster::Config do
 
   it 'loads stack defaults' do
     expect(loaded_config.stack_defaults).to eq({
-      'tags' => { 'application' => 'my-awesome-blog' }
+      'tags' => { 'application' => 'my-awesome-blog' },
+      's3' => { 'bucket' => 'my-bucket', 'region' => 'us-east-1' }
     })
   end
 
@@ -107,11 +110,13 @@ RSpec.describe StackMaster::Config do
     expect(loaded_config.find_stack('ap-southeast-2', 'myapp-vpc')).to eq(StackMaster::StackDefinition.new(
       stack_name: 'myapp-vpc',
       region: 'ap-southeast-2',
+      region_alias: 'staging',
       tags: {
         'application' => 'my-awesome-blog',
         'environment' => 'staging',
         'test_override' => 1
       },
+      s3: { 'bucket' => 'my-bucket', 'region' => 'us-east-1' },
       notification_arns: ['test_arn_3', 'test_arn_4'],
       template: 'myapp_vpc.rb',
       base_dir: base_dir,
@@ -121,11 +126,13 @@ RSpec.describe StackMaster::Config do
     expect(loaded_config.find_stack('ap-southeast-2', 'myapp-web')).to eq(StackMaster::StackDefinition.new(
       stack_name: 'myapp-web',
       region: 'ap-southeast-2',
+      region_alias: 'staging',
       tags: {
         'application' => 'my-awesome-blog',
         'environment' => 'staging',
         'test_override' => 2
       },
+      s3: { 'bucket' => 'my-bucket', 'region' => 'us-east-1' },
       notification_arns: ['test_arn_3'],
       template: 'myapp_web',
       base_dir: base_dir,

data/spec/stack_master/parameter_resolver_spec.rb

@@ -38,6 +38,11 @@ RSpec.describe StackMaster::ParameterResolver do
     expect(resolve(param1: [1, 2])).to eq(param1: '1,2')
   end
 
+  it 'converts boolean values to strings' do
+    expect(resolve(param1: true)).to eq(param1: 'true')
+    expect(resolve(param1: false)).to eq(param1: 'false')
+  end
+
   it 'it throws an error when the hash contains more than one key' do
     expect {
       resolve(param: { nested1: 'value1', nested2: 'value2' })

data/spec/stack_master/sparkle_formation/user_data_file_spec.rb

@@ -1,3 +1,5 @@
+require 'stack_master/sparkle_formation/user_data_file'
+
 RSpec.describe SparkleFormation::SparkleAttribute::Aws, '#user_data_file!' do
   let(:user_data) do
     <<-EOS

data/spec/stack_master/stack_events/presenter_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe StackMaster::StackEvents::Presenter do
     subject(:print_event) { described_class.print_event($stdout, event) }
 
     it "nicely presents event data" do
-      expect { print_event }.to output("\e[0;33;49m2001-01-01 02:02:02 #{Time.now.strftime('%z')} MyAwesomeQueue AWS::SQS::Queue CREATE_IN_PROGRESS Resource creation Initiated\e[0m\n").to_stdout
+      expect { print_event }.to output("\e[0;33;49m2001-01-01 02:02:02 #{time.strftime('%z')} MyAwesomeQueue AWS::SQS::Queue CREATE_IN_PROGRESS Resource creation Initiated\e[0m\n").to_stdout
     end
   end
 end

data/spec/stack_master/stack_spec.rb

@@ -144,14 +144,32 @@ RSpec.describe StackMaster::Stack do
   end
 
   describe '#too_big?' do
-    let(:big_stack) { described_class.new(template_body: "{\"a\":\"#{'x' * 60000}\"}") }
+    let(:big_stack) { described_class.new(template_body: "{\"a\":\"#{'x' * 500000}\"}") }
+    let(:medium_stack) { described_class.new(template_body: "{\"a\":\"#{'x' * 60000}\"}") }
     let(:little_stack) { described_class.new(template_body: "{\"a\":\"#{'x' * 1000}\"}") }
 
-    it 'returns true for big stacks' do
-      expect(big_stack.too_big?).to be_truthy
+    context 'when not using S3' do
+      it 'returns true for big stacks' do
+        expect(big_stack.too_big?).to be_truthy
+      end
+      it 'returns true for medium stacks' do
+        expect(medium_stack.too_big?).to be_truthy
+      end
+      it 'returns false for small stacks' do
+        expect(little_stack.too_big?).to be_falsey
+      end
     end
-    it 'returns false for small stacks' do
-      expect(little_stack.too_big?).to be_falsey
+
+    context 'when using S3' do
+      it 'returns true for big stacks' do
+        expect(big_stack.too_big?(true)).to be_truthy
+      end
+      it 'returns false for medium stacks' do
+        expect(medium_stack.too_big?(true)).to be_falsey
+      end
+      it 'returns false for small stacks' do
+        expect(little_stack.too_big?(true)).to be_falsey
+      end
     end
   end
 

data/spec/stack_master/template_compiler_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe StackMaster::TemplateCompiler do
     let(:template_file_path) { '/base_dir/templates/template.fab' }
 
     class TestTemplateCompiler
+      def self.require_dependencies; end
       def self.compile(template_file_path); end
     end
 

data/spec/stack_master/template_compilers/cfndsl_spec.rb

@@ -1,4 +1,6 @@
 RSpec.describe StackMaster::TemplateCompilers::Cfndsl do
+  before(:all) { described_class.require_dependencies }
+
   describe '.compile' do
     def compile
       described_class.compile(template_file_path)

data/spec/stack_master/test_driver/s3_spec.rb

@@ -0,0 +1,17 @@
+RSpec.describe StackMaster::TestDriver::S3 do
+  subject(:s3_driver) { described_class.new }
+  let(:bucket) { 'test-bucket' }
+  let(:prefix) { 'test-prefix' }
+  let(:files) { { 'test-file' => { path: 'path', body: 'body' } } }
+  let(:region) { 'us-east-1' }
+
+  it 'uploads and finds files' do
+    s3_driver.upload_files(bucket: bucket,
+                           prefix: prefix,
+                           region: region,
+                           files: files)
+    file = s3_driver.find_file(bucket: bucket,
+                               object_key: [prefix, 'test-file'].compact.join('/'))
+    expect(file).to be
+  end
+end

data/stack_master.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_dependency "ruby-progressbar"
   spec.add_dependency "commander"
-  spec.add_dependency "virtus"
   spec.add_dependency "aws-sdk", "~> 2.2.31"
   spec.add_dependency "diffy"
   spec.add_dependency "erubis"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,20 +137,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +302,7 @@ files:
 - example/simple/templates/myapp_vpc.rb
 - example/simple/templates/myapp_web.rb
 - features/apply.feature
+- features/apply_with_s3.feature
 - features/delete.feature
 - features/diff.feature
 - features/events.feature
@@ -330,6 +317,7 @@ files:
 - features/validate.feature
 - lib/stack_master.rb
 - lib/stack_master/aws_driver/cloud_formation.rb
+- lib/stack_master/aws_driver/s3.rb
 - lib/stack_master/change_set.rb
 - lib/stack_master/cli.rb
 - lib/stack_master/command.rb
@@ -375,6 +363,7 @@ files:
 - lib/stack_master/template_compilers/sparkle_formation.rb
 - lib/stack_master/template_compilers/yaml.rb
 - lib/stack_master/test_driver/cloud_formation.rb
+- lib/stack_master/test_driver/s3.rb
 - lib/stack_master/testing.rb
 - lib/stack_master/utils.rb
 - lib/stack_master/validator.rb
@@ -392,6 +381,7 @@ files:
 - spec/fixtures/templates/yml/valid_myapp_vpc.yml
 - spec/fixtures/test/.gitkeep
 - spec/spec_helper.rb
+- spec/stack_master/aws_driver/s3_spec.rb
 - spec/stack_master/change_set_spec.rb
 - spec/stack_master/command_spec.rb
 - spec/stack_master/commands/apply_spec.rb
@@ -428,6 +418,7 @@ files:
 - spec/stack_master/template_compilers/sparkle_formation_spec.rb
 - spec/stack_master/template_compilers/yaml_spec.rb
 - spec/stack_master/test_driver/cloud_formation_spec.rb
+- spec/stack_master/test_driver/s3_spec.rb
 - spec/stack_master/utils_spec.rb
 - spec/stack_master/validator_spec.rb
 - spec/stack_master_spec.rb
@@ -463,6 +454,7 @@ summary: StackMaster is a sure-footed way of creating, updating and keeping trac
   of Amazon (AWS) CloudFormation stacks.
 test_files:
 - features/apply.feature
+- features/apply_with_s3.feature
 - features/delete.feature
 - features/diff.feature
 - features/events.feature
@@ -484,6 +476,7 @@ test_files:
 - spec/fixtures/templates/yml/valid_myapp_vpc.yml
 - spec/fixtures/test/.gitkeep
 - spec/spec_helper.rb
+- spec/stack_master/aws_driver/s3_spec.rb
 - spec/stack_master/change_set_spec.rb
 - spec/stack_master/command_spec.rb
 - spec/stack_master/commands/apply_spec.rb
@@ -520,6 +513,7 @@ test_files:
 - spec/stack_master/template_compilers/sparkle_formation_spec.rb
 - spec/stack_master/template_compilers/yaml_spec.rb
 - spec/stack_master/test_driver/cloud_formation_spec.rb
+- spec/stack_master/test_driver/s3_spec.rb
 - spec/stack_master/utils_spec.rb
 - spec/stack_master/validator_spec.rb
 - spec/stack_master_spec.rb