stack_master 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6427d9e4a3e305c6d57efd44e015b5e83a415abe
-  data.tar.gz: e9509b938fa0646f8c35571c74278b370c4d4512
+  metadata.gz: decf1cea6cb689ff5f5df562e7393715a97c9a59
+  data.tar.gz: 6b2b11e73212a5e154f50a7350618b1e5f3a31a0
 SHA512:
-  metadata.gz: d32fa9ae827d12afeef460c724a8db1beac7ef6b645533d621ab2bb5ecfef3e15c4b2a8eec1720a4b6f5f2b184bc1bfb532bac3b56cd0cb08c33609d0117fbad
-  data.tar.gz: 2c7dbc03cb04804fb152b5f0040aa68b1d631d874ec3ca620698758de8f3e21b661561598fe14cdacc193d258728d9f6af419c07ab16e0f7a7bfb39b79752b27
+  metadata.gz: 663b7860af6120f09ebed47d50374a51b09d4b4f9f3981b7753f1876fbcefa082b62d5dc99a7ebdeee78a2b85c0f23bcb088a5619e4a69284b08a2574547d537
+  data.tar.gz: 65f77fc48be1584005cfc7292f07815a7f575b5b63cda9c6334572668bedfa9097f50ec5386c4aa25b642acd3e244b56a793bfc3e45ec675a1cf6a749457ed61

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
+  - 2.1
   - 2.2
   - 2.3.1
+  - 2.4.0
 sudo: false
 script:
   - bundle exec rake spec features

data/README.md

@@ -49,6 +49,7 @@ region_aliases:
 stack_defaults:
   tags:
     application: my-awesome-app
+  role_arn: service_role_arn
 region_defaults:
   us-east-1:
     secret_file: production.yml.gpg

data/lib/stack_master/aws_driver/cloud_formation.rb

@@ -19,8 +19,7 @@ module StackMaster
                           :get_stack_policy,
                           :describe_stack_events,
                           :update_stack,
-                          :create_stack,
-                          :validate_template
+                          :create_stack
 
       def describe_stacks(options)
         retry_with_backoff do
@@ -28,6 +27,12 @@ module StackMaster
         end
       end
 
+      def validate_template(options)
+        retry_with_backoff do
+          cf.validate_template(options)
+        end
+      end
+
       private
 
       def cf

data/lib/stack_master/commands/apply.rb

@@ -122,6 +122,7 @@ module StackMaster
           stack_name: stack_name,
           parameters: proposed_stack.aws_parameters,
           capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+          role_arn: proposed_stack.role_arn,
           notification_arns: proposed_stack.notification_arns,
           stack_policy_body: proposed_stack.stack_policy_body,
           template_method => template_value

data/lib/stack_master/stack.rb

@@ -7,6 +7,7 @@ module StackMaster
                 :parameters,
                 :template_body,
                 :template_format,
+                :role_arn,
                 :notification_arns,
                 :outputs,
                 :stack_policy_body,
@@ -52,6 +53,7 @@ module StackMaster
           template_body: template_body,
           template_format: template_format,
           outputs: outputs,
+          role_arn: cf_stack.role_arn,
           notification_arns: cf_stack.notification_arns,
           stack_policy_body: stack_policy_body,
           stack_status: cf_stack.stack_status)
@@ -73,6 +75,7 @@ module StackMaster
           parameters: parameters,
           template_body: template_body,
           template_format: template_format,
+          role_arn: stack_definition.role_arn,
           notification_arns: stack_definition.notification_arns,
           stack_policy_body: stack_policy_body)
     end

data/lib/stack_master/stack_definition.rb

@@ -4,6 +4,7 @@ module StackMaster
                   :stack_name,
                   :template,
                   :tags,
+                  :role_arn,
                   :notification_arns,
                   :base_dir,
                   :secret_file,
@@ -28,6 +29,7 @@ module StackMaster
         @stack_name == other.stack_name &&
         @template == other.template &&
         @tags == other.tags &&
+        @role_arn == other.role_arn &&
         @notification_arns == other.notification_arns &&
         @base_dir == other.base_dir &&
         @secret_file == other.secret_file &&

data/lib/stack_master/test_driver/cloud_formation.rb

@@ -10,6 +10,7 @@ module StackMaster
                   :stack_status,
                   :stack_status_reason,
                   :disable_rollback,
+                  :role_arn,
                   :notification_arns,
                   :timeout_in_minutes,
                   :capabilities,

data/lib/stack_master/version.rb

@@ -1,3 +1,3 @@
 module StackMaster
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/spec/fixtures/stack_master.yml

@@ -15,6 +15,7 @@ region_defaults:
       environment: production
     notification_arns:
       - test_arn
+    role_arn: test_service_role_arn
     secret_file: production.yml.gpg
     stack_policy_file: my_policy.json
   staging:
@@ -23,6 +24,7 @@ region_defaults:
       test_override: 1
     notification_arns:
       - test_arn_3
+    role_arn: test_service_role_arn3
     secret_file: staging.yml.gpg
 stacks:
   us-east-1:
@@ -30,6 +32,7 @@ stacks:
       template: myapp_vpc.json
       notification_arns:
         - test_arn_2
+      role_arn: test_service_role_arn2
     myapp_web:
       template: myapp_web.rb
     myapp_vpc_with_secrets:
@@ -39,6 +42,7 @@ stacks:
       template: myapp_vpc.rb
       notification_arns:
         - test_arn_4
+      role_arn: test_service_role_arn4
     myapp_web:
       template: myapp_web
       tags:

data/spec/stack_master/commands/apply_spec.rb

@@ -4,12 +4,13 @@ RSpec.describe StackMaster::Commands::Apply do
   let(:region) { 'us-east-1' }
   let(:stack_name) { 'myapp-vpc' }
   let(:config) { double(find_stack: stack_definition) }
+  let(:role_arn) { 'test_service_role_arn' }
   let(:notification_arn) { 'test_arn' }
   let(:stack_definition) { StackMaster::StackDefinition.new(base_dir: '/base_dir', region: region, stack_name: stack_name) }
   let(:template_body) { '{}' }
   let(:template_format) { :json }
   let(:parameters) { { 'param_1' => 'hello' } }
-  let(:proposed_stack) { StackMaster::Stack.new(template_body: template_body, template_format: template_format, tags: { 'environment' => 'production' } , parameters: parameters, notification_arns: [notification_arn], stack_policy_body: stack_policy_body ) }
+  let(:proposed_stack) { StackMaster::Stack.new(template_body: template_body, template_format: template_format, tags: { 'environment' => 'production' } , parameters: parameters, role_arn: role_arn, notification_arns: [notification_arn], stack_policy_body: stack_policy_body ) }
   let(:stack_policy_body) { '{}' }
 
   before do
@@ -47,6 +48,7 @@ RSpec.describe StackMaster::Commands::Apply do
           { parameter_key: 'param_1', parameter_value: 'hello' }
         ],
         capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+        role_arn: role_arn,
         notification_arns: [notification_arn],
         stack_policy_body: stack_policy_body
       )
@@ -134,6 +136,7 @@ RSpec.describe StackMaster::Commands::Apply do
             value: 'production'
           }],
         capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+        role_arn: role_arn,
         notification_arns: [notification_arn],
         stack_policy_body: stack_policy_body,
         on_failure: 'ROLLBACK'

data/spec/stack_master/config_spec.rb

@@ -10,6 +10,7 @@ RSpec.describe StackMaster::Config do
       tags: { 'application' => 'my-awesome-blog', 'environment' => 'production' },
       s3: { 'bucket' => 'my-bucket', 'region' => 'us-east-1' },
       notification_arns: ['test_arn', 'test_arn_2'],
+      role_arn: 'test_service_role_arn2',
       base_dir: base_dir,
       secret_file: 'production.yml.gpg',
       stack_policy_file: 'my_policy.json',
