kumo_keisei 3.1.1.pre.alpha1 → 3.1.1.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df000354f099ca12844b78b3654802e0fed12ee
-  data.tar.gz: f9969d6b1c6b2908c7eb64ce92f67a1b84e12578
+  metadata.gz: 346086261310a8b9fa14843b8da22adc19a081cc
+  data.tar.gz: 777605345884ba91408ba1393a55bdbe21855369
 SHA512:
-  metadata.gz: e7ade3dfdd2657eab105971b9839961c25b6baa5b1efea2dccabdbbfabb539f6dc5260ea1b2cb03d7b5d6f191c582a668c47e58e4da5e343ae76d12609ba3bd7
-  data.tar.gz: d81212b95224b161f9eb085e2edfa0983ed83ce1f611983438673774f650c69a7d89264be292f74cb6ee9bdff7d3fdf9c3c8687f4b2f7f89fd3e4169a4d65997
+  metadata.gz: 3f884c7a3b0aacffcf066d9c6813d75f762e035f644d5663c4df888a8b1b13f9a551addfbdff0f57ffd658b7d3928f380381a0cde8e708f34a056d6b1dd22c28
+  data.tar.gz: 7a6d328f28cee089cd11c4aeeea81fc18a7d2f4933842c383c536adfc7fb4dba1f4837c72fbbdadb91f7a833c7421cf2a533cc190632709f83f444702a4caf0c

data/VERSION

@@ -1 +1 @@
-3.1.1-alpha1
+3.1.1-alpha3

data/lib/kumo_keisei/stack.rb

@@ -85,6 +85,10 @@ module KumoKeisei
       environment_config(stack_config).config
     end
 
+    def params_template_path(stack_config)
+      stack_config.has_key?(:template_path) ? File.absolute_path("#{File.basename(stack_config[:template_path], '.*')}.yml.erb") : nil
+    end
+
     private
 
     def transform_logical_resource_id(id)
@@ -162,8 +166,7 @@ module KumoKeisei
     end
 
     def environment_config(stack_config)
-      params_template_path = stack_config.has_key?(:template_path) ? File.absolute_path("#{stack_config[:template_path]}.erb") : nil
-      EnvironmentConfig.new(stack_config.merge(params_template_file_path: params_template_path))
+      EnvironmentConfig.new(stack_config.merge(params_template_file_path: params_template_path(stack_config)))
     end
 
     def stack_events_url

data/spec/lib/kumo_keisei/stack_spec.rb

@@ -11,8 +11,9 @@ describe KumoKeisei::Stack do
   let(:app_name) { "my-stack" }
   let(:environment_name) { 'non-production' }
   let(:stack_name) { "#{app_name}-nodes-#{environment_name}" }
-  let(:stack_template_path) { "#{app_name}-#{environment_name}.json" }
-  let(:file_params_path) { nil }
+  let(:stack_template_name) { "#{app_name}-#{environment_name}" }
+  let(:stack_cfntemplate_filename) { "#{stack_template_name}.json" }
+  let(:stack_cfnparams_filename) { "#{stack_template_name}.yml.erb" }
   let(:cloudformation) { instance_double(Aws::CloudFormation::Client) }
   let(:happy_stack_status) { "CREATE_COMPLETE" }
   let(:cf_stack) { stack_result_list_with_status(happy_stack_status, stack_name) }
@@ -34,7 +35,7 @@ describe KumoKeisei::Stack do
   let(:stack_config) {
     {
       config_path: 'config-path',
-      template_path: stack_template_path,
+      template_path: stack_cfntemplate_filename,
       injected_config: { 'VpcId' => 'vpc-id' },
       env_name: 'non-production'
     }
@@ -49,9 +50,10 @@ describe KumoKeisei::Stack do
     allow(Aws::CloudFormation::Client).to receive(:new).and_return(cloudformation)
     allow(cloudformation).to receive(:describe_stacks).with({stack_name: stack_name}).and_return(cf_stack)
     allow(KumoKeisei::ParameterBuilder).to receive(:new).and_return(parameter_builder)
-    allow(File).to receive(:read).with(stack_template_path).and_return(stack_template_body)
-    allow(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: "#{app_name}.yml.erb")).and_return(double(:environment_config, cf_params: {}))
-    allow(File).to receive(:absolute_path).and_return("#{app_name}.yml.erb")
+    allow(File).to receive(:read).with(stack_cfntemplate_filename).and_return(stack_template_body)
+    allow(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: "/#{stack_cfnparams_filename}")).and_return(double(:environment_config, cf_params: {}))
+    # allow(File).to receive(:absolute_path).and_return("#{app_name}.yml.erb")
+    Dir.chdir('/')
   end
 
   describe "#destroy!" do
