cloud-mu 3.6.9 → 3.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1f3ffc314397751b1408cfaa0f11f91c15c0dd5107c3c6795befbdddd73a03
-  data.tar.gz: 27f456bbb9eb736fa166598b64b1043671b296995bca0dbaf4e37042e06a2c90
+  metadata.gz: e73ecd2759df6ccc11710c83b0e3a2733eededf4ac6825bb0a76ab284aaf8887
+  data.tar.gz: 1717164c2388e7e7ba8a7cb66877242399468606524d9ea759e746a6a0fb9c00
 SHA512:
-  metadata.gz: 8daf8715e676f0d30955c9988f9178d2cda118e5dc13dfed5b4c410dcbd3c4c895a8465eeadd7579a34db945013af1c3a068ba5bbaaebcf0de1d310723a9d11d
-  data.tar.gz: 430945864829349c9cacc4958ec013ccd7bbebd57586f49fe3b71dafe9b8c99cdf476fc1b6927ba10f8a688a868590e6435c374d91d57b0f400343c08d5f48fd
+  metadata.gz: 5a859e81138c136a6b49833ce6e63d6a619fe158d7b3f572b2f1e75466f6dd0e180e2df9c76a19f7e925efa67d3cb28c254531d6af731af7ea0aba1258566ce1
+  data.tar.gz: 8b9faa2e7f5c8408e888a74264f13a8bb679ddabb6fcf761ea2c2d28835be3e26f0eb5129d7ecfe6a6b16ab617d9331cc4e18992b7182e7f04ba578764215d9a

data/cloud-mu.gemspec

@@ -17,7 +17,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '3.6.9'
+  s.version     = '3.6.10'
   s.date        = '2024-11-28'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 3'

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

@@ -30,6 +30,30 @@ chef_gem "cloud-mu" do
   action :install
 end
 
+CHEF_SERVER_VERSION="14.11.31-1"
+CHEF_CLIENT_VERSION="18.5.0"
+
+# The versions of these must not bring in a newer version of aws-sdk-core
+# than whatever Chef prefers (aws-sdk-core 3.171.0 as of Chef 18.5.0,
+# roughly spring of 2023)
+awsgems = {
+  "aws-sdk-ec2" => "1.380.0",
+#  "aws-sdk-lambda" => "1.96.0",
+#  "aws-sdk-rds" => "1.179.0",
+#  "aws-sdk-route53" => "1.71.0",
+#  "aws-sdk-efs" => "1.60.0",
+#  "aws-sdk-iam" => "1.77.0"
+}
+
+awsgems.each_pair { |g, v|
+  chef_gem g do
+    gem_binary "/opt/chef/embedded/bin/gem"
+    version v
+    compile_time true
+    action :install
+  end
+}
+
 require 'etc'
 require 'open-uri'
 require 'socket'
@@ -43,8 +67,6 @@ ENV['PATH'] = ENV['PATH']+":/bin:/opt/opscode/embedded/bin"
 
 # XXX We want to be able to override these things when invoked from chef-apply,
 # but, like, how?
-CHEF_SERVER_VERSION="14.11.31-1"
-CHEF_CLIENT_VERSION="18.5.0"
 KNIFE_WINDOWS="1.9.0"
 KNIFE="env -i HOME=/root PATH=/usr/local/ruby-current/bin:/bin:/usr/bin knife" # it's separate from Chef now, we get it as a gem
 MU_BASE="/opt/mu"

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" => {

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 3.6.9
+  version: 3.6.10
 platform: ruby
 authors:
 - John Stange