jets 5.0.14 → 6.0.0.beta1

data/lib/jets/autoloaders.rb

@@ -1,52 +1,23 @@
 require "jets/bundle"
 Jets::Bundle.setup
 require "zeitwerk"
+require_relative "autoloaders/gem"
+require_relative "autoloaders/main"
 
 module Jets
   class Autoloaders
-    require_relative "autoloaders/inflector"
-
-    include Enumerable
-
-    attr_reader :main, :once
-
-    def initialize
-      # This `require` delays loading the library on purpose.
-      #
-      # In Rails 7.0.0, railties/lib/rails.rb loaded Zeitwerk as a side-effect,
-      # but a couple of edge cases related to Bundler and Bootsnap showed up.
-      # They had to do with order of decoration of `Kernel#require`, something
-      # the three of them do.
-      #
-      # Delaying this `require` up to this point is a convenient trade-off.
-      require "zeitwerk"
-
-      @main = Zeitwerk::Loader.new
-      @main.tag = "jets.main"
-      @main.inflector = Inflector
-
-      @once = Zeitwerk::Loader.new
-      @once.tag = "jets.once"
-      @once.inflector = Inflector
-    end
-
-    def each
-      yield main
-      yield once
-    end
-
-    def logger=(logger)
-      each { |loader| loader.logger = logger }
-    end
-
-    def log!
-      each(&:log!)
-    end
-
-    def self.for_gem
-      Gem.new.autoloader
+    class << self
+      extend Memoist
+
+      def main
+        Main
+      end
+      memoize :main
+
+      def gem
+        Gem
+      end
+      memoize :gem
     end
   end
 end
-
-require_relative "autoloaders/gem"

data/lib/jets/aws_services/aws_helpers.rb

@@ -0,0 +1,17 @@
+module Jets::AwsServices
+  module AwsHelpers # :nodoc:
+    include Jets::AwsServices
+
+    def find_stack(stack_name)
+      resp = cfn.describe_stacks(stack_name: stack_name)
+      resp.stacks.first
+    rescue Aws::CloudFormation::Errors::ValidationError => e
+      # example: Stack with id demo-dev does not exist
+      if e.message =~ /Stack with/ && e.message =~ /does not exist/
+        nil
+      else
+        raise
+      end
+    end
+  end
+end

data/lib/jets/{aws_info.rb → aws_services/aws_info.rb}

@@ -1,21 +1,24 @@
-
-module Jets
+module Jets::AwsServices
   class AwsInfo
     extend Memoist
-    include AwsServices
+    include Jets::AwsServices
 
     def region
-      return 'us-east-1' if Jets.env.test?
+      return "us-east-1" if Jets.env.test?
 
-      return ENV['JETS_AWS_REGION'] if ENV['JETS_AWS_REGION'] # highest precedence
-      return ENV['AWS_REGION'] if ENV['AWS_REGION']
+      return ENV["JETS_AWS_REGION"] if ENV["JETS_AWS_REGION"] # highest precedence
+      return ENV["AWS_REGION"] if ENV["AWS_REGION"]
 
       region = nil
 
       # First if aws binary is available
       # try to get it from the ~/.aws/config
-      if which('aws')
-        region = `aws configure get region 2>&1`.strip rescue nil
+      if which("aws")
+        region = begin
+          `aws configure get region 2>&1`.strip
+        rescue
+          nil
+        end
         exit_code = $?.exitstatus
         if exit_code != 0
           exception_message = region.split("\n").grep(/botocore\.exceptions/).first
@@ -28,7 +31,7 @@ module Jets
           puts "You can also get rid of this message by setting AWS_REGION or configuring ~/.aws/config with the region"
           region = nil
         end
-        region = nil if region == ''
+        region = nil if region == ""
         return region if region
       end
 
@@ -37,22 +40,26 @@ module Jets
       begin
         az = `curl -s --max-time 3 --connect-timeout 5 http://169.254.169.254/latest/meta-data/placement/availability-zone`
         region = az.strip.chop # remove last char
-        region = nil if region == ''
+        region = nil if region == ""
       rescue
       end
       return region if region
 
-      'us-east-1' # default if all else fails
+      "us-east-1" # default if all else fails
     end
     memoize :region
 
+    def jets_info
+      Jets::Core::Config::Info.instance
+    end
+
     # aws sts get-caller-identity
     def account
-      return '123456789' if Jets.env.test?
-      return ENV['JETS_AWS_ACCOUNT'] if ENV['JETS_AWS_ACCOUNT']
+      return "123456789" if Jets.env.test?
+      return jets_info.aws_account if jets_info.respond_to?(:aws_account)
 
       # ensure region set, required for sts.get_caller_identity.account to work
-      ENV['AWS_REGION'] ||= region
+      ENV["AWS_REGION"] ||= region
       begin
         sts.get_caller_identity.account
       rescue Aws::Errors::MissingCredentialsError, Aws::Errors::NoSuchEndpointError, Aws::STS::Errors::InvalidClientTokenId
@@ -98,14 +105,14 @@ module Jets
     #
     # source: https://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
     def which(cmd)
-      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+      ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
         exts.each { |ext|
           exe = File.join(path, "#{cmd}#{ext}")
           return exe if File.executable?(exe) && !File.directory?(exe)
         }
       end
-      return nil
+      nil
     end
   end
 end

data/lib/jets/aws_services/global_memoist.rb

@@ -21,15 +21,20 @@
 #
 module Jets::AwsServices
   module GlobalMemoist
+    def reset_cache!
+      $__memo_methods = {}
+    end
+    extend self
+
     def self.included(klass)
       klass.extend(Macros)
     end
 
     module Macros
       def global_memoize(*methods)
-        const_defined?(:"GlobalMemoist#{self.object_id}") ?
-          const_get(:"GlobalMemoist#{self.object_id}") : const_set(:"GlobalMemoist#{self.object_id}", Module.new)
-        mod = const_get(:"GlobalMemoist#{self.object_id}")
+        const_defined?(:"GlobalMemoist#{object_id}") ?
+          const_get(:"GlobalMemoist#{object_id}") : const_set(:"GlobalMemoist#{object_id}", Module.new)
+        mod = const_get(:"GlobalMemoist#{object_id}")
 
         mod.class_eval do
           methods.each do |method|
@@ -54,4 +59,4 @@ module Jets::AwsServices
       end
     end
   end
-end
+end

data/lib/jets/aws_services/s3_bucket.rb

@@ -19,16 +19,14 @@ module Jets::AwsServices
     end
 
     def exists?
-      begin
-        s3.head_bucket(bucket: @name)
-        true
-      rescue Aws::S3::Errors::BucketAlreadyOwnedByYou, Aws::S3::Errors::Http301Error => e
-        # These exceptions indicate bucket already exists
-        # Aws::S3::Errors::Http301Error could be inaccurate but compromising for simplicity
-        true
-      rescue
-        false
-      end
+      s3.head_bucket(bucket: @name)
+      true
+    rescue Aws::S3::Errors::BucketAlreadyOwnedByYou, Aws::S3::Errors::Http301Error => e
+      # These exceptions indicate bucket already exists
+      # Aws::S3::Errors::Http301Error could be inaccurate but compromising for simplicity
+      true
+    rescue
+      false
     end
   end
 end

data/lib/jets/aws_services/stack_status.rb

@@ -4,7 +4,7 @@ module Jets::AwsServices
     @@stack_exists_cache = [] # helps with CloudFormation rate limit
     def stack_exists?(stack_name)
       return false if Jets.env.test?
-      return true if ENV['JETS_NO_INTERNET']
+      return true if ENV["JETS_NO_INTERNET"]
       return true if @@stack_exists_cache.include?(stack_name)
 
       exist = nil
@@ -15,13 +15,13 @@ module Jets::AwsServices
         @@stack_exists_cache << stack_name
         exist = true
       rescue Aws::CloudFormation::Errors::ValidationError => e
-        if e.message =~ /does not exist/
+        if /does not exist/.match?(e.message)
           exist = false
         elsif e.message.include?("'stackName' failed to satisfy constraint")
           # Example of e.message when describe_stack with invalid stack name
           # "1 validation error detected: Value 'instance_and_route53' at 'stackName' failed to satisfy constraint: Member must satisfy regular expression pattern: [a-zA-Z][-a-zA-Z0-9]*|arn:[-a-zA-Z0-9:/._+]*"
-          puts "Invalid stack name: #{stack_name}"
-          puts "Full error message: #{e.message}"
+          log.info "Invalid stack name: #{stack_name}"
+          log.info "Full error message: #{e.message}"
           exit 1
         else
           raise # re-raise exception  because unsure what other errors can happen
@@ -30,33 +30,7 @@ module Jets::AwsServices
       exist
     end
 
-    # All CloudFormation states listed here: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html
-    #
-    # Returns resp so we can use it to grab data about the stack without calling api again.
-    def stack_in_progress?(stack_name)
-      return true if !stack_exists?(stack_name)
-
-      # Assumes stack exists
-      resp = cfn.describe_stacks(stack_name: stack_name)
-      status = resp.stacks[0].stack_status
-      if status =~ /_IN_PROGRESS$/
-        puts "The '#{stack_name}' stack status is #{status}. " \
-             "Please wait until the stack is ready and try again.".color(:red)
-        exit 0
-      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. " \
-        "You can delete the CloudFormation stack or use the `jets delete` command"
-        exit 0
-      else
-        true
-      end
-    end
-
-    # Lookup output value.
-    # Used in Jets::Cfn::Resource::ApiGateway::RestApi::* andJets::Commands::Url
-    def lookup(outputs, key)
+    def output_value(outputs, key)
       out = outputs.find { |o| o.output_key == key }
       out&.output_value
     end

data/lib/jets/aws_services.rb

@@ -1,13 +1,15 @@
 require "aws-sdk-apigateway"
 require "aws-sdk-cloudformation"
 require "aws-sdk-cloudwatchlogs"
+require "aws-sdk-codebuild"
 require "aws-sdk-dynamodb"
 require "aws-sdk-lambda"
 require "aws-sdk-s3"
-require "aws-sdk-sts"
-# Not used in Jets internally but convenient for shared resources
 require "aws-sdk-sns"
 require "aws-sdk-sqs"
+require "aws-sdk-ssm"
+require "aws-sdk-sts"
+require "aws-sdk-wafv2"
 
 require "aws_mfa_secure/ext/aws" # add MFA support
 
@@ -20,21 +22,27 @@ module Jets::AwsServices
   end
   global_memoize :apigateway
 
+  def lambda_client
+    Aws::Lambda::Client.new(aws_options)
+  end
+  global_memoize :lambda_client
+  alias_method :aws_lambda, :lambda_client
+
   def cfn
     Aws::CloudFormation::Client.new(aws_options)
   end
   global_memoize :cfn
 
+  def codebuild
+    Aws::CodeBuild::Client.new(aws_options)
+  end
+  global_memoize :codebuild
+
   def dynamodb
     Aws::DynamoDB::Client.new(aws_options)
   end
   global_memoize :dynamodb
 
-  def aws_lambda
-    Aws::Lambda::Client.new(aws_options)
-  end
-  global_memoize :aws_lambda
-
   def logs
     Aws::CloudWatchLogs::Client.new(aws_options)
   end
@@ -55,16 +63,26 @@ module Jets::AwsServices
   end
   global_memoize :sns
 
-  def sqs
-    Aws::SQS::Client.new(aws_options)
+  def ssm
+    Aws::SSM::Client.new(aws_options)
   end
-  global_memoize :sqs
+  global_memoize :ssm
 
   def sts
     Aws::STS::Client.new(aws_options)
   end
   global_memoize :sts
 
+  def sqs
+    Aws::SQS::Client.new(aws_options)
+  end
+  global_memoize :sqs
+
+  def wafv2
+    Aws::WAFV2::Client.new(aws_options)
+  end
+  global_memoize :wafv2
+
   # Override the AWS retry settings with Jets AWS clients.
   #
   # The aws-sdk-core has exponential backup with this formula:
@@ -85,19 +103,20 @@ module Jets::AwsServices
     options = {
       retry_limit: 7, # default: 3
       retry_base_delay: 0.6, # default: 0.3
+      log_level: :info
     }
     # See debug logger. Noisy.
     # Example:
     #     D, [2022-12-02T13:18:55.298788 #26182] DEBUG -- : [Aws::APIGateway::Client 200 0.030837 0 retries] get_method(rest_api_id:"mke40eh6l0",resource_id:"zf8w2m",http_method:"GET")
-    options.merge!(
-      log_level: :debug,
-      logger: Logger.new($stdout),
-    ) if ENV['JETS_DEBUG_AWS_SDK']
+    if ENV["JETS_DEBUG_AWS_SDK"]
+      options[:log_level] = :debug
+      options[:logger] = Logger.new($stdout)
+    end
     # https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/debugging.html to enable http_wire_trace
     # See the HTTP headers and JSON responses. Super noisy.
-    options.merge!(
-      http_wire_trace: true,
-    ) if ENV['JETS_DEBUG_AWS_SDK_HTTP_WIRE_TRACE']
+    if ENV["JETS_DEBUG_AWS_SDK_HTTP_WIRE_TRACE"]
+      options[:http_wire_trace] = true
+    end
     options
   end
 end

data/lib/jets/bundle.rb

@@ -10,7 +10,7 @@ module Jets
     #
     # Note, this is called super early right before require "zeitwerk"
     # The initially Bundler.setup does not include the Jets.env group.
-    # Later in Jets::Booter, Bundle.require is called and includes the Jets.env group.
+    # Later in Jets::Core::Booter, Bundle.require is called and includes the Jets.env group.
     #
     def setup
       return unless jets_project?
@@ -24,7 +24,7 @@ module Jets
     # Bundler.require called when environment boots up via Jets.boot.  This will eagerly require all gems in the
     # Gemfile. This means the user will not have to explictly require dependencies.
     #
-    # It also useful for when to loading Rake tasks in Jets::Commands::RakeTasks.load! For example, some gems like
+    # It also useful for when to loading Rake tasks in Jets::Thor::RakeTasks.load! For example, some gems like
     # webpacker that load rake tasks are specified with a git based source:
     #
     #   gem "webpacker", git: "https://github.com/tongueroo/webpacker.git"
@@ -34,7 +34,7 @@ module Jets
     # user. So the rake tasks show up when calling jets help.
     #
     # When the user calls jets help from outside the project folder, bundler is not used and the load errors get
-    # rescued gracefully.  This is done in Jets::Commands::RakeTasks.load!  In the case when user is in another
+    # rescued gracefully.  This is done in Jets::Thor::RakeTasks.load!  In the case when user is in another
     # project with another Gemfile, the load errors will also be rescued.
     def require
       return unless jets_project?
@@ -52,20 +52,22 @@ module Jets
         There may be something funny with your ruby and bundler setup.
         You can try upgrading bundler and rubygems:
 
+            gem install --default bundler
             gem update --system
-            gem install bundler
+            bundle update --bundler
 
         Here are some links that may be helpful:
 
         * https://bundler.io/blog/2019/01/03/announcing-bundler-2.html
-        * https://community.rubyonjets.com/t/jets-1-9-8-install-issue-bundler-setup-missing/185/2
+        * https://community.boltops.com/t/jets-1-9-8-issue-cannot-load-such-file-bundler-setup-loaderror/185/2
+        * https://community.boltops.com/t/could-not-find-timeout-0-3-1-in-any-of-the-sources/996
 
         Also, running bundle exec in front of your command may remove this message.
       EOL
     end
 
     def gemfile?
-      ENV['BUNDLE_GEMFILE'] || File.exist?("Gemfile")
+      ENV["BUNDLE_GEMFILE"] || File.exist?("Gemfile")
     end
 
     def bundler_groups
@@ -73,7 +75,7 @@ module Jets
     end
 
     def jets_project?
-      File.exist?("config/application.rb")
+      File.exist?("config/jets")
     end
 
     extend self

data/lib/jets/cfn/base.rb

@@ -6,11 +6,12 @@
 #   attributes
 #
 # These are computed methods that derive their values from the resource definition itself.
-# Overriding these methods will remove the computed logical which handles things
+# Overriding these methods will remove the computed logic which handles things
 # like camelizing and replacements.
 module Jets::Cfn
   class Base
     extend Memoist
+    include Jets::Util::Logging
     include Jets::Util::Camelize
 
     # interface method
@@ -61,13 +62,23 @@ module Jets::Cfn
       {}
     end
 
-    def permission
-      Resource::Lambda::Permission.new(replacements, self)
+    def normalize_tags(tags)
+      if tags.is_a?(Hash)
+        tags.map do |k, v|
+          {Key: k.to_s, Value: v.to_s}
+        end
+      else # Array passthrough
+        tags
+      end
+    end
+
+    # interface method
+    def config
+      Jets.bootstrap.config
     end
-    memoize :permission
 
     class << self
-      def truncate_id(id, postfix = '')
+      def truncate_id(id, postfix = "")
         # Api Gateway resource name has a limit of 64 characters.
         # Yet it throws not found when ID is longer than 62 characters and I don't know why.
         # To keep it safe, let's stick to the 62 characters limit.

data/lib/jets/cfn/bootstrap.rb

@@ -0,0 +1,13 @@
+module Jets::Cfn
+  class Bootstrap
+    def initialize(options = {})
+      @options = options.merge(bootstrap: true)
+    end
+
+    def run
+      Builder::Parent::Genesis.new(@options).build
+      success = Deploy.new(@options).sync # returns true if success
+      abort("Bootstrap deploy failed") unless success
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 #   * compose
 #   * template_path
 #
-class Jets::Cfn::Builder
+module Jets::Cfn::Builder
   module Interface
     extend Memoist
     include Jets::Util::Camelize
@@ -46,39 +46,29 @@ class Jets::Cfn::Builder
     end
 
     def add_parameters(attributes)
-      attributes.each do |name,value|
+      attributes.each do |name, value|
         add_parameter(name.camelize.to_sym, Description: value)
       end
     end
 
-    def add_parameter(name, options={})
-      defaults = { Type: "String" }
+    def add_parameter(name, options = {})
+      defaults = {Type: "String"}
       options = defaults.merge(options)
       @template[:Parameters] ||= {}
       @template[:Parameters][name.camelize.to_sym] = camelize(options)
     end
 
     def add_outputs(attributes)
-      attributes.each do |name,value|
+      attributes.each do |name, value|
         add_output(name.camelize.to_sym, Value: value)
       end
     end
 
-    def add_output(name, options={})
+    def add_output(name, options = {})
       @template[:Outputs] ||= {}
       @template[:Outputs][name.camelize.to_sym] = camelize(options)
     end
 
-    def add_resources
-      @app_class.definitions.each do |definition|
-        definition.associated_resources.each do |associated|
-          resource = Jets::Cfn::Resource.new(associated.definition, definition.replacements)
-          add_resource(resource)
-          add_resource(resource.permission)
-        end
-      end
-    end
-
     # Note: Jets::Cfn::Resource::Iam classes are special treated.
     # They are only a few resources that result in creating 2 CloudFormation resources.
     # Cfn::Builder::Api::Methods also creates a method, permission, and possible cors resource.
@@ -94,15 +84,11 @@ class Jets::Cfn::Builder
     #
     #    iam_policy("s3", "sns")
     #
-    # and be none-the-wiser about the special behavior.
+    # and are 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::Cfn::Resource::Iam")
-        role = resource # for clarity: resource is a Iam::*Role class
-        iam_policy = Jets::Cfn::Resource::Iam::Policy.new(role)
-        add_template_resource(iam_policy.logical_id, iam_policy.type, iam_policy.attributes)
-      end
+      add_outputs(resource.outputs)
     end
 
     # The add_resource method can take an options Hash with both with either
@@ -131,16 +117,21 @@ class Jets::Cfn::Builder
       options = camelize(options)
 
       attributes = if options.include?(:Type)
-                     base = { Type: type }
-                     base.merge(options) # options are top-level attributes
-                   else
-                     {
-                       Type: type,
-                       Properties: options # options are properties
-                     }
-                   end
+        base = {Type: type}
+        base.merge(options) # options are top-level attributes
+      else
+        {
+          Type: type,
+          Properties: options # options are properties
+        }
+      end
 
       @template[:Resources][logical_id] = attributes
     end
+
+    # interface method
+    def config
+      Jets.bootstrap.config
+    end
   end
 end