@@ -89,27 +91,6 @@ describe KumoKeisei::Stack do
       end
     end
 
-    context "when looking for the parameter template file" do
-      before do
-        allow(cloudformation).to receive(:wait_until).with(:stack_update_complete, stack_name: stack_name).and_return(nil)
-        allow(cloudformation).to receive(:describe_stacks).with({stack_name: stack_name}).and_return(
-                                   stack_result_list_with_status('CREATE_COMPLETE', stack_name),
-                                   stack_result_list_with_status('UPDATE_COMPLETE', stack_name)
-                                 )
-        allow(cloudformation).to receive(:update_stack).with(cf_stack_update_params).and_return("stack_id")
-      end
-
-      EXAMPLE_CFN_STACK_FILENAMES = ['app.json', 'rds.json']
-
-      EXAMPLE_CFN_STACK_FILENAMES.each do |stack_filename|
-        it "uses a file in the form of #{stack_filename}.erb" do
-          expect(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: "#{stack_filename}.erb")).and_return(double(:environment_config, cf_params: {}))
-          expect(File).to receive(:absolute_path).and_return("#{stack_filename}.erb")
-          subject.apply!(stack_config)
-        end
-      end
-    end
-
     context "when the stack is updatable" do
       UPDATEABLE_STATUSES = ['UPDATE_ROLLBACK_COMPLETE', 'CREATE_COMPLETE', 'UPDATE_COMPLETE']
 
@@ -304,11 +285,8 @@ describe KumoKeisei::Stack do
 
   describe "#config" do
     context "when passed a config_path and params_template_file_path" do
-      before do
-        allow(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: "#{app_name}.yml.erb")).and_return(double(:environment_config, cf_params: {}, config: { :foo=> 'bar', :baz=> 'qux' }))
-      end
-
       it "will return the results of the nested KumoKeisei::EnvironmentConfig.config" do
+        expect(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: "/#{stack_template_name}.yml.erb")).and_return(double(:environment_config, cf_params: {}, config: { :foo=> 'bar', :baz=> 'qux' }))
         expect(subject.config(stack_config)).to eq({:foo=> 'bar', :baz=>'qux'})
       end
     end
@@ -321,11 +299,8 @@ describe KumoKeisei::Stack do
         }
       }
 
-      before do
-        allow(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: nil)).and_return(double(:environment_config, cf_params: {}, config: { :foo=> 'bar', :baz=> 'qux' }))
-      end
-
       it "will return the results of the nested KumoKeisei::EnvironmentConfig.config" do
+        expect(KumoKeisei::EnvironmentConfig).to receive(:new).with(stack_config.merge(params_template_file_path: nil)).and_return(double(:environment_config, cf_params: {}, config: { :foo=> 'bar', :baz=> 'qux' }))
         expect(subject.config(stack_config)).to eq({:foo=> 'bar', :baz=>'qux'})
       end
     end
@@ -343,4 +318,37 @@ describe KumoKeisei::Stack do
   end
 end
 
+  describe "#params_template_path" do
+    context "when looking for the parameter template file" do
+      CFN_STACK_TEMPLATE_TO_PARAMATER_TEMPLATE = {
+        'app.json' => 'app.yml.erb',
+        'rds.json' => 'rds.yml.erb'
+      }
+
+      CFN_STACK_TEMPLATE_TO_PARAMATER_TEMPLATE.each_pair do |cfn_template, parameter_template|
+        context "given #{cfn_template}" do
+          let(:stack_cfntemplate_filename) { "#{cfn_template}" }
+          it "uses a matching file in the form of #{parameter_template}" do
+            expect(subject.params_template_path(stack_config)).to eq(File.join(Dir.pwd, parameter_template))
+          end
+        end
+      end
+    end
+
+    context "when the parameter template file has not been passed in" do
+      let(:stack_config) {
+        {
+          config_path: 'config-path',
+          injected_config: { 'VpcId' => 'vpc-id' },
+          env_name: 'non-production'
+        }
+      }
+
+      it "will return nil" do
+        expect(subject.params_template_path(stack_config)).to be_nil
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumo_keisei
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.alpha1
+  version: 3.1.1.pre.alpha3
 platform: ruby
 authors:
 - Redbubble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk