jets 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fedba281ee9d6ac31a44184b49bbc8fe15d309a3f4d58142cfa25c4ddebc153
-  data.tar.gz: e73ee950202ea1786c881b43abc95c03bc4c3e7ef44b04265997eca2f4b9211b
+  metadata.gz: 557e01dec1b92f8a04213ef4b7f5ee9d8a35f25dd20231c96ba24b0d9890b7cd
+  data.tar.gz: 5c8c12ae959d76dc9e5a681c8f18a40d5d60defcc4eead52ed9d9ad2571a3fe1
 SHA512:
-  metadata.gz: 57070368542b8a767fbf8553f0c627b36432e691ae07f1f41488a0d8af830bffd1ed84a71633fe971df6b45bcf79ff8862f2d4513d22e4a1981b633f36cbb8bd
-  data.tar.gz: 32ba83eb4d4e87a8c92b5d7ec8d573ae2b36ff558fedbae7bb33f1ebe5dbcb36baf2f64b89b2a05d2e56e52bcd2145964a0770f7a56efdb48d1a925498c7f177
+  metadata.gz: 944a1d09ba4da26110e292cdf42d73a240d283d066dbe1ca677787c20b03ee925cf12e3d92555bc16e6327c7096ce59782cd271ff802f5d8554819674f040020
+  data.tar.gz: 987eac8ef96a9cc10b0ac071ff099c02245cf5143bb75d23622513aba73ba447414ab0c542f7a734c30ba6ce07f20cd479daecc030c02d9a5d3505c10c0a5c34

data/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [4.0.0] - 2023-05-27
+- [#641](https://github.com/boltops-tools/jets/pull/641) bundle check and prevent error from getting to aws lambda
+- [#642](https://github.com/boltops-tools/jets/pull/642) Fix rack mounted apps: update interface with removed meth
+- [#643](https://github.com/boltops-tools/jets/pull/643) JETS_EXTRA support, deprecate JETS_ENV_EXTRA
+- [#644](https://github.com/boltops-tools/jets/pull/644) remove docs to separate repo
+- [#645](https://github.com/boltops-tools/jets/pull/645) PreheatJob: fix function lookups and iam function permission
+- [#646](https://github.com/boltops-tools/jets/pull/646) log debug uploading and setting content type
+- [#647](https://github.com/boltops-tools/jets/pull/647) fix Jets.logger call
+- [#648](https://github.com/boltops-tools/jets/pull/648) make sure logger level info is default
+- [#649](https://github.com/boltops-tools/jets/pull/649) Custom Domain: Hard fail on IAM permission error
+- [#650](https://github.com/boltops-tools/jets/pull/650) Validate lambda function names
+- [#651](https://github.com/boltops-tools/jets/pull/651) allow custom rake tasks with params to work with jets as well as rake command
+- [#652](https://github.com/boltops-tools/jets/pull/652) Validate lambda function names: fix regexp
+- [#653](https://github.com/boltops-tools/jets/pull/653) refactor cleanup: rename Jets::Naming to Jets::Names
+- [#654](https://github.com/boltops-tools/jets/pull/654) Ruby 3.2 Support
+- apigw routes state save: fix to_json infinite loop from Grape apps
+- delete .python-version: more general approach. fixes specs when specific version of python is not installed
+
+## [3.2.2] - 2023-05-19
+- [#640](https://github.com/boltops-tools/jets/pull/640) Base path mapping CloudFormation custom resource and lambda function hardening
+
 ## [3.2.1] - 2023-05-03
 - [#637](https://github.com/boltops-tools/jets/pull/637) Readme: Replace "splat out" with "had" a baby
 - [#638](https://github.com/boltops-tools/jets/pull/638) feature: update an array of reserved variables in aws lambda

data/jets.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://rubyonjets.com"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ['>= 2.5.0', '< 3.0.0']
+  spec.required_ruby_version = ['>= 2.5.0']
   spec.rdoc_options += Jets::Rdoc.options
 
   vendor_files       = Dir.glob("vendor/**/*")

data/lib/jets/application/defaults.rb

@@ -51,6 +51,7 @@ class Jets::Application
       config.autoload_paths = [] # allows for customization
       config.ignore_paths = [] # allows for customization
       config.logger = Jets::Logger.new($stderr)
+      config.logger.level = Logger::INFO
       config.time_zone = "UTC"
 
       # function properties defaults
@@ -162,6 +163,7 @@ class Jets::Application
 
       config.ruby = ActiveSupport::OrderedOptions.new
       config.ruby.check = true
+      config.ruby.supported_versions = %w[2.5 2.7 3.2] # supported by AWS Lambda
 
       config
     end

data/lib/jets/application.rb

@@ -163,13 +163,12 @@ class Jets::Application
     staging: 'stag',
   }
   def set_computed_configs!
-    # env_extra can be also be set with JETS_ENV_EXTRA.
-    # JETS_ENV_EXTRA higher precedence than config.env_extra
-    config.env_extra = ENV['JETS_ENV_EXTRA'] if ENV['JETS_ENV_EXTRA']
-    # IE: With env_extra: project-dev-1
-    #     Without env_extra: project-dev
+    # env var JETS_EXTRA higher precedence than config.extra
+    config.extra = Jets.extra
+    # IE: With extra: project-dev-1
+    #     Without extra: project-dev
     config.short_env = ENV_MAP[Jets.env.to_sym] || Jets.env
-    # table_namespace does not have the env_extra, more common case desired.
+    # table_namespace does not have the extra, more common case desired.
     config.table_namespace = [config.project_name, config.short_env].compact.join('-')
 
     config.project_namespace = Jets.project_namespace
@@ -205,7 +204,7 @@ class Jets::Application
     if File.exist?(database_yml)
       require "active_record/database_configurations" # lazy require
       text = Jets::Erb.result(database_yml)
-      db_configs = YAML.load(text)
+      db_configs = Jets::Util::Yamler.load(text)
       configurations = ActiveRecord::DatabaseConfigurations.new(db_configs)
       config.database = configurations
     end

data/lib/jets/aws_info.rb

@@ -73,7 +73,7 @@ module Jets
       return "fake-test-s3-bucket" if Jets.env.test?
       return @@s3_bucket unless @@s3_bucket == BUCKET_DOES_NOT_YET_EXIST
 
-      resp = cfn.describe_stacks(stack_name: Jets::Naming.parent_stack_name)
+      resp = cfn.describe_stacks(stack_name: Jets::Names.parent_stack_name)
       stack = resp.stacks.first
       output = stack["outputs"].find { |o| o["output_key"] == "S3Bucket" }
       @@s3_bucket = output["output_value"] # s3_bucket
@@ -83,7 +83,7 @@ module Jets
       # not been loaded in the config yet.  We do some trickery with loading
       # the config twice in Application#load_app_config
       # The first load will result in a Aws::CloudFormation::Errors::ValidationError
-      # since the Jets::Naming.parent_stack_name has not been properly set yet.
+      # since the Jets::Names.parent_stack_name has not been properly set yet.
       #
       # Rescuing all exceptions in case there are other exceptions dont know about yet
       # Here are the known ones: Aws::CloudFormation::Errors::ValidationError, Aws::CloudFormation::Errors::InvalidClientTokenId

data/lib/jets/booter.rb

@@ -10,6 +10,7 @@ class Jets::Booter
       Jets::Bundle.require
 
       Jets.application.setup!
+      check_ruby_version!
 
       # Turbines are loaded after setup_autoload_paths in Jets.application.setup!  Some Turbine options are defined
       # in the project so setup must happen before internal Turbines are loaded.
@@ -98,7 +99,7 @@ class Jets::Booter
         primary_hash_config = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env).find { |hash_config|
           hash_config.name == "primary"
         }
-  
+
         primary_config = primary_hash_config.configuration_hash # configuration_hash is a normal Ruby Hash
 
         ActiveRecord::Base.establish_connection(primary_config)
@@ -174,5 +175,51 @@ class Jets::Booter
         exit 1
       end
     end
+
+    def check_ruby_version!
+      return if ENV['JETS_RUBY_CHECK'] == '0'
+      return if !Jets.config.ruby.check
+      return if ruby_version_supported?
+
+      puts <<~EOL.color(:red)
+        You are using Ruby #{RUBY_VERSION}
+        AWS Lambda does not support this version.
+        Please use one of the supported Ruby versions: #{supported_ruby_versions.join(' ')}
+      EOL
+
+      puts <<~EOL
+        If you would like to skip this check, you can set: JETS_RUBY_CHECK=0 or configure
+
+        config/application.rb
+
+            Jets.application.configure do
+              config.ruby.check = false
+            end
+
+        Or if you want to allow additional Ruby versions, then configure:
+
+        config/application.rb
+
+            Jets.application.configure do
+              config.ruby.supported_versions = ["2.5", "2.7", "3.2"]
+            end
+
+        Note: If AWS Lambda does not officially support the Ruby version,
+        you'll need to also provide the Ruby Custom Runtime Layer.
+        Related Docs: https://rubyonjets.com/docs/extras/custom-runtime/
+      EOL
+      exit 1
+    end
+
+    def ruby_version_supported?
+      md = RUBY_VERSION.match(/(\d+)\.(\d+)\.\d+/)
+      major, minor = md[1], md[2]
+      detected_ruby = [major, minor].join('.')
+      supported_ruby_versions.include?(detected_ruby)
+    end
+
+    def supported_ruby_versions
+      Jets.config.ruby.supported_versions
+    end
   end
 end

data/lib/jets/builders/code_builder.rb

@@ -26,7 +26,6 @@ module Jets::Builders
     end
 
     def build
-      check_ruby_version
       @version_purger.purge
       cache_check_message
 
@@ -80,6 +79,7 @@ module Jets::Builders
       return false if ENV['JETS_BUILD_NO_INTERNET']
       s3_key = "jets/code/#{filename}"
       begin
+        Jets.logger.debug "Checking s3://#{s3_bucket}/#{s3_key}"
         s3.head_object(bucket: s3_bucket, key: s3_key)
         true
       rescue Aws::S3::Errors::NotFound, Aws::S3::Errors::Forbidden
@@ -355,7 +355,7 @@ module Jets::Builders
       webpacker_yml = "#{"#{stage_area}/code"}/config/webpacker.yml"
       return unless File.exist?(webpacker_yml)
 
-      config = YAML.load_file(webpacker_yml)
+      config = Jets::Util::Yamler.load_file(webpacker_yml)
       config["development"]["compile"] = false # force this to be false for deployment
       new_yaml = YAML.dump(config)
       IO.write(webpacker_yml, new_yaml)
@@ -412,25 +412,6 @@ module Jets::Builders
       FileUtils.cp_r(ruby_version_path, build_area)
     end
 
-    SUPPORTED_RUBY_VERSIONS = %w[2.5 2.7]
-    def check_ruby_version
-      return unless ENV['JETS_RUBY_CHECK'] == '0' || Jets.config.ruby.check == false
-      return if ruby_version_supported?
-      puts <<~EOL.color(:red)
-      You are using Ruby version #{RUBY_VERSION} which is not supported by Jets.
-      Please use one of the Jets supported ruby versions: #{SUPPORTED_RUBY_VERSIONS.join(' ')}
-      If you would like to skip this check you can set: JETS_RUBY_CHECK=0
-      EOL
-      exit 1
-    end
-
-    def ruby_version_supported?
-      md = RUBY_VERSION.match(/(\d+)\.(\d+)\.\d+/)
-      major, minor = md[1], md[2]
-      detected_ruby = [major, minor].join('.')
-      SUPPORTED_RUBY_VERSIONS.include?(detected_ruby)
-    end
-
     # Group all the path settings together here
     def self.tmp_code
       Jets::Commands::Build.tmp_code

data/lib/jets/builders/gem_replacer.rb

@@ -1,6 +1,8 @@
 module Jets::Builders
   class GemReplacer
     extend Memoist
+    include Util
+    
     def initialize(options)
       @options = options
     end
@@ -37,13 +39,6 @@ module Jets::Builders
       FileUtils.mv(src, dest) unless File.exist?(dest) # looks like rename_gem actually runs twice
     end
 
-    def sh(command)
-      puts "=> #{command}".color(:green)
-      success = system(command)
-      abort("Command Failed: #{command}") unless success
-      success
-    end
-
     def ruby_folder
       Jets::Gems.ruby_folder
     end

data/lib/jets/builders/ruby_packager.rb

@@ -3,9 +3,9 @@ require "bundler" # for clean_old_submodules only
 module Jets::Builders
   class RubyPackager
     include Util
-    
-    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/    
-    
+
+    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/
+
     attr_reader :full_app_root
     def initialize(relative_app_root)
       @full_app_root = "#{build_area}/#{relative_app_root}"
@@ -16,6 +16,7 @@ module Jets::Builders
 
       clean_old_submodules
       bundle_install
+      bundle_check
       copy_bundle_config
       copy_cache_gems
     end
@@ -75,7 +76,39 @@ module Jets::Builders
       # For example we add the jets-rails to the Gemfile.
       copy_back_gemfile_lock
 
-      puts 'Bundle install success.'
+      puts 'Bundle install completed'
+    end
+
+    # Example `bundle check` error:
+    #
+    #     The following gems are missing
+    #     * date (3.3.3)
+    #     * timeout (0.3.2)
+    #     Install missing gems with `bundle install`
+    #
+    # Example success:
+    #
+    #     The Gemfile's dependencies are satisfied
+    #
+    def bundle_check
+      out = ''
+      Bundler.with_unbundled_env do
+        out = `cd #{cache_area} && bundle check 2>&1`
+      end
+      if out.include?("missing")
+        puts "Failed: bundle check".color(:red)
+        puts <<~EOL
+          This means something went wrong with the bundle install.
+          Jets will prevent the deployment to AWS Lambda.
+          It's better to error now instead of finding out on AWS Lambda.
+          The bundle install can fail for different system-specific reasons.
+          It could be an outdated or incompatible version of RubyGems and Ruby.
+
+          Related: https://community.boltops.com/t/could-not-find-timeout-0-3-1-in-any-of-the-sources/996
+
+        EOL
+        exit 1
+      end
     end
 
     def copy_back_gemfile_lock

data/lib/jets/cfn/builders/api_deployment_builder.rb

@@ -45,7 +45,7 @@ module Jets::Cfn::Builders
 
     # template_path is an interface method
     def template_path
-      Jets::Naming.api_deployment_template_path
+      Jets::Names.api_deployment_template_path
     end
 
     # do not bother writing a template if routes are empty

data/lib/jets/cfn/builders/api_gateway_builder.rb

@@ -18,7 +18,7 @@ module Jets::Cfn::Builders
 
     # template_path is an interface method
     def template_path
-      Jets::Naming.api_gateway_template_path
+      Jets::Names.api_gateway_template_path
     end
 
     # do not bother writing a template if routes are empty
@@ -55,7 +55,7 @@ module Jets::Cfn::Builders
       end
     end
 
-    def create_domain_name()
+    def create_domain_name
       resource = Jets::Resource::ApiGateway::DomainName.new
 
       return {
@@ -70,41 +70,44 @@ module Jets::Cfn::Builders
       apigateway.get_domain_name({
         domain_name: resource.domain_name
       })
-      return true
-    rescue
-      return false
+      true
+    # IE: Aws::APIGateway::Errors::NotFoundException Invalid domain name identifier specified
+    rescue Aws::APIGateway::Errors::NotFoundException
+      false
     end
     memoize :existing_domain_name?
 
     def existing_domain_name_on_stack?
-      cfn.describe_stack_resource({
+      cfn.describe_stack_resource(
         stack_name: api_gateway_physical_resource_id,
         logical_resource_id: "DomainName"
-      })
-      return true
-    rescue
-      return false
+      )
+      true
+    # IE: Aws::CloudFormation::Errors::ValidationError (Resource DomainName does not exist for stack demo-dev)
+    rescue Aws::CloudFormation::Errors::ValidationError
+      false
     end
 
     def existing_dns_record_on_stack?
-      cfn.describe_stack_resource({
+      cfn.describe_stack_resource(
         stack_name: api_gateway_physical_resource_id,
         logical_resource_id: "DnsRecord"
-      })
-      return true
-    rescue
-      return false
+      )
+      true
+    # IE: Aws::CloudFormation::Errors::ValidationError (Resource DnsRecord does not exist for stack demo-dev)
+    rescue Aws::CloudFormation::Errors::ValidationError
+      false
     end
 
     def api_gateway_physical_resource_id
-      cfn.describe_stack_resource({
-        stack_name: Jets::Naming.parent_stack_name,
+      resp = cfn.describe_stack_resource(
+        stack_name: Jets::Names.parent_stack_name,
         logical_resource_id: "ApiGateway"
-      })
-      .stack_resource_detail
-      .physical_resource_id
-    rescue
-      return nil
+      )
+      resp&.stack_resource_detail&.physical_resource_id
+    # IE: Aws::CloudFormation::Errors::ValidationError (Resource ApiGateway does not exist for stack demo-dev)
+    rescue Aws::CloudFormation::Errors::ValidationError
+      nil
     end
     memoize :api_gateway_physical_resource_id
 

data/lib/jets/cfn/builders/api_resources_builder.rb

@@ -16,7 +16,7 @@ module Jets::Cfn::Builders
 
     # template_path is an interface method
     def template_path
-      Jets::Naming.api_resources_template_path(@page)
+      Jets::Names.api_resources_template_path(@page)
     end
 
     def add_rest_api_parameter

data/lib/jets/cfn/builders/authorizer_builder.rb

@@ -61,7 +61,7 @@ module Jets::Cfn::Builders
     end
 
     def template_path
-      Jets::Naming.authorizer_template_path(@path)
+      Jets::Names.authorizer_template_path(@path)
     end
   end
 end

data/lib/jets/cfn/builders/base_child_builder.rb

@@ -18,7 +18,7 @@ module Jets::Cfn::Builders
 
     # template_path is an interface method for Interface module
     def template_path
-      Jets::Naming.app_template_path(@app_class)
+      Jets::Names.app_template_path(@app_class)
     end
 
     def add_common_parameters
@@ -40,6 +40,7 @@ module Jets::Cfn::Builders
     end
 
     def add_functions
+      validate_function_names!
       add_class_iam_policy
       @app_class.tasks.each do |task|
         add_function(task)
@@ -65,5 +66,23 @@ module Jets::Cfn::Builders
       resource = Jets::Resource::Iam::FunctionRole.new(task)
       add_resource(resource)
     end
+
+    def validate_function_names!
+      invalids = @app_class.tasks.reject do |task|
+        task.meth.to_s =~ /^[a-zA-Z][a-zA-Z0-9_]/
+      end
+      return if invalids.empty?
+      list = invalids.map do |task|
+        "    #{task.class_name}##{task.meth}" # IE: PostsController#index
+      end.join("\n")
+      puts "ERROR: Detected invalid AWS Lambda function names".color(:red)
+      puts <<~EOL
+        Lambda function names must start with a letter and can only contain letters, numbers, and underscores.
+        Invalid function names:
+
+        #{list}
+      EOL
+      exit 1
+    end
   end
 end

data/lib/jets/cfn/builders/interface.rb

@@ -88,8 +88,27 @@ module Jets::Cfn::Builders
       end
     end
 
+    # Note: Jets::Resource::Iam classes are special treated. They are the only resources that result
+    # in creating 2 CloudFormation resources: Iam::Policy and Iam::Role.
+    # This allows the user to refer to the Lambda Function name in the IAM Policy itself.
+    # We need separate resources to avoid CloudFormation erroring with a circular dependency.
+    # Using separate IAM::Policy and IAM::Role resources allows us avoid the circular dependency error.
+    #
+    # Handling logic here also centralizes code for this special behavior.
+    # Also important to note, this does not change the user-facing interface.
+    # IE: Users still uses code like:
+    #
+    #    iam_policy("s3", "sns")
+    #
+    # and be none-the-wiser about the special behavior.
     def add_resource(resource)
       add_template_resource(resource.logical_id, resource.type, resource.attributes)
+
+      if resource.class.to_s.include?("Jets::Resource::Iam")
+        role = resource # for clarity: resource is a Iam::*Role class
+        iam_policy = Jets::Resource::Iam::Policy.new(role)
+        add_template_resource(iam_policy.logical_id, iam_policy.type, iam_policy.attributes)
+      end
     end
 
     # The add_resource method can take an options Hash with both with either

data/lib/jets/cfn/builders/parent_builder.rb

@@ -19,7 +19,7 @@ module Jets::Cfn::Builders
 
     # template_path is an interface method
     def template_path
-      Jets::Naming.parent_template_path
+      Jets::Names.parent_template_path
     end
 
     def build_minimal_resources
@@ -90,7 +90,7 @@ module Jets::Cfn::Builders
     #    #{Jets.build_root}/templates/demo-dev-2-app-comments_controller.yml
     #    #{Jets.build_root}/templates/demo-dev-2-authorizers-main_authorizer.yml
     def for_each_path(type)
-      expression = "#{Jets::Naming.template_path_prefix}-#{type}-*"
+      expression = "#{Jets::Names.template_path_prefix}-#{type}-*"
       Dir.glob(expression).each do |path|
         next unless File.file?(path)
         yield(path)
@@ -123,7 +123,7 @@ module Jets::Cfn::Builders
     end
 
     def add_api_resources
-      expression = "#{Jets::Naming.template_path_prefix}-api-resources-*"
+      expression = "#{Jets::Names.template_path_prefix}-api-resources-*"
       # IE: path: #{Jets.build_root}/templates/demo-dev-2-api-resources-1.yml"
       Dir.glob(expression).sort.each do |path|
         next unless File.file?(path)

data/lib/jets/cfn/builders/shared_builder.rb

@@ -8,7 +8,7 @@ module Jets::Cfn::Builders
 
     # template_path is an interface method for Interface module
     def template_path
-      Jets::Naming.shared_template_path(@app_class)
+      Jets::Names.shared_template_path(@app_class)
     end
   end
 end

data/lib/jets/cfn/built_template.rb

@@ -7,7 +7,7 @@ module Jets::Cfn
         if @@cache[path]
           @@cache[path] # using cache
         else
-          @@cache[path] = YAML.load_file(path) # setting and using cache
+          @@cache[path] = Jets::Util::Yamler.load_file(path) # setting and using cache
         end
       end
     end

data/lib/jets/cfn/ship.rb

@@ -5,7 +5,7 @@ module Jets::Cfn
 
     def initialize(options)
       @options = options
-      @parent_stack_name = Jets::Naming.parent_stack_name
+      @parent_stack_name = Jets::Names.parent_stack_name
     end
 
     def run
@@ -81,7 +81,7 @@ module Jets::Cfn
     end
 
     def template
-      @template ||= TemplateSource.new(Jets::Naming.parent_template_path, @options)
+      @template ||= TemplateSource.new(Jets::Names.parent_template_path, @options)
     end
 
     # check for /(_COMPLETE|_FAILED)$/ status

data/lib/jets/cfn/status.rb

@@ -3,7 +3,7 @@ require 'cfn_status'
 module Jets::Cfn
   class Status < CfnStatus
     def initialize(options={})
-      @stack_name = Jets::Naming.parent_stack_name
+      @stack_name = Jets::Names.parent_stack_name
       super(@stack_name, options)
     end
   end

data/lib/jets/cfn/upload.rb

@@ -21,7 +21,7 @@ module Jets::Cfn
 
     def upload_cfn_templates
       puts "Uploading CloudFormation templates to S3."
-      expression = "#{Jets::Naming.template_path_prefix}-*"
+      expression = "#{Jets::Names.template_path_prefix}-*"
       Dir.glob(expression).each do |path|
         next unless File.file?(path)
 
@@ -93,7 +93,7 @@ module Jets::Cfn
       key = s3_key(full_path)
       obj = s3_resource.bucket(bucket_name).object(key)
       content_type = content_type_headers(full_path)
-      puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      Jets.logger.debug "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
       obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 

data/lib/jets/cli.rb

@@ -137,10 +137,16 @@ class Jets::CLI
     end
 
     return unless jets_project?
-    rake_task_found = Jets::Commands::RakeCommand.namespaced_commands.include?(full_command)
-    if rake_task_found
-      return Jets::Commands::RakeCommand
-    end
+
+    Jets::Commands::RakeCommand if rake_task_found
+  end
+
+  def rake_task_found
+    return false unless full_command # can be nil for subcommands and would break jets help without this check
+    bracket_regex = /\[.*/ # matches everything after the first [
+    command = full_command.sub(bracket_regex, '') # remove everything after the first [
+    namespaced_commands = Jets::Commands::RakeCommand.namespaced_commands.map {|x| x.sub(bracket_regex, '') }
+    namespaced_commands.include?(command)
   end
 
   def jets_project?

data/lib/jets/commands/call/base_guesser.rb

@@ -56,7 +56,7 @@ class Jets::Commands::Call
 
     @@parent_stack = nil
     def parent_stack
-      @@parent_stack ||= cfn.describe_stacks(stack_name: Jets::Naming.parent_stack_name).stacks.first
+      @@parent_stack ||= cfn.describe_stacks(stack_name: Jets::Names.parent_stack_name).stacks.first
     end
   end
 end

data/lib/jets/commands/clean/log.rb

@@ -4,7 +4,7 @@
 #   /aws/lambda/demo-dev-2-jets-preheat_job-warm
 #   /aws/lambda/demo-dev-2-jets-public_controller-show
 #
-# We're doing this because JETS_ENV_EXTRA environments can create additional matching
+# We're doing this because Jets.extra environments can create additional matching
 # log groups and we don't want to overly-aggressively delete them.
 #
 # The `keep_prefixes(log_group_names)` method calcuates the log groups to keep.
@@ -49,7 +49,7 @@ class Jets::Commands::Clean
 
   private
     def prefix_guess
-      Jets::Naming.parent_stack_name
+      Jets::Names.parent_stack_name
     end
 
     def log_groups
@@ -78,7 +78,7 @@ class Jets::Commands::Clean
 
     # Check for the prefixes to keep. The slightly tricky thing to watch for is
     # for the prefix matching addiitonal log groups that belong to other
-    # JETS_ENV_EXTRA=xxx created environments.
+    # JETS_EXTRA=xxx created environments.
     #
     # We find and store the prefixes to keep so we don't over aggressively delete
     # log groups.