cloud-mu 2.0.0.pre.alpha7 → 2.0.0.pre.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e181f1f55514d5bd594a4b506fc55fd60cbca3a22170d168c2d594d707b2eae
-  data.tar.gz: 18372f6029f4de995a80bbc7737b3897852ae16400b20067e2691557f629077b
+  metadata.gz: a9fc0e69f111f1e2db75ce8fba5b8365a3e25ffe0c1cb833b122437c8e44d5d1
+  data.tar.gz: d32f039a46986f2d9946e0dd125994d0c57bf1619697674791067e9160bc78df
 SHA512:
-  metadata.gz: 1612a8948e9d284462ad9d9e33df2020da096ad6bae6f61bd25b4e73362040f5453814cf9ca8fc4d79048ba5f3098d889589f6a46cbdc2c4dcc63cfd710ae3e1
-  data.tar.gz: 7af7243b43262485f5dc3075b3176a251541a7d5a56ce74446d97afd898d0fda321035242e5ac824ab7d926a4b0f60b95fe7bad777b62e61a3527f20b8e59a8b
+  metadata.gz: b4b370235cd758082a0e8d0963a8efdc17c1c741ec3a04a81f6c730de2d321ad4ac46fad7b650d15b5148cf6baab858e1d8ea318c8744103c04111bd7f20f41e
+  data.tar.gz: ce268250489a482ba77f9c17e993e29dc4126412b6b700d7299f40084afadc35b2bc966d5e7f13706e1db3ff897a7e83e891110c60d75112bd7c4dfd2ae167ee

data/cloud-mu.gemspec

@@ -17,8 +17,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '2.0.0-alpha7'
-  s.date        = '2019-02-13'
+  s.version     = '2.0.0-alpha8'
+  s.date        = '2019-02-14'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 2.4'
   s.summary     = "The eGTLabs Mu toolkit for unified cloud deployments"

data/cookbooks/awscli/recipes/default.rb

@@ -13,7 +13,7 @@ case node['platform']
 end
 r = execute "install awscli" do
   command cmd
-  not_if { ::File.exists?(file) }
+  not_if { ::File.exist?(file) }
   if node['awscli']['compile_time']
     action :nothing
   end
@@ -30,7 +30,7 @@ if node['awscli']['config_profiles']
     owner 'root'
     group 'root'
     mode 00700
-    not_if { ::File.exists?(::File.dirname(config_file)) }
+    not_if { ::File.exist?(::File.dirname(config_file)) }
     if node['awscli']['compile_time']
       action :nothing
     end
@@ -44,7 +44,7 @@ if node['awscli']['config_profiles']
     owner 'root'
     group 'root'
     source 'config.erb'
-    not_if { ::File.exists?(config_file) }
+    not_if { ::File.exist?(config_file) }
     if node['awscli']['compile_time']
       action :nothing
     end

data/cookbooks/mu-activedirectory/attributes/default.rb

@@ -28,7 +28,7 @@ default['ad']['homedir'] = "/home/%u"
 default['ad']['sites'] = []
 if !node['deployment']['vpcs'].empty?
   vpc = node['deployment']['vpcs'][node['deployment']['vpcs'].keys.first]
-  vpc['subnets'].each_pair { |name, data|
+  vpc['subnets'].each_pair { |_name, data|
     default['ad']['sites'] << {
         :name => data['name'],
         :ip_block => data['ip_block']
@@ -91,7 +91,7 @@ if node['ad']['dc_ips'].empty?
       begin
         default['ad']['dc_ips'] << resolver.getaddress(dc).to_s
       rescue Resolv::ResolvError => e
-        Chef::Log.warn ("Couldn't resolve domain controller #{dc}!")
+        Chef::Log.warn("Couldn't resolve domain controller #{dc}!")
       end
     end
   } rescue NoMethodError

data/cookbooks/mu-activedirectory/libraries/helper.rb

@@ -17,7 +17,7 @@ module Activedirectory
       return cmd.stdout.match(/True/)
     end
 
-    def is_domain_controller?(hostname)
+    def domain_controller?(hostname)
       # cmd = powershell_out("(Get-ADDomainController).name -eq '#{new_resource.computer_name}'")
       cmd = powershell_out("(Get-ADDomainController).name -eq '#{hostname}'")
       return cmd.stdout.match(/True/)
@@ -73,7 +73,7 @@ module Activedirectory
       return cmd.stdout.match(/True/)
     end
 
-    def is_schemamaster?(domain_name, hostname)
+    def schemamaster?(domain_name, hostname)
       cmd = powershell_out("(Get-ADForest #{domain_name}).SchemaMaster -eq '#{hostname.downcase}.#{domain_name}'")
       return cmd.stdout.match(/True/)
     end

data/cookbooks/mu-activedirectory/providers/domain.rb

@@ -22,8 +22,6 @@ action :create do
       create_domain
       configure_network_interface
       configure_domain
-    when platform_family?('rhel')
-      # To do: Do Active Directory on Linux
     else
       Chef::Log.info("Unsupported platform #{node['platform']}")
   end
@@ -33,8 +31,6 @@ action :delete do
   case node['platform']
     when "windows"
       delete_domain
-    when platform_family?('rhel')
-      # To do: Do Active Directory on Linux
     else
       Chef::Log.info("Unsupported platform #{node['platform']}")
   end

data/cookbooks/mu-activedirectory/providers/domain_controller.rb

@@ -25,8 +25,6 @@ action :add do
       configure_network_interface
       set_replication_static_ports
       set_computer_name(admin_creds)
-    when platform_family?('rhel')
-      # To do: Do Active Directory on Linux
     else
       Chef::Log.info("Unsupported platform #{node['platform']}")
   end
@@ -36,8 +34,6 @@ action :remove do
   case node['platform']
     when "windows"
       demote
-    when platform_family?('rhel')
-      # To do: Do Active Directory on Linux
     else
       Chef::Log.info("Unsupported platform #{node['platform']}")
   end
@@ -48,7 +44,7 @@ end
 # end
 
 def promote
-  unless is_domain_controller?(new_resource.computer_name)
+  unless domain_controller?(new_resource.computer_name)
     Chef::Log.info("Promoting #{new_resource.computer_name} to domain controller in #{new_resource.dns_name} domain")
     cmd = powershell_out("Stop-Process -ProcessName sshd -force -ErrorAction SilentlyContinue; Install-ADDSDomainController -InstallDns -DomainName #{new_resource.dns_name} -Credential #{admin_creds} -SafeModeAdministratorPassword (convertto-securestring '#{new_resource.restore_mode_password}' -asplaintext -force) -Force -Confirm:$false; Restart-Computer -Force")
     kill_ssh
@@ -58,7 +54,7 @@ def promote
 end
 
 def demote
-  if is_domain_controller?(new_resource.computer_name)
+  if domain_controller?(new_resource.computer_name)
     Chef::Log.info("Demoting domain controller #{new_resource.computer_name} in #{new_resource.dns_name} domain")
     cmd = powershell_out("Stop-Process -ProcessName sshd -force -ErrorAction SilentlyContinue; Uninstall-WindowsFeature DNS; Uninstall-ADDSDomainController -Credential #{admin_creds} -LocalAdministratorPassword (convertto-securestring '#{new_resource.domain_admin_password}'  -asplaintext -force) -Force -Confirm:$false; Restart-Computer -Force")
     kill_ssh

data/cookbooks/mu-activedirectory/providers/domain_node.rb

@@ -220,7 +220,7 @@ def create_pam_winbind_directories
     owner "root"
     group "root"
     mode 0755
-    not_if { ::File.exists?("/home/#{new_resource.dns_name}") or ::File.symlink?("/home/#{new_resource.dns_name}")}
+    not_if { ::File.exist?("/home/#{new_resource.dns_name}") or ::File.symlink?("/home/#{new_resource.dns_name}")}
   end
 
   %w[/run /run/samba /run/samba/winbindd].each { |path|

data/cookbooks/mu-activedirectory/recipes/domain-controller.rb

@@ -24,8 +24,6 @@ case node['platform']
     else
       Chef::Log.info "Requires Windows Server 2012 or 2012R2, current version is #{version})"
     end
-  when platform_family?('rhel')
-    # To do: Active Directory on Linux
   else
     Chef::Log.info("Unsupported platform #{node['platform']}")
 end

data/cookbooks/mu-activedirectory/recipes/domain.rb

@@ -23,8 +23,6 @@ case node['platform']
     else
       Chef::Log.info "Requires Windows Server 2012 or 2012R2, current version is #{version})"
     end
-  when platform_family?('rhel')
-    # To do: Active Directory on Linux
   else
     Chef::Log.info("Unsupported platform #{node['platform']}")
 end

data/cookbooks/mu-activedirectory/recipes/sssd.rb

@@ -25,7 +25,7 @@ case node['platform_family']
       rescue Chef::Exceptions::ResourceNotFound
         service svc do
           action [:enable, :start]
-          only_if { ::File.exists?("/etc/init.d/#{svc}") }
+          only_if { ::File.exist?("/etc/init.d/#{svc}") }
         end
       end
     }
@@ -34,7 +34,7 @@ case node['platform_family']
       resources('service[network]')
     rescue Chef::Exceptions::ResourceNotFound
       service "network" do
-        only_if { ::File.exists?("/etc/init.d/network") }
+        only_if { ::File.exist?("/etc/init.d/network") }
       end
     end
 
@@ -93,7 +93,7 @@ case node['platform_family']
       
       # execute "git clone git://anongit.freedesktop.org/realmd/adcli" do
       #   cwd "/root"
-      #   not_if { ::Dir.exists?("/root/adcli") }
+      #   not_if { ::Dir.exist?("/root/adcli") }
       # end
 
       # execute "git fetch && git pull" do
@@ -110,7 +110,7 @@ case node['platform_family']
       execute "compile adcli" do
         cwd "/root/adcli"
         command "./autogen.sh --disable-doc --prefix=/usr && make && make install"
-        not_if { ::File.exists?("/usr/sbin/adcli") }
+        not_if { ::File.exist?("/usr/sbin/adcli") }
       end
     when 7
       # Seems to work on CentOS7
@@ -131,7 +131,7 @@ case node['platform_family']
     service "sssd" do
       action :nothing
       notifies :restart, "service[sshd]", :immediately
-      only_if { ::File.exists?("/etc/krb5.keytab") }
+      only_if { ::File.exist?("/etc/krb5.keytab") }
     end
     directory "/etc/sssd"
     template "/etc/sssd/sssd.conf" do
@@ -163,7 +163,7 @@ case node['platform_family']
     # to your DCs. It seems to dumbly trust any reverse mapping it sees,
     # whether or not the name matches the actual Kerberos tickets you et.
     execute "Run ADCLI" do
-      not_if { ::File.exists?("/etc/krb5.keytab") }
+      not_if { ::File.exist?("/etc/krb5.keytab") }
       command "echo -n '#{domain_creds[node['ad']['join_auth']['password_field']]}' | /usr/sbin/adcli join #{node['ad']['domain_name']} --domain-realm=#{node['ad']['domain_name'].upcase} -U #{domain_creds[node['ad']['join_auth']['username_field']]} --stdin-password"
       notifies :restart, "service[sssd]", :immediately
 #      sensitive true

data/cookbooks/mu-glusterfs/recipes/server.rb

@@ -58,7 +58,7 @@ case node['platform']
       end
 
       execute "mdadm --detail --scan >> /etc/mdadm.conf" do
-        not_if { File.exists?("/etc/mdadm.conf") }
+        not_if { File.exist?("/etc/mdadm.conf") }
       end
 
       execute "mkfs -t xfs -i size=512 #{node['glusterfs']['server']['raid_dev']}" do
@@ -131,7 +131,7 @@ case node['platform']
 
     if i_am_master
       ips = []
-      node['deployment']['servers'][$nodeclass].each_pair do |name, data|
+      node['deployment']['servers'][$nodeclass].each_pair do |_name, data|
         next if data['private_ip_address'].nil? or data['private_ip_address'].empty?
         execute "gluster peer probe #{data['private_ip_address']}" do
           not_if { data['private_ip_address'] == node['ipaddress'] }
@@ -188,7 +188,7 @@ case node['platform']
         # end
       end
     else
-      node['deployment']['servers'][$nodeclass].each_pair do |name, data|
+      node['deployment']['servers'][$nodeclass].each_pair do |_name, data|
         execute "gluster peer probe #{data['private_ip_address']}" do
           not_if { data['private_ip_address'] == node['ipaddress'] }
         end

data/cookbooks/mu-jenkins/recipes/default.rb

@@ -83,14 +83,14 @@ end
 
 
 node['jenkins_plugins'].each { |plugin|
-#  if !::File.exists?("#{node['jenkins']['master']['home']}/plugins/#{plugin}.jpi")
+#  if !::File.exist?("#{node['jenkins']['master']['home']}/plugins/#{plugin}.jpi")
 #    restart_jenkins = true
 #  end
 # XXX this runs as the 'jenkins' user, yet download the files as 0600/root
   jenkins_plugin plugin
   # do
     # notifies :restart, 'service[jenkins]', :delayed
-    #not_if { ::File.exists?("#{node['jenkins']['master']['home']}/plugins/#{plugin}.jpi") }
+    #not_if { ::File.exist?("#{node['jenkins']['master']['home']}/plugins/#{plugin}.jpi") }
   # end
 }
 
@@ -131,7 +131,7 @@ uidsearch = "sAMAccountName={0}" if $MU_CFG['ldap']['type'] == "Active Directory
 membersearch = "(| (member={0}) (uniqueMember={0}) (memberUid={1}))"
 membersearch = "memberUid={0}" if $MU_CFG['ldap']['type'] == "389 Directory Services"
 bind_creds = chef_vault_item($MU_CFG['ldap']['bind_creds']['vault'], $MU_CFG['ldap']['bind_creds']['item'])
-jenkins_admins = ::MU::Master.listUsers.delete_if { |u, data| !data['admin'] }.keys
+jenkins_admins = ::MU::Master.listUsers.delete_if { |_u, data| !data['admin'] }.keys
 #jenkins_regular = ::MU::Master.listUsers.delete_if { |u, data| data['admin'] or u == "jenkins" }.keys
 regular_user_perms = ["Item.BUILD", "Item.CREATE", "Item.DISCOVER", "Item.READ"]
 jenkins_script 'configure_jenkins_auth' do

data/cookbooks/mu-master/recipes/389ds.rb

@@ -50,7 +50,7 @@ directory "/root/389ds.tmp" do
   recursive true
   mode 0700
 end
-$CREDS.each_pair { |creds, cfg|
+$CREDS.each_pair { |creds, _cfg|
   user = pw = data = nil
   if $MU_CFG["ldap"].has_key?(creds)
     data = chef_vault_item($MU_CFG['ldap'][creds]['vault'], $MU_CFG['ldap'][creds]['item'])
@@ -73,7 +73,7 @@ end
 
 #  %x{/usr/sbin/setenforce 0}
 execute "initialize 389 Directory Services" do
-  command "/usr/sbin/setup-ds-admin.pl -s -f /root/389ds.tmp/389-directory-setup.inf --continue --debug #{Dir.exists?("/etc/dirsrv/slapd-#{$MU_CFG["hostname"]}") ? "--update" : ""}"
+  command "/usr/sbin/setup-ds-admin.pl -s -f /root/389ds.tmp/389-directory-setup.inf --continue --debug #{Dir.exist?("/etc/dirsrv/slapd-#{$MU_CFG["hostname"]}") ? "--update" : ""}"
   action :nothing
 end
 
@@ -84,7 +84,7 @@ template "/root/389ds.tmp/389-directory-setup.inf"do
             :domain => $MU_CFG["ldap"]["domain_name"],
             :domain_dn => $MU_CFG["ldap"]["domain_name"].split(/\./).map{ |x| "DC=#{x}" }.join(","),
             :creds => $CREDS
-  not_if { ::Dir.exists?("/etc/dirsrv/slapd-#{$MU_CFG["hostname"]}") }
+  not_if { ::Dir.exist?("/etc/dirsrv/slapd-#{$MU_CFG["hostname"]}") }
   notifies :run, "execute[initialize 389 Directory Services]", :immediately
 end
 
@@ -131,7 +131,7 @@ ruby_block "import SSL certificates for 389ds" do
     certimportcmd = "/usr/bin/pk12util -i /opt/mu/var/ssl/ldap.p12 -d /etc/dirsrv/slapd-#{$MU_CFG["hostname"]} -w /root/389ds.tmp/blank -W \"\""
     require 'pty'
     require 'expect'
-    PTY.spawn(certimportcmd) { |r, w, pid|
+    PTY.spawn(certimportcmd) { |r, w, _pid|
       begin
         r.expect("Enter new password:") do
           w.puts

data/cookbooks/mu-master/recipes/default.rb

@@ -55,7 +55,7 @@ if !node['update_nagios_only']
 
   include_recipe 'chef-vault'
   if $MU_CFG.has_key?('ldap')
-    if $MU_CFG['ldap']['type'] == "389 Directory Services" and Dir.exists?("/etc/dirsrv/slapd-#{$MU_CFG['hostname']}")
+    if $MU_CFG['ldap']['type'] == "389 Directory Services" and Dir.exist?("/etc/dirsrv/slapd-#{$MU_CFG['hostname']}")
       include_recipe 'mu-master::sssd'
     elsif $MU_CFG['ldap']['type'] == "Active Directory"
       node.normal['ad'] = {}

data/cookbooks/mu-master/recipes/init.rb

@@ -40,7 +40,7 @@ CHEF_CLIENT_VERSION="14.4.56"
 KNIFE_WINDOWS="1.9.0"
 MU_BASE="/opt/mu"
 MU_BRANCH="Azure_you_want_azure" # GIT HOOK EDITABLE DO NOT TOUCH
-realbranch=`cd #{MU_BASE}/lib && git rev-parse --abbrev-ref HEAD`
+realbranch=`cd #{MU_BASE}/lib && git rev-parse --abbrev-ref HEAD` # ~FC048
 
 if ENV.key?('MU_BRANCH')
   MU_BRANCH = ENV['MU_BRANCH']
@@ -87,16 +87,16 @@ end
 #  owner "opscode-pgsql"
 #  group "opscode-pgsql"
 #  action :nothing
-#  only_if { !::File.exists?("/tmp/.s.PGSQL.5432") }
-#  only_if { ::File.exists?("/var/run/postgresql/.s.PGSQL.5432") }
+#  only_if { !::File.exist?("/tmp/.s.PGSQL.5432") }
+#  only_if { ::File.exist?("/var/run/postgresql/.s.PGSQL.5432") }
 #end
 link "/var/run/postgresql/.s.PGSQL.5432" do
   to "/tmp/.s.PGSQL.5432"
 #  owner "opscode-pgsql"
 #  group "opscode-pgsql"
   notifies :create, "directory[/var/run/postgresql]", :before
-  only_if { !::File.exists?("/var/run/postgresql/.s.PGSQL.5432") }
-#  only_if { ::File.exists?("/tmp/.s.PGSQL.5432") }
+  only_if { !::File.exist?("/var/run/postgresql/.s.PGSQL.5432") }
+#  only_if { ::File.exist?("/tmp/.s.PGSQL.5432") }
 end
 execute "Chef Server rabbitmq workaround" do
   # This assumes we get clean stop, which *should* be the case if we execute
@@ -120,7 +120,7 @@ file "use a clean /etc/hosts during install" do
 "
   notifies :create, "remote_file[back up /etc/hosts]", :before
   only_if { RUNNING_STANDALONE }
-  not_if { ::Dir.exists?("#{MU_BASE}/lib/.git") }
+  not_if { ::Dir.exist?("#{MU_BASE}/lib/.git") }
 end
 
 execute "reconfigure Chef server" do
@@ -219,7 +219,7 @@ git "#{MU_BASE}/lib" do
   revision MU_BRANCH
   checkout_branch MU_BRANCH
   enable_checkout false
-  not_if { ::Dir.exists?("#{MU_BASE}/lib/.git") }
+  not_if { ::Dir.exist?("#{MU_BASE}/lib/.git") }
   notifies :run, "bash[set git default branch to #{MU_BRANCH}]", :immediately
 end
 
@@ -275,7 +275,7 @@ end
 # REMOVE OLD RUBYs
 execute "clean up old Ruby 2.1.6" do
   command "rm -rf /opt/rubies/ruby-2.1.6"
-  only_if { ::Dir.exists?("/opt/rubies/ruby-2.1.6") }
+  only_if { ::Dir.exist?("/opt/rubies/ruby-2.1.6") }
 end
 
 yum_package 'ruby23-2.3.1-1.el7.centos.x86_64' do
@@ -284,12 +284,12 @@ end
 
 execute "Kill ruby-2.3.1" do
   command "yum erase ruby23-2.3.1-1.el7.centos.x86_64 -y"
-  only_if { ::Dir.exists?("/opt/rubies/ruby-2.3.1") }
+  only_if { ::Dir.exist?("/opt/rubies/ruby-2.3.1") }
 end
 
 execute "clean up old ruby-2.3.1" do
   command "rm -rf /opt/rubies/ruby-2.3.1"
-  only_if { ::Dir.exists?("/opt/rubies/ruby-2.3.1") }
+  only_if { ::Dir.exist?("/opt/rubies/ruby-2.3.1") }
 end
 
 # Regular old rpm-based installs
@@ -406,8 +406,8 @@ end
         package_name "knife-windows"
         version Regexp.last_match[1]
         action :remove
-        only_if { ::Dir.exists?(dir) }
-        only_if { ::Dir.exists?(gemdir) }
+        only_if { ::Dir.exist?(dir) }
+        only_if { ::Dir.exist?(gemdir) }
       end
       execute "rm -rf #{gemdir}/knife-windows-#{Regexp.last_match[1]}"
     }
@@ -426,7 +426,7 @@ end
 #      command "patch -p1 < #{MU_BASE}/lib/install/knife-windows-cygwin-#{KNIFE_WINDOWS}.patch"
 #      not_if "grep -i 'locate_config_value(:cygwin)' #{gemdir}/knife-windows-#{KNIFE_WINDOWS}/lib/chef/knife/bootstrap_windows_base.rb"
 #      notifies :restart, "service[chef-server]", :delayed if rubydir == "/opt/opscode/embedded"
-#      only_if { ::Dir.exists?(gemdir) }
+#      only_if { ::Dir.exist?(gemdir) }
       # XXX notify mommacat if we're *not* in chef-apply... RUNNING_STANDALONE
 #    end
   end
@@ -504,7 +504,7 @@ bash "add localhost ssh to authorized_keys and config" do
 end
 execute "ssh-keygen -N '' -f #{ROOT_SSH_DIR}/id_rsa" do
   umask 0177
-  not_if { ::File.exists?("#{ROOT_SSH_DIR}/id_rsa") }
+  not_if { ::File.exist?("#{ROOT_SSH_DIR}/id_rsa") }
   notifies :run, "bash[add localhost ssh to authorized_keys and config]", :immediately
 end
 file "/etc/chef/client.pem" do

data/cookbooks/mu-master/recipes/ssl-certs.rb

@@ -25,7 +25,7 @@
 include_recipe 'mu-master::firewall-holes'
 service_certs = ["rsyslog", "mommacat", "ldap", "consul", "vault"]
 
-directory "#{$MU_CFG['datadir']}"
+directory $MU_CFG['datadir']
 directory "#{$MU_CFG['datadir']}/ssl"
 template "#{$MU_CFG['datadir']}/ssl/openssl.cnf" do
   source "openssl.cnf.erb"
@@ -41,7 +41,7 @@ end
 execute "generate SSL CA key" do
   command "openssl genrsa -out Mu_CA.key 4096"
   cwd "#{$MU_CFG['datadir']}/ssl"
-  not_if { ::File.exists?("#{$MU_CFG['datadir']}/ssl/Mu_CA.key") }
+  not_if { ::File.exist?("#{$MU_CFG['datadir']}/ssl/Mu_CA.key") }
   notifies :delete, "file[#{$MU_CFG['datadir']}/ssl/CA-command.txt]", :immediately
 end
 file "#{$MU_CFG['datadir']}/ssl/Mu_CA.key" do

data/cookbooks/mu-master/recipes/update_nagios_only.rb

@@ -102,7 +102,7 @@ nagios_policies.each { |policy|
 
 # Workaround for minor Nagios (cookbook?) bug. It looks for this at the wrong
 # URL at the moment, so copy it where it's actually looking.
-if File.exists?("/usr/lib/cgi-bin/nagios/statusjson.cgi")
+if File.exist?("/usr/lib/cgi-bin/nagios/statusjson.cgi")
   remote_file "/usr/lib/cgi-bin/statusjson.cgi" do
     source "file:///usr/lib/cgi-bin/nagios/statusjson.cgi"
     mode 0755
@@ -155,7 +155,7 @@ end
 ["/etc/nagios/conf.d/", "/etc/nagios/*.cfg", "/var/run/nagios.pid"].each { |dir|
   execute "/sbin/restorecon -R #{dir}" do
     not_if "ls -aZ #{dir} | grep ':nagios_etc_t:'"
-    only_if { ::File.exists?(dir) }
+    only_if { ::File.exist?(dir) }
   end
 }
 

data/cookbooks/mu-splunk/definitions/splunk_installer.rb

@@ -75,7 +75,7 @@ define :splunk_installer, :url => nil do
   begin
     resources('package['+params[:name]+']')
   rescue Chef::Exceptions::ResourceNotFound
-    package params[:name] do
+    package params[:name] do # ~FC109
       source cached_package.gsub(/\.Z/, '')
       notifies :create, "remote_file[#{cached_package}]", :before
       notifies :delete, "file[#{cached_package} cleanup]", :immediately

data/cookbooks/mu-splunk/libraries/splunk_app_provider.rb

@@ -24,7 +24,7 @@ include Chef::Mixin::ShellOut
 class Chef
   class Provider
     class SplunkApp < Chef::Provider::LWRPBase
-      use_inline_resources if defined?(:use_inline_resources)
+      use_inline_resources if defined?(:use_inline_resources) # ~FC113
 
       def whyrun_supported?
         true

data/cookbooks/mu-splunk/recipes/upgrade.rb

@@ -29,7 +29,7 @@ service 'splunk_stop' do
   if node['platform_family'] != 'windows'
     service_name 'splunk'
     provider Chef::Provider::Service::Init
-    only_if { ::File.exists?("/etc/init.d/splunk") }
+    only_if { ::File.exist?("/etc/init.d/splunk") }
   else
     service_name 'SplunkForwarder'
     provider Chef::Provider::Service::Windows
@@ -40,7 +40,7 @@ service 'splunk_stop' do
     start_command "c:/Windows/system32/sc.exe start SplunkForwarder"
     stop_command "c:/Windows/system32/sc.exe stop SplunkForwarder"
     pattern "splunkd.exe"
-    only_if { ::Dir.exists?("c:/Program Files/SplunkUniversalForwarder") }
+    only_if { ::Dir.exist?("c:/Program Files/SplunkUniversalForwarder") }
     not_if { ::Dir.glob("c:/Program Files/SplunkUniversalForwarder/splunkforwarder-#{node['splunk']['preferred_version']}-*").size > 0 }
   end
   supports :status => true
@@ -61,7 +61,7 @@ if node['platform_family'] == 'windows'
       }
     EOH
     not_if { ::Dir.glob("c:/Program Files/SplunkUniversalForwarder/splunkforwarder-#{node['splunk']['preferred_version']}-*").size > 0 }
-    only_if { ::Dir.exists?("c:/Program Files/SplunkUniversalForwarder") }
+    only_if { ::Dir.exist?("c:/Program Files/SplunkUniversalForwarder") }
   end
 end
 

data/cookbooks/mu-tools/libraries/helper.rb

@@ -157,7 +157,7 @@ module Mutools
     end
 
     def get_first_nameserver
-      if File.exists?("/etc/resolv.conf")
+      if File.exist?("/etc/resolv.conf")
         File.readlines("/etc/resolv.conf").each { |l|
           l.chomp!
           if l.match(/^nameserver (\d+\.\d+\.\d+\.\d+)$/)
@@ -190,9 +190,9 @@ module Mutools
       elsif !get_google_metadata("instance/name").nil?
         include_recipe "mu-tools::gcloud"
         ["/opt/google-cloud-sdk/bin/gsutil", "/bin/gsutil"].each { |gsutil|
-          next if !File.exists?(gsutil)
+          next if !File.exist?(gsutil)
           Chef::Log.info("Fetching deploy secret: #{gsutil} cp gs://#{bucket}/#{filename} -")
-          if File.exists?("/usr/bin/python2.7")
+          if File.exist?("/usr/bin/python2.7")
             # secret = %x{CLOUDSDK_PYTHON=/usr/bin/python2.7 #{gsutil} cp gs://#{bucket}/#{filename} -}
             secret = shell_out("CLOUDSDK_PYTHON=/usr/bin/python2.7 #{gsutil} cp gs://#{bucket}/#{filename} -").stdout.str
           else
@@ -232,7 +232,6 @@ module Mutools
           "mu_id" => mu_get_tag_value("MU-ID"),
           "mu_resource_name" => node['service_name'],
           "mu_instance_id" => get_aws_metadata("meta-data/instance-id") || get_google_metadata("name"),
-          "mu_resource_name" => node[:service_name],
           "mu_resource_type" => res_type,
           "mu_user" => node['deployment']['mu_user'] || node['deployment']['chef_user'],
           "mu_deploy_secret" => secret,

data/cookbooks/mu-tools/recipes/add_admin_ssh_keys.rb

@@ -24,7 +24,7 @@ if node['deployment']['admins']
   end rescue NoMethodError
   ssh_user = 'root' if ssh_user.nil?
   ssh_dir = "#{Etc.getpwnam(ssh_user).dir}/.ssh"
-  node['deployment']['admins'].each_pair { |name, admin|
+  node['deployment']['admins'].each_pair { |_name, admin|
     if !admin['public-key'].nil?
       execute "Add #{admin.name}'s ssh key to #{ssh_dir}/authorized_keys" do
         not_if "grep '^#{admin['public-key']}$' #{ssh_dir}/authorized_keys"

data/cookbooks/mu-tools/recipes/apply_security.rb

@@ -75,7 +75,7 @@ if !node['application_attributes']['skip_recipes'].include?('apply_security')
   				aide --init
   				mv /var/lib/aide/aide.db.new.gz /var/lib/aide/aide.db.gz
         EOH
-        not_if { File.exists?("/var/lib/aide/aide.db.gz") }
+        not_if { File.exist?("/var/lib/aide/aide.db.gz") }
       end
       cron "AIDE daily scan" do
         action :create
@@ -83,7 +83,7 @@ if !node['application_attributes']['skip_recipes'].include?('apply_security')
         hour "5"
         user "root"
         command "/usr/sbin/aide --check"
-        only_if { File.exists?("/usr/sbin/aide") }
+        only_if { File.exist?("/usr/sbin/aide") }
       end
   
       cookbook_file "/etc/security/limits.conf" do
@@ -338,7 +338,7 @@ if !node['application_attributes']['skip_recipes'].include?('apply_security')
 
       Chef::Log.info("Value of login_disabled is #{node.normal.root_login_disabled}")
   
-      ruby_block "do a bunch of weird stuff" do
+      ruby_block "do a bunch of weird stuff" do # ~FC014
         block do
           cmd = Mixlib::ShellOut.new('chcon -Rv --type=user_home_t /home')
           cmd.run_command
@@ -357,7 +357,7 @@ if !node['application_attributes']['skip_recipes'].include?('apply_security')
           fe.search_file_replace_line(/^AllowUsers.*$/, valid_users)
           fe.write_file
         end
-        only_if { ::File.exists?("/tmp/moveusers.tgz") }
+        only_if { ::File.exist?("/tmp/moveusers.tgz") }
       end
   
       execute "mount -oremount /dev/shm" do

data/cookbooks/mu-tools/recipes/base_repositories.rb

@@ -19,7 +19,7 @@
 
 if !node['application_attributes']['skip_recipes'].include?('base_repositories')
   case node['platform_family']
-    when "rhel", "redhat"
+    when "rhel", "redhat" # ~FC024
       # Workaround for EOL CentOS 5 repos
       if node['platform'] != "amazon" and node['platform_version'].to_i == 5
         cookbook_file "/etc/yum.repos.d/CentOS-Base.repo" do

data/cookbooks/mu-tools/recipes/cloudinit.rb

@@ -51,7 +51,7 @@ if !node['application_attributes']['skip_recipes'].include?('epel') and !node['a
   elsif platform_family?("debian")
     package "cloud-init"
   elsif platform_family?("windows")
-    Chef::Log.info ("Windows use ec2config, no cloud-init package is necessary")
+    Chef::Log.info("Windows use ec2config, no cloud-init package is necessary")
   else
     Chef::Log.info("Unsupported platform #{node['platform']}")
   end

data/cookbooks/mu-tools/recipes/efs.rb

@@ -24,14 +24,14 @@ if node['deployment'].has_key?('storage_pools')
   case node['platform']
   when 'ubuntu'
     package "nfs-common"
-  when "rhel", "amazon", "centos"
+  when "rhel", "amazon", "centos" # ~FC024
     package %w{nfs-utils nfs4-acl-tools}
   end
 
   instance_identity = JSON.parse(Net::HTTP.get(URI("http://169.254.169.254/latest/dynamic/instance-identity/document")))
 
-  node['deployment']['storage_pools'].each { |name, pool|
-    pool['mount_targets'].each { |name, target|
+  node['deployment']['storage_pools'].each { |_name, pool|
+    pool['mount_targets'].each { |_name, target|
       if target['availability_zone'] == instance_identity["availabilityZone"]
       # Should also make it possible to choose a random endpoint if there isn't one for a specific AZ
 
@@ -48,7 +48,7 @@ if node['deployment'].has_key?('storage_pools')
           endpoint = target['ip_address']
         end
 
-        if node[:platform_family] == "rhel" and node[:platform_version].to_i < 6 and node['platform'] != "amazon"
+        if node['platform_family'] == "rhel" and node['platform_version'].to_i < 6 and node['platform'] != "amazon"
           service "portmap" do
             action [:enable, :start]
           end

data/cookbooks/mu-tools/recipes/eks.rb

@@ -26,7 +26,7 @@ if node['deployment'].has_key?('container_clusters')
   endpoint = node['deployment']['container_clusters'][cluster_short_name]['endpoint']
 #  admin_role = node['deployment']['container_clusters'][cluster_short_name]['k8s_admin_role']
 
-  if platform_family?("rhel") and node[:platform_version].to_i >= 7
+  if platform_family?("rhel") and node['platform_version'].to_i >= 7
     execute "rpm --import https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg"
     file "/etc/yum.repos.d/kubernetes.repo" do
       content "[kubernetes]
@@ -66,7 +66,7 @@ EOH
     package "kubelet"
     package "kubectl"
   else
-    Chef::Log.info("I don't know how to turn this #{node['platform']} AMI (#{node[:platform_version].to_s}) into a Kubernetes worker, hopefully it's the official, pre-configured AMI")
+    Chef::Log.info("I don't know how to turn this #{node['platform']} AMI (#{node['platform_version'].to_s}) into a Kubernetes worker, hopefully it's the official, pre-configured AMI")
   end
 
   service "docker" do

data/cookbooks/mu-tools/recipes/gcloud.rb

@@ -70,7 +70,7 @@ if platform_family?("rhel")
       EOH
       notifies :create, "remote_file[#{Chef::Config[:file_cache_path]}/gcloud-cli.sh]", :before
       notifies :create, "remote_file[#{Chef::Config[:file_cache_path]}/gcloud-cli.tar.gz]", :before
-      not_if { ::File.exists?("/opt/google-cloud-sdk/bin/gcloud") }
+      not_if { ::File.exist?("/opt/google-cloud-sdk/bin/gcloud") }
     end
     link "/etc/bash_completion.d/gcloud" do
       to "/opt/google-cloud-sdk/completion.bash.inc"
@@ -91,7 +91,7 @@ elsif platform_family?("debian")
       curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
       sudo apt-get update
     EOH
-    not_if { ::File.exists?("/etc/apt/sources.list.d/google-cloud-sdk.list") }
+    not_if { ::File.exist?("/etc/apt/sources.list.d/google-cloud-sdk.list") }
   end
   package "google-cloud-sdk"
 else

data/cookbooks/mu-tools/recipes/newclient.rb

@@ -17,7 +17,7 @@ if !node['application_attributes']['skip_recipes'].include?('newclient')
     file Chef::Config[:validation_key] do
       action :delete
       backup false
-      only_if { ::File.exists?(Chef::Config[:client_key]) }
+      only_if { ::File.exist?(Chef::Config[:client_key]) }
     end
   end
 end

data/cookbooks/mu-tools/recipes/python_pip.rb

@@ -23,6 +23,7 @@
 
 case node['platform']
   when "windows"
+    Chef::Log.info 'Unsupported platform Windows'
   else
     bash "update-pip" do
       code <<-EOF

data/cookbooks/mu-tools/recipes/rsyslog.rb

@@ -23,7 +23,7 @@ if !node['application_attributes']['skip_recipes'].include?('rsyslog')
     package "rsyslog-gnutls"
     execute "chcon -R -h -t var_log_t /Mu_Logs" do
       action :nothing
-      only_if { ::Dir.exists?("/Mu_Logs") }
+      only_if { ::Dir.exist?("/Mu_Logs") }
     end
     service "rsyslog" do
       action [:enable, :start]

data/cookbooks/mu-tools/recipes/set_local_fw.rb

@@ -30,7 +30,7 @@ when platform_family?('rhel')
       command "/bin/firewall-cmd --reload"
       action :nothing
       not_if "/bin/systemctl list-units | grep iptables.service"
-      only_if { ::File.exists?("/bin/firewall-cmd") }
+      only_if { ::File.exist?("/bin/firewall-cmd") }
     end
   end
 

data/cookbooks/mu-tools/recipes/set_mu_hostname.rb

@@ -37,7 +37,7 @@ if !node['application_attributes']['skip_recipes'].include?('set_mu_hostname')
   end
 
   case node['platform']
-    when "rhel", "centos", "amazon"
+    when "rhel", "centos", "amazon" # ~FC024
       template "/etc/sysconfig/network" do
         source "etc_sysconfig_network.erb"
         notifies :run, "execute[set hostname]", :immediately if elversion != 7
@@ -47,7 +47,7 @@ if !node['application_attributes']['skip_recipes'].include?('set_mu_hostname')
         )
       end
 
-      if elversion == 7 and File.exists?("/etc/cloud/cloud.cfg")
+      if elversion == 7 and File.exist?("/etc/cloud/cloud.cfg")
         execute "sed -i '/ssh_pwauth/a preserve_hostname: true' /etc/cloud/cloud.cfg" do
           not_if "grep 'preserve_hostname: true' /etc/cloud/cloud.cfg"
         end

data/cookbooks/mu-tools/recipes/splunk-client.rb

@@ -60,10 +60,10 @@ deploy_svr = splunk_servers.first
 if !deploy_svr.nil?
   execute 'Splunk client poll for deploy server' do
     command "\"#{splunk_cmd}\" set deploy-poll #{deploy_svr['splunk']['receiver_ip']}:8089 -auth #{user}:#{pw}"
-    not_if { ::File.exists?(deploy_guard) }
+    not_if { ::File.exist?(deploy_guard) }
     notifies :create, "file[#{deploy_guard}]", :immediately
     notifies :restart, "service[splunk]", :delayed
   end
 else
-  Chef::Log.info ("Configured to run a Splunk client, but no Splunk servers were found.")
+  Chef::Log.info("Configured to run a Splunk client, but no Splunk servers were found.")
 end

data/cookbooks/mu-tools/recipes/updates.rb

@@ -34,7 +34,7 @@ if !node['application_attributes']['skip_recipes'].include?('updates')
         windows_zipfile dir do
           source "#{Chef::Config[:file_cache_path]}/PSWindowsUpdate.zip"
           action :unzip
-          not_if { File.exists?("#{dir}/PSWindowsUpdate") }
+          not_if { File.exist?("#{dir}/PSWindowsUpdate") }
         end
       }
   

data/cookbooks/mu-tools/recipes/windows-client.rb

@@ -35,13 +35,13 @@ if !node['application_attributes']['skip_recipes'].include?('windows-client')
 #        code <<-EOH
 #          Start-Process -wait -FilePath "#{Chef::Config[:file_cache_path]}/cygwin-x86_64.exe" -ArgumentList "-q -n -l #{Chef::Config[:file_cache_path]} -L -R c:/bin/cygwin -s http://mirror.cs.vt.edu/pub/cygwin/cygwin/ -P #{pkgs.join(",")}"
 #        EOH
-#        not_if { ::File.exists?("#{cygwindir}/Cygwin.bat") }
+#        not_if { ::File.exist?("#{cygwindir}/Cygwin.bat") }
 #      end
 
       # Be prepared to reinit installs that are missing key utilities
 #      file "#{cygwindir}/etc/setup/installed.db" do
 #        action :delete
-#        not_if { ::File.exists?("#{cygwindir}/bin/cygcheck.exe") }
+#        not_if { ::File.exist?("#{cygwindir}/bin/cygcheck.exe") }
 #      end
 
 #      pkgs.each { |pkg|

data/cookbooks/mu-tools/resources/disk.rb

@@ -5,7 +5,7 @@ property :preserve_data, :kind_of => [TrueClass, FalseClass], :required => false
 property :reboot_after_create, :kind_of => [TrueClass, FalseClass], :required => false, :default => false
 property :size, Integer, default: 8
 
-actions :create
+actions :create # ~FC092
 default_action :create
 
 action :create do
@@ -24,7 +24,7 @@ action :create do
       :dev => devicename,
       :size => new_resource.size
     )
-    not_if { ::File.exists?(device) }
+    not_if { ::File.exist?(device) }
   end
 
   reboot "Rebooting after adding #{path}" do
@@ -45,7 +45,7 @@ action :create do
     # also expunge files so we don't eat up a bunch of disk space quietly
     # underneath our new mount
     command "( cd #{path} && tar -cpf - . | su -c 'cd /mnt#{backupname}/ && tar -xpf -' ) && find #{path}/ -type f -exec rm -f {} \\;"
-    only_if { ::Dir.exists?(path) and ::Dir.exists?("/mnt#{backupname}") }
+    only_if { ::Dir.exist?(path) and ::Dir.exist?("/mnt#{backupname}") }
     action :nothing
   end
 
@@ -71,7 +71,7 @@ action :create do
     end
 
     execute "/sbin/restorecon -R #{path}" do
-      only_if { ::File.exists?("/sbin/restorecon") }
+      only_if { ::File.exist?("/sbin/restorecon") }
       action :nothing
     end
 

data/cookbooks/mu-tools/resources/mommacat_request.rb

@@ -2,7 +2,7 @@
 property :request, String, name_property: true
 property :passparams, Hash
 
-actions :run
+actions :run # ~FC092
 default_action :run
 
 action :run do

data/cookbooks/mu-tools/resources/sshd_service.rb

@@ -1,6 +1,6 @@
 resource_name :sshd_service
 
-property :name, String, name_property: true
+property :name, String, name_property: true # ~FC108
 property :username, String, required: true
 property :password, String, required: true
 property :service_username, String, required: true

data/cookbooks/mu-tools/resources/windows_users.rb

@@ -19,7 +19,7 @@ action :config do
     source "ntrights"
   end
 
-  if is_domain_controller?(new_resource.computer_name)
+  if domain_controller?(new_resource.computer_name)
     [new_resource.username, new_resource.ssh_user, new_resource.ec2config_user].each { |user|
       unless domain_user_exist?(user)
         pwd = 
@@ -69,7 +69,7 @@ action :config do
     # Using WinRM here doesn't work for multiple reasons so instead we're going to run it only on the schemamaster which is hopefully still the first domain controller.
     # Also need to chagne this to re-import the GPO even if the GPO exist. The SSH user that is running the service might change, and the GPO will have the old SID.
     gpo_name = "ec2config-ssh-privileges"
-    if is_schemamaster?(new_resource.domain_name, new_resource.computer_name)
+    if schemamaster?(new_resource.domain_name, new_resource.computer_name)
       unless gpo_exist?(gpo_name)
         ["Machine\\microsoft\\windows nt\\SecEdit", "Machine\\Scripts\\Shutdown", "Machine\\Scripts\\Startup", "User"].each { |dir|
           directory "#{Chef::Config[:file_cache_path]}\\gpo\\{24E13F41-7118-4FB6-AE8B-45D48AFD6AFE}\\DomainSysvol\\GPO\\#{dir}" do

data/cookbooks/mu-utility/recipes/cleanup_image_helper.rb

@@ -66,9 +66,9 @@ case node['platform']
     end
 
 # XXX this breaks Chef mid-run
-#	if Dir.exists?("C:\\chef")
+#	if Dir.exist?("C:\\chef")
 #		%w{client.rb first-boot.json client.pem validation.pem}.each { |file|
-#			if File.exists?("C:\\chef\\#{file}")
+#			if File.exist?("C:\\chef\\#{file}")
 #				file "C:\\Users\\Administrator\\AppData\\Local\\Temp\\#{file}" do
 #					content IO.read("C:\\chef\\#{file}")
 #				end

data/cookbooks/mu-utility/recipes/php.rb

@@ -17,12 +17,7 @@
 # limitations under the License.
 
 case node['platform']
-
-  when "centos"
-
-
   when "ubuntu"
-
     ["php5", "php5-mysql", "libapache2-mod-php5", "php5-mysql", "php5-curl", "php5-gd", "php5-intl", "php-pear", "php5-imagick", "php5-imap", "php5-mcrypt", "php5-memcache", "php5-ming", "php5-ps", "php5-pspell", "php5-recode", "php5-snmp", "php5-sqlite", "php5-tidy", "php5-xmlrpc", "php5-xsl", "php5-fpm"].each { |pkg|
       package pkg
     }

data/cookbooks/nagios/libraries/users_helper.rb

@@ -37,7 +37,7 @@ class NagiosUsers
 
   def load_encrypted_databag(user_databag)
     Chef::DataBag.load(user_databag).each do |u, _|
-      d = Chef::EncryptedDataBagItem.load(user_databag, u)
+      d = Chef::EncryptedDataBagItem.load(user_databag, u) # ~FC086
       @users << d unless d['nagios'].nil? || d['nagios']['email'].nil?
     end
   rescue Net::HTTPServerException

data/extras/ruby_rpm/muby.spec

@@ -9,6 +9,10 @@ URL: http://www.ruby-lang.org/
 Prefix: /opt/rubies
 Source: https://cache.ruby-lang.org/pub/ruby/2.5/ruby-%{version}.tar.gz
 
+BuildRequires: zlib
+BuildRequires: zlib-devel
+BuildRequires: openssl
+
 %description
 I was drunk when I wrote this spec file
     

data/modules/mu/clouds/aws.rb

@@ -148,7 +148,7 @@ module MU
         return @@myRegion_var if @@myRegion_var
         return nil if credConfig.nil? and !hosted?
 
-        if $MU_CFG and (!$MU_CFG['aws'] or !account_number) and !hosted?
+        if $MU_CFG and (!$MU_CFG['aws'] or !account_number) and !hosted? and !ENV['EC2_REGION']
           return nil
         end
 
@@ -439,6 +439,13 @@ module MU
               end
             rescue JSON::ParserError => e
             end
+          elsif ENV['AWS_ACCESS_KEY'] and ENV['AWS_SECRET_ACCESS_KEY']
+            env_config = {
+              "region" => ENV['EC2_REGION'] || "us-east-1",
+              "access_key" => ENV['AWS_ACCESS_KEY'],
+              "access_secret" => ENV['AWS_SECRET_ACCESS_KEY']
+            }
+            return name_only ? "#default" : env_config
           end
 
           return nil

data/modules/mu/clouds/azure.rb

@@ -71,15 +71,15 @@ module MU
       end
 
       def self.listRegions(credentials = nil)
-        "TODO"
+        []
       end
 
       def self.listAZs(region = nil)
-        "TODO"
+        []
       end
 
       def self.config_example
-        "TODO"
+        {}
       end
 
       def self.writeDeploySecret

data/modules/mu/config.rb

@@ -1152,18 +1152,21 @@ module MU
       ok
     end
 
-# XXX this is some primitive nonsense and needs to be cloud-agnostic
     @@allregions = []
-    @@allregions.concat(MU::Cloud::AWS.listRegions) if MU::Cloud::AWS.myRegion
-    @@allregions.concat(MU::Cloud::Google.listRegions) if MU::Cloud::Google.defaultProject
+    MU::Cloud.supportedClouds.each { |cloud|
+      cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
+      @@allregions.concat(cloudclass.listRegions())
+    }
 
     # Configuration chunk for choosing a provider region
     # @return [Hash]
     def self.region_primitive
       if !@@allregions or @@allregions.empty?
         @@allregions = []
-        @@allregions.concat(MU::Cloud::AWS.listRegions) if MU::Cloud::AWS.myRegion
-        @@allregions.concat(MU::Cloud::Google.listRegions) if MU::Cloud::Google.defaultProject
+        MU::Cloud.supportedClouds.each { |cloud|
+          cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
+          @@allregions.concat(cloudclass.listRegions())
+        }
       end
       {
         "type" => "string",
@@ -1633,10 +1636,10 @@ module MU
           kitten['region'] ||= MU::Cloud::Google.myRegion(kitten['credentials'])
         end
       elsif !resclass.isGlobal?
-        if MU::Cloud::AWS.myRegion.nil?
+        if MU::Cloud::AWS.myRegion(kitten['credentials']).nil?
           raise ValidationError, "AWS resource declared without a region, but no default AWS region found"
         end
-        kitten['region'] ||= MU::Cloud::AWS.myRegion
+        kitten['region'] ||= MU::Cloud::AWS.myRegion(kitten['credentials'])
       end
 
       kitten['us_only'] ||= @config['us_only']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha7
+  version: 2.0.0.pre.alpha8
 platform: ruby
 authors:
 - John Stange
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis