jets 5.0.2 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b1cd2d4dadd8582bfaf2eeda623bed469ae4effd0cd3aff9f2c80741721b23
-  data.tar.gz: 4abf083f6a7d090ed0bf0adf1c16b24ea6f8ec98714c0335ba165f92b5115766
+  metadata.gz: a5dfbf6918bc02ab0aa922e66411129fb177f79acbefd26f481b9d0b9e6fe046
+  data.tar.gz: 81bde117ec85d14328dc523c20e757123c8e73ea7de508e0ab00f368cce7a38d
 SHA512:
-  metadata.gz: aae65dfb73f92802e3a8e44b7e4171a97345ba7912143ad03d644e1ded48822541fba035d4d1c6707c0e2aed2d31c595be637c8cdc9c9eb19be13627b2576afb
-  data.tar.gz: 3a71ac74963d2d81cb75f57bcb2a32df1a34a890f2d60f522d4a53640f8bee3ff2c6fc7ddcca73990c232724436597ecf0f2b0cc6bab2513c3d4c15c5ea99d5d
+  metadata.gz: e7794943a90301a37af8dc14338e0504a53b0d3ff37ae6a15541c48130194e06078de0d66ef4be6b119db37284ae679c87095e7c252ef4860938aba31ff72af4
+  data.tar.gz: 0b768fa41186630d876fd9690003c8c3ff3f70b46ace56a3f325d931dc4ae80dd2a777d2bfe3af0c8f6b73b377a83ab4c0bb3bd2158d3baddd6afcdd7a8cacb5

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [5.0.4] - 2023-12-17
+- [#695](https://github.com/rubyonjets/jets/pull/695) dont run reconfigure webpacker unless using
+- [#696](https://github.com/rubyonjets/jets/pull/696) improve deploy failure message by showing nested stack failure message
+- update delete error messaging to stack
+
+## [5.0.3] - 2023-12-15
+- [#691](https://github.com/rubyonjets/jets/pull/691) jets deploy fix for empty project
+- [#692](https://github.com/rubyonjets/jets/pull/692) fix jets deploy for empty project
+- [#693](https://github.com/rubyonjets/jets/pull/693) do not include sprockets-jets in new app generator for api mode
+- [#694](https://github.com/rubyonjets/jets/pull/694) fix jets deploy for empty project
+
 ## [5.0.2] - 2023-12-11
 - [#688](https://github.com/rubyonjets/jets/pull/688) improve releases:info output
 

data/jets.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-ssm"
   spec.add_dependency "cfn_camelizer", ">= 0.4.9"
   spec.add_dependency "cfn_response"
-  spec.add_dependency "cfn-status"
+  spec.add_dependency "cfn-status", ">= 0.5.0"
   spec.add_dependency "cli-format", ">= 0.4.0"
   spec.add_dependency "dotenv"
   spec.add_dependency "dsl_evaluator", ">= 0.3.0" # for DslEvaluator.print_code

data/lib/jets/builders/code_builder.rb

@@ -232,7 +232,7 @@ module Jets::Builders
       # Checking this way because when using jets standalone for Afterburner mode we don't want to run into
       # bundler gem collisions.  TODO: figure out the a better way to handle the collisions.
       lines = IO.readlines("#{Jets.root}/Gemfile")
-      lines.detect { |l| l =~ /#{name}/ && l !~ /\s.*#/ }
+      lines.detect { |l| l =~ /gem ['"]#{name}/ && l !~ /^\s*?#/ }
     end
 
     # Cleans out non-cached files like code-*.zip in Jets.build_root
@@ -279,6 +279,7 @@ module Jets::Builders
     # when they deploy a jets project in development mode
     def reconfigure_development_webpacker
       return unless Jets.env.development?
+      return unless gemfile_include?("jetpacker")
       headline "Reconfiguring webpacker development settings for AWS Lambda."
 
       webpacker_yml = "#{"#{stage_area}/code"}/config/webpacker.yml"
@@ -305,7 +306,7 @@ module Jets::Builders
         puts "Skip packaging ruby".color(:yellow) # useful for developing handlers
         return
       end
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
 
       check_agree
       ruby_packager.install
@@ -322,7 +323,7 @@ module Jets::Builders
     end
 
     def build_lambda_layer
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
       lambda_layer = LambdaLayer.new
       lambda_layer.build
     end

data/lib/jets/builders/handler_generator.rb

@@ -45,6 +45,14 @@ module Jets::Builders
           generate_handler(vars)
         end
       end
+
+      if app_files.empty? && Jets.gem_layer?
+        # When there are no app files, still need to generate a shim for JetsController
+        lib = File.expand_path('../../..', __dir__)
+        path = "#{lib}/engines/internal/app/controllers/jets/public_controller.rb"
+        vars = Jets::Builders::ShimVars::App.new(path)
+        generate_handler(vars)
+      end
     end
 
     def generate_handler(vars)

data/lib/jets/cfn/builder/parent.rb

@@ -44,7 +44,7 @@ class Jets::Cfn::Builder
       add_resource(resource)
       add_outputs(resource.outputs)
 
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
       resource = Jets::Cfn::Resource::Lambda::GemLayer.new
       add_resource(resource)
       add_outputs(resource.outputs)

data/lib/jets/cfn/builder.rb

@@ -86,8 +86,8 @@ module Jets::Cfn
       builder_class = "Jets::Cfn::Builder::#{app_class}".constantize
 
       app_class = Jets::Klass.from_path(path)
-      if Jets.poly_only? && app_class == Jets::PreheatJob
-        return # No prewarm when there's only poly functions
+      if !Jets.gem_layer? && app_class == Jets::PreheatJob
+        return # No prewarm when there's only poly functions and no gem layer
       end
 
       # Builder class fully qualified name:

data/lib/jets/cfn/params/common.rb

@@ -5,7 +5,7 @@ module Jets::Cfn::Params
         IamRole: "!GetAtt IamRole.Arn",
         S3Bucket: "!Ref S3Bucket",
       }
-      parameters[:GemLayer] = "!Ref GemLayer" unless Jets.poly_only?
+      parameters[:GemLayer] = "!Ref GemLayer" if Jets.gem_layer?
       parameters
     end
 

data/lib/jets/cfn/ship.rb

@@ -31,16 +31,11 @@ module Jets::Cfn
         end
       end
 
-      success = wait_for_stack
+      # waits for /(_COMPLETE|_FAILED)$/ status
+      cfn_status = Jets::Cfn::Status.new
+      success = cfn_status.wait
       unless success
-        puts <<~EOL
-          The Jets application failed to deploy. Jets creates a few CloudFormation stacks to deploy your application.
-          The logs above show the CloudFormation parent stack events and points to the stack with the error.
-          Please go to the CloudFormation console and look for the specific stack with the error.
-          The specific child stack usually shows more detailed information and can be used to resolve the issue.
-          Example of checking the CloudFormation console: https://rubyonjets.com/docs/debugging/cloudformation/
-        EOL
-        exit 1
+        cfn_status.failure_message!
       end
 
       save_apigw_state
@@ -100,11 +95,6 @@ module Jets::Cfn
       @template ||= Template.new(Jets::Names.parent_template_path, @options)
     end
 
-    # check for /(_COMPLETE|_FAILED)$/ status
-    def wait_for_stack
-      Jets::Cfn::Status.new(@options).wait
-    end
-
     def save_apigw_state
       Jets::Router::State.save_apigw_state
     end
@@ -116,7 +106,7 @@ module Jets::Cfn
       end
       return unless @options[:stack_type] == :full # s3 bucket is available
       return unless Jets.config.prewarm.enable
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
 
       puts "Prewarming application."
       Jets::PreheatJob.prewarm!

data/lib/jets/cfn/status.rb

@@ -2,9 +2,52 @@ require 'cfn_status'
 
 module Jets::Cfn
   class Status < CfnStatus
-    def initialize(options={})
-      @stack_name = Jets::Names.parent_stack_name
-      super(@stack_name, options)
+    extend Memoist
+
+    def initialize(stack_name = Jets::Names.parent_stack_name, options={})
+      super(stack_name, options)
+    end
+
+    def failure_message!
+      puts <<~EOL
+        The Jets application failed to deploy. Jets creates a few CloudFormation stacks
+        to deploy your application. The logs above show the CloudFormation parent stack
+        events. You can go to the CloudFormation console and look for the nested stack
+        with the error. The specific nested stack usually shows more detailed information
+        and can be used to resolve the issue.
+        Example of checking the CloudFormation console:
+
+            https://rubyonjets.com/docs/debugging/cloudformation/
+
+      EOL
+
+      show_nested_stack_error
+
+      exit 1
+    end
+
+    def show_nested_stack_error
+      event = find_failed_event
+      return unless event
+      puts "-" * 80
+      puts "Here's the nested stack error details: #{event.resource_status_reason}"
+      self.class.new(event.physical_resource_id, start_index_before_delete: true).run
+
+      region = Jets.aws.region
+      puts <<~EOL
+        Here's also the AWS Console link to the failed nested stack:
+
+            https://#{region}.console.aws.amazon.com/cloudformation/home?region=#{region}#/stacks/events?filteringText=&filteringStatus=active&viewNested=true&stackId=#{event.physical_resource_id}
+
+      EOL
+    end
+
+    def find_failed_event
+      cfn_status = self.class.new # fresh instance to get the refreshed events
+      cfn_status.refresh_events
+      i = cfn_status.start_index
+      events = cfn_status.events[0..i].reverse # events are in reverse chronological order
+      events.find { |e| e.resource_status =~ /FAILED/ } # first failed event
     end
   end
 end

data/lib/jets/cfn/upload.rb

@@ -138,6 +138,9 @@ module Jets::Cfn
     # If only max_age is provided, then we'll generate a cache_control header.
     # Using max_age is the shorter and simply way of setting the cache_control header.
     def cache_control
+      # default when sprockets-jets not installed
+      return "public, max-age=3600" unless Jets.config.respond_to?(:assets)
+
       cache_control = Jets.config.assets.cache_control
       unless cache_control
         max_age = Jets.config.assets.max_age # defaults to 3600 in jets/application.rb

data/lib/jets/commands/delete/delete_command.rb

@@ -44,7 +44,7 @@ module Jets::Command
     end
 
     def wait_for_stack
-      status = Jets::Cfn::Status.new(@options)
+      status = Jets::Cfn::Status.new
       start_time = Time.now
       status.wait
       took = Time.now - start_time
@@ -60,7 +60,7 @@ module Jets::Command
     def confirm_project_exists
       stack = find_stack(parent_stack_name)
       return if stack
-      puts "ERROR: Project #{parent_stack_name} does not exist".color(:red)
+      puts "ERROR: Stack #{parent_stack_name} does not exist".color(:red)
       exit 1
     end
 

data/lib/jets/commands/deploy/deploy_command.rb

@@ -44,8 +44,8 @@ module Jets::Command
     def delete_minimal_stack
       puts "Existing stack is in ROLLBACK_COMPLETE state from a previous failed minimal deploy. Deleting stack and continuing."
       cfn.delete_stack(stack_name: stack_name)
-      status.wait
-      status.reset
+      cfn_status.wait
+      cfn_status.reset
     end
 
     def check_dev_mode
@@ -69,8 +69,8 @@ module Jets::Command
       Jets::Cfn::Ship.new(options).run
     end
 
-    def status
-      @status ||= Jets::Cfn::Status.new(stack_name)
+    def cfn_status
+      @cfn_status ||= Jets::Cfn::Status.new(stack_name)
     end
 
     def stack_name

data/lib/jets/commands/status/status_command.rb

@@ -1,9 +1,16 @@
 module Jets::Command
   class StatusCommand < Base
+    include Jets::AwsServices
+
     desc "status", "Shows the current status of the Jets app"
     long_desc Help.text(:status)
     def perform
-      Jets::Cfn::Status.new(options).run
+      Jets.boot
+      cfn_status = Jets::Cfn::Status.new
+      success = cfn_status.run
+      unless success
+        cfn_status.failure_message!
+      end
     end
   end
 end

data/lib/jets/core.rb

@@ -207,6 +207,10 @@ module Jets::Core
     Jets.config.cfn.build.controllers == "one_lambda_for_all_controllers"
   end
 
+  def gem_layer?
+    !Jets.poly_only? || Jets.one_lambda_for_all_controllers?
+  end
+
   # Do not memoize here. The JetsBucket.name does it's own special memoization.
   def s3_bucket
     Jets::Cfn::Resource::S3::JetsBucket.name

data/lib/jets/generators/overrides/app/templates/Gemfile.tt

@@ -2,9 +2,12 @@ source "https://rubygems.org"
 
 gem "jets", "~> <%= Jets::VERSION %>"
 
+<%- if options[:mode] == 'html'-%>
+gem "sprockets-jets"
+<% end -%>
+
 <%- if options[:mode] != 'job' && !options[:database].nil? -%>
 <%= database_gemfile_entry %>
-gem "sprockets-jets"
 <%- end -%>
 <%- if options[:mode] == 'html' -%>
 gem "importmap-jets"

data/lib/jets/stack/builder.rb

@@ -21,7 +21,7 @@ class Jets::Stack
       return unless elements
 
       if section == :parameters
-        elements[:GemLayer] = {Type: "String"} unless Jets.poly_only?
+        elements[:GemLayer] = {Type: "String"} if Jets.gem_layer?
       end
       @template[section] = elements
     end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.2"
+  VERSION = "5.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: cli-format
   requirement: !ruby/object:Gem::Requirement