rubycfn 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337ae0668503c4e97c9a3b8a3ed2693d5611ecb592ad2802b83e158f1a2b32f5
-  data.tar.gz: 25e6d98d9f4ecb0f80fb8a1c55bd907ff2af293ca04e8186774ffec5375948ec
+  metadata.gz: 83de34bc40509c9a8425856cbc70eac67efb38eeb7441e6710fd2490abc70779
+  data.tar.gz: f8f01c6a27922524362b59aef01d05841d3247c46874caf8cfa2c944ee7441e9
 SHA512:
-  metadata.gz: 5de8efbd6b5b242f5f63a336f82602dcb96d6824b4bbf763c62bba0661bf1c811a1c453dfbcef7e20b6650cba46660758a5f99e271b70481e9850c51ba3bf9f5
-  data.tar.gz: '08fdaabf55a7e3ed1e6bf60b66b038f8729433d257c59fe74323042d178c6f0e0a1d52fd12aae13ea482b14ea986326614f79efb7a412cd2b1eea6932fc0fc83'
+  metadata.gz: 7082ea8b1a3f7b3a23406898614fd08c5af073889c13b1101a5b2580e9025881443f91ce5ceb81141508a06bf943ec3c1c4ed9ab754c51a56fd324fc6c659106
+  data.tar.gz: c735c3327552fbfea5417ab18442dc2829a7fc05d94a4687af942a8f70ba2e0e5b94d7da66f2b27ebdac278d430da54b606b328706ae215c6cc114b33d0122e1

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     rubycfn (0.5.3)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
-      json (~> 2.1.0)
+      json (~> 2.3.0)
       neatjson (~> 0.8.4)
       tty-prompt (~> 0.16.0)
 
@@ -16,20 +16,20 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    awesome_print (1.8.0)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    docile (1.3.2)
+    awesome_print (1.9.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
     dotenv (2.4.0)
-    equatable (0.6.1)
-    ffi (1.12.2)
-    formatador (0.2.5)
-    given_core (3.8.0)
+    equatable (0.7.0)
+    ffi (1.15.3)
+    formatador (0.3.0)
+    given_core (3.8.2)
       sorcerer (>= 0.3.7)
-    guard (2.16.1)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -43,65 +43,67 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.3.1)
     launchy (2.5.0)
       addressable (~> 2.7)
-    listen (3.2.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.4)
-    method_source (0.9.2)
-    minitest (5.14.0)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.14.4)
     neatjson (0.8.4)
     necromancer (0.4.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pastel (0.7.3)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.3)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    rake (13.0.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-given (3.8.0)
-      given_core (= 3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-given (3.8.2)
+      given_core (= 3.8.2)
       rspec (>= 2.14.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     shellany (0.0.1)
-    simplecov (0.18.5)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
     sorcerer (2.0.1)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    timers (4.3.0)
-    tty-color (0.5.1)
+    timers (4.3.3)
+    tty-color (0.6.0)
     tty-cursor (0.5.0)
     tty-prompt (0.16.1)
       necromancer (~> 0.4.0)
@@ -114,7 +116,7 @@ GEM
       tty-screen (~> 0.6.4)
       wisper (~> 2.0.0)
     tty-screen (0.6.5)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     wisper (2.0.1)
 
@@ -137,4 +139,4 @@ DEPENDENCIES
   simplecov (~> 0.9)
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.5.3".freeze
+  VERSION = "0.5.4".freeze
 end

data/rubycfn.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "neatjson", "~> 0.8.4"
-  spec.add_runtime_dependency "json", "~> 2.1.0"
+  spec.add_runtime_dependency "json", "~> 2.3.0"
   spec.add_runtime_dependency "activesupport", "~> 5.1.5"
   spec.add_runtime_dependency "tty-prompt", "~> 0.16.0"
   spec.add_runtime_dependency "dotenv", "~> 2.4.0"

data/templates/lib/core/applications.rb

@@ -34,8 +34,10 @@ def env_vars_to_array(val)
   vars
 end
 
+@ignore_params = {}
+
 # Return the mandatory Stack parameters and add all defined ENV vars from config.yaml
-def parent_parameters(env_vars)
+def parent_parameters(env_vars, simple_name)
   params = {
     "Vpc": :vpc_stack.ref("Outputs.Vpc"),
     "Cluster": :ecs_stack.ref("Outputs.EcsCluster"),
@@ -50,6 +52,11 @@ def parent_parameters(env_vars)
   }
 
   env_vars.each do |var|
+    TOPLEVEL_BINDING.eval("@ignore_params[:#{simple_name}] ||= []")
+    if var[:Value].class == Hash && var[:Value].keys[0] == :Ref
+      TOPLEVEL_BINDING.eval("@ignore_params[:#{simple_name}].push(\"#{var[:Name]}\")")
+      next
+    end
     params[var[:Name].cfnize] = var[:Value]
   end
   params
@@ -59,10 +66,17 @@ def application_parameters(env_vars)
   vars = []
 
   env_vars.each do |var|
-    vars.push(
-      Name: var[:Name],
-      Value: var[:Name].cfnize.ref
-    )
+    if var[:Value].class == Hash && var[:Value].keys[0] == :Ref
+      vars.push(
+        Name: var[:Name],
+        Value: var[:Value]
+      )
+    else
+      vars.push(
+        Name: var[:Name],
+        Value: var[:Name].cfnize.ref
+      )
+    end
   end
   vars
 end
@@ -83,14 +97,23 @@ def create_applications
 
     r._id("#{resource_name}Stack")
     r.property(:template_url) { "#{simple_name}stack" }
-    r.property(:parameters) { parent_parameters(env_vars) }
+    r.property(:parameters) { parent_parameters(env_vars, simple_name) }
     Object.const_set("#{resource_name}Stack", Module.new).class_eval <<-RUBY
       extend ActiveSupport::Concern
       include Rubycfn
 
       included do
 
+        def get_aliases(val)
+          aliases = []
+          return aliases if val["aliases"].nil?
+          return aliases if val["aliases"][environment].nil?
+          val["aliases"][environment]
+        end
+
+        ignore_params = TOPLEVEL_BINDING.eval("@ignore_params[:#{simple_name}]")
         application_vars.each do |var|
+          next if ignore_params.include? var[:Name]
           Object.class_eval("parameter var[:Name].to_sym, description: 'Value for ENV var \#{var[:Name]}'")
         end
 
@@ -134,17 +157,30 @@ def create_applications
                   description: "ARN of ECS deployment failure Lambda",
                   type: "String"
 
+        variable :aliases,
+                 value: app_config,
+                 filter: :get_aliases
+
+        variable :min_override,
+                 value: app_config[environment].nil? ? "" : app_config[environment]["min"].to_s
+
         variable :min,
-                 value: app_config["min"].to_s
+                 value: min_override.empty? ? app_config["min"].to_s : min_override
+
+        variable :max_override,
+                 value: app_config[environment].nil? ? "" : app_config[environment]["max"].to_s
 
         variable :max,
-                 value: app_config["max"].to_s
+                 value: max_override.empty? ? app_config["max"].to_s : max_override
 
         variable :container_port,
                  value: app_config["container_port"].to_s
 
+        variable :memory_override,
+                 value: app_config[environment].nil? ? "" : app_config[environment]["mem"].to_s
+
         variable :memory,
-                 value: app_config["mem"].to_s
+                 value: memory_override.empty? ? app_config["mem"].to_s : memory_override
 
         variable :image,
                  value: app_config["image"]
@@ -158,11 +194,14 @@ def create_applications
 
 
         description generate_stack_description("#{resource_name}Stack")
+
         resource :service,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ECS::Service" do |r|
           r.property(:service_name) { "#{environment}-<%= project_name %>-#{simple_name}" }
           r.property(:cluster) { :cluster.ref }
           r.property(:role) { :service_role.ref }
+          r.property(:health_check_grace_period_seconds) { 120 }
           r.property(:desired_count) { min.to_i }
           r.property(:task_definition) { :task_definition.ref }
           r.property(:load_balancers) do
@@ -175,6 +214,7 @@ def create_applications
         end
 
         resource :application_deployment_health,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "Custom::EcsDeploymentCheck" do |r|
           r.property(:service_token) { :application_deployment_failure_rollback_function_arn.ref }
           r.property("AWSRegion") { "${AWS::Region}".fnsub }
@@ -183,6 +223,7 @@ def create_applications
         end
 
         resource :task_definition,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ECS::TaskDefinition" do |r|
           r.property(:family) { "#{simple_name}-service" }
           r.property(:container_definitions) do
@@ -211,12 +252,14 @@ def create_applications
         end
 
         resource :cloud_watch_logs_group,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::Logs::LogGroup" do |r|
           r.property(:log_group_name) { ["AWS::StackName".ref, "-#{simple_name}"].fnjoin }
           r.property(:retention_in_days) { 30 }
         end
 
         resource :target_group,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ElasticLoadBalancingV2::TargetGroup" do |r|
           r.property(:vpc_id) { :vpc.ref }
           r.property(:port) { container_port.to_i }
@@ -234,6 +277,7 @@ def create_applications
         end
 
         resource :listener_rule,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ElasticLoadBalancingV2::ListenerRule" do |r|
           r.property(:listener_arn) { :listener.ref }
           r.property(:priority) { priority.to_i }
@@ -244,7 +288,7 @@ def create_applications
                 "Values": [
                   ["origin", name.tr("_", "-"), :hosted_zone_name.ref].fnjoin("."),
                   [name.tr("_", "-"), :hosted_zone_name.ref].fnjoin(".")
-                ]
+                ] + aliases
               }
             ]
           end
