foreman_google 2.0.1 → 3.0.1

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

@@ -3,11 +3,11 @@
   "locale_data": {
     "foreman_google": {
       "": {
-        "Project-Id-Version": "foreman_google 1.0.0",
+        "Project-Id-Version": "foreman_google 3.0.0",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2022-08-01 12:51+0000",
         "Last-Translator": "0868a4d1af5275b3f70b0a6dac4c99a4, 2022",
-        "Language-Team": "Chinese (Taiwan) (https://www.transifex.com/foreman/teams/114/zh_TW/)",
+        "Language-Team": "Chinese (Taiwan) (https://app.transifex.com/foreman/teams/114/zh_TW/)",
         "MIME-Version": "1.0",
         "Content-Type": "text/plain; charset=UTF-8",
         "Content-Transfer-Encoding": "8bit",
@@ -17,97 +17,82 @@
         "domain": "foreman_google",
         "plural_forms": "nplurals=1; plural=0;"
       },
-      "Certificate path, for GCE only": [
-        ""
+      "Actions": [
+        "動作"
       ],
-      "Zone, for GCE only": [
+      "Associate Ephemeral External IP": [
         ""
       ],
-      "Deprecated, project is automatically loaded from the JSON file. For GCE only": [
+      "Certificate path, for GCE only": [
         ""
       ],
       "Deprecated, email is automatically loaded from the JSON file. For GCE only": [
         ""
       ],
-      "The email parameter is deprecated, value is automatically loaded from the JSON file": [
+      "Deprecated, project is automatically loaded from the JSON file. For GCE only": [
         ""
       ],
-      "The project parameter is deprecated, value is automatically loaded from the JSON file": [
-        ""
+      "Does this image support user data input (e.g. via cloud-init)?": [
+        "這映像檔是否支援使用者資料輸入（比方說透過 cloud-init）？"
       ],
-      "console is not available at this time because the instance is powered off": [
+      "Google Compute Engine plugin for the Foreman.": [
         ""
       ],
-      "Missing an image for operating system!": [
-        ""
+      "Image": [
+        "影像"
       ],
       "JSON key": [
         ""
       ],
-      "Zone": [
-        "區域"
-      ],
       "Load Zones": [
         ""
       ],
+      "Machine Type": [
+        "機器類型"
+      ],
       "Machine type": [
         "機器類型"
       ],
-      "Please select an image": [
-        "請選擇一個映像檔"
+      "Missing an image for operating system!": [
+        ""
       ],
-      "Image": [
-        "影像"
+      "Name": [
+        "名稱"
       ],
       "Network": [
         "網路"
       ],
-      "Associate Ephemeral External IP": [
-        ""
+      "Please select an image": [
+        "請選擇一個映像檔"
+      ],
+      "Properties": [
+        "屬性"
       ],
       "Size (GB)": [
         "大小（GB）"
       ],
-      "Name": [
-        "名稱"
-      ],
-      "Type": [
-        "類型"
-      ],
       "State": [
         "狀態"
       ],
-      "Actions": [
-        "動作"
-      ],
-      "Properties": [
-        "屬性"
-      ],
-      "Machine Type": [
-        "機器類型"
-      ],
-      "The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, etc. Note: Google engine doesn't support SSH for the root user.": [
+      "The email parameter is deprecated, value is automatically loaded from the JSON file": [
         ""
       ],
-      "Does this image support user data input (e.g. via cloud-init)?": [
-        "這映像檔是否支援使用者資料輸入（比方說透過 cloud-init）？"
-      ],
-      "Preupgrade job": [
+      "The project parameter is deprecated, value is automatically loaded from the JSON file": [
         ""
       ],
-      "Action with sub plans": [
-        "有子計畫的動作"
+      "The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, etc. Note: Google engine doesn't support SSH for the root user.": [
+        ""
       ],
-      "Import facts": [
-        "匯入詳情"
+      "Type": [
+        "類型"
       ],
-      "Import Puppet classes": [
-        "匯入 Puppet 類別"
+      "Zone": [
+        "區域"
       ],
-      "Remote action:": [
-        "遠端動作："
+      "Zone, for GCE only": [
+        ""
       ],
-      "Google Compute Engine plugin for the Foreman.": [
+      "console is not available at this time because the instance is powered off": [
         ""
       ]
     }

data/app/lib/foreman_google/google_compute_adapter.rb

@@ -1,5 +1,3 @@
-require 'google-cloud-compute'
-
 # rubocop:disable Rails/SkipsModelValidations, Metrics/ClassLength
 module ForemanGoogle
   class GoogleComputeAdapter
@@ -91,9 +89,9 @@ module ForemanGoogle
       instance = instance(zone, instance_identity)
       instance.disks.each do |disk|
         manage_instance :set_disk_auto_delete, zone: zone,
-                        device_name: disk.device_name,
-                        instance: instance_identity,
-                        auto_delete: true
+          device_name: disk.device_name,
+          instance: instance_identity,
+          auto_delete: true
       end
     end
 

data/app/models/foreman_google/gce.rb

@@ -1,5 +1,3 @@
-require 'foreman_google/google_compute_adapter'
-
 # rubocop:disable Rails/InverseOf, Metrics/ClassLength
 module ForemanGoogle
   class GCE < ::ComputeResource

data/app/models/foreman_google/google_compute.rb

@@ -1,5 +1,3 @@
-require 'google/apis/compute_v1'
-
 module ForemanGoogle
   class GoogleCompute
     attr_reader :identity, :name, :hostname, :creation_timestamp, :machine_type, :network_interfaces, :volumes,

data/config/initializers/zeitwerk.rb

@@ -0,0 +1,3 @@
+require 'google/apis/compute_v1'
+require 'google/cloud/compute/v1'
+require 'google-cloud-compute'

data/db/migrate/20220331113745_foreman_gce_to_foreman_google_gce.rb

@@ -1,5 +1,5 @@
 # rubocop:disable Metrics/MethodLength
-class ForemanGceToForemanGoogleGce < ActiveRecord::Migration[6.0]
+class ForemanGCEToForemanGoogleGCE < ActiveRecord::Migration[6.0]
   def up
     User.without_auditing do
       original_type = 'Foreman::Model::GCE'
@@ -10,7 +10,7 @@ class ForemanGceToForemanGoogleGce < ActiveRecord::Migration[6.0]
       # mechanism failed to locate the subclass: 'Foreman::Model::GCE'
       ComputeResource.unscoped.where(type: original_type).update_all(type: new_type)
 
-      ComputeResource.unscoped.where(type: new_type).each do |cr|
+      ComputeResource.unscoped.where(type: new_type).find_each do |cr|
         unless cr.attrs[:key_path]
           say("Compute resource [#{cr.name}] is missing path to JSON key file, can't load the data. Please update the resource manually.")
           next

data/lib/foreman_google/engine.rb

@@ -12,7 +12,7 @@ module ForemanGoogle
 
     initializer 'foreman_google.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_google do
-        requires_foreman '>= 3.7.0'
+        requires_foreman '>= 3.13.0'
         register_global_js_file 'global'
         register_gettext
 
@@ -24,8 +24,6 @@ module ForemanGoogle
 
     # Include concerns in this config.to_prepare block
     config.to_prepare do
-      require 'google/cloud/compute/v1'
-
       ::Host::Managed.include ForemanGoogle::HostManagedExtensions
       ::Api::V2::ComputeResourcesController.include ForemanGoogle::Api::V2::ComputeResourcesExtensions
       ::Api::V2::ComputeResourcesController.include ForemanGoogle::Api::V2::ApipieExtensions

data/lib/foreman_google/version.rb

@@ -1,3 +1,3 @@
 module ForemanGoogle
-  VERSION = '2.0.1'.freeze
+  VERSION = '3.0.1'.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/cs_CZ/foreman_google.po

@@ -9,11 +9,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_google 1.0.0\n"
+"Project-Id-Version: foreman_google 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-08-01 12:51+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2022\n"
-"Language-Team: Czech (Czech Republic) (https://www.transifex.com/foreman/teams"
+"Language-Team: Czech (Czech Republic) (https://app.transifex.com/foreman/teams"
 "/114/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,9 +22,6 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= "
 "4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-msgid "Action with sub plans"
-msgstr "Akce s dílčími plány"
-
 msgid "Actions"
 msgstr "Akce"
 
@@ -49,12 +46,6 @@ msgstr ""
 msgid "Image"
 msgstr "Obraz"
 
-msgid "Import Puppet classes"
-msgstr "Importovat Puppet třídy"
-
-msgid "Import facts"
-msgstr "Importovat fakta"
-
 msgid "JSON key"
 msgstr ""
 
@@ -79,15 +70,9 @@ msgstr "Síť"
 msgid "Please select an image"
 msgstr "Vyberte obraz"
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Properties"
 msgstr "Vlastnosti"
 
-msgid "Remote action:"
-msgstr "Akce na protějšku:"
-
 msgid "Size (GB)"
 msgstr "Velikost (GB)"
 

data/locale/de/foreman_google.po

@@ -10,7 +10,7 @@
 # Crited <Alexander.Stoll@netways.de>, 2022
 # simon11 <transifex@stieger.co>, 2022
 # Martin Zimmermann <martin.zimmermann@gmx.com>, 2022
-# Patrick Dolinic, 2022
+# pdolinic, 2022
 # Bryan Kearney <bryan.kearney@gmail.com>, 2022
 # Wiederoder <stefanwiederoder@googlemail.com>, 2022
 # Ettore Atalan <atalanttore@googlemail.com>, 2022
@@ -18,20 +18,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_google 1.0.0\n"
+"Project-Id-Version: foreman_google 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-08-01 12:51+0000\n"
 "Last-Translator: Lukas Kallies <github.com@luke-web.de>, 2022\n"
-"Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Action with sub plans"
-msgstr "Aktion mit Unterplänen"
-
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -56,12 +53,6 @@ msgstr "Google Compute Engine-Erweiterung für the Foreman."
 msgid "Image"
 msgstr "Image"
 
-msgid "Import Puppet classes"
-msgstr "Puppet-Klassen importieren"
-
-msgid "Import facts"
-msgstr "Fakten importieren"
-
 msgid "JSON key"
 msgstr "JSON-Schlüssel"
 
@@ -86,15 +77,9 @@ msgstr "Netzwerk"
 msgid "Please select an image"
 msgstr "bitte ein Abbild auswählen"
 
-msgid "Preupgrade job"
-msgstr "Pre-Upgrade-Job"
-
 msgid "Properties"
 msgstr "Eigenschaften"
 
-msgid "Remote action:"
-msgstr "Entfernte Aktion:"
-
 msgid "Size (GB)"
 msgstr "Grösse (GB)"
 

data/locale/el/foreman_google.po

@@ -8,20 +8,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_google 1.0.0\n"
+"Project-Id-Version: foreman_google 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-08-01 12:51+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>, 2022\n"
-"Language-Team: Greek (https://www.transifex.com/foreman/teams/114/el/)\n"
+"Language-Team: Greek (https://app.transifex.com/foreman/teams/114/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Action with sub plans"
-msgstr ""
-
 msgid "Actions"
 msgstr "Ενέργειες"
 
@@ -46,12 +43,6 @@ msgstr ""
 msgid "Image"
 msgstr "Εικόνα"
 
-msgid "Import Puppet classes"
-msgstr "Εισαγωγή κλάσεων Puppet"
-
-msgid "Import facts"
-msgstr ""
-
 msgid "JSON key"
 msgstr ""
 
@@ -76,15 +67,9 @@ msgstr "Δίκτυο"
 msgid "Please select an image"
 msgstr ""
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Properties"
 msgstr "Ιδιότητες"
 
-msgid "Remote action:"
-msgstr "Απομακρυσμένη ενέργεια:"
-
 msgid "Size (GB)"
 msgstr "Μέγεθος (GB)"
 

data/locale/en/foreman_google.po

@@ -1,22 +1,21 @@
-# foreman_google
-#
-# This file is distributed under the same license as foreman_google.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_google package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_google 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2014-08-20 08:54+0100\n"
-"Last-Translator: Foreman Team <foreman-dev@googlegroups.com>\n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"PO-Revision-Date: 2024-09-19 13:06+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Action with sub plans"
-msgstr ""
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 msgid "Actions"
 msgstr ""
@@ -42,12 +41,6 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-msgid "Import Puppet classes"
-msgstr ""
-
-msgid "Import facts"
-msgstr ""
-
 msgid "JSON key"
 msgstr ""
 
@@ -72,15 +65,9 @@ msgstr ""
 msgid "Please select an image"
 msgstr ""
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Properties"
 msgstr ""
 
-msgid "Remote action:"
-msgstr ""
-
 msgid "Size (GB)"
 msgstr ""
 

data/locale/en_GB/foreman_google.po

@@ -5,14 +5,14 @@
 #
 # Translators:
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2022
-# Andi Chandler <andi@gowling.com>, 2023
+# Andi Chandler <andi@gowling.com>, 2024
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_google 1.0.0\n"
+"Project-Id-Version: foreman_google 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-08-01 12:51+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>, 2023\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>, 2024\n"
 "Language-Team: English (United Kingdom) (https://app.transifex.com/foreman/tea"
 "ms/114/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -21,9 +21,6 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Action with sub plans"
-msgstr "Action with sub plans"
-
 msgid "Actions"
 msgstr "Actions"
 
@@ -31,13 +28,13 @@ msgid "Associate Ephemeral External IP"
 msgstr "Associate Ephemeral External IP"
 
 msgid "Certificate path, for GCE only"
-msgstr ""
+msgstr "Certificate path, for GCE only"
 
 msgid "Deprecated, email is automatically loaded from the JSON file. For GCE only"
-msgstr ""
+msgstr "Deprecated, email is automatically loaded from the JSON file. For GCE only"
 
 msgid "Deprecated, project is automatically loaded from the JSON file. For GCE only"
-msgstr ""
+msgstr "Deprecated, project is automatically loaded from the JSON file. For GCE only"
 
 msgid "Does this image support user data input (e.g. via cloud-init)?"
 msgstr "Does this image support user data input (e.g. via cloud-init)?"
@@ -48,12 +45,6 @@ msgstr "Google Compute Engine plugin for the Foreman."
 msgid "Image"
 msgstr "Image"
 
-msgid "Import Puppet classes"
-msgstr "Import Puppet classes"
-
-msgid "Import facts"
-msgstr "Import facts"
-
 msgid "JSON key"
 msgstr "JSON key"
 
@@ -78,15 +69,9 @@ msgstr "Network"
 msgid "Please select an image"
 msgstr "Please select an image"
 
-msgid "Preupgrade job"
-msgstr "Preupgrade job"
-
 msgid "Properties"
 msgstr "Properties"
 
-msgid "Remote action:"
-msgstr "Remote action:"
-
 msgid "Size (GB)"
 msgstr "Size (GB)"
 
@@ -94,10 +79,10 @@ msgid "State"
 msgstr "State"
 
 msgid "The email parameter is deprecated, value is automatically loaded from the JSON file"
-msgstr ""
+msgstr "The email parameter is deprecated, value is automatically loaded from the JSON file"
 
 msgid "The project parameter is deprecated, value is automatically loaded from the JSON file"
-msgstr ""
+msgstr "The project parameter is deprecated, value is automatically loaded from the JSON file"
 
 msgid "The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, etc. Note: Google engine doesn't support SSH for the root user."
 msgstr "The user that is used to ssh into the instance, normally cloud-user, ec2-user, ubuntu, etc. Note: Google engine doesn't support SSH for the root user."
@@ -109,7 +94,7 @@ msgid "Zone"
 msgstr "Zone"
 
 msgid "Zone, for GCE only"
-msgstr ""
+msgstr "Zone, for GCE only"
 
 msgid "console is not available at this time because the instance is powered off"
 msgstr "console is not available at this time because the instance is powered off"

data/locale/es/foreman_google.po

@@ -15,11 +15,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_google 1.0.0\n"
+"Project-Id-Version: foreman_google 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2022-08-01 12:51+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>, 2022\n"
-"Language-Team: Spanish (https://www.transifex.com/foreman/teams/114/es/)\n"
+"Language-Team: Spanish (https://app.transifex.com/foreman/teams/114/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,9 +27,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 :"
 " 2;\n"
 
-msgid "Action with sub plans"
-msgstr "Acción con subplanes"
-
 msgid "Actions"
 msgstr "Acciones"
 
@@ -54,12 +51,6 @@ msgstr ""
 msgid "Image"
 msgstr "Imagen"
 
-msgid "Import Puppet classes"
-msgstr "Importar clases Puppet"
-
-msgid "Import facts"
-msgstr "Importar datos"
-
 msgid "JSON key"
 msgstr ""
 
@@ -84,15 +75,9 @@ msgstr "Red"
 msgid "Please select an image"
 msgstr "Seleccione una imagen"
 
-msgid "Preupgrade job"
-msgstr "Trabajo previo a la actualización"
-
 msgid "Properties"
 msgstr "Propiedades"
 
-msgid "Remote action:"
-msgstr "Acción remota:"
-
 msgid "Size (GB)"
 msgstr "Tamaño (GB)"