jets 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 323e6d497caeffa2111a48c2ab940cd8cad422cc41fb079a99ad1f6071bc795d
-  data.tar.gz: 19f7bfea35f8da3718968ce3792f536abddc895e4ab0678c0365d1f4f4dde569
+  metadata.gz: 705c645de879c7e521d0dcb66b90b37e4360c67510ab8ffb8ad16e8755093704
+  data.tar.gz: 3a50bef872e5c8851d95fc4ece586ab3b3b006bfaafc752e959d01a58d32674f
 SHA512:
-  metadata.gz: 7563eb1344fe0444ec889ddb88c8479bbbf0242bb65a1e2084e670e6baa1585d121ac045a51507981e6c7c8ad416174ebe2a90fffd72d937495b84e58a470e3b
-  data.tar.gz: d108d1a3b0b1411da955e6c75e8d9d2d74c191cf8cb2e2a880f88d5b6e54d289e9f3a1a5630e1087f160f4419879ee6d4f8f834f5fcd8a23635ec96e8befcc24
+  metadata.gz: 34a5e03a72d87f5cab1a02a555e5c9c30c026cc535c1bb4a1c609171201e1c9c9ff8f07f460ef90431a47fd2ed6afac4de9f663fb06ee16747ad1b10f0722b91
+  data.tar.gz: 412567cb2846d8d9e0c00c4e9ea8a7e87c775b6ad2220f3e0d0c7d0723a4203bc7730afef6a67a1474caaa0d66a4d7d47af15f7caad2fd1aecac0adf48a36f5a

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/), even before v1.0.
 
+## [1.0.16]
+- fix application iam policy when Jets::Application.default_iam_policy is used in config/application.rb
+- #69 from tongueroo/fix-app-iam-policy
+
 ## [1.0.15]
 - Fix polymorphic support: #67 from tongueroo/poly-fixes
 - update .env.development example

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.0.15)
+    jets (1.0.16)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)

data/lib/jets/application.rb

@@ -1,6 +1,8 @@
 require "active_support/ordered_options"
+require "singleton"
 
 class Jets::Application
+  include Singleton
   extend Memoist
   # Middleware used for development only
   autoload :Middleware, "jets/application/middleware"
@@ -73,17 +75,31 @@ class Jets::Application
 
   def load_configs
     # The Jets default/application.rb is loaded.
-    require File.expand_path("../default/application.rb", __FILE__)
+    load File.expand_path("../default/application.rb", __FILE__)
     # Then project config/application.rb is loaded.
-    app_config = "#{Jets.root}config/application.rb"
-    require app_config if File.exist?(app_config)
-    # Normalize config and setup some shortcuts
-    set_aliases!
-    normalize_env_vars!
+    load_app_config
     load_db_config
     load_environments_config
   end
 
+  # First time loading this might not have all the values. Some values like
+  # project_namespace depend on project_name. Loading the config twice
+  # resolves the chicken and egg problem here.
+  def load_app_config
+    eval_app_config
+    # Normalize config and setup some shortcuts
+    set_dependent_configs! # things like project_namespace that need project_name
+    eval_app_config # twice to fix values that rely on the dependent configs
+
+    set_iam_policy # relies on dependent values, must be called late
+    normalize_env_vars!
+  end
+
+  def eval_app_config
+    app_config = "#{Jets.root}config/application.rb"
+    load app_config if File.exist?(app_config)
+  end
+
   def load_environments_config
     env_file = "#{Jets.root}config/environments/#{Jets.env}.rb"
     if File.exist?(env_file)
@@ -104,7 +120,7 @@ class Jets::Application
     production: 'prod',
     staging: 'stag',
   }
-  def set_aliases!
+  def set_dependent_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']
@@ -115,10 +131,6 @@ class Jets::Application
     config.table_namespace = [config.project_name, config.short_env].compact.join('-')
 
     config.project_namespace = Jets.project_namespace
-
-    # Must set default iam_policy here instead of `def config` because we  project_namespace
-    # must have been set and if we call it from `def config` we get an infinite loop
-    set_iam_policy
   end
 
   def set_iam_policy
@@ -127,12 +139,10 @@ class Jets::Application
   end
 
   # After the mimimal template gets build, we need to reload it for the full stack
-  # creation. This is confusing to follow. Think we need to clean up the Jets.application
-  # singleton and make it more explicit?
-  def reload_iam_policy!
-    config.iam_policy = nil
-    config.managed_policy_definitions = nil
-    set_iam_policy
+  # creation. This allows us to reference IAM policies configs that depend on the
+  # creation of the s3 bucket.
+  def reload_configs!
+    load_configs
   end
 
   def self.default_iam_policy

data/lib/jets/aws_info.rb

@@ -73,8 +73,15 @@ module Jets
       stack = resp.stacks.first
       output = stack["outputs"].find { |o| o["output_key"] == "S3Bucket" }
       @@s3_bucket = output["output_value"] # s3_bucket
-    rescue
-      # rescuing all exceptions in case here
+    rescue Exception => e
+      # When user uses Jets::Application.default_iam_policy in their config/application.rb
+      # it looks up the s3 bucket for the iam policy, but the project name has
+      # 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.
+      #
+      # 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
       BUCKET_DOES_NOT_YET_EXIST
     end

data/lib/jets/commands/deploy.rb

@@ -19,9 +19,11 @@ module Jets::Commands
       # Delete existing rollback stack from previous bad minimal deploy
       delete_minimal_stack if minimal_rollback_complete?
       exit_unless_updateable! # Stack could be in a weird rollback state or in progress state
-      ship(stack_type: :minimal) if first_run?
 
-      Jets.application.reload_iam_policy!
+      if first_run?
+        ship(stack_type: :minimal)
+        Jets.application.reload_configs!
+      end
 
       # Build code after the minimal stack because need s3 bucket for assets
       # on_aws? and s3_base_url logic

data/lib/jets/core.rb

@@ -11,7 +11,7 @@ module Jets::Core
   def application
     return @@application if @@application
 
-    @@application = Jets::Application.new
+    @@application = Jets::Application.instance
     @@application.setup!
     @@application
   end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack