jets 4.0.17 → 5.0.0.beta1

data/lib/jets/{resource/child_stack → cfn/resource/nested}/app_class.rb

@@ -1,29 +1,23 @@
-# Implements:
-#
-#   definition
-#   template_filename
-#
-module Jets::Resource::ChildStack
+module Jets::Cfn::Resource::Nested
   class AppClass < Base
-    include CommonParameters
-
-    def initialize(s3_bucket, options={})
+    def initialize(options={})
       super
       @path = options[:path]
     end
 
+    # interface method
     def definition
       logical_id = app_logical_id
       defintion = {
         logical_id => {
-          type: "AWS::CloudFormation::Stack",
-          properties: {
-            template_url: template_url,
-            parameters: parameters,
+          Type: "AWS::CloudFormation::Stack",
+          Properties: {
+            TemplateURL: template_url,
+            Parameters: parameters,
           }
         }
       }
-      defintion[logical_id][:depends_on] = depends.stack_list if depends
+      defintion[logical_id][:DependsOn] = depends.stack_list if depends
       defintion
     end
 
@@ -54,48 +48,31 @@ module Jets::Resource::ChildStack
     end
 
     def parameters
-      params = self.class.common_parameters
+      params = Jets::Cfn::Params::Common.parameters
       params.merge!(controller_params) if controller?
       params.merge!(depends.params) if depends
       params
     end
 
-    def self.common_parameters
-      parameters = {
-        IamRole: "!GetAtt IamRole.Arn",
-        S3Bucket: "!Ref S3Bucket",
-      }
-      parameters[:GemLayer] = "!Ref GemLayer" unless Jets.poly_only?
-      parameters
-    end
-
     def controller_params
-      return {} if Jets::Router.routes.empty?
+      return {} if Jets::Router.no_routes?
 
       params = {
         RestApi: "!GetAtt ApiGateway.Outputs.RestApi",
       }
 
       template_path = @path
-      template = Jets::Cfn::BuiltTemplate.get(template_path)
-      template['Parameters'].each do |p,data|
+      template = Jets::Cfn::Template.load_file(template_path)
+      template[:Parameters].each do |p,data|
         case p
-        when /Resource$/ # AWS::ApiGateway::Resource in api-resources templates. IE: demo-dev-api-resources-2.yml
-          params[p] = "!GetAtt #{api_resource_page(p)}.Outputs.#{p}"
         when /Authorizer$/ # AWS::ApiGateway::Authorizer in authorizers templates. IE: demo-dev-authorizers.yml
           # Description contains metadata to get the Authorizer logical id
-          params[p] = "!GetAtt #{authorizer_output(data["Description"])}"
-        when 'RootResourceId'
-          params[p] = "!GetAtt ApiGateway.Outputs.RootResourceId"
+          params[p] = "!GetAtt #{authorizer_output(data[:Description])}"
         end
       end
       params
     end
 
-    def api_resource_page(parameter)
-      ApiResource::Page.logical_id(parameter)
-    end
-
     def authorizer_output(desc)
       authorizer_stack, authorizer_logical_id = desc.split('.')
       # IE: MainAuthorizer.Outputs.ProtectAuthorizer
@@ -118,14 +95,8 @@ module Jets::Resource::ChildStack
       @path.include?('_job.yml')
     end
 
-    def scoped_routes
-      @routes ||= Jets::Router.routes.select do |route|
-        route.controller_name == current_app_class.to_s
-      end
-    end
-
     def current_app_class
-      templates_prefix = "#{Jets::Names.template_path_prefix}-app-"
+      templates_prefix = "#{Jets::Names.templates_folder}/app-"
       @path.sub(templates_prefix, '')
         .sub(/\.yml$/,'')
         .gsub('-','/')
@@ -137,13 +108,9 @@ module Jets::Resource::ChildStack
     #   /tmp/jets/demo/templates/demo-dev-2-posts_controller.yml to
     #   PostsController
     def app_logical_id
-      regexp = Regexp.new(".*#{Jets.config.project_namespace}-app-")
+      regexp = Regexp.new(".*#{Jets::Names.templates_folder}/app-")
       controller_name = @path.sub(regexp, '').sub('.yml', '')
       controller_name.underscore.camelize
     end
-
-    def template_filename
-      @path
-    end
   end
 end

data/lib/jets/{resource/child_stack → cfn/resource/nested}/authorizer.rb

@@ -1,8 +1,6 @@
-module Jets::Resource::ChildStack
+module Jets::Cfn::Resource::Nested
   class Authorizer < Base
-    include CommonParameters
-
-    def initialize(s3_bucket, options={})
+    def initialize(options={})
       super
       @path = options[:path]
     end
@@ -11,30 +9,26 @@ module Jets::Resource::ChildStack
       logical_id = authorizer_logical_id
       {
         logical_id => {
-          type: "AWS::CloudFormation::Stack",
-          properties: {
-            template_url: template_url,
-            parameters: parameters,
+          Type: "AWS::CloudFormation::Stack",
+          Properties: {
+            TemplateURL: template_url,
+            Parameters: parameters,
           }
         }
       }
     end
 
     def parameters
-      params = common_parameters
+      params = Jets::Cfn::Params::Common.parameters
       params[:RestApi] = "!GetAtt ApiGateway.Outputs.RestApi"
       params
     end
 
     # map the path to a camelized logical_id. IE: ProtectAuthorizer
     def authorizer_logical_id
-      regexp = Regexp.new(".*#{Jets.config.project_namespace}-authorizers-")
+      regexp = Regexp.new("#{Jets::Names.templates_folder}/authorizers-")
       authorizer_name = @path.sub(regexp, '').sub('.yml', '')
       authorizer_name.underscore.camelize
     end
-
-    def template_filename
-      @path
-    end
   end
 end

data/lib/jets/cfn/resource/nested/base.rb

@@ -0,0 +1,38 @@
+# Inheriting classes should implement:
+#
+#   definition
+#   template_filename
+#
+module Jets::Cfn::Resource::Nested
+  class Base < Jets::Cfn::Base
+    def initialize(options={})
+      @options = options # not used yet
+    end
+
+    def outputs
+      {
+        logical_id => "!Ref #{logical_id}",
+      }
+    end
+
+    def template_url
+      checksum = Jets::Builders::Md5.checksums["stage/code"]
+      "https://s3.amazonaws.com/#{Jets.s3_bucket}/jets/cfn-templates/shas/#{checksum}/#{template_filename}"
+    end
+
+    # Examples:
+    #   api-gateway.yml
+    #   api-resources-1.yml
+    #   api-methods-1.yml
+    #   app-posts_controller.yml
+    #   shared-custom.yml
+    def template_filename
+      filename = if @path # AppClass, Authorizer, Shared
+        @path.sub("#{Jets::Names.templates_folder}/", '').gsub('/','-').sub('.yml', '')
+      else
+          self.class.name.to_s.sub(/.*Nested::/,'').underscore.gsub('/','-').dasherize
+        end
+      [filename, @page_number].compact.join('-') + '.yml'
+    end
+  end
+end

data/lib/jets/cfn/resource/nested/one_controller.rb

@@ -0,0 +1,48 @@
+module Jets::Cfn::Resource::Nested
+  class OneController < Base
+    # interface method
+    def definition
+      defintion = {
+        JetsController: {
+          Type: "AWS::CloudFormation::Stack",
+          Properties: {
+            TemplateURL: template_url,
+            Parameters: parameters,
+          }
+        }
+      }
+      defintion
+    end
+
+    # override
+    def template_filename
+      "jets-controller.yml"
+    end
+
+    def parameters
+      params = Jets::Cfn::Params::Common.parameters
+      params.merge!(controller_params)
+      params
+    end
+
+    def controller_params
+      if Jets::Router.no_routes?
+        {}
+      else
+        {
+          RestApi: "!GetAtt ApiGateway.Outputs.RestApi",
+        }
+      end
+    end
+
+    def authorizer_output(desc)
+      authorizer_stack, authorizer_logical_id = desc.split('.')
+      # IE: MainAuthorizer.Outputs.ProtectAuthorizer
+      "#{authorizer_stack}.Outputs.#{authorizer_logical_id}"
+    end
+
+    def outputs
+      {}
+    end
+  end
+end

data/lib/jets/{resource/child_stack → cfn/resource/nested}/shared.rb

@@ -3,11 +3,9 @@
 #   definition
 #   template_filename
 #
-module Jets::Resource::ChildStack
+module Jets::Cfn::Resource::Nested
   class Shared < AppClass
-    include CommonParameters
-
-    def initialize(s3_bucket, options={})
+    def initialize(options={})
       super
       @path = options[:path]
     end
@@ -16,25 +14,25 @@ module Jets::Resource::ChildStack
       logical_id = shared_logical_id
       definition = {
         logical_id => {
-          type: "AWS::CloudFormation::Stack",
-          properties: child_properties
+          Type: "AWS::CloudFormation::Stack",
+          Properties: child_properties
         }
       }
-      definition[logical_id][:depends_on] = depends_on if depends_on
+      definition[logical_id][:DependsOn] = depends_on if depends_on
       definition
     end
 
     def child_properties
       props = {
-        template_url: template_url,
+        TemplateURL: template_url,
       }
 
-      props[:parameters] = common_parameters # common child parameters
+      props[:Parameters] = Jets::Cfn::Params::Common.parameters # common child parameters
       # add depends on parameters
       depends_on.each do |dependency|
         dependency_outputs(dependency).each do |output|
           dependency_class = dependency.to_s.camelize
-          props[:parameters][output] = "!GetAtt #{dependency_class}.Outputs.#{output}"
+          props[:Parameters][output] = "!GetAtt #{dependency_class}.Outputs.#{output}"
         end
       end if depends_on
 
@@ -55,7 +53,7 @@ module Jets::Resource::ChildStack
     #   /tmp/jets/demo/templates/demo-dev-2-shared-resources.yml to
     #   PostsController
     def shared_logical_id
-      regexp = Regexp.new(".*#{Jets.config.project_namespace}-shared-") # remove the shared
+      regexp = Regexp.new(".*#{Jets::Names.templates_folder}/shared-") # remove the shared
       shared_name = @path.sub(regexp, '').sub('.yml', '')
       shared_name.underscore.camelize
     end
@@ -63,7 +61,7 @@ module Jets::Resource::ChildStack
     # IE: app/resource.rb => Resource
     # Returns Resource class object in the example
     def current_shared_class
-      templates_prefix = "#{Jets::Names.template_path_prefix}-shared-"
+      templates_prefix = "#{Jets::Names.templates_folder}/shared-"
       @path.sub(templates_prefix, '')
         .sub(/\.yml$/,'')
         .gsub('-','/')
@@ -77,9 +75,5 @@ module Jets::Resource::ChildStack
     def resources?
       current_shared_class.build?
     end
-
-    def template_filename
-      "#{Jets.config.project_namespace}-shared-#{current_shared_class.to_s.underscore}.yml"
-    end
   end
 end

data/lib/jets/cfn/resource/one/function.rb

@@ -0,0 +1,66 @@
+module Jets::Cfn::Resource::One
+  class Function < Jets::Cfn::Resource::Lambda::Function
+    include Jets::Cfn::Resource::Lambda::Function::Environment
+
+    # override to use the same function name for all controllers
+    def initialize
+    end
+
+    # override
+    def function_logical_id
+      "JetsControllerLambdaFunction"
+    end
+
+    # override
+    def combined_properties
+      props = env_properties
+        .deep_merge(global_properties)
+        .deep_merge(application_controller_properties)
+      finalize_properties!(props)
+    end
+
+    def application_controller_properties
+      klass = ApplicationController
+      return {} unless klass.build_class_iam?
+
+      class_properties = lookup_class_properties(klass)
+      iam_policy = Jets::Cfn::Resource::Iam::ClassRole.new(klass)
+      class_properties[:Role] = "!GetAtt #{iam_policy.logical_id}.Arn"
+      camelize(class_properties)
+    end
+
+    # Properties managed by Jets merged with finality.
+    def finalize_properties!(props)
+      handler = "handlers/controller.lambda_handler"
+      runtime = get_runtime(props)
+      description = "Jets Lambda function for all controllers"
+      managed = {
+        Handler: handler,
+        Runtime: runtime,
+        Description: description,
+      }
+      managed[:FunctionName] = function_name if function_name
+      layers = get_layers(runtime)
+      managed[:Layers] = layers if layers
+      props.merge!(managed)
+    end
+
+    # override
+    def get_runtime(props)
+      props[:Runtime] || Jets.ruby_runtime
+    end
+
+    # Examples:
+    #   "#{Jets.project_namespace}-sleep_job-perform"
+    #   "demo-dev-sleep_job-perform"
+    def function_name
+      return if ENV['JETS_RESET'] # reset mode, let CloudFormation manage the function name
+      "#{Jets.project_namespace}-controller"
+    end
+
+    # override
+    def replacements
+      {}
+    end
+  end
+end

data/lib/jets/cfn/resource/one/permission.rb

@@ -0,0 +1,17 @@
+module Jets::Cfn::Resource::One
+  class Permission < Jets::Cfn::Base
+    def definition
+      {
+        JetsControllerPermission: {
+          Type: "AWS::Lambda::Permission",
+          Properties: {
+            FunctionName: "!Ref JetsControllerLambdaFunction",
+            Action: "lambda:InvokeFunction",
+            Principal: "apigateway.amazonaws.com",
+            SourceArn: "!Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${RestApi}/*/*",
+          }
+        }
+      }
+    end
+  end
+end

data/lib/jets/{resource → cfn/resource}/replacer.rb

@@ -1,4 +1,4 @@
-class Jets::Resource
+class Jets::Cfn::Resource
   class Replacer
     extend Memoist
 
@@ -52,34 +52,33 @@ class Jets::Resource
       value
     end
 
-    class << self
-      # Examples:
-      #   "AWS::Events::Rule" => "events.amazonaws.com",
-      #   "AWS::Config::ConfigRule" => "config.amazonaws.com",
-      #   "AWS::ApiGateway::Method" => "apigateway.amazonaws.com"
-      def principal_map(type)
-        service = type.split('::')[1].downcase
-        service = special_principal_map(service)
-        "#{service}.amazonaws.com"
-      end
+    # The principal_map related methods are used by Resource::Lambda::Permission
+    # Examples:
+    #   "AWS::Events::Rule" => "events.amazonaws.com",
+    #   "AWS::Config::ConfigRule" => "config.amazonaws.com",
+    #   "AWS::ApiGateway::Method" => "apigateway.amazonaws.com"
+    def principal_map(type)
+      service = type.split('::')[1].downcase
+      service = special_principal_map(service)
+      "#{service}.amazonaws.com"
+    end
 
-      def special_principal_map(service)
-        # special map
-        # s3_event actually uses sns topic events to trigger a Lambda function
-        map = { "s3" => "sns" }
-        map[service] || service
-      end
+    def special_principal_map(service)
+      # special map
+      # s3_event actually uses sns topic events to trigger a Lambda function
+      map = { s3: "sns" }
+      map[service.to_sym] || service
+    end
 
-      # From AWS docs: https://amzn.to/2N0QXQL
-      # source_arn is "not supported by all event sources"
-      #
-      # When it is not available the resource definition should add it.
-      def source_arn_map(type)
-        map = {
-          "AWS::ApiGateway::Method" => "!Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${RestApi}/*/*",
-        }
-        map[type]
-      end
+    # From AWS docs: https://amzn.to/2N0QXQL
+    # source_arn is "not supported by all event sources"
+    #
+    # When it is not available the resource definition should add it.
+    def source_arn_map(type)
+      map = {
+        "AWS::ApiGateway::Method" => "!Sub arn:aws:execute-api:${AWS::Region}:${AWS::AccountId}:${RestApi}/*/*",
+      }
+      map[type.to_s]
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/route53/record_set.rb

@@ -12,42 +12,42 @@
 #       TTL: '900'
 #       ResourceRecords:
 #       - !GetAtt Ec2Instance.PublicIp
-module Jets::Resource::Route53
-  class RecordSet < Jets::Resource::Base
+module Jets::Cfn::Resource::Route53
+  class RecordSet < Jets::Cfn::Base
     def definition
       {
-        dns_record: {
-          type: "AWS::Route53::RecordSet",
-          properties: record_set_properties
+        DnsRecord: {
+          Type: "AWS::Route53::RecordSet",
+          Properties: record_set_properties
         }
       }
     end
 
     def record_set_properties
       base = {
-        comment: "DNS record managed by Jets",
-        name: name,
+        Comment: "DNS record managed by Jets",
+        Name: name,
       }
       hosted_zone_id = Jets.config.domain.hosted_zone_id
       if hosted_zone_id
-        base[:hosted_zone_id] = hosted_zone_id
+        base[:HostedZoneId] = hosted_zone_id
       else
-        base[:hosted_zone_name] = hosted_zone_name
+        base[:HostedZoneName] = hosted_zone_name
       end
 
       if Jets.config.domain.apex
         base.merge(
-          alias_target: {
-            dns_name: cname,
-            hosted_zone_id: domain_name_hosted_zone,
+          AliasTarget: {
+            DNSName: cname,
+            HostedZoneId: domain_name_hosted_zone,
           },
-          type: "A",
+          Type: "A",
         )
       else
         base.merge({
-          type: "CNAME",
-          ttl: "60",
-          resource_records: [cname],
+          Type: "CNAME",
+          TTL: "60",
+          ResourceRecords: [cname],
         })
       end
     end
@@ -69,7 +69,7 @@ module Jets::Resource::Route53
     end
 
     def domain_name
-      Jets::Resource::ApiGateway::DomainName.new
+      Jets::Cfn::Resource::ApiGateway::DomainName.new
     end
     memoize :domain_name
 
@@ -91,7 +91,7 @@ module Jets::Resource::Route53
 
     def outputs
       {
-        "DnsRecord" => "!Ref DnsRecord",
+        DnsRecord: "!Ref DnsRecord",
       }
     end
   end

data/lib/jets/{resource → cfn/resource}/s3/bucket.rb

@@ -1,5 +1,5 @@
-module Jets::Resource::S3
-  class Bucket < Jets::Resource::Base
+module Jets::Cfn::Resource::S3
+  class Bucket < Jets::Cfn::Base
     attr_reader :bucket_logical_id
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
@@ -9,8 +9,8 @@ module Jets::Resource::S3
     def definition
       {
         bucket_logical_id => {
-          type: "AWS::S3::Bucket",
-          properties: @props,
+          Type: "AWS::S3::Bucket",
+          Properties: @props,
         }
       }
     end

data/lib/jets/cfn/resource/s3/jets_bucket.rb

@@ -0,0 +1,68 @@
+module Jets::Cfn::Resource::S3
+  class JetsBucket < Bucket
+    def initialize
+      @bucket_logical_id = "S3Bucket"
+      @props = props
+    end
+
+    def props
+      props = {
+        PublicAccessBlockConfiguration: {
+          BlockPublicAcls: false,
+          # BlockPublicPolicy: false,
+          # IgnorePublicAcls: false,
+          # RestrictPublicBuckets: false
+        },
+        OwnershipControls: {
+          Rules: [{ObjectOwnership: "ObjectWriter"}]
+        },
+        BucketEncryption: {
+          ServerSideEncryptionConfiguration: [
+            ServerSideEncryptionByDefault: {
+              SSEAlgorithm: "AES256"
+            }
+          ]
+        },
+      }
+      props[:CorsConfiguration] = cors_configuration # dont check config.api.cors since javascript_importmap_tags also uses
+      props
+    end
+
+    def cors_configuration
+      Jets.config.api.s3_cors_configuration || {
+        CorsRules: [{
+          AllowedHeaders: ["*"],
+          AllowedMethods: ["GET"],
+          AllowedOrigins: ["*"],
+          ExposedHeaders: [],
+        }]
+      }
+    end
+
+    class << self
+      include Jets::AwsServices
+
+      # Usage:
+      #   Jets::Cfn::Resource::S3::JetsBucket.name
+      @@name = nil
+      def name
+        return @@name if @@name
+        return "fake-bucket" if ENV['JETS_BUILD_NO_INTERNET'] || ENV['JETS_TEMPLATES']
+
+        resp = nil
+        begin
+          resp = cfn.describe_stacks(stack_name: Jets::Names.parent_stack_name)
+        rescue Aws::CloudFormation::Errors::ValidationError => e
+          if e.message.include?('does not exist') && ARGV[0] == 'build' # jets build
+            return "no-bucket-yet" # for jets build without s3 bucket yet
+          else
+            raise
+          end
+        end
+
+        output = resp.stacks[0].outputs.find {|o| o.output_key == 'S3Bucket'}
+        @@name = output.output_value # cache only once found
+      end
+    end
+  end
+end

data/lib/jets/{resource → cfn/resource}/sns/subscription.rb

@@ -1,6 +1,6 @@
 # CloudFormation SNS Subscription docs: https://amzn.to/2SJtN3C
-module Jets::Resource::Sns
-  class Subscription < Jets::Resource::Base
+module Jets::Cfn::Resource::Sns
+  class Subscription < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,22 +8,22 @@ module Jets::Resource::Sns
     def definition
       {
         subscription_logical_id => {
-          type: "AWS::SNS::Subscription",
-          properties: merged_properties,
+          Type: "AWS::SNS::Subscription",
+          Properties: merged_properties,
         }
       }
     end
 
-    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    # Do not name this method properties, that is a computed method of `Jets::Cfn::Resource`
     def merged_properties
       {
-        endpoint: "!GetAtt {namespace}LambdaFunction.Arn",
-        protocol: "lambda",
+        Endpoint: "!GetAtt {namespace}LambdaFunction.Arn",
+        Protocol: "lambda",
       }.deep_merge(@props)
     end
 
     def subscription_logical_id
-      "{namespace}_sns_subscription"
+      "{namespace}SnsSubscription"
     end
   end
 end