foreman_snapshot_management 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f8e2f14c91a5cf8d79a5c39ae5d65bcf9df35b
-  data.tar.gz: 2b0299b2785eba2d00c7d4e5fc901532d72647d5
+  metadata.gz: 92825bf181cfd185b7005b4ae8484a45fb76be22
+  data.tar.gz: 69df917d45d4c2fee44194a275aad9b3a93b0484
 SHA512:
-  metadata.gz: 4854c380a31a34c47df1cae2040e3c6720b69337b0d0298a1b33dab96034796a5999731d24e417ef8348235e5c2c3b99f890de5a2f7e0a2c35421bf54b541206
-  data.tar.gz: 276fa74482b40f90600e250ca1ddc57308ce4d241ebe835d8d3e7c5af95e28ac207dbb65341fb44bda75cc8824f78ba1f083cbbdd197c4d3faab694beb450a8f
+  metadata.gz: 1c6fe6bf1cd7b925a20bdd929e519901d193fecbf5817736c4056ffebe2f35bf8c293d313b820cf134bedf8489ccebf1ebd94ba30ff852f62e3ea7b0b9bfbf40
+  data.tar.gz: a24566a0193ce31c7dc8060cee2d82a6c2ca82a232cdd813d7c7595d2211d378768511093e1084f88e5f7040283ace1cf63b37f49f76febe466c156ed1863c41

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/ATIX-AG/foreman_snapshot_management.svg?branch=master)](https://travis-ci.org/ATIX-AG/foreman_snapshot_management)
+
 # ForemanSnapshotManagement
 
 ForemanSnapshotManagement is a Foreman plugin to manage snapshots.

data/app/controllers/foreman_snapshot_management/snapshots_controller.rb

@@ -79,26 +79,13 @@ module ForemanSnapshotManagement
         not_found
         return false
       end
-      @host = Host.authorized(host_permission).friendly.find(host_id)
+      @host = Host.authorized("#{action_permission}_snapshots".to_sym, Host).friendly.find(host_id)
       unless @host
         not_found
         return(false)
       end
     end
 
-    def host_permission
-      case action_permission.to_s
-      when 'create', 'destroy'
-        'edit'
-      when 'edit', 'view'
-        'view'
-      when 'revert'
-        'revert'
-      else
-        raise ::Foreman::Exception.new(N_('unknown host permission for %s'), "#{params[:controller]}##{action_permission}")
-      end
-    end
-
     def action_permission
       case params[:action]
       when 'revert'

data/app/models/foreman_snapshot_management/vmware_extensions.rb

@@ -53,7 +53,13 @@ module ForemanSnapshotManagement
     #
     # This methods returns a specific Snapshot for a given host.
     def get_snapshot(server_id, snapshot_id)
-      client.snapshots(server_id: server_id).get(snapshot_id)
+      snapshot = client.snapshots(server_id: server_id).get(snapshot_id)
+      # Workaround for https://github.com/fog/fog-vsphere/commit/d808255cd19c3d43d3227825f1e0d72d3f6ee6b9
+      # Remove, when fog-vshpere 1.11 lands in foreman
+      while snapshot && snapshot.ref != snapshot_id
+        snapshot = snapshot.get_child(snapshot_id)
+      end
+      snapshot
     end
 
     # Get Snapshots

data/app/views/foreman_snapshot_management/hosts/_snapshots_tab.html.erb

@@ -1,3 +1,3 @@
-<% if @host.compute_resource && @host.compute_resource.capabilities.include?(:snapshots) && authorized_for(:controller => 'foreman_snapshot_management/snapshots', :action => :index) %>
+<% if @host.compute_resource && @host.compute_resource.capabilities.include?(:snapshots) && authorized_for(:auth_object => @host, :permission => :view_snapshots) %>
   <li><a href='#snapshots' data-toggle='tab'><%= _('Snapshots') %></a></li>
 <% end %>

data/app/views/foreman_snapshot_management/hosts/_snapshots_tab_content.html.erb

@@ -1,4 +1,4 @@
-<% if @host.compute_resource && @host.compute_resource.capabilities.include?(:snapshots) && authorized_for(:controller => 'foreman_snapshot_management/snapshots', :action => :index) %>
+<% if @host.compute_resource && @host.compute_resource.capabilities.include?(:snapshots) && authorized_for(:auth_object => @host, :permission => :view_snapshots) %>
 <div id='snapshots' class='tab-pane'
   data-ajax-url='<%= host_snapshots_path(host_id: @host)%>'
   data-on-complete='onContentLoad'>

data/app/views/foreman_snapshot_management/snapshots/_index.html.erb

@@ -8,7 +8,7 @@
   </tr>
   </thead>
   <tbody>
-    <% if authorized_for(:controller => 'foreman_snapshot_management/snapshots', :action => :create) %>
+    <% if authorized_for(:auth_object => @host, :permission => :create_snapshots) %>
       <tr>
         <td>
           <%= f.text_field :name, class: 'form-control' %>
@@ -24,7 +24,7 @@
   <% @snapshots.each do |snapshot| %>
       <tr>
         <td>
-          <% if authorized_for(:controller => 'foreman_snapshot_management/snapshots', :action => :edit) %>
+          <% if authorized_for(:auth_object => @host, :permission => :edit_snapshots) %>
             <%= edit_textfield snapshot, :name %>
           <% else %>
             <%= snapshot.name %>
@@ -32,7 +32,7 @@
           <br /><%= snapshot.formatted_create_time() %>
         </td>
         <td>
-          <% if authorized_for(:controller => 'foreman_snapshot_management/snapshots', :action => :edit) %>
+          <% if authorized_for(:auth_object => @host, :permission => :edit_snapshots) %>
             <%= edit_textarea snapshot, :description %>
           <% else %>
             <%= snapshot.description %>
@@ -40,8 +40,8 @@
         </td>
         <td>
           <%= action_buttons(
-            display_link_if_authorized(_('Rollback'), hash_for_revert_host_snapshot_path(host_id: @host, id: snapshot.id), method: :put, class: 'btn btn-primary', data: {confirm: _("Are you sure to revert this Snapshot?")}),
-            display_delete_if_authorized(hash_for_host_snapshot_path(host_id: @host, id: snapshot.id), data: {confirm: _("Are you sure to delete this Snapshot?")}),
+            display_link_if_authorized(_('Rollback'), hash_for_revert_host_snapshot_path(host_id: @host, id: snapshot.id).merge(:auth_object => @host, :permission => :revert_snapshots), method: :put, class: 'btn btn-primary', data: {confirm: _("Are you sure to revert this Snapshot?")}),
+            display_delete_if_authorized(hash_for_host_snapshot_path(host_id: @host, id: snapshot.id).merge(:auth_object => @host, :permission => :delete_snapshots), data: {confirm: _("Are you sure to delete this Snapshot?")}),
           ) %>
         </td>
       </tr>

data/config/routes.rb

@@ -18,7 +18,7 @@ Rails.application.routes.draw do
 
   constraints(host_id: %r{[^\/]+}) do
     resources :hosts, only: [] do
-      resources :snapshots, module: 'foreman_snapshot_management' do
+      resources :snapshots, module: 'foreman_snapshot_management', only: [:index, :create, :destroy, :update] do
         member do
           put :revert
         end

data/lib/foreman_snapshot_management/version.rb

@@ -1,3 +1,3 @@
 module ForemanSnapshotManagement
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/test/controllers/api/v2/snapshots_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 class Api::V2::SnapshotsControllerTest < ActionController::TestCase
   let(:compute_resource) do
-    cr = FactoryGirl.create(:compute_resource, :vmware, :uuid => 'Solutions')
+    cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions')
     ComputeResource.find_by_id(cr.id)
   end
   let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
-  let(:host) { FactoryGirl.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
+  let(:host) { FactoryBot.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
   let(:snapshot_id) { 'snapshot-0101' }
   setup { ::Fog.mock! }
   teardown { ::Fog.unmock! }

data/test/controllers/foreman_snapshot_management/snapshots_controller_test.rb

@@ -3,11 +3,11 @@ require 'test_helper'
 module ForemanSnapshotManagement
   class SnapshotsControllerTest < ActionController::TestCase
     let(:compute_resource) do
-      cr = FactoryGirl.create(:compute_resource, :vmware, :uuid => 'Solutions')
+      cr = FactoryBot.create(:compute_resource, :vmware, :uuid => 'Solutions')
       ComputeResource.find_by_id(cr.id)
     end
     let(:uuid) { '5032c8a5-9c5e-ba7a-3804-832a03e16381' }
-    let(:host) { FactoryGirl.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
+    let(:host) { FactoryBot.create(:host, :managed, :compute_resource => compute_resource, :uuid => uuid) }
     let(:snapshot_id) { 'snapshot-0101' }
     setup { ::Fog.mock! }
     teardown { ::Fog.unmock! }

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_snapshot_management
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement