cloud-mu 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 210514240124518b016fcafc33868f4efcbd890764614b535a3460fd7736961e
-  data.tar.gz: 22982dbf157d8c94ecb38c9ca7ee9209dcdef516158ecd1835461da255b7a3df
+  metadata.gz: 0cd5b504fe2b0d27e79f230789f429d4d7d4b52605f1f4372d446702a6ff569f
+  data.tar.gz: cff87a2712d10180ebd9aaf2be422b4b26e7f6b8fc82bc35679a62377ef6b478
 SHA512:
-  metadata.gz: 412580d1d702cf61dcd3671bee157b787c0a4ffd79b2c57d845b29bb93cf71da092910209b1ba0a7ff7f98d5a37b21f0b542a99cc31e479b8d4a45b1fa778622
-  data.tar.gz: 55fe915449c29467c2731736b357c35a5aef4af243b1c57e06a986273e27eed1726769ce0982d0e6202888161df0664fd10b8179697b13b73c90b3e02f4bcf45
+  metadata.gz: db01b8662ffc919c11b4c01184077c697bb66003a420512f68c4b9a8b0914c1aced6b5e15a67412a05448a6ece99f42f4a9b84697798c2ef284a4642c8bf5203
+  data.tar.gz: 7defbf9d70c17698d0d3e579683ad5dadf3ede4cd75b46960cc107977f736a24b716cfbd0ccb1e21c79c909a976167aa21ba9894ea9f81317c64a115dcec5067

data/bin/mu-azure-setup

@@ -47,12 +47,12 @@ Usage:
   opt :optdisk, "Create a block volume for /opt and slide our installation onto it", :require => false, :default => false, :type => :boolean
 end
 
-if MU::Cloud::Azure.hosted? and !$MU_CFG['google']
+if MU::Cloud::Azure.hosted? and !$MU_CFG['azure']
   new_cfg = $MU_CFG.dup
   cfg_blob = MU::Cloud::Azure.hosted_config
   if cfg_blob
     cfg_blob['log_bucket_name'] ||= $MU_CFG['hostname']
-    new_cfg["google"] = { "default" => cfg_blob }
+    new_cfg["azure"] = { "default" => cfg_blob }
     MU.log "Adding auto-detected Azure stanza to #{cfgPath}", MU::NOTICE
     if new_cfg != $MU_CFG or !cfgExists?
       MU.log "Generating #{cfgPath}"

data/cloud-mu.gemspec

@@ -17,8 +17,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '3.5.0'
-  s.date        = '2021-01-18'
+  s.version     = '3.5.1'
+  s.date        = '2021-02-25'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 2.4'
   s.summary     = "The eGTLabs Mu toolkit for unified cloud deployments"

data/modules/mu/providers/aws/role.rb

@@ -328,7 +328,7 @@ end
                 version_id: p.default_version_id
               ).policy_version
 
-              doc = JSON.parse CGI.unescape_www_form_component old.document
+              doc = JSON.parse URI.decode_www_form_component old.document
               need_update = false
 
               doc["Statement"].each { |s|

data/modules/mu/providers/azure.rb

@@ -565,12 +565,12 @@ MU.log "vault existence check #{vaultname}", MU::WARN, details: resp
         return @@metadata if svc == "instance" and @@metadata
         base_url = "http://169.254.169.254/metadata/#{svc}"
         args["api-version"] = api_version
-        arg_str = args.keys.map { |k| k.to_s+"="+args[k].to_s }.join("&")
+        arg_str = args.keys.sort.map { |k| k.to_s+"="+CGI.escape(args[k].to_s) }.join("&")
 
         begin
           Timeout.timeout(2) do
-            resp = JSON.parse(URI.open("#{base_url}/?#{arg_str}","Metadata"=>"true").read)
-            MU.log "curl -H Metadata:true "+"#{base_url}/?#{arg_str}", loglevel, details: resp
+            resp = JSON.parse(URI.open("#{base_url}?#{arg_str}","Metadata"=>"true").read)
+            MU.log "curl -H Metadata:true "+"#{base_url}?#{arg_str}", loglevel, details: resp
             if svc != "instance"
               return resp
             else
@@ -597,9 +597,9 @@ MU.log "vault existence check #{vaultname}", MU::WARN, details: resp
         cfg = credConfig(credentials)
 
         if cfg and MU::Cloud::Azure.hosted?
-          token = MU::Cloud::Azure.get_metadata("identity/oauth2/token", "2018-02-01", args: { "resource"=>"https://management.azure.com/" })
+          token = MU::Cloud::Azure.get_metadata("identity/oauth2/token", "2020-09-01", args: { "resource"=>"https://management.azure.com/" })
           if !token
-            MU::Cloud::Azure.get_metadata("identity/oauth2/token", "2018-02-01", args: { "resource"=>"https://management.azure.com/" }, debug: true)
+            MU::Cloud::Azure.get_metadata("identity/oauth2/token", "2020-09-01", args: { "resource"=>"https://management.azure.com/" }, debug: true)
             raise MuError, "Failed to get machine oauth token"
           end
           machine = MU::Cloud::Azure.get_metadata

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - John Stange
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable