jets 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554083017110e6aef17fa79c69bbb53aaa0532c8015a7f9372a5cab266937840
-  data.tar.gz: e93d0e030a9160120cef06b98a86c8417fccbefec7e89729f12b2371ef032a26
+  metadata.gz: 7a1e324ead9b88c6b0bb6086abfa1335cda56a02f1e99626fd670ebbb0c24c11
+  data.tar.gz: fb549594a20485ac5b0102b1693bc37e0082ef5031b073557cb4ffea7d90a73d
 SHA512:
-  metadata.gz: 8f3cae69d437e4a45b3028d59823af81b9d4d1193429ab8cec6dae772f6fdc95a568469128374d107ca37377d3d98cd4edebcecb4d7987503b5fff7ef1df73bd
-  data.tar.gz: 5474c0f27bb2860ce070021539ae0772e1fcc1a9464af205b5a892a604b396fb2ccc6ff57d5c11c03130fdd705bea1eb302934a8386f44809ca52f9e385a488c
+  metadata.gz: 04307b921ea8deb8a0b9db73aef2ba1920ec6e975a71d0b913d0d903b0e160a6bafe02cd4c3203684aaf9fa892b5370c8dd97b4e853778b534b064682e4321c5
+  data.tar.gz: 0a60c57975f1e121fd8bd35150ce9d8469d15616ff91c4a71c9f0bc04d7201707ee27427b5b3bf893599e0219ccf67adfc45edc6fc0524dcc3933c00f6842a43

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.8.4]
+- fix custom iam policies
+- fix edge case: allow stack to be delete in rollback completed state
+
 ## [0.8.3]
 - adjust prewarm.public_ratio default to 10
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (0.8.3)
+    jets (0.8.4)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/aws_services.rb

@@ -67,10 +67,10 @@ module Jets::AwsServices
       puts "The '#{stack_name}' stack status is #{status}. " \
            "Please wait until the stack is ready and try again.".colorize(:red)
       exit 0
-    elsif resp.stacks[0].outputs.empty?
+    elsif resp.stacks[0].outputs.empty? && status != 'ROLLBACK_COMPLETE'
       # This Happens when the miminal stack fails at the very beginning.
       # There is no s3 bucket at all.  User should delete the stack.
-      puts "The minimal stack failed to create. Please delete the stack first and try again." \
+      puts "The minimal stack failed to create. Please delete the stack first and try again. " \
       "You can delete the CloudFormation stack or use the `jets delete` command"
       exit 0
     else

data/lib/jets/commands/delete.rb

@@ -123,6 +123,9 @@ class Jets::Commands::Delete
       # Assumes stack exists
       resp = cfn.describe_stacks(stack_name: @parent_stack_name)
       status = resp.stacks[0].stack_status
+
+      return true if status == 'ROLLBACK_COMPLETE'
+
       if status =~ /_IN_PROGRESS$/
         puts "The '#{@parent_stack_name}' stack status is #{status}. " \
              "It is not in an updateable status. Please wait until the stack is ready and try again.".colorize(:red)
@@ -130,7 +133,7 @@ class Jets::Commands::Delete
       elsif resp.stacks[0].outputs.empty?
         # This Happens when the miminal stack fails at the very beginning.
         # There is no s3 bucket at all.  User should delete the stack.
-        puts "The minimal stack failed to create. Please delete the stack first and try again." \
+        puts "The minimal stack failed to create. Please delete the stack first and try again. " \
         "You can delete the CloudFormation stack or use the `jets delete` command"
         exit 0
       else

data/lib/jets/resource/iam/application_role.rb

@@ -15,7 +15,7 @@ module Jets::Resource::Iam
     end
 
     def role_name
-      "ApplicationRole" # camelized because used as template value
+      "#{Jets.config.project_namespace}-application-role" # camelized because used as template value
     end
 
     def outputs

data/lib/jets/resource/iam/base_role_definition.rb

@@ -22,13 +22,13 @@ module Jets::Resource::Iam
       }
 
       definition[logical_id][:properties][:policies] = [
-        policy_name: "#{role_name}Policy",
+        policy_name: "#{role_name}-policy",
         policy_document: policy_document,
-      ] if policy_document
+      ] unless policy_document['Statement'].empty?
 
-      # if managed_iam_policy.arns
-      #   definition[logical_id][:properties][:managed_policy_arns] = managed_iam_policy.arns
-      # end
+      unless managed_policy_arns.empty?
+        definition[logical_id][:properties][:managed_policy_arns] = managed_policy_arns
+      end
 
       definition
     end
@@ -37,7 +37,7 @@ module Jets::Resource::Iam
       PolicyDocument.new(@policy_definitions).policy_document
     end
 
-    def managed_iam_policy
+    def managed_policy_arns
       ManagedPolicy.new(@managed_policy_definitions).arns
     end
   end

data/lib/jets/resource/iam/class_role.rb

@@ -13,7 +13,8 @@ module Jets::Resource::Iam
     end
 
     def role_name
-      "{namespace}Role" # camelized because used as template value
+      class_namespace = replacements[:namespace].underscore.dasherize
+      "#{Jets.config.project_namespace}-#{class_namespace}-role" # camelized because used as template value
     end
 
     def replacements

data/lib/jets/resource/iam/function_role.rb

@@ -13,7 +13,8 @@ module Jets::Resource::Iam
     end
 
     def role_name
-      "{namespace}Role" # camelized because used as template value
+      funcion_namespace = replacements[:namespace].underscore.dasherize
+      "#{Jets.config.project_namespace}-#{funcion_namespace}-role" # camelized because used as template value
     end
 
     def replacements

data/lib/jets/resource/iam/managed_policy.rb

@@ -4,7 +4,7 @@ module Jets::Resource::Iam
 
     attr_reader :definitions
     def initialize(*definitions)
-      @definitions = definitions.flatten
+      @definitions = definitions.flatten.compact
     end
 
     def arns

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Tung Nguyen