@@ -87,12 +88,14 @@ RSpec.describe StackMaster::Config do
     expect(loaded_config.region_defaults).to eq({
       'us-east-1' => {
         'tags' => { 'environment' => 'production' },
+        'role_arn' => 'test_service_role_arn',
         'notification_arns' => ['test_arn'],
         'secret_file' => 'production.yml.gpg',
         'stack_policy_file' => 'my_policy.json'
       },
       'ap-southeast-2' => {
         'tags' => {'environment' => 'staging', 'test_override' => 1 },
+        'role_arn' => 'test_service_role_arn3',
         'notification_arns' => ['test_arn_3'],
         'secret_file' => 'staging.yml.gpg'
       }
@@ -117,6 +120,7 @@ RSpec.describe StackMaster::Config do
         'test_override' => 1
       },
       s3: { 'bucket' => 'my-bucket', 'region' => 'us-east-1' },
+      role_arn: 'test_service_role_arn4',
       notification_arns: ['test_arn_3', 'test_arn_4'],
       template: 'myapp_vpc.rb',
       base_dir: base_dir,
@@ -133,6 +137,7 @@ RSpec.describe StackMaster::Config do
         'test_override' => 2
       },
       s3: { 'bucket' => 'my-bucket', 'region' => 'us-east-1' },
+      role_arn: 'test_service_role_arn3',
       notification_arns: ['test_arn_3'],
       template: 'myapp_web',
       base_dir: base_dir,

data/spec/stack_master/stack_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe StackMaster::Stack do
         ]
       }
       before do
-        cf.stub_responses(:describe_stacks, stacks: [{ stack_id: stack_id, stack_name: stack_name, creation_time: Time.now, stack_status: 'UPDATE_COMPLETE', parameters: parameters, notification_arns: ['test_arn']}])
+        cf.stub_responses(:describe_stacks, stacks: [{ stack_id: stack_id, stack_name: stack_name, creation_time: Time.now, stack_status: 'UPDATE_COMPLETE', parameters: parameters, notification_arns: ['test_arn'], role_arn: 'test_service_role_arn'}])
         cf.stub_responses(:get_template, template_body: "{}")
         cf.stub_responses(:get_stack_policy, stack_policy_body: stack_policy_body)
       end
@@ -36,6 +36,10 @@ RSpec.describe StackMaster::Stack do
         expect(stack.parameters).to eq({'param1' => 'value1', 'param2' => 'value2'})
       end
 
+      it 'sets role_arn' do
+        expect(stack.role_arn).to eq('test_service_role_arn')
+      end
+      
       it 'sets notification_arns' do
         expect(stack.notification_arns).to eq(['test_arn'])
       end
@@ -70,7 +74,7 @@ RSpec.describe StackMaster::Stack do
 
   describe '.generate' do
     let(:tags) { { 'tag1' => 'value1' } }
-    let(:stack_definition) { StackMaster::StackDefinition.new(region: region, stack_name: stack_name, tags: tags, base_dir: '/base_dir', template: template_file_name, notification_arns: ['test_arn'], stack_policy_file: 'no_replace_rds.json') }
+    let(:stack_definition) { StackMaster::StackDefinition.new(region: region, stack_name: stack_name, tags: tags, base_dir: '/base_dir', template: template_file_name, notification_arns: ['test_arn'], role_arn: 'test_service_role_arn', stack_policy_file: 'no_replace_rds.json') }
     let(:config) { StackMaster::Config.new({'stacks' => {}}, '/base_dir') }
     subject(:stack) { StackMaster::Stack.generate(stack_definition, config) }
     let(:parameter_hash) { { 'DbPassword' => { 'secret' => 'db_password' } } }
@@ -107,6 +111,10 @@ RSpec.describe StackMaster::Stack do
       expect(stack.template_body).to eq template_body
     end
 
+    it 'has role_arn' do
+      expect(stack.role_arn).to eq 'test_service_role_arn'
+    end
+    
     it 'has notification_arns' do
       expect(stack.notification_arns).to eq ['test_arn']
     end

data/stack_master.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack_master
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Steve Hodgkiss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2017-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -442,7 +442,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -450,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: StackMaster is a sure-footed way of creating, updating and keeping track