cloud-mu 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57699fda3a38838f2d7ca73c8855d70b04fd9fa5f891668cd6dd20804c64738d
-  data.tar.gz: 33a3f65a71752ad9000e96f3e47d45869acc52e2e4b8e83ff1bd711322fa3236
+  metadata.gz: e410b5b2d1b9bb3bb28993cda8852ba50bc0d4a32218a64226af3e66ae86465a
+  data.tar.gz: ec28f00264ebea17f917428b12b44f2eaf2361711c1ee8ab0b8db6ac94d4bad8
 SHA512:
-  metadata.gz: f82a3ff7783a9b8e9c1ca5b1797f808f9b5d9d6d97e491d7bca4f6c73dfce164253bf4235a8176b8f62e1dfb6e7ac6fff3299fc89013deb015f8de80853276ca
-  data.tar.gz: 87afb1323714f6eeac80b2cae15b064c83523fe176cb1ee00772b34cde5f93687a5ba464eaf79811a8698a0b49a09269b7ae45b3062cb65343be713fefa99648
+  metadata.gz: 5232f7dc31462aa58f307ded9bb7f46d7dd63a7b373ba88d4546620b8531ae5e71167d8d86d29a49638f159ea21dd5fd2e88a7bb7529c8df350e8627ca29fd71
+  data.tar.gz: '09b513e485274453b5a3242e9747c9bc0cd41e06ea9a6744ffe4ab7cab38b43845c8ca124159d0ab418f39441d894f626b48505992de913615a1fb2a8c4b77cf'

data/cloud-mu.gemspec

@@ -17,8 +17,8 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '3.1.0'
-  s.date        = '2019-12-31'
+  s.version     = '3.1.1'
+  s.date        = '2020-01-11'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 2.4'
   s.summary     = "The eGTLabs Mu toolkit for unified cloud deployments"

data/cookbooks/mu-tools/recipes/gcloud.rb

@@ -40,6 +40,7 @@ if platform_family?("rhel") or platform_family?("amazon")
     bash "install gcloud-cli" do
       cwd "/opt"
       code <<-EOH
+        rm -rf /opt/google-cloud-sdk/
         tar -xzf #{Chef::Config[:file_cache_path]}/gcloud-cli.tar.gz
         if [ -f /opt/rh/python27/root/usr/bin/python ];then
           if [ ! -f /etc/ld.so.conf.d/python27.conf ];then

data/modules/mu/adoption.rb

@@ -388,6 +388,7 @@ module MU
             }
             obj = deploy.findLitterMate(type: attrs[:cfg_plural], name: resource['name'])
             begin
+              raise Incomplete if obj.nil?
               new_cfg = resolveReferences(resource, deploy, obj)
               new_cfg.delete("cloud_id")
               cred_cfg = MU::Cloud.const_get(obj.cloud).credConfig(obj.credentials)

data/modules/mu/clouds/aws.rb

@@ -1362,6 +1362,7 @@ module MU
         # Catch-all for AWS client methods. Essentially a pass-through with some
         # rescues for known silly endpoint behavior.
         def method_missing(method_sym, *arguments)
+          require "aws-sdk-core"
 
           retries = 0
           begin

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

@@ -357,14 +357,9 @@ module MU
           name.match(/\b\d+@cloudbuild\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@containerregistry\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@container-analysis\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-bigquerydatatransfer\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-cloudasset\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-cloudiot\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-cloudscheduler\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@compute-system\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@container-engine-robot\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-admin-robot\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-containerscanning\.iam\.gserviceaccount\.com$/) or
+          name.match(/\bservice-\d+@gc[pf]-admin-robot\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@dataflow-service-producer-prod\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@dataproc-accounts\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@endpoints-portal\.iam\.gserviceaccount\.com$/) or
@@ -372,9 +367,8 @@ module MU
           name.match(/\bservice-\d+@cloud-redis\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@firebase-rules\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@cloud-tpu\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-vpcaccess\.iam\.gserviceaccount\.com$/) or
-          name.match(/\bservice-\d+@gcp-sa-websecurityscanner\.iam\.gserviceaccount\.com$/) or
           name.match(/\bservice-\d+@sourcerepo-service-accounts\.iam\.gserviceaccount\.com$/) or
+          name.match(/\bservice-\d+@gcp-sa-[^\.]+\.iam\.gserviceaccount\.com$/) or
           name.match(/\bp\d+\-\d+@gcp-sa-logging\.iam\.gserviceaccount\.com$/)
         end
 
@@ -409,12 +403,13 @@ module MU
             MU.log "FAILED TO FIND CLOUD DESCRIPTOR FOR #{self}", MU::ERR, details: @config
             return nil
           end
-
           bok['name'] = @config['name']
           bok['cloud_id'] = @cloud_id
           bok['type'] = @config['type']
           bok['type'] ||= "service"
+
           if bok['type'] == "service"
+            bok['name'].gsub!(/@.*/, '')
             bok['project'] = @project_id
             keys = MU::Cloud::Google.iam(credentials: @config['credentials']).list_project_service_account_keys(@cloud_id)
 
@@ -433,8 +428,8 @@ module MU
                user_roles["user"][bok['cloud_id']].size > 0
               bok['roles'] = MU::Cloud::Google::Role.entityBindingsToSchema(user_roles["user"][bok['cloud_id']], credentials: @config['credentials'])
             end
-            bok['given_name'] = cloud_desc.name.given_name
-            bok['family_name'] = cloud_desc.name.family_name
+            bok['given_name'] = cloud_desc.name.given_name if cloud_desc.name.given_name and !cloud_desc.name.given_name.empty?
+            bok['family_name'] = cloud_desc.name.family_name if cloud_desc.name.family_name and !cloud_desc.name.family_name.empty?
             bok['email'] = cloud_desc.primary_email
             bok['suspend'] = cloud_desc.suspended
             bok['admin'] = cloud_desc.is_admin
@@ -532,8 +527,8 @@ If we are binding (rather than creating) a user and no roles are specified, we w
 
           # Deal with these name alias fields, here for the convenience of your
           # easily confused english-centric type of person
-          user['given_name'] ||= user['first_name']
-          user['family_name'] ||= user['last_name']
+          user['given_name'] ||= user['first_name'] if user['first_name']
+          user['family_name'] ||= user['last_name'] if user['last_name']
           user.delete("first_name")
           user.delete("last_name")
 

data/modules/mu/config.rb

@@ -348,7 +348,7 @@ module MU
           @deploy_id = @mommacat.deploy_id
         end
 
-        kitten if @mommacat # try to populate the actual cloud object for this
+        kitten(shallow: true) if @mommacat # try to populate the actual cloud object for this
       end
 
       # Comparison operator
@@ -476,7 +476,7 @@ module MU
       # called in a live deploy, which is to say that if called during initial
       # configuration parsing, results may be incorrect.
       # @param mommacat [MU::MommaCat]: A deploy object which will be searched for the referenced resource if provided, before restoring to broader, less efficient searches.
-      def kitten(mommacat = @mommacat)
+      def kitten(mommacat = @mommacat, shallow: false)
         return nil if !@cloud or !@type
 
         if @obj
@@ -509,7 +509,7 @@ end
           end
         end
 
-        if !@obj and !(@cloud == "Google" and @id and @type == "users" and MU::Cloud::Google::User.cannedServiceAcctName?(@id))
+        if !@obj and !(@cloud == "Google" and @id and @type == "users" and MU::Cloud::Google::User.cannedServiceAcctName?(@id)) and !shallow
 
           begin
             hab_arg = if @habitat.nil?
@@ -1656,7 +1656,7 @@ $CONFIGURABLES
         end
       end
 
-      descriptor["dependencies"].uniq!
+      descriptor["dependencies"].uniq! if descriptor["dependencies"]
 
       @kittencfg_semaphore.synchronize {
         @kittens[cfg_plural] << descriptor if append

data/modules/mu/config/storage_pool.rb

@@ -100,7 +100,6 @@ module MU
                                         configurator,
                                         dflt_region: pool['region'],
                                         credentials: pool['credentials'],
-                                        is_sibling: true,
                                         sibling_vpcs: [siblingvpc])
                   ok = false
                 end

data/modules/mu/mommacat.rb

@@ -364,7 +364,7 @@ module MU
                   MU::Config::Ref.get(orig_cfg['vpc'])
                 end
                 orig_cfg['vpc'].delete('mommacat')
-                orig_cfg['vpc'] = ref if ref.kitten
+                orig_cfg['vpc'] = ref if ref.kitten(shallow: true)
               end
 
               begin
@@ -416,7 +416,7 @@ module MU
       seen << @original_config['cloud'] if @original_config['cloud']
       MU::Cloud.resource_types.values.each { |attrs|
         type = attrs[:cfg_plural]
-        if @original_config.has_key?(type)
+        if @original_config[type]
           @original_config[type].each { |resource|
             seen << resource['cloud'] if resource['cloud']
           }
@@ -436,7 +436,7 @@ module MU
 #      defaultcloud = @original_config['cloud']
       MU::Cloud.resource_types.values.each { |attrs|
         type = attrs[:cfg_plural]
-        if @original_config.has_key?(type)
+        if @original_config[type]
           @original_config[type].each { |resource|
             if resource['credentials']
               seen << resource['credentials']
@@ -466,7 +466,7 @@ module MU
       regions << @original_config['region'] if @original_config['region']
       MU::Cloud.resource_types.each_pair { |res_type, attrs|
         type = attrs[:cfg_plural]
-        if @original_config.has_key?(type)
+        if @original_config[type]
           @original_config[type].each { |resource|
             if resource['cloud']
               cloudclass = Object.const_get("MU").const_get("Cloud").const_get(resource['cloud'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - John Stange
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis