cloud-mu 2.0.0.pre.alpha2 → 2.0.0.pre.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea07140b34d57b4dea2bc06b6a9184896585db834782e6b2b4c40184b6cdee71
-  data.tar.gz: 5382c8d82180c39d6797ccbfabb4903877f29f914f2c968aa4550033c6607db8
+  metadata.gz: 674e427624161a3b7026346a10320e7dcf5331222d8cc683d186c3d648fc0c77
+  data.tar.gz: 71c6ddb375bf199f767fa2b8143b98f7de422d6095921c5db0d0cf191bac39bb
 SHA512:
-  metadata.gz: b4f27d9340d4146cadcd2eeb0a9a2abe650a0822158b136560ff3c8f409975f1a83e8106372c0e8c1f51e35a5868de3764492026f50e6aed9faa410fc133199a
-  data.tar.gz: 411b9b7d3e8db61459dfc480a1d2d874603580d87e3597956d882a0e9e9e41fc0eff61d3af3d01924a4ddd8c6f10916bcb6df8a18576bd3fd5f3a187a2d460b7
+  metadata.gz: 8cac89b0d850377f39635f40aafc4fe148fc6b38c971da05592a55dba83a7f8847c3734eddbdb830724e2cda51c7c3968c38facd22eab15814b892913641b2ab
+  data.tar.gz: bce36278c7e00872d5f1f553d41f24abf0593d0a8f1bf076e071d472932e1aa727f196a8e34b37dc4ba3465068420305c3079cd472d9c8a26a9ed65edc06ddc0

data/cloud-mu.gemspec

@@ -17,7 +17,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = 'cloud-mu'
-  s.version     = '2.0.0-alpha2'
+  s.version     = '2.0.0-alpha3'
   s.date        = '2018-12-11'
   s.require_paths = ['modules']
   s.required_ruby_version = '>= 2.4'

data/modules/mu/cleanup.rb

@@ -91,7 +91,7 @@ module MU
           if $MU_CFG[cloud.downcase] and $MU_CFG[cloud.downcase].size > 0
             cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
             creds[cloud] ||= {}
-            $MU_CFG[cloud.downcase].keys.each { |credset|
+            cloudclass.listCredentials.each { |credset|
               creds[cloud][credset] = cloudclass.listRegions(credentials: credset)
             }
           end
@@ -115,7 +115,8 @@ module MU
                   projects << $MU_CFG[provider.downcase][credset]["project"]
                 end
 
-                if projects == [""]
+                if projects == []
+                  projects << "" # dummy
                   MU.log "Checking for #{provider}/#{credset} resources from #{MU.deploy_id} in #{r}", MU::NOTICE
                 end
 
@@ -160,7 +161,6 @@ module MU
 
                       if @mommacat.nil? or @mommacat.numKittens(types: [t]) > 0
                         begin
-                        puts t if t == "Habitat"
                           resclass = Object.const_get("MU").const_get("Cloud").const_get(t)
                           resclass.cleanup(
                             noop: @noop,

data/modules/mu/cloud.rb

@@ -1434,12 +1434,10 @@ MU.log "in dependencies() and findLitterMate gave me "+sib_by_name.to_s+" on beh
             begin
               cloudclass = MU::Cloud.loadCloudType(cloud, shortname)
               raise MuCloudResourceNotImplemented if !cloudclass.respond_to?(:cleanup) or cloudclass.method(:cleanup).owner.to_s != "#<Class:#{cloudclass}>"
-if cfg_name == "habitat"
-              MU.log "Invoking #{cloudclass}.cleanup from #{shortname}", MU::WARN, details: flags
-end
+              MU.log "Invoking #{cloudclass}.cleanup from #{shortname}", MU::DEBUG, details: flags
               cloudclass.cleanup(params)
             rescue MuCloudResourceNotImplemented
-              MU.log "No #{cloud} implementation of #{shortname}.cleanup, skipping", MU::WARN, details: flags
+              MU.log "No #{cloud} implementation of #{shortname}.cleanup, skipping", MU::DEBUG, details: flags
             end
           }
           MU::MommaCat.unlockAll

data/modules/mu/clouds/aws.rb

@@ -152,12 +152,24 @@ module MU
           return nil
         end
 
-        if $MU_CFG and $MU_CFG['aws'] and $MU_CFG['aws']['region']
-          @@myRegion_var ||= MU::Cloud::AWS.ec2(region: $MU_CFG['aws']['region']).describe_availability_zones.availability_zones.first.region_name
-        elsif ENV.has_key?("EC2_REGION") and !ENV['EC2_REGION'].empty?
-          @@myRegion_var ||= MU::Cloud::AWS.ec2(region: ENV['EC2_REGION']).describe_availability_zones.availability_zones.first.region_name
+        def self.validate_region(r)
+          MU::Cloud::AWS.ec2(region: r).describe_availability_zones.availability_zones.first.region_name
+        end
+
+        if $MU_CFG and $MU_CFG['aws']
+          $MU_CFG['aws'].each_pair { |credset, cfg|
+            next if !cfg['region']
+            if (cfg['default'] or !@@myRegion_var) and validate_region(cfg['region'])
+              @@myRegion_var = cfg['region']
+              break if cfg['default']
+            end
+          }
+        elsif ENV.has_key?("EC2_REGION") and !ENV['EC2_REGION'].empty? and
+              validate_region(ENV['EC2_REGION'])
+          # Make sure this string is valid by way of the API
+          @@myRegion_var = ENV['EC2_REGION']
         else
-          # hacky, but useful in a pinch
+          # hacky, but useful in a pinch (and if we're hosted in AWS)
           az_str = MU::Cloud::AWS.getAWSMetaData("placement/availability-zone")
           @@myRegion_var = az_str.sub(/[a-z]$/i, "") if az_str
         end
@@ -936,7 +948,8 @@ module MU
       # Amazon's Organizations API
       def self.orgs(credentials: nil)
         @@organizations_api ||= {}
-        @@organizations_api[credentials] ||= MU::Cloud::AWS::Endpoint.new(api: "Organizations", credentials: credentials)
+# XXX org api doesn't seem to work in many regions
+        @@organizations_api[credentials] ||= MU::Cloud::AWS::Endpoint.new(api: "Organizations", credentials: credentials, region: "us-east-1")
         @@organizations_api[credentials]
       end
 

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

@@ -62,6 +62,8 @@ module MU
             end
           end while resp.create_account_status.state == "IN_PROGRESS"
 
+          @cloud_id = resp.create_account_status.account_id
+
           MU.log "Creation of account #{@mu_name} (#{resp.create_account_status.account_id}) complete"
         end
 
@@ -96,14 +98,21 @@ module MU
         # @param region [String]: The cloud provider region
         # @return [void]
         def self.cleanup(noop: false, ignoremaster: false, region: MU.curRegion, credentials: nil, flags: {})
-          puts "IN HABITAT CLEANUP"
           return if !orgMasterCreds?(credentials)
 
           resp = MU::Cloud::AWS.orgs(credentials: credentials).list_accounts
 
           if resp and resp.accounts
             resp.accounts.each { |acct|
-            pp acct
+              if acct.name.match(/^#{Regexp.quote(MU.deploy_id)}/)
+                MU.log "Would delete account #{acct.name} if that was a thing"
+                if !noop
+                  pp acct
+                end
+else
+pp acct if acct.name.match(/BUNS/)
+#https://687950501457.signin.aws.amazon.com/console/organizations/complete-signup
+              end
             }
           end
         end

data/modules/mu/clouds/azure.rb

@@ -65,11 +65,11 @@ module MU
         "TODO"
       end
 
-      def self.listRegions
+      def self.listRegions(credentials = nil)
         "TODO"
       end
 
-      def self.listAZs
+      def self.listAZs(region = nil)
         "TODO"
       end
 

data/modules/mu/config.rb

@@ -33,17 +33,24 @@ module MU
     end
 
     # The default cloud provider for new resources. Must exist in MU.supportedClouds
+    # return [String]
     def self.defaultCloud
-      begin
-        MU.myCloud
-      rescue NoMethodError
-        "AWS"
-      end
-# XXX this can be more generic (loop through supportedClouds and try this)
-      if MU::Cloud::Google.hosted?
-        "Google"
-      elsif MU::Cloud::AWS.hosted?
-        "AWS"
+      configured = {}
+      MU::Cloud.supportedClouds.each { |cloud|
+        cloudclass = Object.const_get("MU").const_get("Cloud").const_get(cloud)
+        if $MU_CFG[cloud.downcase] and !$MU_CFG[cloud.downcase].empty?
+          configured[cloud] = $MU_CFG[cloud.downcase].size
+          configured[cloud] += 0.5 if cloudclass.hosted? # tiebreaker
+        elsif cloudclass.hosted?
+          configured[cloud] = 1
+        end
+      }
+      if configured.size > 0
+        return configured.keys.sort { |a, b|
+          configured[b] <=> configured[a]
+        }.first
+      else
+        return MU::Cloud.supportedClouds.first
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud-mu
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha2
+  version: 2.0.0.pre.alpha3
 platform: ruby
 authors:
 - John Stange