foreman_docker 3.1.0 → 3.2.0

data/app/models/service/registry_api.rb

@@ -12,19 +12,17 @@ module Service
     def initialize(params = {})
       self.config = DEFAULTS.merge(params)
       self.url = config[:url]
-      @user = config[:user] unless config[:user].blank?
-      @password = config[:password] unless config[:password].blank?
 
       Docker.logger = logger if Rails.env.development? || Rails.env.test?
     end
 
     def connection
-      @connection ||= ::Docker::Connection.new(url, credentials)
+      @connection ||= ::Docker::Connection.new(url, default_connection_options.merge(credentials))
     end
 
     def get(path, params = nil)
       response = connection.get('/'.freeze, params,
-                                DEFAULTS[:connection].merge({ path: "#{path}" }))
+                                connection.options.merge({ path: "#{path}" }))
       response = parse_json(response)
       response
     end
@@ -65,6 +63,12 @@ module Service
 
     private
 
+    def default_connection_options
+      @default_connection_options ||= DEFAULTS[:connection].tap do |defaults|
+        defaults[:ssl_verify_peer] = config.fetch(:verify_ssl, true)
+      end
+    end
+
     def parse_json(string)
       JSON.parse(string)
     rescue => e
@@ -86,7 +90,8 @@ module Service
     end
 
     def credentials
-      { user: @user, password: @password }
+      { user: config.fetch(:user, nil),
+        password: config.fetch(:password, nil) }
     end
 
     def filter_tags(result, query)

data/app/views/containers/steps/_form_buttons.html.erb

@@ -1,20 +1,18 @@
 <div class="clearfix">
-  <div class="form-actions">
+  <div class="form-actions col-md-6 col-md-offset-2 small-gutter">
     <% if step == :preliminary %>
       <%= link_to _("Cancel"), containers_path, :class => "btn btn-danger" %>
     <% else %>
       <a class="btn btn-default" href="<%= previous_wizard_path %>">
-        <span class="glyphicon glyphicon-chevron-left"></span>
-        <%= _("Back") %>
+        <%= _("Previous Step") %>
       </a>
     <% end %>
-    <% next_id = defined?(registry) ? "next_#{registry}" : "next" %>
-    <%= button_tag(:id => next_id, :type => 'submit', :class => "btn btn-primary pull-right") do %>
+
+    <%= button_tag(:id => 'next', :type => 'submit', :class => "btn btn-primary") do %>
       <% if last_step? %>
         <%= _("Submit") %>
       <% else %>
-        <%= _("Next") %>
-        <span class="glyphicon glyphicon-chevron-right"></span>
+        <%= _("Next Step") %>
       <% end %>
     <% end %>
   </div>

data/app/views/containers/steps/_image_hub_tab.html.erb

@@ -17,47 +17,46 @@
   <% end %>
 
   <% if registry == "registry" -%>
-    <div class="input-group col-md-6">
       <%= select_registry f %>
-    </div>
   <% end -%>
 
   <% help_type = f.object.errors[:repository_name].present? ? :help_block : :help_inline %>
   <%= text_f(f, :repository_name,
     :label => _('Search'),
-    :size => 'col-md-6',
     :wrapper_class => (image_search_wrapper_class(model) if tab_active?(registry)),
-    :'data-url'  => auto_complete_repository_name_image_search_path(model.compute_resource_id),
+    :'data-url'  => search_repository_image_search_path(model.compute_resource_id),
     :value       => f.object.repository_name.present? ? f.object.repository_name : '',
     :'data-registry' => registry,
     :'data-image' => true,
-    :'data-search' => true,
     :'data-min-length' => 1,
     :focus_on_load => true,
     :placeholder => _('Find your favorite container, e.g. centos'),
     :control_group_id => "#{registry}_image_search",
-    help_type => link_to_function(
-        icon_text('search', ''),
-        'searchRepo(this)',
-        :class => 'btn btn-default',
-        :id => "search_repository_#{registry}",
-        :'data-registry' => registry,
-        :'data-url' => search_repository_image_search_path(model.compute_resource_id)
-      ) + content_tag(:span, '', :id => 'image-confirmation').html_safe) %>
+    :help_inline => spinner('', class: 'hide autocomplete-status')) %>
 
   <%= text_f f, :tag,
     :control_group_id => "#{registry}_tag_search",
     :'data-registry' => registry,
     :'data-tag' => true,
-    :'data-url' => auto_complete_image_tag_image_search_path(model.compute_resource_id) %>
+    :'data-min-length' => 0,
+    :'data-url' => search_repository_image_search_path(model.compute_resource_id),
+    :help_inline => spinner('', class: 'hide autocomplete-status') %>
+
+  <div class="col-md-6 col-md-offset-2 small-gutter">
+    <%= link_to(icon_text('search', _('Search for images')), "#",
+          :id => "search_repository_button_#{registry}",
+          :class => 'image-search-button btn btn-default',
+          :'data-registry' => registry,
+          :'data-url' => search_repository_image_search_path(model.compute_resource_id)) %>
+  </div>
 
-  <div class="col-md-12">
+  <div class="registry-search-results col-md-12">
     <div data-search-spinner=true class='col-md-offset-3 hide'>
       <span data-wait-text=true>
       </span>
-      <%= spinner('', :id => "loading_repositories_indicator_#{registry}") %>
+      <%= spinner('') %>
     </div>
-    <div data-repository-search-results=true >
+    <div class="registry-search-results-list">
     </div>
   </div>
   <%= render :partial => 'form_buttons', locals: { :registry => registry} %>

data/app/views/containers/steps/image.html.erb

@@ -1,4 +1,4 @@
-<%= javascript 'foreman_docker/image_step' %>
+<%= javascript 'foreman_docker/container_image_search' %>
 <%= stylesheet 'foreman_docker/autocomplete' %>
 
 <%= render :layout => 'title', :locals => { :step => 2 } do %>
@@ -11,11 +11,9 @@
       <% end -%>
 
       <li class='<%= tab_class(:hub) %>'><a href="#hub" data-toggle="tab" id="hub_tab">
-        <span class="glyphicon glyphicon-cloud-download"></span>
         <%= _("Docker hub") %>
       </a></li>
       <li class='<%= tab_class(:registry) %>'><a href="#registry" data-toggle="tab" id="registry_tab">
-        <span class="glyphicon glyphicon-cloud-download"></span>
         <%= _("External registry") %>
       </a></li>
     </ul>

data/app/views/image_search/_repository_search_results.html.erb

@@ -1,5 +1,5 @@
 <% repositories.each do |repository| %>
-    <h3><%= link_to cleanup_image_name(repository['name']), '#', :onclick => 'repoSelected(this)', "data-hub" => use_hub %></h3>
+    <h3><%= link_to cleanup_image_name(repository['name']), '#', class: 'repository-name' %></h3>
     <p>
       <%= '<span class="glyphicon glyphicon-certificate" title="Official"></span>'.html_safe if repository['is_official'] %>
       <%= '<span class="glyphicon glyphicon-thumbs-up" title="Trusted"></span>'.html_safe    if repository['is_trusted'] %>

data/app/views/registries/_form.html.erb

@@ -1,3 +1,4 @@
+<%= javascript 'foreman_docker/create_registry' %>
 <%= form_for @registry, :url => (@registry.new_record? ? registries_path : registry_path(:id => @registry.id)) do |f| %>
     <%= base_errors_for @registry %>
     <ul class="nav nav-tabs" data-tabs="tabs">
@@ -14,9 +15,10 @@
       <div class="tab-pane active" id="primary">
         <%= text_f   f, :name %>
         <%= text_f   f, :url %>
-        <%= text_f   f, :description, :help_inline => _("Description of the registry") %>
-        <%= text_f   f, :username, :help_inline => _("Username used to access the registry") %>
-        <%= password_f   f, :password, :help_inline => _("Password used for authentication to the registry") %>
+        <%= text_f   f, :description, :label_help => _("Description of the registry") %>
+        <%= text_f   f, :username, :label_help => _("Username used to access the registry") %>
+        <%= password_f   f, :password, :label_help => _("Password used for authentication to the registry") %>
+        <%= checkbox_f f, :verify_ssl, :label_help => _("Disable to use an insecure registry"), :wrapper_class => 'form-group hidden' %>
       </div>
 
       <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @registry %>

data/app/views/registries/index.html.erb

@@ -3,16 +3,16 @@
 <%= title_actions(new_link(_("Create Registry"))) %>
 
 <table class="table table-bordered table-striped table-condensed" data-table="inline">
+  <thead>
+    <tr>
+      <th><%= sort :name, :as => _("Name") %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :url, :as => _("URL") %></th>
+      <th class="hidden-tablet hidden-xs"><%= _("Description") %></th>
+      <th><%= _('Actions') %></th>
+    </tr>
   </thead>
-  <tr>
-    <th class="text-center"><%= sort :name, :as => _("Name") %></th>
-    <th class="hidden-tablet hidden-xs text-center"><%= sort :url, :as => _("URL") %></th>
-    <th class="hidden-tablet hidden-xs text-center"><%= _("Description") %></th>
-    <th><%= _('Actions') %></th>
-  </tr>
-  </thead>
-
-  <% @registries.each do |r| %>
+  <tbody>
+    <% @registries.each do |r| %>
       <tr>
         <td><%= link_to_if_authorized trunc_with_tooltip(r.name), hash_for_edit_registry_path(:id => r).merge(:auth_object => r, :authorizer => authorizer) %></td>
         <td class="hidden-tablet hidden-xs text-center"><%= trunc_with_tooltip(r.url) %></td>
@@ -22,7 +22,8 @@
           merge(:auth_object => r, :authorizer => authorizer),
           :confirm => _("Delete %s?") % r.name) %></td>
       </tr>
-  <% end %>
+    <% end %>
+  </tbody>
 </table>
 
 <%= will_paginate_with_info @registries %>

data/db/migrate/20170508130316_add_verify_ssl_option_to_docker_registries.rb

@@ -0,0 +1,5 @@
+class AddVerifySslOptionToDockerRegistries < ActiveRecord::Migration
+  def change
+    add_column :docker_registries, :verify_ssl, :boolean, default: true
+  end
+end

data/lib/foreman_docker/engine.rb

@@ -20,17 +20,18 @@ module ForemanDocker
       end
     end
 
+    foreman_docker_assets = %w[foreman_docker/autocomplete.css
+                               foreman_docker/terminal.css
+                               foreman_docker/container_image_search.js
+                               foreman_docker/create_registry.js]
+
     initializer "foreman_docker.assets.precompile" do |app|
-      app.config.assets.precompile += %w(foreman_docker/autocomplete.css
-                                         foreman_docker/terminal.css
-                                         foreman_docker/image_step.js)
+      app.config.assets.precompile += foreman_docker_assets
     end
 
     initializer 'foreman_docker.configure_assets', :group => :assets do
       SETTINGS[:foreman_docker] =
-        { :assets => { :precompile => ['foreman_docker/autocomplete.css',
-                                       'foreman_docker/terminal.css',
-                                       'foreman_docker/image_step.js'] } }
+        { :assets => { :precompile => foreman_docker_assets } }
     end
 
     initializer 'foreman_docker.register_gettext', :after => :load_config_initializers do

data/lib/foreman_docker/version.rb

@@ -1,3 +1,3 @@
 module ForemanDocker
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/test/functionals/image_search_controller_test.rb

@@ -18,204 +18,155 @@ class ImageSearchControllerTest < ActionController::TestCase
       .stubs(:find).returns(registry)
   end
 
-  describe '#auto_complete_repository_name' do
-    test 'returns if an image is available' do
-      exists = ['true', 'false'].sample
-      search_type = ['hub', 'registry'].sample
-      subject.instance_variable_set(:@image_search_service, image_search_service)
-      image_search_service.expects(:available?).returns(exists)
-
-      xhr :get, :auto_complete_repository_name,
-        { registry: search_type, search: term,
-          id: compute_resource }, set_session_user
-      assert_equal exists, response.body
-    end
-
-    context 'it is a Docker Hub tab request' do
-      let(:search_type) { 'hub' }
+  describe '#search_repository' do
+    let(:search_types) { ['hub', 'registry'] }
 
-      test 'it queries the compute_resource and Docker Hub' do
-        compute_resource.expects(:image).with(term)
-          .returns(term)
-        compute_resource.expects(:tags_for_local_image)
-          .returns(tags)
-        docker_hub.expects(:tags).returns([])
+    describe 'calls #search on image_search_service' do
+      setup do
+        subject.instance_variable_set(:@image_search_service, image_search_service)
+      end
 
-        xhr :get, :auto_complete_repository_name,
-          { registry: search_type, search: term,
+      test 'passes params search and tags' do
+        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
       end
-    end
-
-    context 'it is a External Registry tab request' do
-      let(:search_type) { 'registry' }
 
-      test 'it only queries the registry api' do
-        compute_resource.expects(:image).with(term).never
-        docker_hub.expects(:tags).never
-        registry.api.expects(:tags).with(term, nil)
-          .returns(['latest'])
+      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
+        assert_equal tags.first, JSON.parse(response.body).first['value']
+      end
 
-        xhr :get, :auto_complete_repository_name,
-          { registry: search_type, registry_id: registry,
-            search: term, id: compute_resource }, set_session_user
+      test 'returns html with the found images' do
+        image_search_service.expects(:search)
+          .with({ term: term, tags: 'false' })
+          .returns([{ 'name' => term }])
+        xhr :get, :search_repository,
+          { registry: search_types.sample, search: term,
+            id: compute_resource, format: :html}, set_session_user
+        assert response.body.include?(term)
       end
-    end
-  end
 
-  describe '#auto_complete_image_tag' do
-    let(:tag_fragment) { 'lat' }
-    let(:term) { "#{docker_image}:#{tag_fragment}"}
-
-    test 'returns an array of { label:, value: } hashes' do
-      search_type = ['hub', 'registry'].sample
-      subject.instance_variable_set(:@image_search_service, image_search_service)
-      image_search_service.expects(:search)
-        .with({ term: term, tags: 'true' })
-        .returns(tags)
-      xhr :get, :auto_complete_image_tag,
-        { registry: search_type, search: term,
-          id: compute_resource }, set_session_user
-      assert_equal tags.first, JSON.parse(response.body).first['value']
-    end
+      [Docker::Error::DockerError, Excon::Errors::Error, Errno::ECONNREFUSED].each do |error|
+        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
 
-    context 'a Docker Hub tab request' do
-      let(:search_type) { 'hub' }
+          assert_response :error
+          assert response.body.include?('An error occured during repository search:')
+        end
+      end
 
-      test 'it searches Docker Hub and the ComputeResource' do
-        compute_resource.expects(:image).with(docker_image)
-          .returns(term)
-        compute_resource.expects(:tags_for_local_image)
-          .returns(tags)
-        docker_hub.expects(:tags).returns([])
+      test "centos 7 search responses are handled correctly" do
+        repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
+        repo_full_name = "redhat.com: #{repository}"
+        expected = [{  "description" => "Really fancy database app...",
+                       "is_official" => true,
+                       "is_trusted" => true,
+                       "name" =>  repo_full_name,
+                       "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
+        assert_response :success
+        refute response.body.include?(repo_full_name)
+        assert response.body.include?(repository)
+      end
 
-        xhr :get, :auto_complete_image_tag,
-          { registry: search_type, search: term,
-            id: compute_resource }, set_session_user
+      test "fedora search responses are handled correctly" do
+        repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
+        repo_full_name = repository
+        request.env["HTTP_ACCEPT"] = "application/javascript"
+        expected = [{ "description" => "Really fancy database app...",
+                      "is_official" => true,
+                      "is_trusted" => true,
+                      "name" =>  repo_full_name,
+                      "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
+        assert_response :success
+        assert response.body.include?(repo_full_name)
+        assert response.body.include?(repository)
       end
     end
 
-    context 'it is a External Registry tab request' do
-      let(:search_type) { 'registry' }
+    describe 'for image names' do
+      context 'with a Docker Hub tab request' do
+        let(:search_type) { 'hub' }
 
-      test 'it only queries the registry api' do
-        compute_resource.expects(:image).with(docker_image).never
-        docker_hub.expects(:tags).never
-        registry.api.expects(:tags).with(docker_image, tag_fragment)
-          .returns([])
+        test 'it searches Docker Hub and the ComputeResource' do
+          compute_resource.expects(:local_images)
+            .returns([OpenStruct.new(info: { 'RepoTags' => [term] })])
+          docker_hub.expects(:search).returns({})
 
-        xhr :get, :auto_complete_image_tag,
-          { registry: search_type, registry_id: registry,
-            search: term, id: compute_resource }, set_session_user
+          xhr :get, :search_repository,
+            { registry: search_type, search: term,
+              id: compute_resource }, set_session_user
+        end
       end
-    end
-  end
 
-  describe '#search_repository' do
-    test 'returns html with the found images' do
-      search_type = ['hub', 'registry'].sample
-      subject.instance_variable_set(:@image_search_service, image_search_service)
-      image_search_service.expects(:search)
-        .with({ term: term, tags: 'false' })
-        .returns([{ 'name' => term}])
-      xhr :get, :search_repository,
-        { registry: search_type, search: term,
-          id: compute_resource }, set_session_user
-      assert response.body.include?(term)
-    end
+      context 'with a External Registry tab request' do
+        let(:search_type) { 'registry' }
 
-    context 'a Docker Hub tab request' do
-      let(:search_type) { 'hub' }
+        test 'it only queries the registry api' do
+          compute_resource.expects(:local_images).with(docker_image).never
+          docker_hub.expects(:search).never
+          registry.api.expects(:search).with(docker_image)
+            .returns({})
 
-      test 'it searches Docker Hub and the ComputeResource' do
-        compute_resource.expects(:local_images)
-          .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
+          xhr :get, :search_repository,
+            { registry: search_type, registry_id: registry,
+              search: term, id: compute_resource }, set_session_user
+        end
       end
     end
 
-    context 'it is a External Registry tab request' do
-      let(:search_type) { 'registry' }
+    describe 'for tags' do
+      let(:tag_fragment) { 'lat' }
+      let(:term) { "#{docker_image}:#{tag_fragment}"}
 
-      test 'it only queries the registry api' do
-        compute_resource.expects(:local_images).with(docker_image).never
-        docker_hub.expects(:search).never
-        registry.api.expects(:search).with(docker_image)
-          .returns({})
+      context 'with a Docker Hub tab request' do
+        let(:search_type) { 'hub' }
 
-        xhr :get, :search_repository,
-          { registry: search_type, registry_id: registry,
-            search: term, id: compute_resource }, set_session_user
+        test 'it searches Docker Hub and the ComputeResource' do
+          compute_resource.expects(:image).with(docker_image)
+            .returns(term)
+          compute_resource.expects(:tags_for_local_image)
+            .returns(tags)
+          docker_hub.expects(:tags).returns([])
+
+          xhr :get, :search_repository,
+            { registry: search_type, search: term, tags: 'true',
+              id: compute_resource }, set_session_user
+        end
       end
-    end
-  end
 
-  [Docker::Error::DockerError, Excon::Errors::Error, Errno::ECONNREFUSED].each do |error|
-    test 'auto_complete_repository_name catches exceptions on network errors' do
-      ForemanDocker::ImageSearch.any_instance.expects(:available?)
-        .raises(error)
-      xhr :get, :auto_complete_repository_name,
-        { registry: 'hub', search: term, id: compute_resource }, set_session_user
-      assert_response_is_expected
-    end
+      context 'with a External Registry tab request' do
+        let(:search_type) { 'registry' }
 
-    test 'auto_complete_image_tag catch exceptions on network errors' do
-      ForemanDocker::ImageSearch.any_instance.expects(:search).raises(error)
-      xhr :get, :auto_complete_image_tag,
-        { registry: 'hub', search:  term, id: compute_resource }, set_session_user
-      assert_response_is_expected
-    end
+        test 'it only queries the registry api' do
+          compute_resource.expects(:image).with(docker_image).never
+          docker_hub.expects(:tags).never
+          registry.api.expects(:tags).with(docker_image, tag_fragment)
+            .returns([])
 
-    test 'search_repository catch exceptions on network errors' do
-      ForemanDocker::ImageSearch.any_instance.expects(:search).raises(error)
-      xhr :get, :search_repository,
-        { registry: 'hub', search: term, id: compute_resource }, set_session_user
-      assert_response_is_expected
+          xhr :get, :search_repository,
+            { registry: search_type, registry_id: registry, tags: 'true',
+              search: term, id: compute_resource }, set_session_user
+        end
+      end
     end
   end
-
-  test "centos 7 search responses are handled correctly" do
-    repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
-    repo_full_name = "redhat.com: #{repository}"
-    request.env["HTTP_ACCEPT"] = "application/javascript"
-    expected = [{  "description" => "Really fancy database app...",
-                   "is_official" => true,
-                   "is_trusted" => true,
-                   "name" =>  repo_full_name,
-                   "star_count" => 0
-                }]
-    ForemanDocker::ImageSearch.any_instance.expects(:search).returns(expected).at_least_once
-    xhr :get, :search_repository,
-      { registry: 'hub', search: 'centos', id: compute_resource }, set_session_user
-    assert_response :success
-    refute response.body.include?(repo_full_name)
-    assert response.body.include?(repository)
-  end
-
-  test "fedora search responses are handled correctly" do
-    repository = "registry-fancycorp.rhcloud.com/fancydb-rhel7/fancydb"
-    repo_full_name = repository
-    request.env["HTTP_ACCEPT"] = "application/javascript"
-    expected = [{ "description" => "Really fancy database app...",
-                  "is_official" => true,
-                  "is_trusted" => true,
-                  "name" =>  repo_full_name,
-                  "star_count" => 0
-                }]
-    ForemanDocker::ImageSearch.any_instance.expects(:search).returns(expected).at_least_once
-    xhr :get, :search_repository,
-      { registry: 'hub', search: 'centos', id: compute_resource  }, set_session_user
-    assert_response :success
-    assert response.body.include?(repo_full_name)
-    assert response.body.include?(repository)
-  end
-
-  def assert_response_is_expected
-    assert_response :error
-    assert response.body.include?('An error occured during repository search:')
-  end
 end