cloud-mu 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0703ebefd7fa57346e99f8e85e1a663d9b5355ff4ed0fc6f24950a502dc93a25
-  data.tar.gz: 289aea9a9ca2fbb881722066babb163d53bf16ed3b0cd5827a3f229289034779
+  metadata.gz: dbf64422b17171e8819f4c4453496497eb6002180a188ea55e40a0cfab1c0492
+  data.tar.gz: 7ac1d24779b378c39e2d8c73f23eab28580cfc1d3d8ee9ccd621bc2c9f0e9bff
 SHA512:
-  metadata.gz: db2ac2b6e630dc7fcf06b91cc4bfd7e3b126c91c50250298b667d66e1c5a715dace2830bae9869ebd6ee251ea2f23d1b1f4d3d61a816a92e4b32e3b708653ef9
-  data.tar.gz: 9ab809e33c1e1ab6299a36272f674964cdaa1c325c55cfdfb4354262e2b9479ab51ea669be7121400408047e254dae47aeecb8abcbe34c61ea41a61a1740032a
+  metadata.gz: 0cb9f5a23e095ce0d22686ad3e40496373e24ddd0f91ff2427c8d3cd63957005e1ee90b66e087d15b56275a21e30375cd830cd551f85de8b26066f04b70bf8f2
+  data.tar.gz: 4f64dc9cfeb105a2ea4c52906670f625426a59deae6d75758c0e3df8677fc9b49fc4868051230ffd2bc2ef155aea36734414dc6e96c481ab586240f96c1c28c6

data/Berksfile

@@ -2,7 +2,7 @@ source "https://supermarket.chef.io"
 source chef_repo: "cookbooks/"
 
 # Mu Platform Cookbooks
-cookbook 'awscli', path: 'cookbooks/awscli'
+cookbook 'awscli'
 cookbook 'mu-activedirectory'
 cookbook 'mu-splunk'
 cookbook 'mu-firewall'
@@ -14,6 +14,5 @@ cookbook 'mu-openvpn'
 cookbook 'mu-php54'
 cookbook 'mu-tools'
 cookbook 'mu-utility'
-cookbook 'nagios', path: 'cookbooks/nagios'
-cookbook 'firewall', path: 'cookbooks/firewall'
-#cookbook 's3fs', path: 'cookbooks/s3fs'
+cookbook 'nagios'
+cookbook 'firewall'

data/cloud-mu.gemspec

@@ -17,8 +17,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '2.0.2'
-  s.date        = '2019-05-06'
+  s.version     = '2.0.3'
+  s.date        = '2019-05-25'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 2.4'
   s.summary     = "The eGTLabs Mu toolkit for unified cloud deployments"

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

@@ -216,30 +216,35 @@ module MU
           end
 
           my_policies = cloud_desc["policies"]
+          
           my_policies.each { |p|
             if p.policy_name == policy
               old = MU::Cloud::AWS.iam(credentials: @config['credentials']).get_policy_version(
                 policy_arn: p.arn,
                 version_id: p.default_version_id
               ).policy_version
-              doc = JSON.parse(URI.decode(old.document))
+
+              doc = JSON.parse URI.decode_www_form_component old.document
+              
               need_update = false
+              
               doc["Statement"].each { |s|
                 targets.each { |target|
-                  targetstr = if target['type']
+                  target_string = target
+
+                  if target['type']
                     sibling = @deploy.findLitterMate(
                       name: target["identifier"],
                       type: target["type"]
                     )
-                    sibling.cloudobj.arn
-                  elsif target.is_a?(Hash)
-                    target['identifier']
-                  else
-                    target
+
+                    target_string = sibling.cloudobj.arn
+                  elsif target.is_a? Hash
+                    target_string = target['identifier']
                   end
 
-                  if targetstr and !s["Resource"].include?(targetstr)
-                    s["Resource"] << targetstr
+                  unless s["Resource"].include? target_string
+                    s["Resource"] << target_string
                     need_update = true
                   end
                 }

data/modules/mu/clouds/aws/userdata/windows.erb

@@ -1,5 +1,6 @@
 <powershell>
 Set-ExecutionPolicy Unrestricted -Force -Scope CurrentUser
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
 $sshdUser = "sshd_service"
 $tmp = "$env:Temp\mu-userdata"

data/modules/mu/groomers/chef.rb

@@ -337,14 +337,19 @@ module MU
                 end
               end
             }
-            if resp.exitcode != 0
+
+            if resp.exitcode == 1 and output.join("\n").match(/Chef Client finished/)
+              MU.log "resp.exit code 1"
+            elsif resp.exitcode != 0
               raise MU::Cloud::BootstrapTempFail if resp.exitcode == 35 or output.join("\n").match(/REBOOT_SCHEDULED| WARN: Reboot requested:/)
               raise MU::Groomer::RunError, output.slice(output.length-50, output.length).join("")
             end
           end
         rescue MU::Cloud::BootstrapTempFail
           MU.log "#{@server.mu_name} rebooting from Chef, waiting then resuming", MU::NOTICE
+
           sleep 30
+
           # weird failures seem common in govcloud
           if MU::Cloud::AWS.isGovCloud?(@config['region'])
             @server.reboot(true)

data/modules/mu/mommacat.rb

@@ -2313,7 +2313,7 @@ MESSAGE_END
           # Create a certificate request for this node
           csr = OpenSSL::X509::Request.new
           csr.version = 3
-          csr.subject = OpenSSL::X509::Name.parse "CN=#{data['cn']}/O=Mu/C=US"
+          csr.subject = OpenSSL::X509::Name.parse "/CN=#{data['cn']}/O=Mu/C=US"
           csr.public_key = key.public_key
           csr.sign key, OpenSSL::Digest::SHA256.new
           open("#{MU.mySSLDir}/#{certname}.csr", 'w', 0644) { |io|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - John Stange
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis