cloud-mu 2.0.0.pre.alpha9 → 2.0.0.pre.beta1

data/cookbooks/nagios/libraries/hostescalation.rb

@@ -116,7 +116,7 @@ class Nagios
         @escalation_period = nil if @escalation_period == obj
       end
     end
-    # rubocop:enable MethodLength
+    
 
     def to_s
       host_description
@@ -160,7 +160,7 @@ class Nagios
         'register'              => 'register',
       }
     end
-    # rubocop:enable MethodLength
+    
 
     def merge_members(obj)
       obj.contacts.each { |m| push(m) }
@@ -170,4 +170,4 @@ class Nagios
     end
   end
 end
-# rubocop:enable ClassLength
+

data/cookbooks/nagios/libraries/hostgroup.rb

@@ -83,7 +83,7 @@ class Nagios
         end
       end
     end
-    # rubocop:enable MethodLength
+    
 
     def self.create(name)
       Nagios.instance.find(Nagios::Hostgroup.new(name))
@@ -109,7 +109,7 @@ class Nagios
         'register'               => 'register',
       }
     end
-    # rubocop:enable MethodLength
+    
 
     def merge_members(obj)
       obj.members.each { |m| push(m) }

data/cookbooks/nagios/libraries/nagios.rb

@@ -64,7 +64,7 @@ class Nagios
     @host_name_attribute = 'hostname'
     @normalize_hostname  = false
   end
-  # rubocop:enable MethodLength
+  
 
   def commands
     Hash[@commands.sort]
@@ -108,7 +108,7 @@ class Nagios
       @resources.delete(key)
     end
   end
-  # rubocop:enable MethodLength
+  
 
   def find(obj)
     case obj
@@ -136,7 +136,7 @@ class Nagios
       find_object(obj, @resources)
     end
   end
-  # rubocop:enable MethodLength
+  
 
   def hosts
     Hash[@hosts.sort]
@@ -189,7 +189,7 @@ class Nagios
       raise
     end
   end
-  # rubocop:enable MethodLength
+  
 
   def timeperiods
     Hash[@timeperiods.sort]
@@ -273,7 +273,7 @@ class Nagios
       host.push(hg)
     end
   end
-  # rubocop:enable MethodLength
+  
 
   def push_object(obj)
     object = find(obj.class.new(obj.to_s))

data/cookbooks/nagios/libraries/service.rb

@@ -83,7 +83,7 @@ class Nagios
       @custom_options      = {}
       super()
     end
-    # rubocop:enable MethodLength
+    
 
     def check_command
       if blank?(@arguments)
@@ -236,7 +236,7 @@ class Nagios
         end
       end
     end
-    # rubocop:enable MethodLength
+    
 
     # servicegroups
     # This directive is used to define the description of the service, which may contain spaces,
@@ -441,7 +441,7 @@ class Nagios
         'register'                     => 'register',
       }
     end
-    # rubocop:enable MethodLength
+    
 
     def merge_members(obj)
       obj.contacts.each { |m| push(m) }

data/cookbooks/nagios/libraries/servicedependency.rb

@@ -145,7 +145,7 @@ class Nagios
         end
       end
     end
-    # rubocop:enable MethodLength
+    
 
     def push_dependency(obj)
       case obj
@@ -201,7 +201,7 @@ class Nagios
         'notification_failure_criteria'    => 'notification_failure_criteria',
       }
     end
-    # rubocop:enable MethodLength
+    
 
     def merge_members(obj)
       obj.host_name.each { |m| push(m) }

data/cookbooks/nagios/libraries/serviceescalation.rb

@@ -135,7 +135,7 @@ class Nagios
         @escalation_period = nil if @escalation_period == obj
       end
     end
-    # rubocop:enable MethodLength
+    
 
     def to_s
       service_description
@@ -182,7 +182,7 @@ class Nagios
         'register'               => 'register',
       }
     end
-    # rubocop:enable MethodLength
+    
 
     def merge_members(obj)
       obj.contacts.each { |m| push(m) }

data/cookbooks/nagios/libraries/servicegroup.rb

@@ -80,7 +80,7 @@ class Nagios
         end
       end
     end
-    # rubocop:enable MethodLength
+    
 
     def self.create(name)
       Nagios.instance.find(Nagios::Servicegroup.new(name))
@@ -134,7 +134,7 @@ class Nagios
       end
       convert_hostgroup_hash(hostgroup_hash)
     end
-    # rubocop:enable MethodLength
+    
 
     def merge_members(obj)
       obj.members.each { |m| push(m) }

data/cookbooks/nagios/libraries/timeperiod.rb

@@ -114,7 +114,7 @@ class Nagios
         end
       end
     end
-    # rubocop:enable MethodLength
+    
 
     def to_s
       timeperiod_name

data/install/installer

@@ -4,7 +4,7 @@ BOLD=`tput bold`
 NORM=`tput sgr0`
 CHEF_CLIENT_VERSION="14.4.56"
 if [ "$MU_BRANCH" == "" ];then
-  MU_BRANCH="Azure_you_want_azure" # GIT HOOK EDITABLE DO NOT TOUCH
+  MU_BRANCH="master"
   mydir="`dirname $0`"
   cd $mydir
   if git rev-parse --abbrev-ref HEAD > /dev/null 2>&1;then

data/modules/mu/cleanup.rb

@@ -61,7 +61,7 @@ module MU
       end
 
 
-      types_in_order = ["Collection", "Function", "ServerPool", "ContainerCluster", "SearchDomain", "Server", "MsgQueue", "Database", "CacheCluster", "StoragePool", "LoadBalancer", "FirewallRule", "Alarm", "Notifier", "Log", "VPC", "DNSZone", "Collection", "Habitat"]
+      types_in_order = ["Collection", "Endpoint", "Function", "ServerPool", "ContainerCluster", "SearchDomain", "Server", "MsgQueue", "Database", "CacheCluster", "StoragePool", "LoadBalancer", "NoSQLDB", "FirewallRule", "Alarm", "Notifier", "Log", "VPC", "Role", "Group", "User", "Bucket", "DNSZone", "Collection", "Habitat"]
 
       # Load up our deployment metadata
       if !mommacat.nil?

data/modules/mu/cloud.rb

@@ -116,6 +116,15 @@ module MU
     # Stub base class; real implementations generated at runtime
     class Role;
     end
+    # Stub base class; real implementations generated at runtime
+    class Endpoint;
+    end
+    # Stub base class; real implementations generated at runtime
+    class Bucket;
+    end
+    # Stub base class; real implementations generated at runtime
+    class NoSQLDB;
+    end
 
     # The types of cloud resources we can create, as class objects. Include
     # methods a class implementing this resource type must support to be
@@ -273,7 +282,18 @@ module MU
         :deps_wait_on_my_creation => true,
         :waits_on_parent_completion => false,
         :class => generic_class_methods,
-        :instance => generic_instance_methods
+        :instance => generic_instance_methods + [:groom]
+      },
+      :Endpoint => {
+        :has_multiples => false,
+        :can_live_in_vpc => true,
+        :cfg_name => "endpoint",
+        :cfg_plural => "endpoints",
+        :interface => self.const_get("Endpoint"),
+        :deps_wait_on_my_creation => true,
+        :waits_on_parent_completion => false,
+        :class => generic_class_methods,
+        :instance => generic_instance_methods + [:groom]
       },
       :ContainerCluster => {
         :has_multiples => false,
@@ -362,6 +382,28 @@ module MU
         :waits_on_parent_completion => true,
         :class => generic_class_methods,
         :instance => generic_instance_methods + [:groom]
+      },
+      :Bucket => {
+        :has_multiples => false,
+        :can_live_in_vpc => false,
+        :cfg_name => "bucket",
+        :cfg_plural => "buckets",
+        :interface => self.const_get("Bucket"),
+        :deps_wait_on_my_creation => true,
+        :waits_on_parent_completion => true,
+        :class => generic_class_methods,
+        :instance => generic_instance_methods + [:groom]
+      },
+      :NoSQLDB => {
+        :has_multiples => false,
+        :can_live_in_vpc => false,
+        :cfg_name => "nosqldb",
+        :cfg_plural => "nosqldbs",
+        :interface => self.const_get("NoSQLDB"),
+        :deps_wait_on_my_creation => true,
+        :waits_on_parent_completion => true,
+        :class => generic_class_methods,
+        :instance => generic_instance_methods + [:groom]
       }
     }.freeze
 

data/modules/mu/clouds/aws.rb

@@ -151,6 +151,9 @@ module MU
           return nil
         end
 
+        # Given an AWS region, check the API to make sure it's a valid one
+        # @param r [String]
+        # @return [String]
         def self.validate_region(r)
           MU::Cloud::AWS.ec2(region: r).describe_availability_zones.availability_zones.first.region_name
         end
@@ -406,12 +409,20 @@ module MU
         $MU_CFG['aws'].keys
       end 
 
+      # Resolve the administrative S3 bucket for a given credential set, or
+      # return a default.
+      # @param credentials [String]
+      # @return [String]
       def self.adminBucketName(credentials = nil)
          #XXX find a default if this particular account doesn't have a log_bucket_name configured
         cfg = credConfig(credentials)
         cfg['log_bucket_name']
       end
 
+      # Resolve the administrative S3 bucket for a given credential set, or
+      # return a default.
+      # @param credentials [String]
+      # @return [String]
       def self.adminBucketUrl(credentials = nil)
         "s3://"+adminBucketName+"/"
       end
@@ -716,13 +727,13 @@ module MU
       def self.acm(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@acm_api[credentials] ||= {}
-        @@acm_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "ACM", region: region, credentials: credentials)
+        @@acm_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ACM", region: region, credentials: credentials)
         @@acm_api[credentials][region]
       end
 
       # Amazon's IAM API
       def self.iam(credentials: nil)
-        @@iam_api[credentials] ||= MU::Cloud::AWS::Endpoint.new(api: "IAM", credentials: credentials)
+        @@iam_api[credentials] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "IAM", credentials: credentials)
         @@iam_api[credentials]
       end
 
@@ -730,7 +741,7 @@ module MU
       def self.ec2(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@ec2_api[credentials] ||= {}
-        @@ec2_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "EC2", region: region, credentials: credentials)
+        @@ec2_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "EC2", region: region, credentials: credentials)
         @@ec2_api[credentials][region]
       end
 
@@ -738,7 +749,7 @@ module MU
       def self.autoscale(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@autoscale_api[credentials] ||= {}
-        @@autoscale_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "AutoScaling", region: region, credentials: credentials)
+        @@autoscale_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "AutoScaling", region: region, credentials: credentials)
         @@autoscale_api[credentials][region]
       end
 
@@ -746,7 +757,7 @@ module MU
       def self.elb(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@elb_api[credentials] ||= {}
-        @@elb_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "ElasticLoadBalancing", region: region, credentials: credentials)
+        @@elb_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ElasticLoadBalancing", region: region, credentials: credentials)
         @@elb_api[credentials][region]
       end
 
@@ -754,13 +765,13 @@ module MU
       def self.elb2(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@elb2_api[credentials] ||= {}
-        @@elb2_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "ElasticLoadBalancingV2", region: region, credentials: credentials)
+        @@elb2_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ElasticLoadBalancingV2", region: region, credentials: credentials)
         @@elb2_api[credentials][region]
       end
 
       # Amazon's Route53 API
       def self.route53(credentials: nil)
-        @@route53_api[credentials] ||= MU::Cloud::AWS::Endpoint.new(api: "Route53", credentials: credentials)
+        @@route53_api[credentials] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "Route53", credentials: credentials)
         @@route53_api[credentials]
       end
 
@@ -768,7 +779,7 @@ module MU
       def self.rds(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@rds_api[credentials] ||= {}
-        @@rds_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "RDS", region: region, credentials: credentials)
+        @@rds_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "RDS", region: region, credentials: credentials)
         @@rds_api[credentials][region]
       end
 
@@ -776,7 +787,7 @@ module MU
       def self.cloudformation(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cloudformation_api[credentials] ||= {}
-        @@cloudformation_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CloudFormation", region: region, credentials: credentials)
+        @@cloudformation_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CloudFormation", region: region, credentials: credentials)
         @@cloudformation_api[credentials][region]
       end
 
@@ -784,7 +795,7 @@ module MU
       def self.s3(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@s3_api[credentials] ||= {}
-        @@s3_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "S3", region: region, credentials: credentials)
+        @@s3_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "S3", region: region, credentials: credentials)
         @@s3_api[credentials][region]
       end
 
@@ -792,7 +803,7 @@ module MU
       def self.cloudtrail(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cloudtrail_api[credentials] ||= {}
-        @@cloudtrail_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CloudTrail", region: region, credentials: credentials)
+        @@cloudtrail_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CloudTrail", region: region, credentials: credentials)
         @@cloudtrail_api[credentials][region]
       end
 
@@ -800,7 +811,7 @@ module MU
       def self.cloudwatch(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cloudwatch_api[credentials] ||= {}
-        @@cloudwatch_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CloudWatch", region: region, credentials: credentials)
+        @@cloudwatch_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CloudWatch", region: region, credentials: credentials)
         @@cloudwatch_api[credentials][region]
       end
 
@@ -808,7 +819,7 @@ module MU
       def self.wafglobal(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@wafglobal_api[credentials] ||= {}
-        @@wafglobal[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "WAF", region: region, credentials: credentials)
+        @@wafglobal[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "WAF", region: region, credentials: credentials)
         @@wafglobal[credentials][region]
       end
 
@@ -817,7 +828,7 @@ module MU
       def self.waf(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@waf[credentials] ||= {}
-        @@waf[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "WAFRegional", region: region, credentials: credentials)
+        @@waf[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "WAFRegional", region: region, credentials: credentials)
         @@waf[credentials][region]
       end
 
@@ -825,7 +836,7 @@ module MU
       def self.cloudwatchlogs(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cloudwatchlogs_api[credentials] ||= {}
-        @@cloudwatchlogs_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CloudWatchLogs", region: region, credentials: credentials)
+        @@cloudwatchlogs_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CloudWatchLogs", region: region, credentials: credentials)
         @@cloudwatchlogs_api[credentials][region]
       end
 
@@ -833,7 +844,7 @@ module MU
       def self.cloudfront(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cloudfront_api[credentials] ||= {}
-        @@cloudfront_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CloudFront", region: region, credentials: credentials)
+        @@cloudfront_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CloudFront", region: region, credentials: credentials)
         @@cloudfront_api[credentials][region]
       end
 
@@ -841,7 +852,7 @@ module MU
       def self.elasticache(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@elasticache_api[credentials] ||= {}
-        @@elasticache_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "ElastiCache", region: region, credentials: credentials)
+        @@elasticache_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ElastiCache", region: region, credentials: credentials)
         @@elasticache_api[credentials][region]
       end
       
@@ -849,7 +860,7 @@ module MU
       def self.sns(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@sns_api[credentials] ||= {}
-        @@sns_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "SNS", region: region, credentials: credentials)
+        @@sns_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "SNS", region: region, credentials: credentials)
         @@sns_api[credentials][region]
       end
       
@@ -857,7 +868,7 @@ module MU
       def self.sqs(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@sqs_api[credentials] ||= {}
-        @@sqs_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "SQS", region: region, credentials: credentials)
+        @@sqs_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "SQS", region: region, credentials: credentials)
         @@sqs_api[credentials][region]
       end
 
@@ -865,7 +876,7 @@ module MU
       def self.efs(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@efs_api[credentials] ||= {}
-        @@efs_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "EFS", region: region, credentials: credentials)
+        @@efs_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "EFS", region: region, credentials: credentials)
         @@efs_api[credentials][region]
       end
 
@@ -873,7 +884,7 @@ module MU
       def self.lambda(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@lambda_api[credentials] ||= {}
-        @@lambda_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "Lambda", region: region, credentials: credentials)
+        @@lambda_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "Lambda", region: region, credentials: credentials)
         @@lambda_api[credentials][region]
       end
 
@@ -881,7 +892,7 @@ module MU
       def self.apig(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@apig_api[credentials] ||= {}
-        @@apig_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "APIGateway", region: region, credentials: credentials)
+        @@apig_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "APIGateway", region: region, credentials: credentials)
         @@apig_api[credentials][region]
       end
       
@@ -889,7 +900,7 @@ module MU
       def self.cloudwatch_events(region = MU.cureRegion)
         region ||= myRegion
         @@cloudwatch_events_api[credentials] ||= {}
-        @@cloudwatch_events_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CloudWatchEvents", region: region, credentials: credentials)
+        @@cloudwatch_events_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CloudWatchEvents", region: region, credentials: credentials)
         @@cloudwatch_events_api
       end
 
@@ -897,7 +908,7 @@ module MU
       def self.ecs(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@ecs_api[credentials] ||= {}
-        @@ecs_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "ECS", region: region, credentials: credentials)
+        @@ecs_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ECS", region: region, credentials: credentials)
         @@ecs_api[credentials][region]
       end
 
@@ -905,15 +916,23 @@ module MU
       def self.eks(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@eks_api[credentials] ||= {}
-        @@eks_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "EKS", region: region, credentials: credentials)
+        @@eks_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "EKS", region: region, credentials: credentials)
         @@eks_api[credentials][region]
       end
 
+      # Amazon's DynamoDB API
+      def self.dynamo(region: MU.curRegion, credentials: nil)
+        region ||= myRegion
+        @@dynamo_api[credentials] ||= {}
+        @@dynamo_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "DynamoDB", region: region, credentials: credentials)
+        @@dynamo_api[credentials][region]
+      end
+
       # Amazon's Pricing API
       def self.pricing(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@pricing_api[credentials] ||= {}
-        @@pricing_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "Pricing", region: region, credentials: credentials)
+        @@pricing_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "Pricing", region: region, credentials: credentials)
         @@pricing_api[credentials][region]
       end
 
@@ -921,7 +940,7 @@ module MU
       def self.ssm(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@ssm_api[credentials] ||= {}
-        @@ssm_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "SSM", region: region, credentials: credentials)
+        @@ssm_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "SSM", region: region, credentials: credentials)
         @@ssm_api[credentials][region]
       end
 
@@ -929,7 +948,7 @@ module MU
       def self.elasticsearch(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@elasticsearch_api[credentials] ||= {}
-        @@elasticsearch_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "ElasticsearchService", region: region, credentials: credentials)
+        @@elasticsearch_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "ElasticsearchService", region: region, credentials: credentials)
         @@elasticsearch_api[credentials][region]
       end
 
@@ -937,7 +956,7 @@ module MU
       def self.cognito_ident(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cognito_ident_api[credentials] ||= {}
-        @@cognito_ident_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CognitoIdentity", region: region, credentials: credentials)
+        @@cognito_ident_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CognitoIdentity", region: region, credentials: credentials)
         @@cognito_ident_api[credentials][region]
       end
 
@@ -945,7 +964,7 @@ module MU
       def self.cognito_user(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@cognito_user_api[credentials] ||= {}
-        @@cognito_user_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "CognitoIdentityProvider", region: region, credentials: credentials)
+        @@cognito_user_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "CognitoIdentityProvider", region: region, credentials: credentials)
         @@cognito_user_api[credentials][region]
       end
 
@@ -953,7 +972,7 @@ module MU
       def self.kms(region: MU.curRegion, credentials: nil)
         region ||= myRegion
         @@kms_api[credentials] ||= {}
-        @@kms_api[credentials][region] ||= MU::Cloud::AWS::Endpoint.new(api: "KMS", region: region, credentials: credentials)
+        @@kms_api[credentials][region] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "KMS", region: region, credentials: credentials)
         @@kms_api[credentials][region]
       end
 
@@ -961,7 +980,7 @@ module MU
       def self.orgs(credentials: nil)
         @@organizations_api ||= {}
 # XXX org api doesn't seem to work in many regions
-        @@organizations_api[credentials] ||= MU::Cloud::AWS::Endpoint.new(api: "Organizations", credentials: credentials, region: "us-east-1")
+        @@organizations_api[credentials] ||= MU::Cloud::AWS::AmazonEndpoint.new(api: "Organizations", credentials: credentials, region: "us-east-1")
         @@organizations_api[credentials]
       end
 
@@ -1154,7 +1173,7 @@ module MU
 
       # Wrapper class for the EC2 API, so that we can catch some common transient
       # endpoint errors without having to spray rescues all over the codebase.
-      class Endpoint
+      class AmazonEndpoint
         @api = nil
         @region = nil
         @cred_obj = nil
@@ -1204,7 +1223,7 @@ module MU
               retval = @api.method(method_sym).call
             end
             return retval
-          rescue Aws::EC2::Errors::InternalError, Aws::EC2::Errors::RequestLimitExceeded, Aws::EC2::Errors::Unavailable, Aws::Route53::Errors::Throttling, Aws::ElasticLoadBalancing::Errors::HttpFailureException, Aws::EC2::Errors::Http503Error, Aws::AutoScaling::Errors::Http503Error, Aws::AutoScaling::Errors::InternalFailure, Aws::AutoScaling::Errors::ServiceUnavailable, Aws::Route53::Errors::ServiceUnavailable, Aws::ElasticLoadBalancing::Errors::Throttling, Aws::RDS::Errors::ClientUnavailable, Aws::Waiters::Errors::UnexpectedError, Aws::ElasticLoadBalancing::Errors::ServiceUnavailable, Aws::ElasticLoadBalancingV2::Errors::Throttling, Seahorse::Client::NetworkingError, Aws::IAM::Errors::Throttling, Aws::EFS::Errors::ThrottlingException, Aws::Pricing::Errors::ThrottlingException => e
+          rescue Aws::EC2::Errors::InternalError, Aws::EC2::Errors::RequestLimitExceeded, Aws::EC2::Errors::Unavailable, Aws::Route53::Errors::Throttling, Aws::ElasticLoadBalancing::Errors::HttpFailureException, Aws::EC2::Errors::Http503Error, Aws::AutoScaling::Errors::Http503Error, Aws::AutoScaling::Errors::InternalFailure, Aws::AutoScaling::Errors::ServiceUnavailable, Aws::Route53::Errors::ServiceUnavailable, Aws::ElasticLoadBalancing::Errors::Throttling, Aws::RDS::Errors::ClientUnavailable, Aws::Waiters::Errors::UnexpectedError, Aws::ElasticLoadBalancing::Errors::ServiceUnavailable, Aws::ElasticLoadBalancingV2::Errors::Throttling, Seahorse::Client::NetworkingError, Aws::IAM::Errors::Throttling, Aws::EFS::Errors::ThrottlingException, Aws::Pricing::Errors::ThrottlingException, Aws::APIGateway::Errors::TooManyRequestsException => e
             if e.class.name == "Seahorse::Client::NetworkingError" and e.message.match(/Name or service not known/)
               MU.log e.inspect, MU::ERR
               raise e
@@ -1262,7 +1281,8 @@ module MU
       @@cognito_ident_api ={}
       @@cognito_user_api ={}
       @@kms_api ={}
-      @@organizataion_api ={}
+      @@organization_api ={}
+      @@dynamo_api ={}
     end
   end
 end