foreman_docker 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e552869e1ab0cfde41332e6ab9717d5f13415d70
-  data.tar.gz: e00b20498e799f4b647ada00f7778b45b25bc230
+  metadata.gz: 742be737268d18e9406b2e44b41fe3f8a76add83
+  data.tar.gz: 020370eb15873e7527a2efd2d3577d48b84ad00d
 SHA512:
-  metadata.gz: 6162d8977618e99eed69ff55308f00d1f1983288d5cadd801c6a3aeebb2f10aae1e48d1225568ea34d38bc4463dc0ab5efb58b35bf584a51a21b658cbd74bd99
-  data.tar.gz: 6121f40a5b10d66b9aafee7a498ed16966c9db755a695eeb0b71eb4b97a63801d4e276944dea02b49bfe7fa93bcc3a06a9f8b1189a7960ff74ad6384315597ae
+  metadata.gz: 3ebeae9695d4cf06e6e22485c14252864a57416bfc8f4db3ffbb79f15359c1648a51fe7332a74f87e50a77e12a3092637562b693972ef84e786a7156ca17e9d3
+  data.tar.gz: 02b9638cbe1075186286781625210fd3112c41b593be3886843f895efbe93409dcfb7a029f66fae03a70d5bdbe3cb8b1775fd8780d6033b74c2f732eacbeeb64

data/README.md

@@ -30,7 +30,7 @@
     ![](http://i.imgur.com/DPcaHkZ.png)
 
 ### Planned
-* [Kubernetes](https://github.com/GoogleCloudPlatform/kubernetes/) integration
+* [Kubernetes](https://github.com/kubernetes/kubernetes/) integration
 * Events stream ([#8037](http://projects.theforeman.org/issues/8037))
 * Tight integration between Docker hosts [Atomic](http://www.projectatomic.io/) and [CoreOS](http://coreos.com/) and containers ([#7653](http://projects.theforeman.org/issues/7653), [#7652](http://projects.theforeman.org/issues/7652))
 * Quickstart images - pre-supplied images and configuration ([#7869](http://projects.theforeman.org/issues/7869))

data/app/controllers/containers_controller.rb

@@ -29,7 +29,7 @@ class ContainersController < ::ApplicationController
       if @container.present?
         process_error(:redirect => containers_path)
       else
-        redirect_to :back
+        redirect_back(:fallback_location => containers_path)
       end
     end
   rescue ActiveRecord::RecordNotFound
@@ -67,12 +67,12 @@ class ContainersController < ::ApplicationController
       redirect_to containers_path(:id => @container.id)
     else
       error _("failed to %{action} %{vm}") % { :action => _(action), :vm => @docker_container }
-      redirect_to :back
+      redirect_back(:fallback_location => containers_path)
     end
     # This should only rescue Fog::Errors, but Fog returns all kinds of errors...
   rescue => e
     error _("Error - %{message}") % { :message => _(e.message) }
-    redirect_to :back
+    redirect_back(:fallback_location => containers_path)
   end
 
   private

data/app/models/concerns/foreman_docker/parameter_validators.rb

@@ -16,13 +16,13 @@ module ForemanDocker
           errors = duplicate_key?(keys, param)
         end
 
-        self.errors[param_symbol] = _('Please ensure the following parameters are unique') if errors
+        self.errors.add(param_symbol, _('Please ensure the following parameters are unique')) if errors
       end
     end
 
     def duplicate_key?(keys, param)
       if keys.include?(param.key)
-        param.errors[:key] = _('has already been taken')
+        param.errors.add(:key, _('has already been taken'))
         return true
       else
         keys << param.key

data/app/models/container.rb

@@ -3,7 +3,7 @@ class Container < ApplicationRecord
   include Taxonomix
 
   belongs_to :compute_resource
-  belongs_to :registry, :class_name => "DockerRegistry", :foreign_key => :registry_id
+  belongs_to :registry, :class_name => 'DockerRegistry', :foreign_key => :registry_id
   has_many :environment_variables, :dependent  => :destroy, :foreign_key => :reference_id,
                                    :inverse_of => :container,
                                    :class_name => 'EnvironmentVariable'

data/app/models/docker_container_wizard_state.rb

@@ -1,11 +1,11 @@
 class DockerContainerWizardState < ApplicationRecord
-  has_one :preliminary, :class_name => DockerContainerWizardStates::Preliminary,
+  has_one :preliminary, :class_name => 'DockerContainerWizardStates::Preliminary',
                         :dependent => :destroy, :validate => true, :autosave => true
-  has_one :image, :class_name => DockerContainerWizardStates::Image,
+  has_one :image, :class_name => 'DockerContainerWizardStates::Image',
                   :dependent => :destroy, :validate => true, :autosave => true
-  has_one :configuration, :class_name => DockerContainerWizardStates::Configuration,
+  has_one :configuration, :class_name => 'DockerContainerWizardStates::Configuration',
                           :dependent => :destroy, :validate => true, :autosave => true
-  has_one :environment, :class_name => DockerContainerWizardStates::Environment,
+  has_one :environment, :class_name => 'DockerContainerWizardStates::Environment',
                         :dependent => :destroy, :validate => true, :autosave => true
 
   delegate :compute_resource_id,   :to => :preliminary

data/app/models/docker_container_wizard_states/configuration.rb

@@ -1,7 +1,7 @@
 module DockerContainerWizardStates
   class Configuration < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
-    belongs_to :wizard_state, :class_name => DockerContainerWizardState,
+    belongs_to :wizard_state, :class_name => 'DockerContainerWizardState',
                               :foreign_key => :docker_container_wizard_state_id
   end
 end

data/app/models/docker_container_wizard_states/environment.rb

@@ -1,7 +1,7 @@
 module DockerContainerWizardStates
   class Environment < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
-    belongs_to :wizard_state, :class_name => DockerContainerWizardState
+    belongs_to :wizard_state, :class_name => 'DockerContainerWizardState'
 
     has_many :environment_variables, :dependent  => :destroy, :foreign_key => :reference_id,
                                      :inverse_of => :environment,

data/app/models/docker_container_wizard_states/image.rb

@@ -1,7 +1,7 @@
 module DockerContainerWizardStates
   class Image < ApplicationRecord
     self.table_name_prefix = 'docker_container_wizard_states_'
-    belongs_to :wizard_state, :class_name => DockerContainerWizardState,
+    belongs_to :wizard_state, :class_name => 'DockerContainerWizardState',
                               :foreign_key => :docker_container_wizard_state_id
     delegate :compute_resource_id, :to => :wizard_state
     delegate :compute_resource, :to => :wizard_state

data/app/models/docker_container_wizard_states/preliminary.rb

@@ -3,7 +3,7 @@ module DockerContainerWizardStates
     include Taxonomix
 
     self.table_name_prefix = 'docker_container_wizard_states_'
-    belongs_to :wizard_state, :class_name => DockerContainerWizardState,
+    belongs_to :wizard_state, :class_name => 'DockerContainerWizardState',
                               :foreign_key => :docker_container_wizard_state_id
 
     belongs_to :compute_resource, :required => true

data/app/models/service/containers.rb

@@ -74,7 +74,7 @@ module Service
 
     def destroy_wizard_state(wizard_state)
       wizard_state.destroy
-      DockerContainerWizardState.destroy_all(["updated_at < ?", (Time.now.utc - 24.hours)])
+      DockerContainerWizardState.where(["updated_at < ?", (Time.now.utc - 24.hours)]).destroy_all
     end
 
     def load_environment_variables(state, r)

data/db/migrate/20180105090316_remove_docker_search_permission.rb

@@ -0,0 +1,13 @@
+class RemoveDockerSearchPermission < ActiveRecord::Migration[4.2]
+  def up
+    Permission.where(
+      :name => "search_repository_image_search",
+      :resource_type => 'Docker/ImageSearch').destroy_all
+  end
+
+  def down
+    Permission.where(
+      :name => "search_repository_image_search",
+      :resource_type => 'DockerRegistry').destroy_all
+  end
+end

data/lib/foreman_docker/engine.rb

@@ -102,7 +102,7 @@ module ForemanDocker
                      { :image_search => [:auto_complete_repository_name,
                                          :auto_complete_image_tag,
                                          :search_repository] },
-                     :resource_type => 'Docker/ImageSearch'
+                     :resource_type => 'DockerRegistry'
         end
 
         add_all_permissions_to_default_roles

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/test/functionals/containers_controller_test.rb

@@ -40,10 +40,10 @@ class ContainersControllerTest < ActionController::TestCase
     test 'failed deletion of unmanaged container in Docker' do
       ComputeResource.any_instance.stubs(:destroy_vm).
         raises(::Foreman::Exception.new('Could not destroy Docker container'))
-      @request.env['HTTP_REFERER'] = "http://test.host/#{containers_path}"
+      @request.env['HTTP_REFERER'] = "http://test.host#{containers_path}"
       delete :destroy, params: { :compute_resource_id => @container_resource, :id => @container.id }, session: set_session_user
       assert @container.present?
-      assert_redirected_to :back
+      assert_redirected_to containers_path
       assert_equal 'Your container could not be deleted in Docker',
         flash[:error]
     end

data/test/functionals/image_search_controller_test.rb

@@ -12,12 +12,13 @@ class ImageSearchControllerTest < ActionController::TestCase
 
   setup do
     Service::RegistryApi.stubs(:docker_hub).returns(docker_hub)
-    ComputeResource::ActiveRecord_Relation.any_instance
+    ComputeResource.const_get(:ActiveRecord_Relation).any_instance
       .stubs(:find).returns(compute_resource)
-    DockerRegistry::ActiveRecord_Relation.any_instance
+    DockerRegistry.const_get(:ActiveRecord_Relation).any_instance
       .stubs(:find).returns(registry)
   end
 
+  # rubocop:disable Metrics/BlockLength
   describe '#search_repository' do
     let(:search_types) { ['hub', 'registry'] }
 
@@ -30,17 +31,22 @@ class ImageSearchControllerTest < ActionController::TestCase
         tags_enabled = ['true', 'false'].sample
         image_search_service.expects(:search).with({ term: term, tags: tags_enabled })
           .returns([])
-        xhr :get, :search_repository,
-          { registry: search_types.sample, search: term, tags: tags_enabled,
-            id: compute_resource }, set_session_user
+        get :search_repository,
+            params: { registry: search_types.sample, search: term, tags: tags_enabled,
+                      id: compute_resource },
+            session: set_session_user,
+            xhr: true
       end
 
       test 'returns an array of { label:, value: } hashes' do
         image_search_service.expects(:search).with({ term: term, tags: 'true' })
           .returns(tags)
-        xhr :get, :search_repository,
-          { registry: search_types.sample, search: term, tags: 'true',
-            id: compute_resource }, set_session_user
+        get :search_repository,
+            params: { registry: search_types.sample, search: term, tags: 'true',
+                      id: compute_resource },
+            session: set_session_user,
+            xhr: true
+
         assert_equal tags.first, JSON.parse(response.body).first['value']
       end
 
@@ -48,9 +54,11 @@ class ImageSearchControllerTest < ActionController::TestCase
         image_search_service.expects(:search)
           .with({ term: term, tags: 'false' })
           .returns([{ 'name' => term }])
-        xhr :get, :search_repository,
+        get :search_repository, params:
           { registry: search_types.sample, search: term,
-            id: compute_resource, format: :html}, set_session_user
+            id: compute_resource, format: :html },
+            session: set_session_user, xhr: true
+
         assert response.body.include?(term)
       end
 
@@ -58,8 +66,9 @@ class ImageSearchControllerTest < ActionController::TestCase
         test "search_repository catch exceptions on network errors like #{error}" do
           image_search_service.expects(:search)
             .raises(error)
-          xhr :get, :search_repository,
-            { registry: search_types.sample, search: term, id: compute_resource }, set_session_user
+          get :search_repository,
+              params: { registry: search_types.sample, search: term, id: compute_resource },
+              session: set_session_user, xhr: true
 
           assert_response :error
           assert response.body.include?('An error occured during repository search:')
@@ -76,8 +85,11 @@ class ImageSearchControllerTest < ActionController::TestCase
                        "star_count" => 0
                     }]
         image_search_service.expects(:search).returns(expected)
-        xhr :get, :search_repository,
-          { registry: search_types.sample, search: 'centos', id: compute_resource, format: :html }, set_session_user
+        get :search_repository,
+            params: { registry: search_types.sample, search: 'centos', id: compute_resource, format: :html },
+            session: set_session_user,
+            xhr: true
+
         assert_response :success
         refute response.body.include?(repo_full_name)
         assert response.body.include?(repository)
@@ -94,8 +106,11 @@ class ImageSearchControllerTest < ActionController::TestCase
                       "star_count" => 0
                     }]
         image_search_service.expects(:search).returns(expected)
-        xhr :get, :search_repository,
-          { registry: search_types.sample, search: term, id: compute_resource, format: :html }, set_session_user
+        get :search_repository,
+            params: { registry: search_types.sample, search: term, id: compute_resource, format: :html },
+            session: set_session_user,
+            xhr: true
+
         assert_response :success
         assert response.body.include?(repo_full_name)
         assert response.body.include?(repository)
@@ -111,9 +126,11 @@ class ImageSearchControllerTest < ActionController::TestCase
             .returns([OpenStruct.new(info: { 'RepoTags' => [term] })])
           docker_hub.expects(:search).returns({})
 
-          xhr :get, :search_repository,
-            { registry: search_type, search: term,
-              id: compute_resource }, set_session_user
+          get :search_repository,
+              params:  { registry: search_type, search: term,
+                         id: compute_resource },
+              session: set_session_user,
+              xhr: true
         end
       end
 
@@ -126,9 +143,11 @@ class ImageSearchControllerTest < ActionController::TestCase
           registry.api.expects(:search).with(docker_image)
             .returns({})
 
-          xhr :get, :search_repository,
-            { registry: search_type, registry_id: registry,
-              search: term, id: compute_resource }, set_session_user
+          get :search_repository,
+              params: { registry: search_type, registry_id: registry,
+              search: term, id: compute_resource },
+              session: set_session_user,
+              xhr: true
         end
       end
     end
@@ -147,9 +166,11 @@ class ImageSearchControllerTest < ActionController::TestCase
             .returns(tags)
           docker_hub.expects(:tags).returns([])
 
-          xhr :get, :search_repository,
-            { registry: search_type, search: term, tags: 'true',
-              id: compute_resource }, set_session_user
+          get :search_repository,
+              params: { registry: search_type, search: term,
+                        tags: 'true', id: compute_resource },
+              session: set_session_user,
+              xhr: true
         end
       end
 
@@ -162,9 +183,11 @@ class ImageSearchControllerTest < ActionController::TestCase
           registry.api.expects(:tags).with(docker_image, tag_fragment)
             .returns([])
 
-          xhr :get, :search_repository,
-            { registry: search_type, registry_id: registry, tags: 'true',
-              search: term, id: compute_resource }, set_session_user
+          get :search_repository,
+              params: { registry: search_type, registry_id: registry, tags: 'true',
+                        search: term, id: compute_resource },
+              session: set_session_user,
+              xhr: true
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_docker
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Daniel Lobato, Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -191,6 +191,7 @@ files:
 - db/migrate/20160605133025_create_docker_parameters.rb
 - db/migrate/20160605134652_move_parameters_to_docker_parameters.rb
 - db/migrate/20170508130316_add_verify_ssl_option_to_docker_registries.rb
+- db/migrate/20180105090316_remove_docker_search_permission.rb
 - lib/foreman_docker.rb
 - lib/foreman_docker/engine.rb
 - lib/foreman_docker/version.rb
@@ -270,9 +271,9 @@ test_files:
 - test/factories/docker_registry.rb
 - test/functionals/api/v2/containers_controller_test.rb
 - test/functionals/api/v2/registries_controller_test.rb
-- test/functionals/image_search_controller_test.rb
-- test/functionals/containers_controller_test.rb
 - test/functionals/containers_steps_controller_test.rb
+- test/functionals/containers_controller_test.rb
+- test/functionals/image_search_controller_test.rb
 - test/integration/container_test.rb
 - test/integration/container_steps_test.rb
 - test/integration/registry_creation_test.rb