foreman_google 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3387889c509d7c5e6374b66fbe1a53635ecd5227a4f92dab8ab47a5227275782
-  data.tar.gz: 1a54d851fc1b61d2a9bb5d0f8c802ff137152b0a43ecbc761a76724106510cad
+  metadata.gz: 8b338a987ab4135f00fbdb21f1aefb2bc6e09ac5337b53ea09954a72890b2bba
+  data.tar.gz: 78e7d640594e2b928855c5b5d6ac285e1b9ee5b984cbc14ba9aab50db64ac2aa
 SHA512:
-  metadata.gz: f17acaa93e46fb7bfecac30a4169d996aee5d895a3cb1f3b7b710001bba2765d122e7f2ad29a00bf184d61eeda56349a8dd662388546e51c5f67720176ece1a0
-  data.tar.gz: af406a295cac958fcf4b9c5e4f7060f9c64e9736868be96299608ccdb4531d7802d4ca2bbf7ed2b01e3e98e1b938bded6856d0dcaede1164079317b7da63274f
+  metadata.gz: 40a2ab4f5b7b8b690bbbf59efba473cb78d00a1a0570328f86e214a03ed3e2413b84490380b76d08e33f2758e5b31815f456432ce34be677824126af35a2ba36
+  data.tar.gz: cb0749dc7f3f70555574e3c68fc14f75abd60b536f0355a3551c31b1ada4e8132003c721694f8390e5ce90d7d3f92a105cb2249ad83753fbbf86080e00776545

data/app/controllers/concerns/foreman/controller/parameters/compute_resource_extension.rb

@@ -7,11 +7,7 @@ module Foreman
         class_methods do
           def compute_resource_params_filter
             super.tap do |filter|
-              filter.permit :email,
-                :key_pair,
-                :key_path,
-                :project,
-                :zone
+              filter.permit :key_path, :zone
             end
           end
         end

data/app/controllers/foreman_google/api/v2/apipie_extensions.rb

@@ -8,6 +8,8 @@ module ForemanGoogle
           param :compute_resource, Hash do
             param :key_path, String, desc: N_('Certificate path, for GCE only')
             param :zone, String, desc: N_('Zone, for GCE only')
+            param :project, String, desc: N_('Deprecated, project is automatically loaded from the JSON file. For GCE only')
+            param :email, String, desc: N_('Deprecated, email is automatically loaded from the JSON file. For GCE only')
           end
         end
       end

data/app/controllers/foreman_google/api/v2/compute_resources_extensions.rb

@@ -7,6 +7,7 @@ module ForemanGoogle
         # rubocop:disable Rails/LexicallyScopedActionFilter
         included do
           before_action :read_key, only: [:create]
+          before_action :deprecated_params, only: [:create]
         end
         # rubocop:enable Rails/LexicallyScopedActionFilter
 
@@ -16,6 +17,19 @@ module ForemanGoogle
           return unless compute_resource_params['provider'] == 'GCE'
           params[:compute_resource][:password] = File.read(params['compute_resource'].delete('key_path'))
         end
+
+        def deprecated_params
+          return unless compute_resource_params['provider'] == 'GCE'
+
+          if compute_resource_params['email']
+            msg = _('The email parameter is deprecated, value is automatically loaded from the JSON file')
+            Foreman::Deprecation.api_deprecation_warning(msg)
+          end
+
+          return unless compute_resource_params['project']
+          msg = _('The project parameter is deprecated, value is automatically loaded from the JSON file')
+          Foreman::Deprecation.api_deprecation_warning(msg)
+        end
       end
     end
   end

data/app/models/foreman_google/gce.rb

@@ -33,7 +33,7 @@ module ForemanGoogle
     end
 
     def available_networks(_cluster_id = nil)
-      client.networks.items
+      client.networks
     end
 
     def machine_types

data/lib/foreman_google/version.rb

@@ -1,3 +1,3 @@
 module ForemanGoogle
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_google
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - The Foreman Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-compute_v1
@@ -196,10 +196,10 @@ test_files:
 - test/fixtures/instance_start.json
 - test/fixtures/instance_stop.json
 - test/fixtures/machine_types.json
-- test/fixtures/networks.json
 - test/fixtures/operation_error.json
 - test/fixtures/operation_get.json
 - test/fixtures/zones.json
+- test/fixtures/networks.json
 - test/factories/gce.rb
 - test/unit/foreman_google/google_compute_adapter_test.rb
 - test/unit/google_extensions/attached_disk_test.rb