cloud-mu 3.1.5 → 3.3.2

data/modules/mu/config/database.yml

@@ -4,7 +4,7 @@ name: database-complex
 size: db.r4.large
 engine: postgres
 engine_version: 9.6.6
-storage: 5
+storage: 21
 add_cluster_node: true
 allow_major_version_upgrade: true
 auto_minor_version_upgrade: false
@@ -24,6 +24,5 @@ vpc:
   name: <%= vpc_name %>
 size: <%= db_size %>
 engine: mariadb
-storage: 5
 
 <% end %>

data/modules/mu/config/dnszone.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/dnszone.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/dnszone.rb
     class DNSZone
 
       # Base configuration schema for a DNSZone
@@ -60,7 +60,7 @@ module MU
       # @param default_type [String]: The type of record to make default (e.g. An, CNAME, etc)
       # @param need_zone [Boolean]: Whether to explicitly require a zone be declared
       # @return [Hash]
-      def self.records_primitive(need_target: true, default_type: nil, need_zone: false)
+      def self.records_primitive(need_target: true, default_type: nil, need_zone: false, embedded_type: nil)
         dns_records_primitive = {
           "type" => "array",
           "maxItems" => 100,
@@ -107,8 +107,9 @@ module MU
                   },
                   "mu_type" => {
                     "type" => "string",
-                    "description" => "The Mu resource type to search the deployment for.",
-                      "enum" => ["loadbalancer", "server", "database", "cache_cluster"]
+                    "description" => "The mu type of a resource being targeted.",
+                    "enum" => embedded_type ? [embedded_type] : ["loadbalancer", "server", "database", "cache_cluster", "endpoint", "cdn"],
+                    "default" => embedded_type
                   },
                   "target_type" => {
                       "description" => "If the target is a public or a private resource. This only applies to servers/server_pools when using automatic DNS registration. If set to public but the target only has a private address, the private address will be used",

data/modules/mu/config/doc_helpers.rb

@@ -25,14 +25,13 @@ module MU
       MU::Cloud.resource_types.each_pair { |classname, attrs|
         MU::Cloud.supportedClouds.each { |cloud|
           begin
-            require "mu/clouds/#{cloud.downcase}/#{attrs[:cfg_name]}"
+            require "mu/providers/#{cloud.downcase}/#{attrs[:cfg_name]}"
           rescue LoadError
             next
           end
-          res_class = Object.const_get("MU").const_get("Cloud").const_get(cloud).const_get(classname)
-          _required, res_schema = res_class.schema(self)
+          _required, res_schema = MU::Cloud.resourceClass(cloud, classname).schema(self)
           docschema["properties"][attrs[:cfg_plural]]["items"]["description"] ||= ""
-          docschema["properties"][attrs[:cfg_plural]]["items"]["description"] += "\n#\n# `#{cloud}`: "+res_class.quality
+          docschema["properties"][attrs[:cfg_plural]]["items"]["description"] += "\n#\n# `#{cloud}`: "+MU::Cloud.resourceClass(cloud, classname).quality
           res_schema.each { |key, cfg|
             if !docschema["properties"][attrs[:cfg_plural]]["items"]["properties"][key]
               only_children[attrs[:cfg_plural]] ||= {}
@@ -61,7 +60,7 @@ module MU
         MU::Cloud.supportedClouds.each { |cloud|
           res_class = nil
           begin
-            res_class = Object.const_get("MU").const_get("Cloud").const_get(cloud).const_get(classname)
+            res_class = MU::Cloud.resourceClass(cloud, classname)
           rescue MU::Cloud::MuCloudResourceNotImplemented
             next
           end
@@ -239,7 +238,7 @@ $CONFIGURABLES
 
             if class_hierarchy.size == 1
 
-              _shortclass, cfg_name, cfg_plural, _classname = MU::Cloud.getResourceNames(name)
+              _shortclass, cfg_name, cfg_plural, _classname = MU::Cloud.getResourceNames(name, false)
               if cfg_name
                 example_path = MU.myRoot+"/modules/mu/config/"+cfg_name+".yml"
                 if File.exist?(example_path)

data/modules/mu/config/endpoint.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/api.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/api.rb
     class Endpoint
 
       # Base configuration schema for an Endpoint (e.g. AWS API Gateway)
@@ -32,6 +32,7 @@ module MU
           "iam_role" => {"type" => "string"},
           "region" => MU::Config.region_primitive,
           "vpc" => MU::Config::VPC.reference(MU::Config::VPC::NO_SUBNETS, MU::Config::VPC::NO_NAT_OPTS),
+          "dns_records" => MU::Config::DNSZone.records_primitive(need_target: false, default_type: "CNAME", need_zone: true, embedded_type: "endpoint"),
           "methods" => {
             "type" => "array",
             "items" => {

data/modules/mu/config/firewall_rule.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/firewall_rule.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/firewall_rule.rb
     class FirewallRule
 
       # Base configuration schema for a FirewallRule
@@ -119,21 +119,7 @@ module MU
         if acl_include['sgs']
           acl_include['sgs'].each { |sg_ref|
             if haveLitterMate?(sg_ref, "firewall_rules")
-              acl["dependencies"] ||= []
-              found = false
-              acl["dependencies"].each { |dep|
-                if dep["type"] == "firewall_rule" and dep["name"] == sg_ref
-                  dep["no_create_wait"] = true
-                  found = true
-                end
-              }
-              if !found
-                acl["dependencies"] << {
-                  "type" => "firewall_rule",
-                  "name" => sg_ref,
-                  "no_create_wait" => true
-                }
-              end
+              MU::Config.addDependency(acl, sg_ref, "firewall_rule", no_create_wait: true)
               siblingfw = haveLitterMate?(sg_ref, "firewall_rules")
               if !siblingfw["#MU_VALIDATED"]
 # XXX raise failure somehow
@@ -180,8 +166,6 @@ module MU
         ]
       end
 
-      resclass = Object.const_get("MU").const_get("Cloud").const_get(cloud).const_get("FirewallRule")
-
       if rules_only
         return rules
       end
@@ -217,7 +201,7 @@ module MU
         acl['project'] = acl["vpc"]["habitat"]["id"] || acl["vpc"]["habitat"]["name"]
       end
       acl.delete("vpc") if !acl["vpc"]
-      if !resclass.isGlobal? and !region.nil? and !region.empty?
+      if !MU::Cloud.resourceClass(cloud, "FirewallRule").isGlobal? and !region.nil? and !region.empty?
         acl["region"] = region
       end
       @admin_firewall_rules << acl if !@admin_firewall_rules.include?(acl)

data/modules/mu/config/folder.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/folder.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/folder.rb
     class Folder
 
       # Base configuration schema for a Folder

data/modules/mu/config/function.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/function.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/function.rb
     class Function
 
       # Base configuration schema for a Function
@@ -71,6 +71,10 @@ module MU
               "zip_file" => {
                 "type" => "string",
                 "description" => "Path to a zipped deployment package to upload."
+              }, 
+              "path" => {
+                "type" => "string",
+                "description" => "Path to a directory that can be zipped into deployment package to upload."
               } 
             }
           },
@@ -106,13 +110,18 @@ module MU
         if !function['code']
           ok = false
         end
-        if function['code'] and function['code']['zip_file']
-          if !File.readable?(function['code']['zip_file'])
-            MU.log "Can't read Function deployment package #{function['code']['zip_file']}", MU::ERR
-            ok = false
-          else
-            function['code']['zip_file'] = File.realpath(File.expand_path(function['code']['zip_file']))
-          end
+
+        if function['code']
+          ['zip_file', 'path'].each { |src|
+            if function['code'][src]
+              if !File.readable?(function['code'][src]) and !Dir.exists?(function['code'][src])
+                MU.log "Function '#{function['name']}' specifies a deployment package that I can't read at #{function['code'][src]}", MU::ERR
+                ok = false
+              else
+                function['code'][src] = File.realpath(File.expand_path(function['code'][src]))
+              end
+            end
+          }
         end
 
         ok

data/modules/mu/config/group.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/group.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/group.rb
     class Group
 
       # Base configuration schema for a Group

data/modules/mu/config/habitat.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/project.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/project.rb
     class Habitat
 
       # Base configuration schema for a Habitat

data/modules/mu/config/job.rb

@@ -0,0 +1,89 @@
+# Copyright:: Copyright (c) 2020 eGlobalTech, Inc., all rights reserved
+#
+# Licensed under the BSD-3 license (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License in the root of the project or at
+#
+#     http://egt-labs.com/mu/LICENSE.html
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module MU
+  class Config
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/job.rb
+    class Job
+
+      # Base configuration schema for a scheduled job
+      # @return [Hash]
+      def self.schema
+        {
+          "type" => "object",
+          "additionalProperties" => false,
+          "description" => "A cloud provider-specific facility for triggered or scheduled tasks, such as AWS CloudWatch Events or Google Cloud Scheduler.",
+          "properties" => {
+            "name" => {
+              "type" => "string"
+            },
+            "region" => MU::Config.region_primitive,
+            "credentials" => MU::Config.credentials_primitive,
+            "description" => {
+              "type" => "string",
+              "description" => "Human-readable description field for this job (this will field be overriden with the Mu deploy id on most providers unless +scrub_mu_isms+ is set)"
+            },
+            "schedule" => {
+              "type" => "object",
+              "description" => "A schedule on which to invoke this task, typically unix crontab style.",
+              "properties" => {
+                "minute" => {
+                  "type" => "string",
+                  "description" => "The minute of the hour at which to invoke this job, typically an integer between 0 and 59. This will be validated by the cloud provider, where other more human-readable values may be supported.",
+                  "default" => "0"
+                },
+                "hour" => {
+                  "type" => "string",
+                  "description" => "The hour at which to invoke this job, typically an integer between 0 and 23. This will be validated by the cloud provider, where other more human-readable values may be supported.",
+                  "default" => "*"
+                },
+                "day_of_month" => {
+                  "type" => "string",
+                  "description" => "The day of the month which to invoke this job, typically an integer between 1 and 31. This will be validated by the cloud provider, where other more human-readable values may be supported.",
+                  "default" => "*"
+                },
+                "month" => {
+                  "type" => "string",
+                  "description" => "The month in which to invoke this job, typically an integer between 1 and 12. This will be validated by the cloud provider, where other more human-readable values may be supported.",
+                  "default" => "*"
+                },
+                "day_of_week" => {
+                  "type" => "string",
+                  "description" => "The day of the week on which to invoke this job, typically an integer between 0 and 6. This will be validated by the cloud provider, where other more human-readable values may be supported.",
+                  "default" => "*"
+                },
+                "year" => {
+                  "type" => "string",
+                  "description" => "The year in which to invoke this job. Not honored by all cloud providers.",
+                  "default" => "*"
+                }
+              }
+            }
+          }
+        }
+      end
+
+      # Generic pre-processing of {MU::Config::BasketofKittens::jobs}, bare and unvalidated.
+      # @param _job [Hash]: The resource to process and validate
+      # @param _configurator [MU::Config]: The overall deployment configurator of which this resource is a member
+      # @return [Boolean]: True if validation succeeded, False otherwise
+      def self.validate(_job, _configurator)
+        ok = true
+
+        ok
+      end
+
+    end
+  end
+end

data/modules/mu/config/loadbalancer.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/loadbalancer.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/loadbalancer.rb
     class LoadBalancer
 
       # Generate schema for a LoadBalancer health check
@@ -64,6 +64,45 @@ module MU
         }
       end
 
+      # Generate schema for a LoadBalancer redirect
+      # @return [Hash]
+      def self.redirect
+        {
+          "type" => "object",
+          "title" => "redirect",
+          "additionalProperties" => false,
+          "description" => "Instruct our LoadBalancer to redirect traffic to another host, port, and/or path.",
+          "properties" => {
+            "protocol" => {
+              "type" => "string",
+              "default" => "HTTPS"
+            },
+            "port" => {
+              "type" => "integer",
+              "default" => 443
+            },
+            "host" => {
+              "type" => "string",
+              "default" => "\#{host}"
+            },
+            "path" => {
+              "type" => "string",
+              "default" => "/\#{path}"
+            },
+            "query" => {
+              "type" => "string",
+              "default" => "\#{query}"
+            },
+            "status_code" => {
+              "type" => "integer",
+              "description" => "The HTTP status code when issuing a redirect",
+              "default" => 301,
+              "enum" => [301, 302]
+            },
+          }
+        }
+      end
+
       # Base configuration schema for a LoadBalancer
       # @return [Hash]
       def self.schema
@@ -261,7 +300,7 @@ module MU
               "type" => "array",
               "items" => {
                 "type" => "object",
-                "required" => ["lb_protocol", "lb_port", "instance_protocol", "instance_port"],
+                "required" => ["lb_protocol", "lb_port"],
                 "additionalProperties" => false,
                 "description" => "A list of port/protocols which this Load Balancer should answer.",
                 "properties" => {
@@ -279,6 +318,7 @@ module MU
                     "enum" => ["HTTP", "HTTPS", "TCP", "SSL", "UDP"],
                     "description" => "Specifies the load balancer transport protocol to use for routing - HTTP, HTTPS, TCP, SSL, or UDP. SSL and UDP are only valid in Google Cloud."
                   },
+                  "redirect" => MU::Config::LoadBalancer.redirect,
                   "targetgroup" => {
                     "type" => "string",
                     "description" => "Which of our declared targetgroups should be the back-end for this listener's traffic"
@@ -309,14 +349,14 @@ module MU
                     "items" => {
                       "type" => "object",
                       "description" => "Rules to route requests to different target groups based on the request path",
-                      "required" => ["conditions", "order"],
+                      "required" => ["order", "conditions"],
                       "additionalProperties" => false,
                       "properties" => {
                         "conditions" => {
                           "type" => "array",
                           "items" => {
                             "type" => "object",
-                            "description" => "Rule condition",
+                            "description" => "Rule conditionl; if none are specified (or if none match) the default action will be set.",
                             "required" => ["field", "values"],
                             "additionalProperties" => false,
                             "properties" => {
@@ -339,16 +379,17 @@ module MU
                           "type" => "array",
                           "items" => {
                             "type" => "object",
-                            "description" => "Rule action",
-                            "required" => ["action", "targetgroup"],
+                            "description" => "Rule action, which must specify one of +targetgroup+ or +redirect+",
+                            "required" => ["action"],
                             "additionalProperties" => false,
                             "properties" => {
                               "action" => {
                                 "type" => "string",
                                 "default" => "forward",
                                 "description" => "An action to take when a match occurs. Currently, only forwarding to a targetgroup is supported.",
-                                "enum" => ["forward"]
+                                "enum" => ["forward", "redirect"]
                               },
+                              "redirect" => MU::Config::LoadBalancer.redirect,
                               "targetgroup" => {
                                 "type" => "string",
                                 "description" => "Which of our declared targetgroups should be the recipient of this traffic. If left unspecified, will default to the default targetgroup of this listener."
@@ -405,13 +446,18 @@ module MU
               "proto" => l["instance_protocol"],
               "port" => l["instance_port"]
             }
-            if lb["healthcheck"]
-              hc_target = lb['healthcheck']['target'].match(/^([^:]+):(\d+)(.*)/)
-              tg["healthcheck"] = lb['healthcheck'].dup
+            if l["redirect"]
+              tg["proto"] ||= l["redirect"]["protocol"]
+              tg["port"] ||= l["redirect"]["port"]
+            end
+            l['healthcheck'] ||= lb['healthcheck'] if lb['healthcheck']
+            if l["healthcheck"]
+              hc_target = l['healthcheck']['target'].match(/^([^:]+):(\d+)(.*)/)
+              tg["healthcheck"] = l['healthcheck'].dup
               proto = ["HTTP", "HTTPS"].include?(hc_target[1]) ? hc_target[1] : l["instance_protocol"]
               tg['healthcheck']['target'] = "#{proto}:#{hc_target[2]}#{hc_target[3]}"
               tg['healthcheck']["httpcode"] = "200,301,302"
-              MU.log "Converting classic-style ELB health check target #{lb['healthcheck']['target']} to ALB style for target group #{tgname} (#{l["instance_protocol"]}:#{l["instance_port"]}).", details: tg['healthcheck']
+              MU.log "Converting classic-style ELB health check target #{l['healthcheck']['target']} to ALB style for target group #{tgname} (#{l["instance_protocol"]}:#{l["instance_port"]}).", details: tg['healthcheck']
             end
             lb["targetgroups"] << tg
           }

data/modules/mu/config/log.rb

@@ -14,7 +14,7 @@
 
 module MU
   class Config
-    # Basket of Kittens config schema and parser logic. See modules/mu/clouds/*/log.rb
+    # Basket of Kittens config schema and parser logic. See modules/mu/providers/*/log.rb
     class Log
 
       # Base configuration schema for a Log