foreman_azure_rm 2.0.6 → 2.1.2

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -5,6 +5,7 @@ module ForemanAzureRm
     attr_accessor :resource_group
     attr_accessor :nics
     attr_accessor :script_command, :script_uris
+    attr_accessor :volumes
 
     delegate :name, to: :azure_vm, allow_nil: true
 
@@ -12,6 +13,7 @@ module ForemanAzureRm
                    sdk: sdk,
                    resource_group: azure_vm.resource_group,
                    nics: [],
+                   volumes: [],
                    script_command: nil,
                    script_uris: nil)
 
@@ -19,6 +21,7 @@ module ForemanAzureRm
       @sdk = sdk
       @resource_group ||= resource_group
       @nics ||= nics
+      @volumes ||= volumes
       @script_command ||= script_command
       @script_uris ||= script_uris
       @azure_vm.hardware_profile ||= ComputeModels::HardwareProfile.new
@@ -119,6 +122,20 @@ module ForemanAzureRm
       []
     end
 
+    def data_disks
+      @data_disks ||= @azure_vm.storage_profile.data_disks || []
+    end
+
+    def volumes
+      return @volumes if data_disks.empty?
+      volumes = data_disks.map do |disk|
+        OpenStruct.new(:disk => disk, :persisted? => true)
+      end
+    end
+
+    def volumes_attributes=(attrs)
+    end
+
     def identity
       @azure_vm.name
     end
@@ -169,7 +186,17 @@ module ForemanAzureRm
     def image_uuid
       image = @azure_vm.storage_profile.image_reference
       return nil unless image
-      "#{image.publisher}:#{image.offer}:#{image.sku}:#{image.version}"
+      if image.id.nil?
+        return "marketplace://#{image.publisher}:#{image.offer}:#{image.sku}:#{image.version}"
+      else
+        image_rg = image.id.split('/')[4]
+        image_name = image.id.split('/')[-1]
+        if sdk.list_custom_images.find { |custom_img| custom_img.name == image_name }
+          return "custom://#{image_name}"
+        elsif sdk.fetch_gallery_image_id(image_rg, image_name)
+          return "gallery://#{image_name}"
+        end
+      end
     end
 
     alias_method :image_id, :image_uuid
@@ -188,8 +215,12 @@ module ForemanAzureRm
         # Index is based on script_command that is being injected
         # from the code in #create_vm. It can be partly hard-coded
         # since the command shall no change frequently.
-        user_cmd_index = (vm_extension.settings["commandToExecute"].index("-c"))+ 4
-        script_command = vm_extension.settings["commandToExecute"][user_cmd_index..-2]
+        if ssh_key_data.nil?
+          user_cmd_index = (vm_extension.settings["commandToExecute"].index("-c"))+ 4
+          script_command = vm_extension.settings["commandToExecute"][user_cmd_index..-2]
+        else
+          vm_extension.settings["commandToExecute"]
+        end
       else
         @script_command
       end

data/app/views/compute_resources/form/_azurerm.html.erb

@@ -3,8 +3,4 @@
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>
 
-<%= selectable_f(f, :url, f.object.class.regions, {}, {:label => _('Azure Region'), :required => true }) %>
-
-<div class="col-md-offset-2">
-    <%= test_connection_button_f(f, true) %>
-</div>
+<%= regions_list(@compute_resource, f) %>

data/app/views/compute_resources_vms/form/azurerm/_base.html.erb

@@ -155,7 +155,7 @@
 %>
 
 <%= selectable_f f, :os_disk_caching, %w(None ReadOnly ReadWrite),
-               {   :include_blank => _('Please select OS Disk Caching method') },
+               {   :include_blank => _("Azure's Default") },
                {
                    :label    => _('OS Disk Caching'),
                    :label_help => _("Default ReadWrite"),

data/app/views/compute_resources_vms/form/azurerm/_volume.html.erb

@@ -0,0 +1,20 @@
+<%= number_f f, :disk_size_gb,
+             {
+               :class    => "col-md-2",
+               :label    => _("Size (GB)"), :label_size => "col-md-2",
+               :required => true,
+               :min      => 0,
+               :value    => f.object.disk_size_gb || f.object.disk.disk_size_gb,
+               :help_inline => _("Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation")
+             }
+%>
+
+<%= selectable_f f, :data_disk_caching, options_for_select(["None", "ReadOnly", "ReadWrite"],
+                    :selected => f.object.data_disk_caching || f.object.disk.caching),
+                 { :include_blank => _("Azure's default") },
+                 {
+                     :class    => "col-md-2",
+                     :label    => _('Data Disk Caching'),
+                     :required => true
+                 }
+%>

data/app/views/compute_resources_vms/index/_azurerm.html.erb

@@ -1,14 +1,14 @@
-<table class="table table-bordered" data-table="inline">
-  <thead>
-    <tr>
-      <th><%= _('Name') %></th>
-      <th><%= _('Size') %></th>
-      <th><%= _('Resource Group') %></th>
-      <th><%= _('Region') %></th>
-      <th><%= _('State') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-  </thead>
+<thead>
+  <tr>
+    <th><%= _('Name') %></th>
+    <th><%= _('Size') %></th>
+    <th><%= _('Resource Group') %></th>
+    <th><%= _('Region') %></th>
+    <th><%= _('State') %></th>
+    <th><%= _('Actions') %></th>
+  </tr>
+</thead>
+<tbody>
   <% @vms.each do |vm| %>
     <tr>
       <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource) %></td>
@@ -27,4 +27,4 @@
       </td>
     </tr>
   <% end %>
-</table>
+</tbody>

data/app/views/images/form/_azurerm.html.erb

@@ -2,5 +2,5 @@
            :help_inline         => _("The user that will be used to SSH into the VM for completion")
 %>
 <%= password_f f, :password, :keep_value => true, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
-<%= image_field(f, :label => _("Marketplace Image URN"), :help_inline => _("Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)")) %>
-<%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>
+<%= image_field(f, :label => _("Azure Image Name"), :help_inline => _("For custom or shared gallery image, use prefix 'custom://' or 'gallery://'. For public and RHEL-byos images, prefix the uuid with 'marketplace://'. (e.g. 'marketplace://OpenLogic:CentOS:7.5:latest' or 'custom://image-name')")) %>
+<%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>

data/db/migrate/20200211073049_fix_case_azure_rm.rb

@@ -0,0 +1,5 @@
+class FixCaseAzureRm < ActiveRecord::Migration[5.2]
+  def change
+    ComputeResource.where(type: 'ForemanAzureRM::AzureRM').update_all(type: 'ForemanAzureRm::AzureRm')
+  end
+end

data/db/migrate/20200507103900_fix_image_uuid_prefix.rb

@@ -0,0 +1,8 @@
+class FixImageUuidPrefix < ActiveRecord::Migration[5.2]
+  def up
+    Image.where(compute_resource: ForemanAzureRm::AzureRm.unscoped.all).update_all("uuid = concat('marketplace://', uuid)")
+  end
+
+  def down
+  end
+end

data/lib/foreman_azure_rm.rb

@@ -3,15 +3,18 @@ require 'azure_mgmt_resources'
 require 'azure_mgmt_network'
 require 'azure_mgmt_storage'
 require 'azure_mgmt_compute'
+require 'azure_mgmt_subscriptions'
 
 module ForemanAzureRm
   Storage = Azure::Storage::Profiles::Latest::Mgmt
   Network = Azure::Network::Profiles::Latest::Mgmt
   Compute = Azure::Compute::Profiles::Latest::Mgmt
   Resources = Azure::Resources::Profiles::Latest::Mgmt
+  Subscriptions = Azure::Subscriptions::Profiles::Latest::Mgmt
 
   StorageModels = Storage::Models
   NetworkModels = Network::Models
   ComputeModels = Compute::Models
   ResourceModels = Resources::Models
+  SubscriptionModels = Subscriptions::Models
 end

data/lib/foreman_azure_rm/azure_sdk_adapter.rb

@@ -23,6 +23,10 @@ module ForemanAzureRm
       @storage_client ||= Storage::Client.new(azure_credentials)
     end
 
+    def subscription_client
+      @subscription_client ||= Subscriptions::Client.new(azure_credentials)
+    end
+
     def azure_credentials
       provider = MsRestAzure::ApplicationTokenProvider.new(
       @tenant,
@@ -37,6 +41,14 @@ module ForemanAzureRm
       }
     end
 
+    def list_regions(subscription_id)
+      subscription_client.subscriptions.list_locations(subscription_id)
+    end
+
+    def list_resources(filter)
+      resource_client.resources.list(filter)
+    end
+
     def rgs
       rgs      = resource_client.resource_groups.list
       rgs.map(&:name)
@@ -58,6 +70,10 @@ module ForemanAzureRm
       network_client.network_interfaces.get(rg_name, nic_name)
     end
 
+    def vm_disk(rg_name, disk_name)
+      compute_client.disks.get(rg_name, disk_name)
+    end
+
     def get_vm_extension(rg_name, vm_name, vm_extension_name)
       compute_client.virtual_machine_extensions.get(rg_name, vm_name, vm_extension_name)
     end
@@ -77,6 +93,38 @@ module ForemanAzureRm
       compute_client.virtual_machines.get(rg_name, vm_name)
     end
 
+    def get_marketplace_image(location, publisher_name, offer, skus, version)
+      compute_client.virtual_machine_images.get(location, publisher_name, offer, skus, version)
+    end
+
+    def list_versions(location, publisher_name, offer, skus)
+      compute_client.virtual_machine_images.list(location, publisher_name, offer, skus)
+    end
+
+    def list_custom_images
+      compute_client.images.list
+    end
+
+    def get_custom_image(rg_name, image_name)
+      compute_client.images.get(rg_name, image_name)
+    end
+
+    def list_galleries
+      compute_client.galleries.list
+    end
+
+    def list_gallery_images(rg_name, gallery_name)
+      compute_client.gallery_images.list_by_gallery(rg_name, gallery_name)
+    end
+
+    def get_gallery_image(rg_name, gallery_name, gallery_image_name)
+      compute_client.gallery_images.get(rg_name, gallery_name, gallery_image_name)
+    end
+
+    def list_gallery_image_versions(rg_name, gallery_name, gallery_image_name)
+      compute_client.gallery_image_versions.list_by_gallery_image(rg_name, gallery_name, gallery_image_name)
+    end
+
     def get_storage_accts
       result = storage_client.storage_accounts.list
       result.value
@@ -113,8 +161,8 @@ module ForemanAzureRm
       compute_client.virtual_machines.delete(rg_name, vm_name)
     end
 
-    def delete_disk(rg_name, osdisk_name)
-      compute_client.disks.delete(rg_name, osdisk_name)
+    def delete_disk(rg_name, disk_name)
+      compute_client.disks.delete(rg_name, disk_name)
     end
 
     def check_vm_status(rg_name, vm_name)
@@ -141,5 +189,23 @@ module ForemanAzureRm
       compute_client.virtual_machines.power_off(rg_name, vm_name)
       compute_client.virtual_machines.deallocate(rg_name, vm_name)
     end
+
+    def self.gallery_caching(rg_name)
+      @gallery_caching ||= {}
+      @gallery_caching[rg_name] ||= {}
+    end
+
+    def actual_gallery_image_id(rg_name, image_id)
+      gallery_names = list_galleries.map(&:name)
+      gallery_names.each do |gallery|
+        gallery_image = list_gallery_images(rg_name, gallery).detect { |image| image.name == image_id }
+        return gallery_image&.id
+      end
+      nil
+    end
+
+    def fetch_gallery_image_id(rg_name, image_id)
+      AzureSdkAdapter.gallery_caching(rg_name)[image_id] ||= actual_gallery_image_id(rg_name, image_id)
+    end
   end
 end

data/lib/foreman_azure_rm/engine.rb

@@ -5,6 +5,7 @@ module ForemanAzureRm
     #autoloading all files inside lib dir
     config.eager_load_paths += Dir["#{config.root}/lib"]
     config.eager_load_paths += Dir["#{config.root}/app/models/concerns/foreman_azure_rm/vm_extensions/"]
+    config.eager_load_paths += Dir["#{config.root}/app/helpers/"]
 
     initializer 'foreman_azure_rm.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_azure_rm do
@@ -14,6 +15,13 @@ module ForemanAzureRm
       end
     end
 
+    # Add any db migrations
+    initializer "foreman_azure_rm.load_app_instance_data" do |app|
+      ForemanAzureRm::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
+      end
+    end
+
     initializer "foreman_azure_rm.add_rabl_view_path" do
       Rabl.configure do |config|
         config.view_paths << ForemanAzureRm::Engine.root.join('app', 'views')
@@ -31,6 +39,11 @@ module ForemanAzureRm
       require 'azure_mgmt_network'
       require 'azure_mgmt_storage'
       require 'azure_mgmt_compute'
+      require 'azure_mgmt_subscriptions'
+
+      # Add format validation for azure images
+      ::Image.validates :uuid, uniqueness: { scope: :compute_resource_id, case_sensitive: false }, format: { with: /\A((marketplace|custom|gallery):\/\/)[^:]+(:[^:]+:[^:]+:[^:]+)?\z/,
+          message: "Incorrect UUID format" }, if: -> (image){ image.compute_resource.is_a? ForemanAzureRm::AzureRm }
 
       # Use excon as default so that HTTP Proxy settings of foreman works
       Faraday::default_adapter=:excon

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.0.6'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/locale/Makefile

@@ -0,0 +1,61 @@
+#
+# Makefile for PO merging and MO generation. More info in the README.
+#
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = foreman_azure_rm
+VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '$(DOMAIN).po')
+MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+
+%.mo: %.po
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+# Generate MO files from PO files
+all-mo: $(MOFILES)
+
+# Check for malformed strings
+%.pox: %.po
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
+	! grep -q msgid $@
+
+%.edit.po:
+	touch $@
+
+check: $(POXFILES)
+
+# Unify duplicate translations
+uniq-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+tx-pull: $(EDITFILES)
+	tx pull -f
+	for f in $(EDITFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+
+tx-update: tx-pull
+	@echo
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo
+
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git commit -m "i18n - pulling from tx"
+	@echo
+	@echo Changes commited!
+	@echo
+

data/locale/action_names.rb

@@ -0,0 +1,5 @@
+# Autogenerated!
+_("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/ca/foreman_azure_rm.po

@@ -0,0 +1,185 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_azure_rm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2020
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_azure_rm 2.0.8\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-04-21 13:58+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2020\n"
+"Language-Team: Catalan (https://www.transifex.com/foreman/teams/114/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%{vm_size} VM Size"
+msgstr ""
+
+msgid "Action with sub plans"
+msgstr ""
+
+msgid "Actions"
+msgstr "Accions"
+
+msgid "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation"
+msgstr ""
+
+msgid "Azure Region"
+msgstr ""
+
+msgid "Azure Resource Manager as a compute resource for Foreman"
+msgstr ""
+
+msgid "Azure Subnet"
+msgstr ""
+
+msgid "Azure's Default"
+msgstr ""
+
+msgid "Azure's default"
+msgstr ""
+
+msgid "Client ID"
+msgstr ""
+
+msgid "Client ID for AzureRm"
+msgstr ""
+
+msgid "Client Secret"
+msgstr ""
+
+msgid "Client Secret for AzureRm"
+msgstr ""
+
+msgid "Comma seperated file URIs"
+msgstr ""
+
+msgid "Custom Script Command"
+msgstr ""
+
+msgid "Data Disk Caching"
+msgstr ""
+
+msgid "Default ReadWrite"
+msgstr ""
+
+msgid "Does this image support user data input?"
+msgstr "La imatge admet l'entrada de dades d'usuari?"
+
+msgid "Image"
+msgstr "Imatge"
+
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
+msgid "Load Regions"
+msgstr ""
+
+msgid "Marketplace Image URN"
+msgstr ""
+
+msgid "Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)"
+msgstr ""
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "OS Disk Caching"
+msgstr ""
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid "Password to authenticate with - used for SSH finish step."
+msgstr ""
+
+msgid "Platform"
+msgstr ""
+
+msgid "Please select a Resource Group"
+msgstr ""
+
+msgid "Please select a VM Size"
+msgstr ""
+
+msgid "Please select an image"
+msgstr "Si us plau, seleccioneu una imatge"
+
+msgid "Premium OS Disk"
+msgstr ""
+
+msgid "Properties"
+msgstr "Propietats"
+
+msgid "Public IP"
+msgstr ""
+
+msgid "Region"
+msgstr "Regió"
+
+msgid "Reload Images, Sizes, vNets"
+msgstr ""
+
+msgid "Remote action:"
+msgstr ""
+
+msgid "Resource Group"
+msgstr ""
+
+msgid "SSH Key"
+msgstr ""
+
+msgid "Select"
+msgstr "Selecciona"
+
+msgid "Size"
+msgstr "Mida"
+
+msgid "Size (GB)"
+msgstr "Mida (GB)"
+
+msgid "State"
+msgstr "Estat"
+
+msgid "Static Private IP"
+msgstr ""
+
+msgid "Subscription ID"
+msgstr "ID de subscripció"
+
+msgid "Subscription ID for AzureRm"
+msgstr ""
+
+msgid "Tenant ID"
+msgstr ""
+
+msgid "The region you selected has no sizes associated with it"
+msgstr ""
+
+msgid "The selected image has no associated compute resource"
+msgstr ""
+
+msgid "The selected region has no subnets"
+msgstr ""
+
+msgid "The user that will be used to SSH into the VM for completion"
+msgstr ""
+
+msgid "To perform commands as root, prefix it with 'sudo'"
+msgstr ""
+
+msgid "Username"
+msgstr "Nom d'usuari"
+
+msgid "VM Size"
+msgstr ""