cloud-mu 3.1.3 → 3.1.4

data/modules/mu/clouds/azure.rb

@@ -101,11 +101,11 @@ module MU
         def initialize(*args)
           if args.first.is_a?(String)
             @raw = args.first
-            junk, junk, @subscription, junk, @resource_group, junk, @provider, @resource_type, @name = @raw.split(/\//)
+            _junk, _junk2, @subscription, _junk3, @resource_group, _junk4, @provider, @resource_type, @name = @raw.split(/\//)
             if @subscription.nil? or @resource_group.nil? or @provider.nil? or @resource_type.nil? or @name.nil?
               # Not everything has a resource group
               if @raw.match(/^\/subscriptions\/#{Regexp.quote(@subscription)}\/providers/)
-                junk, junk, @subscription, junk, @provider, @resource_type, @name = @raw.split(/\//)
+                _junk, _junk2, @subscription, _junk3, @provider, @resource_type, @name = @raw.split(/\//)
                 if @subscription.nil? or @provider.nil? or @resource_type.nil? or @name.nil?
                   raise MuError, "Failed to parse Azure resource id string #{@raw} (got subscription: #{@subscription}, provider: #{@provider}, resource_type: #{@resource_type}, name: #{@name}"
                 end
@@ -266,7 +266,7 @@ module MU
         
         begin
           sdk_response = MU::Cloud::Azure.subs(credentials: credentials).subscriptions().list_locations(subscription)
-        rescue Exception => e
+        rescue StandardError => e
           MU.log e.inspect, MU::ERR, details: e.backtrace
           #pp "Error Getting the list of regions from Azure" #TODO: SWITCH THIS TO MU LOG
           if @@regions and @@regions.size > 0
@@ -378,7 +378,7 @@ module MU
         rg_obj = MU::Cloud::Azure.resources(:ResourceGroup).new
         rg_obj.location = region
         rg_obj.tags = MU::MommaCat.listStandardTags
-        rg_obj.tags.reject! { |k, v| v.nil? }
+        rg_obj.tags.reject! { |_k, v| v.nil? }
 
         MU::Cloud::Azure.resources(credentials: credentials).resource_groups.list.each { |rg|
           if rg.name == name and rg.location == region and rg.tags == rg_obj.tags
@@ -519,7 +519,7 @@ module MU
           end
           return @@metadata
 
-        rescue Timeout::Error => e
+        rescue Timeout::Error
           # MU.log "Timeout querying Azure Metadata"
           return nil
         rescue
@@ -906,7 +906,6 @@ module MU
 # END SDK STUBS
 
 # BEGIN SDK CLIENT
-      private
 
       @@authorization_api = {}
       @@subscriptions_api = {}
@@ -967,7 +966,7 @@ module MU
             begin
               modelpath = "::Azure::#{api}::Mgmt::#{profile}::#{@subclass}"
               @api = Object.const_get(modelpath).new(@cred_obj)
-            rescue NameError => e
+            rescue NameError
               raise MuError, "Unable to locate a profile #{profile} of Azure API #{api}. I tried:\n#{stdpath}\n#{modelpath}"
             end
           end
@@ -1017,6 +1016,7 @@ module MU
           # @param arguments [Array]
           def method_missing(method_sym, *arguments)
             MU.log "Calling #{@parentname}.#{@myname}.#{method_sym.to_s}", MU::DEBUG, details: arguments
+            retries = 0
             begin
               if !arguments.nil? and arguments.size == 1
                 retval = @myobject.method(method_sym).call(arguments[0])
@@ -1025,9 +1025,16 @@ module MU
               else
                 retval = @myobject.method(method_sym).call
               end
-            rescue ::Net::ReadTimeout, ::Faraday::TimeoutError => e
+            rescue ::Net::ReadTimeout, ::Faraday::TimeoutError, ::Faraday::ConnectionFailed => e
               sleep 5
-              retry
+              if retries < 12
+                MU.log e.message+" calling #{@parentname}.#{@myname}.#{method_sym.to_s}(#{arguments.map { |a| a.to_s }.join(", ")})", MU::DEBUG, details: caller
+                retries += 1
+                retry
+              else
+                MU.log e.message+" calling #{@parentname}.#{@myname}.#{method_sym.to_s}(#{arguments.map { |a| a.to_s }.join(", ")})", MU::ERR, details: caller
+                raise e
+              end
             rescue ::MsRestAzure::AzureOperationError, ::MsRest::HttpOperationError => e
               MU.log "Error calling #{@parent.api.class.name}.#{@myname}.#{method_sym.to_s}", MU::DEBUG, details: arguments
               begin

data/modules/mu/clouds/azure/container_cluster.rb

@@ -119,7 +119,6 @@ module MU
 
         # Register a description of this cluster instance with this deployment's metadata.
         def notify
-          base = {}
           base = MU.structToHash(cloud_desc)
           base["cloud_id"] = @cloud_id.name
           base.merge!(@config.to_h)
@@ -146,9 +145,9 @@ module MU
         end
 
         # Cloud-specific configuration properties.
-        # @param config [MU::Config]: The calling MU::Config object
+        # @param _config [MU::Config]: The calling MU::Config object
         # @return [Array<Array,Hash>]: List of required fields, and json-schema Hash of cloud-specific configuration parameters for this resource
-        def self.schema(config)
+        def self.schema(_config)
           toplevel_required = []
           schema = {
             "flavor" => {

data/modules/mu/clouds/azure/firewall_rule.rb

@@ -53,7 +53,7 @@ module MU
               oldrules[rule.name] = rule
             end
           }
-          used_priorities = oldrules.values.map { |r| r.priority }
+#          used_priorities = oldrules.values.map { |r| r.priority }
 
           newrules_semaphore = Mutex.new
           num_rules = 0
@@ -136,12 +136,12 @@ module MU
             }
           end
 
-          resolved_lbs = []
-          if lbs
-            lbs.each { |lb|
+#          resolved_lbs = []
+#          if lbs
+#            lbs.each { |lb|
 # TODO awaiting LoadBalancer implementation
-            }
-          end
+#            }
+#          end
 
           if egress
             rule_obj.direction = MU::Cloud::Azure.network(:SecurityRuleDirection)::Outbound
@@ -295,7 +295,7 @@ module MU
                 resp = MU::Cloud::Azure.network(credentials: args[:credentials]).network_security_groups.get(rg, id_str)
                 next if resp.nil?
                 found[Id.new(resp.id)] = resp
-              rescue MU::Cloud::Azure::APIError => e
+              rescue MU::Cloud::Azure::APIError
                 # this is fine, we're doing a blind search after all
               end
             }
@@ -336,16 +336,16 @@ module MU
         # Reverse-map our cloud description into a runnable config hash.
         # We assume that any values we have in +@config+ are placeholders, and
         # calculate our own accordingly based on what's live in the cloud.
-        def toKitten(rootparent: nil, billing: nil)
+        def toKitten(**args)
           bok = {}
 
           bok
         end
 
         # Cloud-specific configuration properties.
-        # @param config [MU::Config]: The calling MU::Config object
+        # @param _config [MU::Config]: The calling MU::Config object
         # @return [Array<Array,Hash>]: List of required fields, and json-schema Hash of cloud-specific configuration parameters for this resource
-        def self.schema(config = nil)
+        def self.schema(_config = nil)
           toplevel_required = []
           hosts_schema = MU::Config::CIDR_PRIMITIVE
           hosts_schema["pattern"] = "^(\\d+\\.\\d+\\.\\d+\\.\\d+\/[0-9]{1,2}|\\*)$"

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

@@ -59,8 +59,10 @@ module MU
         def groom
         end
 
+        @cached_cloud_desc = nil
         # Return the cloud descriptor for the Habitat
-        def cloud_desc
+        def cloud_desc(use_cache: true)
+          return @cached_cloud_desc if @cached_cloud_desc and use_cache
           @cached_cloud_desc ||= MU::Cloud::Azure::Habitat.find(cloud_id: @cloud_id).values.first
 #          @habitat_id ||= @cached_cloud_desc.parent.id if @cached_cloud_desc
           @cached_cloud_desc
@@ -131,7 +133,7 @@ module MU
         # Reverse-map our cloud description into a runnable config hash.
         # We assume that any values we have in +@config+ are placeholders, and
         # calculate our own accordingly based on what's live in the cloud.
-        def toKitten(rootparent: nil, billing: nil)
+        def toKitten(**args)
           bok = {
             "cloud" => "Azure",
             "credentials" => @config['credentials']
@@ -141,9 +143,9 @@ module MU
         end
 
         # Cloud-specific configuration properties.
-        # @param config [MU::Config]: The calling MU::Config object
+        # @param _config [MU::Config]: The calling MU::Config object
         # @return [Array<Array,Hash>]: List of required fields, and json-schema Hash of cloud-specific configuration parameters for this resource
-        def self.schema(config)
+        def self.schema(_config)
           toplevel_required = []
           schema = {
           }
@@ -152,9 +154,9 @@ module MU
 
         # Cloud-specific pre-processing of {MU::Config::BasketofKittens::habitats}, bare and unvalidated.
         # @param habitat [Hash]: The resource to process and validate
-        # @param configurator [MU::Config]: The overall deployment configurator of which this resource is a member
+        # @param _configurator [MU::Config]: The overall deployment configurator of which this resource is a member
         # @return [Boolean]: True if validation succeeded, False otherwise
-        def self.validateConfig(habitat, configurator)
+        def self.validateConfig(habitat, _configurator)
           ok = true
           habitat['region'] ||= MU::Cloud::Azure.myRegion(habitat['credentials'])
 

data/modules/mu/clouds/azure/loadbalancer.rb

@@ -74,9 +74,9 @@ module MU
         end
 
         # Cloud-specific configuration properties.
-        # @param config [MU::Config]: The calling MU::Config object
+        # @param _config [MU::Config]: The calling MU::Config object
         # @return [Array<Array,Hash>]: List of required fields, and json-schema Hash of cloud-specific configuration parameters for this resource
-        def self.schema(config)
+        def self.schema(_config)
           toplevel_required = []
           schema = {
 #            "named_ports" => {
@@ -102,9 +102,9 @@ module MU
 
         # Cloud-specific pre-processing of {MU::Config::BasketofKittens::loadbalancers}, bare and unvalidated.
         # @param lb [Hash]: The resource to process and validate
-        # @param configurator [MU::Config]: The overall deployment configurator of which this resource is a member
+        # @param _configurator [MU::Config]: The overall deployment configurator of which this resource is a member
         # @return [Boolean]: True if validation succeeded, False otherwise
-        def self.validateConfig(lb, configurator)
+        def self.validateConfig(lb, _configurator)
           ok = true
           lb['region'] ||= MU::Cloud::Azure.myRegion(lb['credentials'])
 
@@ -144,7 +144,7 @@ module MU
                 found[Id.new(lb.id)] = lb
               }
             else
-              MU::Cloud::Azure.network(credentials: args[:credentials]).load_balancers.list_all.each { |net|
+              MU::Cloud::Azure.network(credentials: args[:credentials]).load_balancers.list_all.each { |lb|
                 found[Id.new(lb.id)] = lb
               }
             end

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

@@ -65,8 +65,8 @@ module MU
         end
 
         # Assign this role object to a given principal (create a RoleAssignment)
-        # @param principal [MU::Cloud::Azure::Id]
-        def assignTo(principal)
+        # @param principal_id [MU::Cloud::Azure::Id]
+        def assignTo(principal_id)
           MU::Cloud::Azure::Role.assignTo(principal_id, role_id: @cloud_id)
         end
 
@@ -145,7 +145,7 @@ module MU
             begin
               resp = MU::Cloud::Azure.authorization(credentials: args[:credentials]).role_definitions.get(scope, id_str)
               found[Id.new(resp.id)] = resp
-            rescue MsRestAzure::AzureOperationError => e
+            rescue MsRestAzure::AzureOperationError
               # this is fine, we're doing a blind search after all
             end
           else
@@ -155,7 +155,7 @@ module MU
               end
             }
             if args[:role_name]
-              @@role_list_cache[scope].each_pair { |key, role|
+              @@role_list_cache[scope].values.each { |role|
                 begin
                   if role.role_name == args[:role_name]
                     found[Id.new(role.id)] = role
@@ -183,9 +183,9 @@ module MU
         end
 
         # Cloud-specific configuration properties.
-        # @param config [MU::Config]: The calling MU::Config object
+        # @param _config [MU::Config]: The calling MU::Config object
         # @return [Array<Array,Hash>]: List of required fields, and json-schema Hash of cloud-specific configuration parameters for this resource
-        def self.schema(config)
+        def self.schema(_config)
           toplevel_required = []
           schema = {
           }
@@ -194,17 +194,15 @@ module MU
 
         # Cloud-specific pre-processing of {MU::Config::BasketofKittens::roles}, bare and unvalidated.
         # @param role [Hash]: The resource to process and validate
-        # @param configurator [MU::Config]: The overall deployment configurator of which this resource is a member
+        # @param _configurator [MU::Config]: The overall deployment configurator of which this resource is a member
         # @return [Boolean]: True if validation succeeded, False otherwise
-        def self.validateConfig(role, configurator)
+        def self.validateConfig(role, _configurator)
           ok = true
           role['region'] ||= MU::Cloud::Azure.myRegion(role['credentials'])
 
           ok
         end
 
-        private
-
       end
     end
   end

data/modules/mu/clouds/azure/server.rb

@@ -139,7 +139,7 @@ module MU
         # Figure out what's needed to SSH into this server.
         # @return [Array<String>]: nat_ssh_key, nat_ssh_user, nat_ssh_host, canonical_ip, ssh_user, ssh_key_name, alternate_names
         def getSSHConfig
-          node, config, deploydata = describe(cloud_id: @cloud_id)
+          describe(cloud_id: @cloud_id)
 # XXX add some awesome alternate names from metadata and make sure they end
 # up in MU::MommaCat's ssh config wangling
           ssh_keydir = Etc.getpwuid(Process.uid).dir+"/.ssh"
@@ -153,7 +153,7 @@ module MU
                 MU.log "NAT was missing cloud descriptor when called in #{@mu_name}'s getSSHConfig", MU::ERR
                 return nil
               end
-              foo, bar, baz, nat_ssh_host, nat_ssh_user, nat_ssh_key  = @nat.getSSHConfig
+              _foo, _bar, _baz, nat_ssh_host, nat_ssh_user, nat_ssh_key  = @nat.getSSHConfig
               if nat_ssh_user.nil? and !nat_ssh_host.nil?
                 MU.log "#{@config["name"]} (#{MU.deploy_id}) is configured to use #{@config['vpc']} NAT #{nat_ssh_host}, but username isn't specified. Guessing root.", MU::ERR, details: caller
                 nat_ssh_user = "root"
@@ -163,7 +163,7 @@ module MU
 
           if @config['ssh_user'].nil?
             if windows?
-              @config['ssh_user'] = "Administrator"
+              @config['ssh_user'] = "muadmin"
             else
               @config['ssh_user'] = "root"
             end
@@ -188,7 +188,7 @@ module MU
             @named = true
           end
 
-          nat_ssh_key, nat_ssh_user, nat_ssh_host, canonical_ip, ssh_user, ssh_key_name = getSSHConfig
+          _nat_ssh_key, _nat_ssh_user, nat_ssh_host, _canonical_ip, _ssh_user, _ssh_key_name = getSSHConfig
           if !nat_ssh_host and !MU::Cloud::Azure::VPC.haveRouteToInstance?(cloud_desc, region: @config['region'], credentials: @config['credentials'])
 # XXX check if canonical_ip is in the private ranges
 #            raise MuError, "#{node} has no NAT host configured, and I have no other route to it"
@@ -236,7 +236,7 @@ module MU
                 resp = MU::Cloud::Azure.compute(credentials: args[:credentials]).virtual_machines.get(rg, id_str)
                 next if resp.nil?
                 found[Id.new(resp.id)] = resp
-              rescue MU::Cloud::Azure::APIError => e
+              rescue MU::Cloud::Azure::APIError
                 # this is fine, we're doing a blind search after all
               end
             }
@@ -267,7 +267,7 @@ module MU
 
           MU::MommaCat.lock(@cloud_id.to_s+"-groom")
           
-          node, config, deploydata = describe(cloud_id: @cloud_id)
+          node, _config, deploydata = describe(cloud_id: @cloud_id)
 
           if node.nil? or node.empty?
             raise MuError, "MU::Cloud::Azure::Server.groom was called without a mu_name"
@@ -357,7 +357,7 @@ module MU
         # bastion hosts that may be in the path, see getSSHConfig if that's what
         # you need.
         def canonicalIP
-          mu_name, config, deploydata = describe(cloud_id: @cloud_id)
+          describe(cloud_id: @cloud_id)
 
           if !cloud_desc
             raise MuError, "Couldn't retrieve cloud descriptor for server #{self}"
@@ -451,6 +451,34 @@ module MU
                   }
                 }
               }
+            },
+            "windows_admin_username" => {
+              "type" => "string",
+              "default" => "muadmin",
+            },
+            "ssh_user" => {
+              "default_if" => [
+                {
+                  "key_is" => "platform",
+                  "value_is" => "windows",
+                  "set" => "muadmin"
+                },
+                {
+                  "key_is" => "platform",
+                  "value_is" => "win2k12",
+                  "set" => "muadmin"
+                },
+                {
+                  "key_is" => "platform",
+                  "value_is" => "win2k12r2",
+                  "set" => "muadmin"
+                },
+                {
+                  "key_is" => "platform",
+                  "value_is" => "win2k16",
+                  "set" => "muadmin"
+                }
+              ]
             }
           }
           [toplevel_required, schema]
@@ -479,6 +507,7 @@ module MU
                 mem = foreign_types[size]["memory"]
                 ecu = foreign_types[size]["ecu"]
                 types.keys.sort.reverse.each { |type|
+                  next if type.match(/_Promo$/i)
                   features = types[type]
                   next if ecu == "Variable" and ecu != features["ecu"]
                   next if features["vcpu"] != vcpu
@@ -495,7 +524,6 @@ module MU
 
             if !foundmatch
               MU.log "Invalid size '#{size}' for Azure Compute instance in #{region}. Supported types:", MU::ERR, details: types.keys.sort.join(", ")
-exit
               return nil
             end
           end
@@ -512,6 +540,10 @@ exit
 
           server['region'] ||= MU::Cloud::Azure.myRegion(server['credentials'])
           server['ssh_user'] ||= "muadmin"
+          if server['windows_admin_username'] == "Administrator"
+            MU.log "Azure does not permit admin user to be 'Administrator'", MU::ERR
+            ok = false
+          end
 
           server['size'] = validateInstanceType(server["size"], server["region"])
           ok = false if server['size'].nil?
@@ -527,17 +559,17 @@ exit
           end
 
           image_desc = MU::Cloud::Azure::Server.fetchImage(server['image_id'].to_s, credentials: server['credentials'], region: server['region'])
-          if image_desc.plan
-            terms = MU::Cloud::Azure.marketplace(credentials: @credentials).marketplace_agreements.get(image_desc.plan.publisher, image_desc.plan.product, image_desc.plan.name)
-            if !terms.accepted
-              MU.log "Deploying #{server['name']} will automatically agree to the licensing terms for #{terms.product}", MU::NOTICE, details: terms.license_text_link
-            end
-          end
 
           if !image_desc
             MU.log "Failed to locate an Azure VM image for #{server['name']} from #{server['image_id']} in #{server['region']}", MU::ERR
             ok = false
           else
+            if image_desc.plan
+              terms = MU::Cloud::Azure.marketplace(credentials: @credentials).marketplace_agreements.get(image_desc.plan.publisher, image_desc.plan.product, image_desc.plan.name)
+              if !terms.accepted
+                MU.log "Deploying #{server['name']} will automatically agree to the licensing terms for #{terms.product}", MU::NOTICE, details: terms.license_text_link
+              end
+            end
             server['image_id'] = image_desc.id
           end
 
@@ -624,17 +656,22 @@ exit
           skus = MU::Cloud::Azure.compute(credentials: credentials).virtual_machine_images.list_skus(region, publisher, offer).map { |s| s.name }
 
           if !skus.include?(sku)
-            skus.sort { |a, b| MU.version_sort(a, b) }.reverse.each { |s|
-              if s.match(/^#{Regexp.quote(sku)}/)
-                sku = s
-                break
-              end
-            }
+            skus.reject! { |s| !s.match(/^#{Regexp.quote(sku)}/) }
+            skus.sort! { |a, b| MU.version_sort(a, b) }.reverse!
+            sku = skus.first
           end
 
-          versions = MU::Cloud::Azure.compute(credentials: credentials).virtual_machine_images.list(region, publisher, offer, sku).map { |v| v.name }
+          version = nil
+          begin
+            versions = MU::Cloud::Azure.compute(credentials: credentials).virtual_machine_images.list(region, publisher, offer, sku).map { |v| v.name }
+            if versions.nil? or versions.empty?
+              skus.delete(sku)
+              sku = skus.first
+            end
+          end while skus.size > 0 and (versions.nil? or versions.empty?)
+
           if versions.nil? or versions.empty?
-            MU.log "Azure API returned empty machine image version list for publisher #{publisher} offer #{offer} sku #{sku}", MU::ERR
+            MU.log "Azure API returned empty machine image version list for publisher #{publisher} offer #{offer} sku #{sku}", MU::ERR, details: skus
             return nil
           end
 
@@ -724,12 +761,15 @@ exit
           hw_obj.vm_size = @config['size']
 
           os_obj = MU::Cloud::Azure.compute(:OSProfile).new
-          os_obj.admin_username = @config['ssh_user']
-          os_obj.computer_name = @mu_name
           if windows?
             win_obj = MU::Cloud::Azure.compute(:WindowsConfiguration).new
             os_obj.windows_configuration = win_obj
+            os_obj.admin_username = @config['windows_admin_username']
+            os_obj.admin_password = MU.generateWindowsPassword
+            os_obj.computer_name = @deploy.getResourceName(@config["name"], max_length: 15, disallowed_chars: /[~!@#$%^&*()=+_\[\]{}\\\|;:\.'",<>\/\?]/)
           else
+            os_obj.admin_username = @config['ssh_user']
+            os_obj.computer_name = @mu_name
             key_obj = MU::Cloud::Azure.compute(:SshPublicKey).new
             key_obj.key_data = @deploy.ssh_public_key
             key_obj.path = "/home/#{@config['ssh_user']}/.ssh/authorized_keys"
@@ -772,7 +812,7 @@ exit
               begin
 # XXX this doesn't actually work as documented
                 MU::Cloud::Azure.marketplace(credentials: @credentials).marketplace_agreements.sign(image_desc.plan.publisher, image_desc.plan.product, image_desc.plan.name)
-              rescue Exception => e
+              rescue StandardError => e
                 MU.log e.message, MU::ERR
                 vm_obj.plan = nil
               end