foreman_google 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 436414dce3da889d6bcd459132d3f00bb24fa5ea36afc99efa7987836a57b6a9
-  data.tar.gz: 05026b5514e98aafe1dd2ccebd9bd52fd04be94af87a78222145b73269f2301f
+  metadata.gz: ea94c8410bd480a5d037871dfdbcc479c4a6b241ae0c02ab47f506f4b52215e4
+  data.tar.gz: a0f2fc8d3b5eac53bde9bbf0cf263feccc2e15e142ba5a0acb27383ad8b77872
 SHA512:
-  metadata.gz: ecdf08325bc8ae14f1bb8d6f1af9b71adcdf702239c29f8fd84f80bc8f1266f3f1947a017430eda34dc20cc907a32ef4a51fe8799e5d40562e24c68c5723d8eb
-  data.tar.gz: 2980cd7a4e569cdd46009d1560245f0864d05a8d9eab9e401ef7d3da90777326722dc41cf429ac43e1e9c4b87d5746a2bdef9e2354e5c215ae28377ad6be1a74
+  metadata.gz: 1bbfeec72844bb5dbb055c912552c5929e0ac758d09ff53065d24b29ae2bfc3ae830724fcf79fc9a9f3d1302041dd315775935ca739e4b8caf5916233846cd62
+  data.tar.gz: 885348d92eb06c1cc78c14d98b9826e6591683dd1ae561c42ad8d91ec2d1859db6d2b4b4509d908b16d63e8eca0f6eacf861908b764fcb40d9caa396e89cb69a

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

@@ -0,0 +1,21 @@
+module Foreman
+  module Controller
+    module Parameters
+      module ComputeResourceExtension
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def compute_resource_params_filter
+            super.tap do |filter|
+              filter.permit :email,
+                :key_pair,
+                :key_path,
+                :project,
+                :zone
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module ForemanGoogle
+  module Api
+    module V2
+      module ApipieExtensions
+        extend Apipie::DSL::Concern
+
+        update_api(:create, :update) do
+          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')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module ForemanGoogle
+  module Api
+    module V2
+      module ComputeResourcesExtensions
+        extend ActiveSupport::Concern
+
+        # rubocop:disable Rails/LexicallyScopedActionFilter
+        included do
+          before_action :read_key, only: [:create]
+        end
+        # rubocop:enable Rails/LexicallyScopedActionFilter
+
+        private
+
+        def read_key
+          return unless compute_resource_params['provider'] == 'GCE'
+          params[:compute_resource][:password] = File.read(params['compute_resource'].delete('key_path'))
+        end
+      end
+    end
+  end
+end

data/app/models/foreman_google/gce.rb

@@ -85,10 +85,14 @@ module ForemanGoogle
       true
     end
 
-    def available_images(filter: nil)
+    def available_images(filter: filter_for_images)
       client.images(filter: filter)
     end
 
+    def filter_for_images
+      @filter_for_images ||= nil
+    end
+
     def self.model_name
       ComputeResource.model_name
     end

data/lib/foreman_google/engine.rb

@@ -24,13 +24,13 @@ module ForemanGoogle
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       require 'google/cloud/compute/v1'
-      Google::Cloud::Compute::V1::AttachedDisk.include GoogleExtensions::AttachedDisk
 
-      ::ComputeResourcesController.include ForemanGoogle::TemporaryPrependPath
-      ::ComputeResourcesVmsController.include ForemanGoogle::TemporaryPrependPath
-      ::ImagesController.include ForemanGoogle::TemporaryPrependPath
-      ::HostsController.include ForemanGoogle::TemporaryPrependPath
       ::Host::Managed.include ForemanGoogle::HostManagedExtensions
+      ::Api::V2::ComputeResourcesController.include ForemanGoogle::Api::V2::ComputeResourcesExtensions
+      ::Api::V2::ComputeResourcesController.include ForemanGoogle::Api::V2::ApipieExtensions
+      ::Api::V2::ComputeResourcesController.include Foreman::Controller::Parameters::ComputeResourceExtension
+      ::ComputeResourcesController.include Foreman::Controller::Parameters::ComputeResourceExtension
+      Google::Cloud::Compute::V1::AttachedDisk.include GoogleExtensions::AttachedDisk
     rescue StandardError => e
       Rails.logger.warn "ForemanGoogle: skipping engine hook (#{e})"
     end

data/lib/foreman_google/version.rb

@@ -1,3 +1,3 @@
 module ForemanGoogle
-  VERSION = '0.0.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_google
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - The Foreman Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-compute_v1
@@ -62,7 +62,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/concerns/foreman_google/temporary_prepend_path.rb
+- app/controllers/concerns/foreman/controller/parameters/compute_resource_extension.rb
+- app/controllers/foreman_google/api/v2/apipie_extensions.rb
+- app/controllers/foreman_google/api/v2/compute_resources_extensions.rb
 - app/lib/foreman_google/google_compute_adapter.rb
 - app/lib/google_cloud_compute/compute_attributes.rb
 - app/lib/google_cloud_compute/compute_collection.rb

data/app/controllers/concerns/foreman_google/temporary_prepend_path.rb

@@ -1,16 +0,0 @@
-module ForemanGoogle
-  # This module prepends core paths so view for gce takes precedence over core ones
-  # This module NEEDS to get deleted once the core support for gce is dropped.
-  # or this plugin is merged to core
-  module TemporaryPrependPath
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :prepare_views
-    end
-
-    def prepare_views
-      prepend_view_path ForemanGoogle::Engine.root.join('app', 'views')
-    end
-  end
-end