jets 1.9.18 → 1.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571d8c17d9ca179f5d8ca50a0a7e236852c1cfa9bc53704b74f28d6056a24606
-  data.tar.gz: f06f81427e21b1085be5bd2e82399426d57a2a2bb6b7e7f8ca9c29f753e4853e
+  metadata.gz: '06684dfe45f0cb90c0809eb24f3bcb36f8dfbd4c5e1c69fcf46eb86c140325a4'
+  data.tar.gz: 8e5a0ff622207135ae9013d6ab300db68bb3ffbbaa368641e248937992c6e932
 SHA512:
-  metadata.gz: aca85c2ec33d54d03a3ed0fcd670c47f7880a79f093711022c1d843ff4515089c5b9b8074c4e24a194784d07abda4b7e5763fb6b636e627d56278413ddc1d526
-  data.tar.gz: d00d6b66ba32ea8b65ac908c65ea7545e50bb87c1dbde705c2e492f0a9fef3aac39ab9aa10f1c1759fb77f4992b02c4b44e411f4759546293931152c061585b6
+  metadata.gz: dd974cacee0866e00091a817ba4e7e2b476674ff096e8b3139da5b35fcf24fa237a69ee77d9ac981b2582bca135042137eee3ab37449e788b6937ea43ef2e11e
+  data.tar.gz: 82ffb01f43d6261220c96d329a7a26ddc1439c27c341460dc8d2de32c4b59f8507aa6a6c7291f1ed4a5439782546f5bdea7442b5906cb3d9d415b2a54b838c6a

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/).
 
+## [1.9.19]
+- #295 dotenv env extra support, fix precedence again
+- #296 automatically add vpc permissions when using vpc_config at the application-wide iam level
+
 ## [1.9.18]
 - #233 SSM Parameter Store support for dotenv files
 - #293 Improvements to SSM Parameter Store support

data/lib/jets/application.rb

@@ -5,7 +5,7 @@ class Jets::Application
   include Singleton
   extend Memoist
   include Jets::Middleware
-  include DefaultConfig
+  include Defaults
 
   def configure(&block)
     instance_eval(&block) if block
@@ -108,33 +108,6 @@ class Jets::Application
     loader.setup
   end
 
-  # Essentially folders under app folder will be the default_autoload_paths. Example:
-  #   app/controllers
-  #   app/helpers
-  #   app/jobs
-  #   app/models
-  #   app/rules
-  #   app/shared/resources
-  #
-  # Also include:
-  #   app/models/concerns
-  #   app/controllers/concerns
-  def default_autoload_paths
-    paths = []
-    each_app_autoload_path("#{Jets.root}/app/*") do |path|
-      paths << path
-    end
-    # Handle concerns folders
-    each_app_autoload_path("#{Jets.root}/app/**/concerns") do |path|
-      paths << path
-    end
-
-    paths << "#{Jets.root}/app/shared/resources"
-    paths << "#{Jets.root}/app/shared/extensions"
-
-    paths
-  end
-
   def each_app_autoload_path(expression)
     Dir.glob(expression).each do |p|
       p.sub!('./','')
@@ -189,37 +162,6 @@ class Jets::Application
     config.managed_policy_definitions ||= [] # default empty
   end
 
-  def self.default_iam_policy
-    project_namespace = Jets.project_namespace
-    logs = {
-      action: ["logs:*"],
-      effect: "Allow",
-      resource: "arn:aws:logs:#{Jets.aws.region}:#{Jets.aws.account}:log-group:/aws/lambda/#{project_namespace}-*",
-    }
-    s3_bucket = Jets.aws.s3_bucket
-    s3_readonly = {
-      action: ["s3:Get*", "s3:List*"],
-      effect: "Allow",
-      resource: "arn:aws:s3:::#{s3_bucket}*",
-    }
-    s3_bucket = {
-      action: ["s3:ListAllMyBuckets", "s3:HeadBucket"],
-      effect: "Allow",
-      resource: "arn:aws:s3:::*", # scoped to all buckets
-    }
-    policies = [logs, s3_readonly, s3_bucket]
-
-    if Jets::Stack.has_resources?
-      cloudformation = {
-        action: ["cloudformation:DescribeStacks"],
-        effect: "Allow",
-        resource: "arn:aws:cloudformation:#{Jets.aws.region}:#{Jets.aws.account}:stack/#{project_namespace}*",
-      }
-      policies << cloudformation
-    end
-    policies
-  end
-
   # It is pretty easy to attempt to set environment variables without
   # the correct AWS Environment.Variables path struture.
   # Auto-fix it for convenience.

data/lib/jets/application/{default_config.rb → defaults.rb}

@@ -1,5 +1,53 @@
 class Jets::Application
-  module DefaultConfig
+  module Defaults
+    extend ActiveSupport::Concern
+
+    included do
+      def self.default_iam_policy
+        project_namespace = Jets.project_namespace
+        logs = {
+          action: ["logs:*"],
+          effect: "Allow",
+          resource: "arn:aws:logs:#{Jets.aws.region}:#{Jets.aws.account}:log-group:/aws/lambda/#{project_namespace}-*",
+        }
+        s3_bucket = Jets.aws.s3_bucket
+        s3_readonly = {
+          action: ["s3:Get*", "s3:List*"],
+          effect: "Allow",
+          resource: "arn:aws:s3:::#{s3_bucket}*",
+        }
+        s3_bucket = {
+          action: ["s3:ListAllMyBuckets", "s3:HeadBucket"],
+          effect: "Allow",
+          resource: "arn:aws:s3:::*", # scoped to all buckets
+        }
+        policies = [logs, s3_readonly, s3_bucket]
+
+        if Jets::Stack.has_resources?
+          cloudformation = {
+            action: ["cloudformation:DescribeStacks"],
+            effect: "Allow",
+            resource: "arn:aws:cloudformation:#{Jets.aws.region}:#{Jets.aws.account}:stack/#{project_namespace}*",
+          }
+          policies << cloudformation
+        end
+
+        if Jets.config.function.vpc_config
+          vpc = %w[
+            ec2:CreateNetworkInterface
+            ec2:DeleteNetworkInterface
+            ec2:DescribeNetworkInterfaces
+            ec2:DescribeVpcs
+            ec2:DescribeSubnets
+            ec2:DescribeSecurityGroups
+          ]
+          policies += vpc
+        end
+
+        policies
+      end
+    end
+
     def default_config
       config = ActiveSupport::OrderedOptions.new
       config.project_name = parse_project_name # must set early because other configs requires this
@@ -91,5 +139,32 @@ class Jets::Application
 
       config
     end
+
+    # Essentially folders under app folder will be the default_autoload_paths. Example:
+    #   app/controllers
+    #   app/helpers
+    #   app/jobs
+    #   app/models
+    #   app/rules
+    #   app/shared/resources
+    #
+    # Also include:
+    #   app/models/concerns
+    #   app/controllers/concerns
+    def default_autoload_paths
+      paths = []
+      each_app_autoload_path("#{Jets.root}/app/*") do |path|
+        paths << path
+      end
+      # Handle concerns folders
+      each_app_autoload_path("#{Jets.root}/app/**/concerns") do |path|
+        paths << path
+      end
+
+      paths << "#{Jets.root}/app/shared/resources"
+      paths << "#{Jets.root}/app/shared/extensions"
+
+      paths
+    end
   end
 end

data/lib/jets/commands/templates/skeleton/config/application.rb.tt

@@ -32,8 +32,8 @@ Jets.application.configure do
   # More examples:
   # config.function.dead_letter_config = { target_arn: "arn" }
   # config.function.vpc_config = {
-  #   security_group_ids: [ "sg-1", "sg-2" ],
-  #   subnet_ids: [ "subnet-1", "subnet-2" ]
+  #   security_group_ids: %w[sg-1 sg-2],
+  #   subnet_ids: %w[subnet-1 subnet-2],
   # }
   # The config.function settings to the CloudFormation Lambda Function properties.
   # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html

data/lib/jets/dotenv.rb

@@ -6,23 +6,22 @@ class Jets::Dotenv
   end
 
   def initialize(remote=false)
-    @remote = remote
-    @remote = ENV['JETS_ENV_REMOTE'] if ENV['JETS_ENV_REMOTE']
+    @remote = ENV['JETS_ENV_REMOTE'] || remote
   end
 
   def load!
     vars = ::Dotenv.load(*dotenv_files)
-    ssm = Ssm.new(vars)
-    ssm.interpolate!
+    Ssm.new(vars).interpolate!
   end
 
   # dotenv files with the following precedence:
   #
-  # - .env.development.remote (highest)
+  # - .env.development.jets_env_extra (highest)
+  # - .env.development.remote (2nd highest)
   # - .env.development.local
   # - .env.development
   # - .env.local - This file is loaded for all environments _except_ `test`.
-  # - .env` - The original (lowest)
+  # - .env - The original (lowest)
   #
   def dotenv_files
     files = [
@@ -32,7 +31,10 @@ class Jets::Dotenv
       root.join(".env.#{Jets.env}.local"),
     ]
     files << root.join(".env.#{Jets.env}.remote") if @remote
-    files.reverse.compact # reverse so the precedence is right
+    if ENV["JETS_ENV_EXTRA"]
+      files << root.join(".env.#{Jets.env}.#{ENV["JETS_ENV_EXTRA"]}")
+    end
+    files.compact
   end
 
   def root

data/lib/jets/resource/api_gateway/rest_api/routes/collision.rb

@@ -33,7 +33,7 @@ class Jets::Resource::ApiGateway::RestApi::Routes
         Example: /posts/:id and /posts/:post_id/reveal should both be /posts/:id and /posts/:id/reveal.
 
         Please check your `config/routes.rb` and remove the colliding routes.
-        More info: http://rubyonjets.com/docs/considerations-api-gateway/
+        More info: http://rubyonjets.com/docs/considerations/api-gateway/
       EOL
     end
 

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.9.18"
+  VERSION = "1.9.19"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.9.18
+  version: 1.9.19
 platform: ruby
 authors:
 - Tung Nguyen
@@ -578,7 +578,7 @@ files:
 - jets.gemspec
 - lib/jets.rb
 - lib/jets/application.rb
-- lib/jets/application/default_config.rb
+- lib/jets/application/defaults.rb
 - lib/jets/autoloaders.rb
 - lib/jets/aws_info.rb
 - lib/jets/aws_services.rb