kumo_keisei 3.1.1.pre.alpha4 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbf33ec387a67676faf868c07c6a71a9dfacedf
-  data.tar.gz: ed68175bb7980a5a6062c56753f08de4dcb9693c
+  metadata.gz: e434e0c19435d10b3c7a986b87979a47f693a8fc
+  data.tar.gz: 442d92aa71ecfb60f7955e2fb244afd8708020b4
 SHA512:
-  metadata.gz: ca685d79c1034445e9140e11c627a5f709cfffd1eefca84cf6648124690ecf4aa92633a43279c8e0515cb6b37b0e972feffb5ccfbc3a514732fb34ca8741d74f
-  data.tar.gz: 9f2450f9666cd0fa0a284e21e2c7bcbd6a6a847c0b4c773836886a54e135c567a840ad276209aa87e3565fbbb4e2d80ab9ed858ae21bf465b98df0cf89cc5da2
+  metadata.gz: 63fc7d4caf90e0d0c1725540d6758c361117f10149d47f6c3d8208170326c0905f0af5bc4d4f3f1c35e901172f201e5055c0140e20a4a88acb2e6eae4313e4a6
+  data.tar.gz: 823a33b5d53bb23e3810c9f1d0fa662a5fa96415c2e82401fdea70d5bc2f2d5e0b7569424619f7591d56c5e8c8d62678463133f918965073affea9b1784a82b9

data/VERSION

@@ -1 +1 @@
-3.1.1-alpha4
+3.1.1

data/lib/kumo_keisei/stack.rb

@@ -29,10 +29,10 @@ module KumoKeisei
     end
 
     def initialize(app_name, environment_name, options = { confirmation_timeout: 30, waiter_delay: 20, waiter_attempts: 90 })
-      type = options.fetch(:type, 'nodes')
+      type = options[:type]
       @env_name = environment_name
       @app_name = app_name
-      @stack_name = "#{app_name}-#{type}-#{ environment_name }"
+      @stack_name = type.nil? ? "#{app_name}-#{ environment_name }" : "#{app_name}-#{type}-#{ environment_name }"
       @confirmation_timeout = options[:confirmation_timeout]
       @waiter_delay = options[:waiter_delay]
       @waiter_attempts = options[:waiter_attempts]
@@ -85,10 +85,6 @@ module KumoKeisei
       environment_config(stack_config).config
     end
 
-    def params_template_path(stack_config)
-      stack_config.has_key?(:template_path) ? File.absolute_path(File.join(File.dirname(stack_config[:template_path]), "#{File.basename(stack_config[:template_path], '.*')}.yml.erb")) : nil
-    end
-
     private
 
     def transform_logical_resource_id(id)
@@ -166,7 +162,8 @@ module KumoKeisei
     end
 
     def environment_config(stack_config)
-      EnvironmentConfig.new(stack_config.merge(params_template_file_path: params_template_path(stack_config)))
+      params_template_path = stack_config.has_key?(:template_path) ? File.absolute_path(File.join(File.dirname(stack_config[:template_path]), "#{@app_name}.yml.erb")) : nil
+      EnvironmentConfig.new(stack_config.merge(params_template_file_path: params_template_path))
     end
 
     def stack_events_url

data/spec/lib/kumo_keisei/stack_spec.rb

@@ -10,10 +10,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_name) { "#{app_name}-#{environment_name}" }
-  let(:stack_cfntemplate_filename) { "#{stack_template_name}.json" }
-  let(:stack_cfnparams_filename) { "#{stack_template_name}.yml.erb" }
+  let(:stack_name) { "#{app_name}-#{environment_name}" }
+  let(:stack_template_path) { "#{app_name}-#{environment_name}.json" }
+  let(:file_params_path) { nil }
   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) }
@@ -35,7 +34,7 @@ describe KumoKeisei::Stack do
   let(:stack_config) {
     {
       config_path: 'config-path',
-      template_path: stack_cfntemplate_filename,
+      template_path: stack_template_path,
       injected_config: { 'VpcId' => 'vpc-id' },
       env_name: 'non-production'
     }
@@ -50,10 +49,9 @@ 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_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('/')
+    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")
   end
 
   describe "#destroy!" do
@@ -273,8 +271,8 @@ describe KumoKeisei::Stack do
   end
 
   describe "#type" do
-    it "presumes stacks are of type node if the type is not set" do
-      expect(subject.stack_name).to eq("#{app_name}-nodes-#{environment_name}")
+    it "uses appname-environment name as stack name if the type is not set" do
+      expect(subject.stack_name).to eq("#{app_name}-#{environment_name}")
     end
 
     it "embeds the type into the name of the stack if set" do
@@ -285,8 +283,11 @@ 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
@@ -299,8 +300,11 @@ 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
@@ -318,37 +322,4 @@ 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 = {
-        '/foo/app.json' => '/foo/app.yml.erb',
-        '/foo/rds.json' => '/foo/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumo_keisei
 version: !ruby/object:Gem::Version
-  version: 3.1.1.pre.alpha4
+  version: 3.1.1
 platform: ruby
 authors:
 - Redbubble
@@ -130,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2