foreman_google 0.0.1 → 1.0.0

data/test/unit/foreman_google/google_compute_adapter_test.rb

@@ -34,6 +34,30 @@ module ForemanGoogle
       end
     end
 
+    describe '#instance - not found' do
+      setup do
+        stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances/not-existing-instance')
+          .to_raise(Google::Cloud::NotFoundError)
+      end
+
+      it 'should raise an error' do
+        value { subject.instance('us-east1-b', 'not-existing-instance') }.must_raise(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    describe '#instances' do
+      setup do
+        stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances')
+          .to_return(body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_list.json')))
+      end
+
+      it 'gets instance by id' do
+        instances = subject.instances('us-east1-b')
+        value(instances[0]).must_be_kind_of(Google::Cloud::Compute::V1::Instance)
+        value(instances[0].id).must_equal(123)
+      end
+    end
+
     describe '#zones' do
       setup do
         stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones')
@@ -107,20 +131,95 @@ module ForemanGoogle
     end
 
     describe 'manage vm' do
+      it '#insert' do
+        stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_insert.json')))
+
+        stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/operations/6200725776819157246')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'operation_get.json')))
+
+        args = {
+          name: 'foreman-test',
+          machine_type: 'zones/us-east1-b/machineTypes/e2-micro',
+          disks: [{ source: 'zones/us-east1-b/disks/foreman-test-disk1', boot: true }],
+          network_interfaces: [{ network: 'global/networks/default' }],
+        }
+
+        result = subject.insert_instance('us-east1-b', args)
+
+        assert 'insert', result.operation.operation_type
+        assert_includes result.operation.target_link, 'foreman-test-google'
+      end
+
+      it '#insert with error' do
+        stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_insert.json')))
+
+        stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/operations/6200725776819157246')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'operation_error.json')))
+
+        args = {
+          name: 'foreman-test',
+          machine_type: 'zones/us-east1-b/machineTypes/e2-micro',
+          disks: [{ source: 'zones/us-east1-b/disks/foreman-test-disk1', boot: true }],
+          network_interfaces: [{ network: 'global/networks/default' }],
+        }
+
+        value { subject.insert_instance('us-east1-b', args) }.must_raise(::Google::Cloud::Error)
+      end
+
       it '#start' do
         stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances/instance_name/start')
-          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_start.json')), headers: {})
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_start.json')))
         result = subject.start('us-east1-b', 'instance_name')
         assert 'start', result.operation.operation_type
       end
 
       it '#stop' do
-        stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances/instance_name/stop').
-
-          to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_stop.json')), headers: {})
+        stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances/instance_name/stop')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_stop.json')))
         result = subject.stop('us-east1-b', 'instance_name')
         assert 'stop', result.operation.operation_type
       end
+
+      it '#set_disk_auto_delete' do
+        stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances/instance_name')
+          .to_return(body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance.json')))
+
+        stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/instances/instance_name/setDiskAutoDelete?autoDelete=true&deviceName=instance-1')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'instance_set_disk_auto_delete.json')))
+        result = subject.set_disk_auto_delete('us-east1-b', 'instance_name')
+
+        assert 'device-1', result[0].source
+        assert result[0].auto_delete
+      end
+    end
+
+    describe 'disks' do
+      it '#insert' do
+        stub_request(:post, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/disks')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'disks_insert.json')))
+
+        result = subject.insert_disk('us-east1-b', { name: 'foreman-disk1', size_gb: 23 })
+        assert_includes result.operation.target_link, 'foreman-disk1'
+        assert 'insert', result.operation.operation_type
+      end
+
+      it '#get' do
+        stub_request(:get, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/disks/foreman-disk1')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'disks_get.json')))
+        result = subject.disk('us-east1-b', 'foreman-disk1')
+        assert 'foreman-disk1', result.name
+      end
+
+      it '#delete' do
+        stub_request(:delete, 'https://compute.googleapis.com/compute/v1/projects/coastal-haven-123456/zones/us-east1-b/disks/foreman-disk1')
+          .to_return(status: 200, body: File.read(File.join(__dir__, '..', '..', 'fixtures', 'disks_delete.json')))
+        result = subject.delete_disk('us-east1-b', 'foreman-disk1')
+
+        assert_includes result.operation.target_link, 'foreman-disk1'
+        assert 'delete', result.operation.operation_type
+      end
     end
   end
 end

data/test/unit/google_extensions/attached_disk_test.rb

@@ -0,0 +1,17 @@
+require 'test_google_helper'
+
+module GoogleExtensions
+  class AttachedDiskTest < GoogleTestCase
+    describe 'insert_attrs' do
+      it 'with source image' do
+        disk = Google::Cloud::Compute::V1::AttachedDisk.new(source: 'source-image')
+        assert_equal 'source-image', disk.insert_attrs[:source_image]
+      end
+
+      it 'without source image' do
+        disk = Google::Cloud::Compute::V1::AttachedDisk.new
+        assert_empty disk.insert_attrs[:source_image]
+      end
+    end
+  end
+end

data/webpack/global_index.js

@@ -1,17 +1,6 @@
-import { registerReducer } from 'foremanReact/common/MountingService';
-// import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import { registerRoutes } from 'foremanReact/routes/RoutingService';
 import Routes from './src/Router/routes';
-import reducers from './src/reducers';
+import { registerLegacy } from './legacy';
 
-// register reducers
-Object.entries(reducers).forEach(([key, reducer]) =>
-  registerReducer(key, reducer)
-);
-
-// register client routes
 registerRoutes('ForemanGoogle', Routes);
-
-// register fills for extending foreman core
-// http://foreman.surge.sh/?path=/docs/introduction-slot-and-fill--page
-// addGlobalFill('<slotId>', '<fillId>', <div key='plugin-template-example' />, 300);
+registerLegacy();

data/webpack/legacy.js

@@ -0,0 +1,16 @@
+const jsonLoader = input => {
+  const file = input.files[0];
+  const reader = new FileReader();
+  reader.onload = () => {
+    const text = reader.result;
+    const outputTextField = document.getElementById('gce_json');
+    outputTextField.value = text;
+  };
+  reader.readAsText(file);
+};
+
+export const registerLegacy = () => {
+  window.tfm = Object.assign(window.tfm || {}, {
+    gce: { jsonLoader },
+  });
+};

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_google
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - The Foreman Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: google-apis-compute_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: google-cloud-compute
   requirement: !ruby/object:Gem::Requirement
@@ -48,38 +62,65 @@ 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
+- app/lib/google_extensions/attached_disk.rb
+- app/models/concerns/foreman_google/host_managed_extensions.rb
 - app/models/foreman_google/gce.rb
 - app/models/foreman_google/google_compute.rb
+- app/views/compute_resources/form/_gce.html.erb
+- app/views/compute_resources/show/_gce.html.erb
+- app/views/compute_resources_vms/form/gce/_base.html.erb
+- app/views/compute_resources_vms/form/gce/_volume.html.erb
+- app/views/compute_resources_vms/index/_gce.html.erb
+- app/views/compute_resources_vms/show/_gce.html.erb
+- app/views/images/form/_gce.html.erb
 - config/routes.rb
+- db/migrate/20220331113745_foreman_gce_to_foreman_google_gce.rb
 - lib/foreman_google.rb
 - lib/foreman_google/engine.rb
-- lib/foreman_google/google_compute_adapter.rb
 - lib/foreman_google/version.rb
 - lib/tasks/foreman_google_tasks.rake
 - locale/Makefile
+- locale/action_names.rb
+- locale/en/foreman_google.edit.po
 - locale/en/foreman_google.po
+- locale/en/foreman_google.po.time_stamp
 - locale/foreman_google.pot
 - locale/gemspec.rb
 - package.json
 - test/factories/gce.rb
+- test/fixtures/disks_delete.json
+- test/fixtures/disks_get.json
+- test/fixtures/disks_insert.json
 - test/fixtures/images_centos_cloud.json
 - test/fixtures/images_coastal.json
 - test/fixtures/images_deprecated.json
 - test/fixtures/images_nothing_found.json
 - test/fixtures/instance.json
+- test/fixtures/instance_insert.json
+- test/fixtures/instance_list.json
+- test/fixtures/instance_set_disk_auto_delete.json
 - 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/models/foreman_google/gce_test.rb
 - test/models/foreman_google/google_compute_test.rb
 - test/test_google_helper.rb
 - test/unit/foreman_google/google_compute_adapter_test.rb
+- test/unit/google_extensions/attached_disk_test.rb
 - webpack/global_index.js
 - webpack/global_test_setup.js
 - webpack/index.js
+- webpack/legacy.js
 - webpack/src/Extends/index.js
 - webpack/src/Router/routes.js
 - webpack/src/reducers.js
@@ -105,23 +146,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Google Compute Engine plugin for the Foreman
 test_files:
-- test/models/foreman_google/google_compute_test.rb
-- test/models/foreman_google/gce_test.rb
-- test/unit/foreman_google/google_compute_adapter_test.rb
-- test/factories/gce.rb
-- test/fixtures/networks.json
-- test/fixtures/instance.json
-- test/fixtures/zones.json
-- test/fixtures/instance_stop.json
-- test/fixtures/machine_types.json
+- test/fixtures/disks_delete.json
+- test/fixtures/disks_get.json
+- test/fixtures/disks_insert.json
+- test/fixtures/images_centos_cloud.json
 - test/fixtures/images_coastal.json
-- test/fixtures/instance_start.json
 - test/fixtures/images_deprecated.json
-- test/fixtures/images_centos_cloud.json
 - test/fixtures/images_nothing_found.json
+- test/fixtures/instance.json
+- test/fixtures/instance_insert.json
+- test/fixtures/instance_list.json
+- test/fixtures/instance_set_disk_auto_delete.json
+- 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/factories/gce.rb
+- test/unit/foreman_google/google_compute_adapter_test.rb
+- test/unit/google_extensions/attached_disk_test.rb
+- test/models/foreman_google/gce_test.rb
+- test/models/foreman_google/google_compute_test.rb
 - test/test_google_helper.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

data/lib/foreman_google/google_compute_adapter.rb

@@ -1,91 +0,0 @@
-require 'google-cloud-compute'
-
-module ForemanGoogle
-  class GoogleComputeAdapter
-    def initialize(auth_json_string:)
-      @auth_json = JSON.parse(auth_json_string)
-    end
-
-    def project_id
-      @auth_json['project_id']
-    end
-
-    # ------ RESOURCES ------
-
-    # Returns an Google::Instance identified by instance_identity within given zone.
-    # @param zone [String] eighter full url or just zone name
-    # @param instance_identity [String] eighter an instance name or its id
-    def instance(zone, instance_identity)
-      get('instances', instance: instance_identity, zone: zone)
-    end
-
-    def zones
-      list('zones')
-    end
-
-    def networks
-      list('networks')
-    end
-
-    def machine_types(zone)
-      list('machine_types', zone: zone)
-    end
-
-    def start(zone, instance_identity)
-      manage_instance(:start, zone, instance_identity)
-    end
-
-    def stop(zone, instance_identity)
-      manage_instance(:stop, zone, instance_identity)
-    end
-
-    # Setting filter to '(deprecated.state != "DEPRECATED") AND (deprecated.state != "OBSOLETE")'
-    # doesn't work and returns empty array, no idea what is happening there
-    def images(filter: nil)
-      projects = [project_id] + all_projects
-      all_images = projects.map { |project| list_images(project, filter: filter) }
-      all_images.flatten.reject(&:deprecated)
-    end
-
-    private
-
-    def list(resource_name, **opts)
-      response = resource_client(resource_name).list(project: project_id, **opts).response
-      response.items
-    rescue ::Google::Cloud::Error => e
-      raise Foreman::WrappedException.new(e, 'Cannot list Google resource %s', resource_name)
-    end
-
-    def list_images(project, **opts)
-      resource_name = 'images'
-      response = resource_client(resource_name).list(project: project, **opts).response
-      response.items
-    rescue ::Google::Cloud::Error => e
-      raise Foreman::WrappedException.new(e, 'Cannot list Google resource %s', resource_name)
-    end
-
-    def get(resource_name, **opts)
-      resource_client(resource_name).get(project: project_id, **opts)
-    rescue ::Google::Cloud::Error => e
-      raise Foreman::WrappedException.new(e, 'Could not fetch Google resource %s', resource_name)
-    end
-
-    def manage_instance(action, zone, instance_identity)
-      resource_client('instances').send(action, project: project_id, zone: zone, instance: instance_identity)
-    rescue ::Google::Cloud::Error => e
-      raise Foreman::WrappedException.new(e, 'Could not %s Google resource %s', action.to_s, resource_name)
-    end
-
-    def resource_client(resource_name)
-      ::Google::Cloud::Compute.public_send(resource_name) do |config|
-        config.credentials = @auth_json
-      end
-    end
-
-    def all_projects
-      %w[centos-cloud cos-cloud coreos-cloud debian-cloud opensuse-cloud
-         rhel-cloud rhel-sap-cloud suse-cloud suse-sap-cloud
-         ubuntu-os-cloud windows-cloud windows-sql-cloud].freeze
-    end
-  end
-end