foreman_azure_rm 3.0.0 → 3.0.2

data/app/assets/javascripts/foreman_azure_rm/locale/zh_TW/foreman_azure_rm.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_azure_rm": {
       "": {
-        "Project-Id-Version": "foreman_azure_rm 2.2.9",
+        "Project-Id-Version": "foreman_azure_rm 3.0.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2020-04-21 13:58+0000",
         "Last-Translator": "Bryan Kearney <bryan.kearney@gmail.com>, 2020",
@@ -17,193 +17,193 @@
         "domain": "foreman_azure_rm",
         "plural_forms": "nplurals=1; plural=0;"
       },
-      "Client ID for AzureRm": [
+      "%{vm_size} VM Size": [
         ""
       ],
-      "Client Secret for AzureRm": [
-        ""
+      "Action with sub plans": [
+        "有子計畫的動作"
       ],
-      "Subscription ID for AzureRm": [
-        ""
+      "Actions": [
+        "動作"
       ],
-      "Cloud": [
+      "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation": [
         ""
       ],
-      "The region you selected has no sizes associated with it": [
+      "Azure Image Name": [
         ""
       ],
-      "The selected region has no subnets": [
+      "Azure Region": [
         ""
       ],
-      "The selected image has no associated compute resource": [
+      "Azure Resource Manager as a compute resource for Foreman": [
         ""
       ],
-      "Azure Region": [
+      "Azure Subnet": [
         ""
       ],
-      "Load Regions": [
-        "載入區域"
-      ],
-      "is not valid, must be lowercase eg. 'eastus'. No special characters allowed.": [
+      "Azure Tags": [
         ""
       ],
-      "is not valid. Valid choices are %s.": [
+      "Azure's Default": [
         ""
       ],
-      "%{vm_size} VM Size": [
+      "Client ID": [
         ""
       ],
-      "Client ID": [
+      "Client ID for AzureRm": [
         ""
       ],
       "Client Secret": [
         ""
       ],
-      "Subscription ID": [
-        "訂閱 ID"
-      ],
-      "Tenant ID": [
+      "Client Secret for AzureRm": [
         ""
       ],
-      "Please select a Resource Group": [
+      "Cloud": [
         ""
       ],
-      "Resource Group": [
+      "Comma seperated file URIs": [
         ""
       ],
-      "Reload Images, Sizes, vNets": [
+      "Comma seperated list of name=value pairs for tags on this VM in Azure": [
         ""
       ],
-      "Please select a VM Size": [
+      "Custom Script Command": [
         ""
       ],
-      "VM Size": [
+      "Data Disk Caching": [
         ""
       ],
-      "Platform": [
+      "Default ReadWrite": [
         ""
       ],
-      "Username": [
-        "使用者名稱"
+      "Deploy NVIDIA GPU driver and CUDA (Azure Extension Microsoft.HpcCompute/NvidiaGpuDriver{Linux,Windows}/1.3)": [
+        ""
       ],
-      "Password": [
-        "密碼"
+      "Does this image support user data input?": [
+        "此映像檔是否支援使用者資料輸入？"
       ],
-      "SSH Key": [
+      "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')": [
         ""
       ],
-      "Premium OS Disk": [
-        ""
+      "Image": [
+        "影像"
       ],
-      "Override OS Disk Size (GB)": [
-        ""
+      "Import Puppet classes": [
+        "匯入 Puppet 類別"
+      ],
+      "Import facts": [
+        "匯入詳情"
       ],
       "Leave empty to use default image size": [
         ""
       ],
-      "Azure's Default": [
-        ""
+      "Load Regions": [
+        "載入區域"
       ],
-      "OS Disk Caching": [
+      "NVIDIA driver / CUDA": [
         ""
       ],
-      "Default ReadWrite": [
-        ""
+      "Name": [
+        "名稱"
       ],
-      "Custom Script Command": [
+      "OS Disk Caching": [
         ""
       ],
-      "To perform commands as root, prefix it with 'sudo'": [
+      "Override OS Disk Size (GB)": [
         ""
       ],
-      "Comma seperated file URIs": [
-        ""
+      "Password": [
+        "密碼"
       ],
-      "Azure Tags": [
-        ""
+      "Password to authenticate with - used for SSH finish step.": [
+        "用來進行認證的密碼 - 用於 SSH 完成步驟。"
       ],
-      "Comma seperated list of name=value pairs for tags on this VM in Azure": [
+      "Platform": [
         ""
       ],
-      "NVIDIA driver / CUDA": [
+      "Please select a Resource Group": [
         ""
       ],
-      "Deploy NVIDIA GPU driver and CUDA (Azure Extension Microsoft.HpcCompute/NvidiaGpuDriver{Linux,Windows}/1.3)": [
+      "Please select a VM Size": [
         ""
       ],
       "Please select an image": [
         "請選擇一個映像檔"
       ],
-      "Image": [
-        "影像"
-      ],
-      "Select": [
-        "選擇"
-      ],
-      "Azure Subnet": [
+      "Premium OS Disk": [
         ""
       ],
+      "Properties": [
+        "屬性"
+      ],
       "Public IP": [
         ""
       ],
-      "Static Private IP": [
+      "Region": [
+        "區域"
+      ],
+      "Reload Images, Sizes, vNets": [
         ""
       ],
-      "Size (GB)": [
-        "大小（GB）"
+      "Remote action:": [
+        "遠端動作："
       ],
-      "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation": [
+      "Resource Group": [
         ""
       ],
-      "Data Disk Caching": [
+      "SSH Key": [
         ""
       ],
-      "Name": [
-        "名稱"
+      "Select": [
+        "選擇"
       ],
       "Size": [
         "大小"
       ],
-      "Region": [
-        "區域"
+      "Size (GB)": [
+        "大小（GB）"
       ],
       "State": [
         "狀態"
       ],
-      "Actions": [
-        "動作"
+      "Static Private IP": [
+        ""
       ],
-      "Properties": [
-        "屬性"
+      "Subscription ID": [
+        "訂閱 ID"
       ],
-      "The user that will be used to SSH into the VM for completion": [
+      "Subscription ID for AzureRm": [
         ""
       ],
-      "Password to authenticate with - used for SSH finish step.": [
-        "用來進行認證的密碼 - 用於 SSH 完成步驟。"
+      "Tenant ID": [
+        ""
       ],
-      "Azure Image Name": [
+      "The region you selected has no sizes associated with it": [
         ""
       ],
-      "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')": [
+      "The selected image has no associated compute resource": [
         ""
       ],
-      "Does this image support user data input?": [
-        "此映像檔是否支援使用者資料輸入？"
+      "The selected region has no subnets": [
+        ""
       ],
-      "Action with sub plans": [
-        "有子計畫的動作"
+      "The user that will be used to SSH into the VM for completion": [
+        ""
       ],
-      "Import facts": [
-        "匯入詳情"
+      "To perform commands as root, prefix it with 'sudo'": [
+        ""
       ],
-      "Import Puppet classes": [
-        "匯入 Puppet 類別"
+      "Username": [
+        "使用者名稱"
       ],
-      "Remote action:": [
-        "遠端動作："
+      "VM Size": [
+        ""
       ],
-      "Azure Resource Manager as a compute resource for Foreman": [
+      "is not valid, must be lowercase eg. 'eastus'. No special characters allowed.": [
+        ""
+      ],
+      "is not valid. Valid choices are %s.": [
         ""
       ]
     }

data/{lib → app/lib}/foreman_azure_rm/azure_sdk_adapter.rb

@@ -11,7 +11,7 @@ module ForemanAzureRm
     end
 
     def resource_client
-      #resource_manager_endpoint_url
+      # resource_manager_endpoint_url
       @resource_client ||= Resources::Client.new(azure_credentials(@environment_settings.resource_manager_endpoint_url))
     end
 
@@ -33,11 +33,12 @@ module ForemanAzureRm
 
     def azure_credentials(base_url)
       provider = MsRestAzure::ApplicationTokenProvider.new(
-      @tenant,
-      @app_ident,
-      @secret_key,
-      @ad_settings)
-      
+        @tenant,
+        @app_ident,
+        @secret_key,
+        @ad_settings
+      )
+
       credentials = MsRest::TokenCredentials.new(provider)
 
       {
@@ -46,7 +47,7 @@ module ForemanAzureRm
         client_id: @app_ident,
         client_secret: @secret_key,
         subscription_id: @sub_id,
-        base_url: base_url
+        base_url: base_url,
       }
     end
 
@@ -91,7 +92,7 @@ module ForemanAzureRm
     end
 
     def rgs
-      rgs      = resource_client.resource_groups.list
+      rgs = resource_client.resource_groups.list
       rgs.map(&:name)
     end
 
@@ -107,7 +108,7 @@ module ForemanAzureRm
       network_client.public_ipaddresses.get(rg_name, pip_name)
     end
 
-    def vm_nic(rg_name,nic_name)
+    def vm_nic(rg_name, nic_name)
       network_client.network_interfaces.get(rg_name, nic_name)
     end
 
@@ -120,14 +121,15 @@ module ForemanAzureRm
     end
 
     def list_vm_sizes(region)
-      return [] unless region.present?
+      return [] if region.blank?
+
       stripped_region = region.gsub(/\s+/, '').downcase
-      compute_client.virtual_machine_sizes.list(stripped_region).value()
+      compute_client.virtual_machine_sizes.list(stripped_region).value
     end
 
     def list_vms(region)
       # List all VMs in a resource group
-      virtual_machines = compute_client.virtual_machines.list_by_location(region)
+      compute_client.virtual_machines.list_by_location(region)
     end
 
     def get_vm(rg_name, vm_name)
@@ -166,7 +168,7 @@ module ForemanAzureRm
       compute_client.gallery_image_versions.list_by_gallery_image(rg_name, gallery_name, gallery_image_name)
     end
 
-    def get_storage_accts
+    def get_storage_accts # rubocop:disable Naming/AccessorMethodName
       result = storage_client.storage_accounts.list
       result.value
     end
@@ -177,9 +179,9 @@ module ForemanAzureRm
 
     def create_or_update_vm_extensions(rg_name, vm_name, vm_extension_name, extension_params)
       compute_client.virtual_machine_extensions.create_or_update(rg_name,
-                                                          vm_name,
-                                                          vm_extension_name,
-                                                          extension_params) 
+        vm_name,
+        vm_extension_name,
+        extension_params)
     end
 
     def create_or_update_pip(rg_name, pip_name, parameters)
@@ -207,7 +209,7 @@ module ForemanAzureRm
     end
 
     def check_vm_status(rg_name, vm_name)
-      virtual_machine = compute_client.virtual_machines.get(rg_name, vm_name, expand:'instanceView')
+      virtual_machine = compute_client.virtual_machines.get(rg_name, vm_name, expand: 'instanceView')
       get_status(virtual_machine)
     end
 
@@ -215,9 +217,7 @@ module ForemanAzureRm
       vm_statuses = virtual_machine.instance_view.statuses
       vm_status = nil
       vm_statuses.each do |status|
-        if status.code.include? 'PowerState'
-          vm_status = status.code.split('/')[1]
-        end
+        vm_status = status.code.split('/')[1] if status.code.include? 'PowerState'
       end
       vm_status
     end
@@ -238,11 +238,10 @@ module ForemanAzureRm
 
     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
+      return unless (gallery = gallery_names.first)
+
+      gallery_image = list_gallery_images(rg_name, gallery).detect { |image| image.name == image_id }
+      gallery_image&.id
     end
 
     def fetch_gallery_image_id(rg_name, image_id)

data/lib/foreman_azure_rm/engine.rb

@@ -2,17 +2,19 @@ module ForemanAzureRm
   class Engine < ::Rails::Engine
     engine_name 'foreman_azure_rm'
 
-    #autoloading all files inside lib dir
-    config.eager_load_paths += Dir["#{config.root}/lib"]
-    config.eager_load_paths += Dir["#{config.root}/app/models/concerns/"]
-    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
-        requires_foreman '>= 3.13'
-        register_gettext
-        compute_resource ForemanAzureRm::AzureRm
-        parameter_filter ComputeResource, :azure_vm, :tenant, :app_ident, :secret_key, :sub_id, :region, :cloud
+    lib = config.root.join('app', 'lib')
+
+    config.autoload_paths << lib
+    config.eager_load_paths << lib
+
+    initializer 'foreman_azure_rm.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_azure_rm do
+          requires_foreman '>= 3.13'
+          register_gettext
+          compute_resource ForemanAzureRm::AzureRm
+          parameter_filter ComputeResource, :azure_vm, :tenant, :app_ident, :secret_key, :sub_id, :region, :cloud
+        end
       end
     end
 
@@ -29,14 +31,6 @@ module ForemanAzureRm
       end
     end
 
-    initializer "foreman_azure_rm.zeitwerk" do
-      Rails.autoloaders.each do |loader|
-        loader.ignore(
-          ForemanAzureRm::Engine.root.join('lib/foreman_azure_rm/version.rb')
-        )
-      end
-    end
-
     config.to_prepare do
       require 'azure_mgmt_resources'
       require 'azure_mgmt_network'

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.2'.freeze
 end

data/locale/Makefile

@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-%.edit.po:
+%.edit.po: %.po.time_stamp
 	touch $@
 
+# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
+%.po.time_stamp: %.po
+	touch --reference $< $@
+
+# Prevent make from treating this as an intermediate file to be cleaned up
+.PRECIOUS: %.po.time_stamp
+
 check: $(POXFILES)
 
 # Unify duplicate translations
@@ -43,7 +50,10 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	cd .. && tx pull -f --all
+	# Initialize new languages
+	cd .. && tx pull -f --all --minimum-perc 50
+	# Force update all existing languages
+	cd .. && tx pull -f --minimum-perc 0
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done

data/locale/ca/foreman_azure_rm.po

@@ -6,9 +6,10 @@
 # Translators:
 # Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.2.9\n"
+"Project-Id-Version: foreman_azure_rm 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
 "Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2020\n"

data/locale/cs_CZ/foreman_azure_rm.po

@@ -8,9 +8,10 @@
 # mhulan <mhulan@redhat.com>, 2020
 # Pavel Borecki <pavel.borecki@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.2.9\n"
+"Project-Id-Version: foreman_azure_rm 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2020\n"

data/locale/de/foreman_azure_rm.po

@@ -12,14 +12,15 @@
 # Wiederoder <stefanwiederoder@googlemail.com>, 2020
 # Bryan Kearney <bryan.kearney@gmail.com>, 2020
 # Crited <Alexander.Stoll@netways.de>, 2020
-# Patrick Dolinic, 2021
+# pdolinic, 2021
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.2.9\n"
+"Project-Id-Version: foreman_azure_rm 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
-"Last-Translator: Patrick Dolinic, 2021\n"
+"Last-Translator: pdolinic, 2021\n"
 "Language-Team: German (https://app.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"