cloud-mu 2.0.0.pre.alpha5 → 2.0.0.pre.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e39984a806ae75ce0f8515204b6a5eed46ff42521c22271397f9cfb5fb529c
-  data.tar.gz: 6548cdbc9871238fa7e6a3856b990f6b6a0fde84f380df392c6d10a4986a0c3f
+  metadata.gz: c2f8abd519c2f8f9acc75995617db4a1ca00014dae0e222a208acd7ad359b9aa
+  data.tar.gz: 5f9c76057263e88e4ea37b11fd83c43c3fe23ad16a5fd342aa5852f14b6cd642
 SHA512:
-  metadata.gz: 79c13219169bbfbc987f5228f48c91879d2f08e6eca20d85cfa1b20e3de2dc5cfa2994ef4744f83bff49c1604a7b768befcf4a4145768928aff9b81affbfdf19
-  data.tar.gz: 189a009570f6184876369969dca6f5f8752caeb29ff84c9bce8af944cdb9478781d67c9f15ec0f69ca4351ebce2378c75234135e067e717deab05a718fb7e41f
+  metadata.gz: c82d65f0c5353128cf908b204f565411598808d2560e13d98f4829d9383d16c1d19b96ceb7ea7ee4d33864b84db83579e7db4b32b7ff616facd2725de3636411
+  data.tar.gz: d9ebe46385658f90ac3442f89d99d5313057b9922c07efcc177e6f886668e45986783689326bd98997ac55ab664e265e4040026f07a0f135d4b3952d03a4048f

data/cloud-mu.gemspec

@@ -17,8 +17,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '2.0.0-alpha5'
-  s.date        = '2019-02-12'
+  s.version     = '2.0.0-alpha6'
+  s.date        = '2019-02-13'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 2.4'
   s.summary     = "The eGTLabs Mu toolkit for unified cloud deployments"
@@ -54,6 +54,8 @@ EOF
   s.add_runtime_dependency 'nokogiri', "~> 1.8"
   s.add_runtime_dependency 'solve', '~> 4.0'
   s.add_runtime_dependency 'net-ldap', "~> 0.16"
+  s.add_runtime_dependency 'net-ssh', "~> 4.2"
+  s.add_runtime_dependency 'net-ssh-multi', '~> 1.2', '>= 1.2.1'
   s.add_runtime_dependency 'googleauth', "~> 0.6"
   s.add_runtime_dependency 'google-api-client', "~> 0.25"
   s.add_runtime_dependency 'rubocop', '~> 0.58'

data/modules/mu/cloud.rb

@@ -523,7 +523,7 @@ module MU
       begin
         require "mu/clouds/#{cloud.downcase}/#{cfg_name}"
       rescue LoadError => e
-        raise MuCloudResourceNotImplemented, "MU::Cloud::#{cloud} does not currently implement #{shortclass}"
+        raise MuCloudResourceNotImplemented, "MU::Cloud::#{cloud} does not currently implement #{shortclass}, or implementation does not load correctly (#{e.message})"
       end
       @cloud_class_cache[cloud] = {} if !@cloud_class_cache.has_key?(cloud)
       begin

data/modules/mu/clouds/google/user.rb

@@ -200,13 +200,13 @@ module MU
           ok = true
 
           # admin_directory only works in a GSuite environment
-          if !user['name'].match(/@/i) and $MU_CFG['google']['masquerade_as']
+          if !user['name'].match(/@/i) and MU::Cloud::Google.credConfig(user['credentials'])['masquerade_as']
             # XXX flesh this check out, need to test with a GSuite site
             pp MU::Cloud::Google.admin_directory(credentials: user['credentials']).get_user(user['name'])
           end
 
           if user['groups'] and user['groups'].size > 0 and
-             !$MU_CFG['google']['masquerade_as']
+             !MU::Cloud::Google.credConfig(user['credentials'])['masquerade_as']
             MU.log "Cannot change Google group memberships in non-GSuite environments.\nVisit https://groups.google.com to manage groups.", MU::ERR
             ok = false
           end
@@ -260,7 +260,7 @@ module MU
                 req_obj
               )
             rescue ::Google::Apis::ClientError => e
-              if e.message.match(/does not exist/i) and !$MU_CFG['google']['masquerade_as']
+              if e.message.match(/does not exist/i) and !MU::Cloud::Google.credConfig(@config['credentials'])['masquerade_as']
                 raise MuError, "User #{@config['name']} does not exist, and we cannot create Google user in non-GSuite environments.\nVisit https://accounts.google.com to create new accounts."
               end
               raise e

data/modules/mu/clouds/google.rb

@@ -572,9 +572,9 @@ module MU
     
         if subclass.nil?
           begin
-            @@admin_directory_api[credentials] ||= MU::Cloud::Google::Endpoint.new(api: "AdminDirectoryV1::DirectoryService", scopes: ['https://www.googleapis.com/auth/admin.directory.group.member.readonly', 'https://www.googleapis.com/auth/admin.directory.group.readonly', 'https://www.googleapis.com/auth/admin.directory.user.readonly', 'https://www.googleapis.com/auth/admin.directory.domain.readonly', 'https://www.googleapis.com/auth/admin.directory.orgunit.readonly', 'https://www.googleapis.com/auth/admin.directory.rolemanagement.readonly', 'https://www.googleapis.com/auth/admin.directory.customer.readonly'], masquerade: $MU_CFG['google']['masquerade_as'], credentials: credentials)
+            @@admin_directory_api[credentials] ||= MU::Cloud::Google::Endpoint.new(api: "AdminDirectoryV1::DirectoryService", scopes: ['https://www.googleapis.com/auth/admin.directory.group.member.readonly', 'https://www.googleapis.com/auth/admin.directory.group.readonly', 'https://www.googleapis.com/auth/admin.directory.user.readonly', 'https://www.googleapis.com/auth/admin.directory.domain.readonly', 'https://www.googleapis.com/auth/admin.directory.orgunit.readonly', 'https://www.googleapis.com/auth/admin.directory.rolemanagement.readonly', 'https://www.googleapis.com/auth/admin.directory.customer.readonly'], masquerade: MU::Cloud::Google.credConfig(credentials)['masquerade_as'], credentials: credentials)
           rescue Signet::AuthorizationError => e
-            MU.log "Cannot masquerade as #{$MU_CFG['google']['masquerade_as']}", MU::ERROR, details: "You can only use masquerade_as with GSuite. For more information on delegating GSuite authority to a service account, see:\nhttps://developers.google.com/identity/protocols/OAuth2ServiceAccount#delegatingauthority"
+            MU.log "Cannot masquerade as #{MU::Cloud::Google.credConfig(credentials)['masquerade_as']}", MU::ERROR, details: "You can only use masquerade_as with GSuite. For more information on delegating GSuite authority to a service account, see:\nhttps://developers.google.com/identity/protocols/OAuth2ServiceAccount#delegatingauthority"
             raise e
           end
           return @@admin_directory_api[credentials]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha5
+  version: 2.0.0.pre.alpha6
 platform: ruby
 authors:
 - John Stange
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -238,6 +238,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-multi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement