cloud-mu 3.6.9 → 3.6.11

data/modules/mu/providers/aws.rb

@@ -1645,21 +1645,23 @@ MU.log "Fetch of http://169.254.169.254/latest/meta-data/instance-id took #{spri
         # rescues for known silly endpoint behavior.
         def method_missing(method_sym, *arguments)
           # make sure error symbols are loaded for our exception handling later
-          require "aws-sdk-lambda"
-          require "aws-sdk-rds"
           require "aws-sdk-ec2"
-          require "aws-sdk-route53"
-          require "aws-sdk-iam"
-          require "aws-sdk-efs"
-          require "aws-sdk-pricing"
-          require "aws-sdk-apigateway"
-          require "aws-sdk-ecs"
-          require "aws-sdk-eks"
-          require "aws-sdk-cloudwatchlogs"
-          require "aws-sdk-cloudwatchevents"
-          require "aws-sdk-elasticloadbalancing"
-          require "aws-sdk-elasticloadbalancingv2"
-          require "aws-sdk-autoscaling"
+          if @api_name != "EC2"
+            require "aws-sdk-lambda"
+            require "aws-sdk-rds"
+            require "aws-sdk-route53"
+            require "aws-sdk-iam"
+            require "aws-sdk-efs"
+            require "aws-sdk-pricing"
+            require "aws-sdk-apigateway"
+            require "aws-sdk-ecs"
+            require "aws-sdk-eks"
+            require "aws-sdk-cloudwatchlogs"
+            require "aws-sdk-cloudwatchevents"
+            require "aws-sdk-elasticloadbalancing"
+            require "aws-sdk-elasticloadbalancingv2"
+            require "aws-sdk-autoscaling"
+          end
 
           known_concats = {
             "Pricing" => {
@@ -1698,12 +1700,17 @@ MU.log "Fetch of http://169.254.169.254/latest/meta-data/instance-id took #{spri
 
               if paginator and new_page and !new_page.empty?
                 resp = retval.respond_to?(:__getobj__) ? retval.__getobj__ : retval
-                concat_to = MU.structToHash(resp).keys.reject { |m|
-                  m.to_s.match(/=$/) or m == paginator or resp.send(m).nil? or !resp.send(m).is_a?(Array)
-                }
+                # This one specific API has the dain bramage
+                if resp.class.name != "Aws::Pricing::Types::GetProductsResponse"
+                  concat_to = MU.structToHash(resp).keys.reject { |m|
+                    m.to_s.match(/=$/) or m == paginator or resp.send(m).nil? or !resp.send(m).is_a?(Array)
+                  }
+                end
 
-                if concat_to.empty? and known_concats[@api_name] and
+                if (concat_to.nil? or concat_to.empty?) and
+                   known_concats[@api_name] and
                    known_concats[@api_name][method_sym]
+                  concat_to ||= []
                   concat_to << known_concats[@api_name][method_sym]
                 end
 
@@ -1750,7 +1757,8 @@ MU.log "Fetch of http://169.254.169.254/latest/meta-data/instance-id took #{spri
             end
 
             return retval
-          rescue Aws::Lambda::Errors::TooManyRequestsException, Aws::RDS::Errors::Throttling, 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, Aws::ECS::Errors::ThrottlingException, Net::ReadTimeout, Faraday::TimeoutError, Aws::CloudWatchLogs::Errors::ThrottlingException => e
+#          rescue Aws::Lambda::Errors::TooManyRequestsException, Aws::RDS::Errors::Throttling, 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, Aws::ECS::Errors::ThrottlingException, Net::ReadTimeout, Faraday::TimeoutError, Aws::CloudWatchLogs::Errors::ThrottlingException => e
+          rescue Aws::Lambda::Errors::TooManyRequestsException, Aws::RDS::Errors::Throttling, 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, Aws::ECS::Errors::ThrottlingException, Net::ReadTimeout, Aws::CloudWatchLogs::Errors::ThrottlingException => 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

data/modules/mu/providers/google.rb

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'googleauth'
 require "net/http"
 require 'net/https'
 require 'multi_json'
@@ -529,6 +528,7 @@ MU.log e.message, MU::WARN, details: e.inspect
       # for consumption by the various GCP APIs.
       # @param scopes [Array<String>]: One or more scopes for which to authorizer the caller. Will vary depending on the API you're calling.
       def self.loadCredentials(scopes = nil, credentials: nil)
+        require 'googleauth'
         if @@authorizers[credentials] and @@authorizers[credentials][scopes.to_s]
           return @@authorizers[credentials][scopes.to_s]
         end

data/modules/mu.rb

@@ -788,7 +788,7 @@ module MU
   end
 
   # The version of Chef we will install on nodes.
-  @@chefVersion = "18.5.0"
+  @@chefVersion = "18.7.6"
   # The version of Chef we will install on nodes.
   # @return [String]
   def self.chefVersion
@@ -892,13 +892,14 @@ module MU
     begin
       google_struct = struct.class.ancestors.include?(::Google::Apis::Core::Hashable)
     rescue NameError
-    rescue TypeError
-      return struct
+    rescue TypeError => e
+      # XXX this just means we haven't loaded the google APIs, detect that state more cleanly and omit this entire block
+      return struct if e.message != "nil is not a class/module"
     end
 
     aws_struct = false
     begin
-      aws_struct = struct.class.ancestors.include?(::Seahorse::Client::Response)
+      aws_struct = struct.class.ancestors.include?(::Seahorse::Client::Response) or struct.is_a?(Aws::EC2::Types::IpRange)
     rescue NameError
     rescue TypeError
       return struct

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 3.6.9
+  version: 3.6.11
 platform: ruby
 authors:
 - John Stange
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2025-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -392,7 +392,6 @@ email: eGTLabs@eglobaltech.com
 executables:
 - mu-adopt
 - mu-ansible-secret
-- mu-aws-setup
 - mu-azure-setup
 - mu-azure-tests
 - mu-cleanup
@@ -411,8 +410,9 @@ executables:
 - mu-ssh
 - mu-tunnel-nagios
 - mu-user-manage
-- mu-configure
 - mu-upload-chef-artifacts
+- mu-aws-setup
+- mu-configure
 extensions: []
 extra_rdoc_files: []
 files:
@@ -562,49 +562,6 @@ files:
 - cookbooks/awscli/metadata.rb
 - cookbooks/awscli/recipes/default.rb
 - cookbooks/awscli/templates/default/config.erb
-- cookbooks/firewall/CHANGELOG.md
-- cookbooks/firewall/LICENSE
-- cookbooks/firewall/README.md
-- cookbooks/firewall/TODO.md
-- cookbooks/firewall/attributes/default.rb
-- cookbooks/firewall/attributes/firewalld.rb
-- cookbooks/firewall/attributes/iptables.rb
-- cookbooks/firewall/attributes/ufw.rb
-- cookbooks/firewall/attributes/windows.rb
-- cookbooks/firewall/chefignore
-- cookbooks/firewall/libraries/helpers.rb
-- cookbooks/firewall/libraries/helpers_firewalld.rb
-- cookbooks/firewall/libraries/helpers_firewalld_dbus.rb
-- cookbooks/firewall/libraries/helpers_iptables.rb
-- cookbooks/firewall/libraries/helpers_nftables.rb
-- cookbooks/firewall/libraries/helpers_ufw.rb
-- cookbooks/firewall/libraries/helpers_windows.rb
-- cookbooks/firewall/libraries/provider_firewall_firewalld.rb
-- cookbooks/firewall/libraries/provider_firewall_iptables.rb
-- cookbooks/firewall/libraries/provider_firewall_iptables_ubuntu.rb
-- cookbooks/firewall/libraries/provider_firewall_iptables_ubuntu1404.rb
-- cookbooks/firewall/libraries/provider_firewall_rule.rb
-- cookbooks/firewall/libraries/provider_firewall_ufw.rb
-- cookbooks/firewall/libraries/provider_firewall_windows.rb
-- cookbooks/firewall/libraries/resource_firewall.rb
-- cookbooks/firewall/libraries/resource_firewall_rule.rb
-- cookbooks/firewall/metadata.json
-- cookbooks/firewall/metadata.rb
-- cookbooks/firewall/recipes/default.rb
-- cookbooks/firewall/recipes/disable_firewall.rb
-- cookbooks/firewall/recipes/firewalld.rb
-- cookbooks/firewall/renovate.json
-- cookbooks/firewall/resources/firewalld.rb
-- cookbooks/firewall/resources/firewalld_config.rb
-- cookbooks/firewall/resources/firewalld_helpers.rb
-- cookbooks/firewall/resources/firewalld_icmptype.rb
-- cookbooks/firewall/resources/firewalld_ipset.rb
-- cookbooks/firewall/resources/firewalld_policy.rb
-- cookbooks/firewall/resources/firewalld_service.rb
-- cookbooks/firewall/resources/firewalld_zone.rb
-- cookbooks/firewall/resources/nftables.rb
-- cookbooks/firewall/resources/nftables_rule.rb
-- cookbooks/firewall/templates/default/ufw/default.erb
 - cookbooks/mu-activedirectory/Berksfile
 - cookbooks/mu-activedirectory/CHANGELOG.md
 - cookbooks/mu-activedirectory/LICENSE
@@ -668,6 +625,27 @@ files:
 - cookbooks/mu-master/README.md
 - cookbooks/mu-master/attributes/default.rb
 - cookbooks/mu-master/files/default/0-mu-log-server.conf
+- cookbooks/mu-master/files/default/389ds-perl/ASDialogs.pm
+- cookbooks/mu-master/files/default/389ds-perl/AdminMigration.pm
+- cookbooks/mu-master/files/default/389ds-perl/AdminServer.pm
+- cookbooks/mu-master/files/default/389ds-perl/AdminUtil.pm
+- cookbooks/mu-master/files/default/389ds-perl/ConfigDSDialogs.pm
+- cookbooks/mu-master/files/default/389ds-perl/DSCreate.pm
+- cookbooks/mu-master/files/default/389ds-perl/DSDialogs.pm
+- cookbooks/mu-master/files/default/389ds-perl/DSMigration.pm
+- cookbooks/mu-master/files/default/389ds-perl/DSUpdate.pm
+- cookbooks/mu-master/files/default/389ds-perl/DSUpdateDialogs.pm
+- cookbooks/mu-master/files/default/389ds-perl/DSUtil.pm
+- cookbooks/mu-master/files/default/389ds-perl/Dialog.pm
+- cookbooks/mu-master/files/default/389ds-perl/DialogManager.pm
+- cookbooks/mu-master/files/default/389ds-perl/FileConn.pm
+- cookbooks/mu-master/files/default/389ds-perl/Inf.pm
+- cookbooks/mu-master/files/default/389ds-perl/Migration.pm
+- cookbooks/mu-master/files/default/389ds-perl/RegDSDialogs.pm
+- cookbooks/mu-master/files/default/389ds-perl/Resource.pm
+- cookbooks/mu-master/files/default/389ds-perl/Setup.pm
+- cookbooks/mu-master/files/default/389ds-perl/SetupDialogs.pm
+- cookbooks/mu-master/files/default/389ds-perl/SetupLog.pm
 - cookbooks/mu-master/files/default/addRSA.ldif
 - cookbooks/mu-master/files/default/check_elastic.sh
 - cookbooks/mu-master/files/default/check_kibana.rb
@@ -680,6 +658,7 @@ files:
 - cookbooks/mu-master/files/default/nagios_selinux_7.pp
 - cookbooks/mu-master/files/default/nagios_selinux_7.te
 - cookbooks/mu-master/files/default/pam_sshd
+- cookbooks/mu-master/files/default/setCertName.ldif
 - cookbooks/mu-master/files/default/ssl_enable.ldif
 - cookbooks/mu-master/files/default/syslogd_oddjobd.pp
 - cookbooks/mu-master/files/default/syslogd_oddjobd.te
@@ -802,6 +781,7 @@ files:
 - cookbooks/mu-tools/files/centos/etc/security/limits.conf
 - cookbooks/mu-tools/files/centos/etc/sysconfig/init
 - cookbooks/mu-tools/files/centos/etc/sysctl.conf
+- cookbooks/mu-tools/files/default/Mu_CA.pem
 - cookbooks/mu-tools/files/default/PSWindowsUpdate.zip
 - cookbooks/mu-tools/files/default/ebs_snapshots.py
 - cookbooks/mu-tools/files/default/etc/BANNER
@@ -937,6 +917,75 @@ files:
 - cookbooks/mu-utility/recipes/zip.rb
 - cookbooks/mu-utility/templates/default/BundleConfig.xml.erb
 - cookbooks/mu-utility/templates/default/config.xml.erb
+- cookbooks/nagios/CHANGELOG.md
+- cookbooks/nagios/LICENSE
+- cookbooks/nagios/README.md
+- cookbooks/nagios/attributes/config.rb
+- cookbooks/nagios/attributes/default.rb
+- cookbooks/nagios/chefignore
+- cookbooks/nagios/libraries/base.rb
+- cookbooks/nagios/libraries/command.rb
+- cookbooks/nagios/libraries/contact.rb
+- cookbooks/nagios/libraries/contactgroup.rb
+- cookbooks/nagios/libraries/custom_option.rb
+- cookbooks/nagios/libraries/data_bag_helper.rb
+- cookbooks/nagios/libraries/default.rb
+- cookbooks/nagios/libraries/helpers.rb
+- cookbooks/nagios/libraries/host.rb
+- cookbooks/nagios/libraries/hostdependency.rb
+- cookbooks/nagios/libraries/hostescalation.rb
+- cookbooks/nagios/libraries/hostgroup.rb
+- cookbooks/nagios/libraries/nagios.rb
+- cookbooks/nagios/libraries/resource.rb
+- cookbooks/nagios/libraries/service.rb
+- cookbooks/nagios/libraries/servicedependency.rb
+- cookbooks/nagios/libraries/serviceescalation.rb
+- cookbooks/nagios/libraries/servicegroup.rb
+- cookbooks/nagios/libraries/timeperiod.rb
+- cookbooks/nagios/libraries/users_helper.rb
+- cookbooks/nagios/metadata.json
+- cookbooks/nagios/metadata.rb
+- cookbooks/nagios/recipes/_load_databag_config.rb
+- cookbooks/nagios/recipes/_load_default_config.rb
+- cookbooks/nagios/recipes/apache.rb
+- cookbooks/nagios/recipes/default.rb
+- cookbooks/nagios/recipes/nginx.rb
+- cookbooks/nagios/recipes/pagerduty.rb
+- cookbooks/nagios/recipes/server.rb
+- cookbooks/nagios/recipes/server_package.rb
+- cookbooks/nagios/recipes/server_source.rb
+- cookbooks/nagios/renovate.json
+- cookbooks/nagios/resources/command.rb
+- cookbooks/nagios/resources/conf.rb
+- cookbooks/nagios/resources/contact.rb
+- cookbooks/nagios/resources/contactgroup.rb
+- cookbooks/nagios/resources/host.rb
+- cookbooks/nagios/resources/hostdependency.rb
+- cookbooks/nagios/resources/hostescalation.rb
+- cookbooks/nagios/resources/hostgroup.rb
+- cookbooks/nagios/resources/resource.rb
+- cookbooks/nagios/resources/service.rb
+- cookbooks/nagios/resources/servicedependency.rb
+- cookbooks/nagios/resources/serviceescalation.rb
+- cookbooks/nagios/resources/servicegroup.rb
+- cookbooks/nagios/resources/timeperiod.rb
+- cookbooks/nagios/templates/apache2.conf.erb
+- cookbooks/nagios/templates/cgi.cfg.erb
+- cookbooks/nagios/templates/commands.cfg.erb
+- cookbooks/nagios/templates/contacts.cfg.erb
+- cookbooks/nagios/templates/hostgroups.cfg.erb
+- cookbooks/nagios/templates/hosts.cfg.erb
+- cookbooks/nagios/templates/htpasswd.users.erb
+- cookbooks/nagios/templates/nagios.cfg.erb
+- cookbooks/nagios/templates/nginx.conf.erb
+- cookbooks/nagios/templates/pagerduty.cgi.erb
+- cookbooks/nagios/templates/resource.cfg.erb
+- cookbooks/nagios/templates/servicedependencies.cfg.erb
+- cookbooks/nagios/templates/servicegroups.cfg.erb
+- cookbooks/nagios/templates/services.cfg.erb
+- cookbooks/nagios/templates/spawn-fcgi.erb
+- cookbooks/nagios/templates/templates.cfg.erb
+- cookbooks/nagios/templates/timeperiods.cfg.erb
 - cookbooks/s3fs/Berksfile
 - cookbooks/s3fs/CHANGELOG.md
 - cookbooks/s3fs/LICENSE
@@ -1088,6 +1137,7 @@ files:
 - modules/mu/groomers/README.md
 - modules/mu/groomers/ansible.rb
 - modules/mu/groomers/chef.rb
+- modules/mu/kittens.rb
 - modules/mu/logger.rb
 - modules/mu/master.rb
 - modules/mu/master/README.md
@@ -1100,6 +1150,7 @@ files:
 - modules/mu/mommacat/search.rb
 - modules/mu/mommacat/storage.rb
 - modules/mu/monkey_patches/chef_knife_ssh.rb
+- modules/mu/mu.yaml.rb
 - modules/mu/providers/README.md
 - modules/mu/providers/aws.rb
 - modules/mu/providers/aws/alarm.rb
@@ -1288,7 +1339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: The eGTLabs Mu toolkit for unified cloud deployments