@@ -275,6 +319,7 @@ def create_applications
         }
 
         resource :service_role,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::IAM::Role" do |r|
           r.property(:role_name) { "ecs-service-${AWS::StackName}".fnsub }
           r.property(:path) { "/" }
@@ -330,6 +375,7 @@ def create_applications
         end
 
         resource :application_load_balancer_record,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::Route53::RecordSet" do |r|
           r.property(:type) { "A" }
           r.property(:name) { ["origin", name.tr("_", "-"), :hosted_zone_name.ref].fnjoin(".") }
@@ -344,6 +390,7 @@ def create_applications
         end
 
         resource :service_scalable_target,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ApplicationAutoScaling::ScalableTarget" do |r|
           r.property(:max_capacity) { max.to_i }
           r.property(:min_capacity) { min.to_i }
@@ -354,6 +401,7 @@ def create_applications
         end
 
         resource :service_scale_out_policy,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ApplicationAutoScaling::ScalingPolicy" do |r|
           r.property(:policy_name) { "ServiceScaleOutPolicy" }
           r.property(:policy_type) { "StepScaling" }
@@ -374,6 +422,7 @@ def create_applications
         end
 
         resource :service_scale_in_policy,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::ApplicationAutoScaling::ScalingPolicy" do |r|
           r.property(:policy_name) { "ServiceScaleInPolicy" }
           r.property(:policy_type) { "StepScaling" }
@@ -394,6 +443,7 @@ def create_applications
         end
 
         resource :cpu_scale_out_alarm,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::CloudWatch::Alarm" do |r|
           r.property(:alarm_name) { "CPU utilization greater than 90% on #{simple_name}-#{environment}" }
           r.property(:alarm_description) { "Alarm if cpu utilization greater than 90% of reserved cpu" }
@@ -420,6 +470,7 @@ def create_applications
         end
 
         resource :cpu_scale_in_alarm,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::CloudWatch::Alarm" do |r|
           r.property(:alarm_name) { "CPU utilization less than 70% on #{simple_name}-#{environment}" }
           r.property(:alarm_description) { "Alarm if cpu utilization greater than 70% of reserved cpu" }
@@ -446,6 +497,7 @@ def create_applications
         end
 
         resource :ecs_application_certificate,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "Custom::Certificate" do |r|
           r.property(:service_token) { :certificate_provider_function_arn.ref }
           r.property(:region) { "us-east-1" }
@@ -454,6 +506,7 @@ def create_applications
         end
 
         resource :ecs_application_issued_certificate,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "Custom::IssuedCertificate" do |r|
           r.property(:service_token) { :certificate_provider_function_arn.ref }
           r.property(:region) { "us-east-1" }
@@ -461,6 +514,7 @@ def create_applications
         end
 
         resource :ecs_application_dns_record,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "Custom::CertificateDNSRecord" do |r|
           r.property(:service_token) { :certificate_provider_function_arn.ref }
           r.property(:region) { "us-east-1" }
@@ -469,6 +523,7 @@ def create_applications
         end
 
         resource :ecs_application_validation_record,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::Route53::RecordSetGroup" do |r|
           r.property(:hosted_zone_id) { :hosted_zone_id.ref }
           r.property(:record_sets) do
@@ -492,6 +547,7 @@ def create_applications
                    :ecs_application_issued_certificate,
                    :application_deployment_health
                  ],
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::CloudFront::Distribution" do |r|
           r.property(:distribution_config) do
             {
@@ -547,6 +603,7 @@ def create_applications
         end
 
         resource :application_cloudfront_dns_record,
+                 amount: max.to_i.positive? ? 1 : 0,
                  type: "AWS::Route53::RecordSetGroup" do |r|
           r.property(:hosted_zone_id) { :hosted_zone_id.ref }
           r.property(:record_sets) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Dennis Vink
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +324,7 @@ homepage: https://github.com/dennisvink/rubycfn
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -339,9 +339,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Rubycfn
 test_files: