foreman_docker 3.0.0 → 3.1.0

data/app/services/foreman_docker/image_search.rb

@@ -0,0 +1,92 @@
+module ForemanDocker
+  class ImageSearch
+    def initialize(*args)
+      @sources = {}
+      args.each do |source|
+        add_source(source)
+      end
+    end
+
+    def add_source(source)
+      case source
+      when ForemanDocker::Docker
+        @sources[:compute_resource] ||= []
+        @sources[:compute_resource] << source
+      when Service::RegistryApi
+        @sources[:registry] ||= []
+        @sources[:registry] << source
+      end
+    end
+
+    def remove_source(source)
+      @sources.each do |_, sources|
+        sources.delete(source)
+      end
+    end
+
+    def search(query)
+      return [] if query[:term].blank? || query[:term] == ':'
+
+      unless query[:tags] == 'true'
+        images(query[:term])
+      else
+        tags(query[:term])
+      end
+    end
+
+    def images(query)
+      sources_results_for(:search, query)
+    end
+
+    def tags(query)
+      image_name, tag = query.split(':')
+      sources_results_for(:tags, image_name, tag)
+        .map { |tag_name| { 'name' => tag_name } }
+    end
+
+    def available?(query)
+      tags(query).present?
+    end
+
+    private
+
+    def registry_search(registry, term)
+      registry.search(term)['results']
+    end
+
+    def compute_resource_search(compute_resource, query)
+      images = compute_resource.local_images(query)
+      images.flat_map do |image|
+        image.info['RepoTags'].map do |tag|
+          { 'name' => tag.split(':').first }
+        end
+      end.uniq
+    end
+
+    def compute_resource_image(compute_resource, image_name)
+      compute_resource.image(image_name)
+    rescue ::Docker::Error::NotFoundError
+      nil
+    end
+
+    def compute_resource_tags(compute_resource, image_name, tag)
+      image = compute_resource_image(compute_resource, image_name)
+      image ? compute_resource.tags_for_local_image(image, tag) : []
+    end
+
+    def registry_tags(registry, image_name, tag)
+      registry.tags(image_name, tag).map { |t| t['name'] }
+    end
+
+    def sources_results_for(search, *args)
+      result = []
+      @sources.each do |kind, sources|
+        sources.each do |source|
+          result << self.send("#{kind}_#{search}", source, *args)
+        end
+      end
+      result.flatten.compact
+    end
+  end
+end
+

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

@@ -1,8 +1,6 @@
 <% title _("Containers") %>
 
-<%= title_actions(display_link_if_authorized(
-  _('New container'),
-  hash_for_new_container_path)) %>
+<%= title_actions(new_link(_("Create container"))) %>
 
 <ul class="nav nav-tabs" data-tabs="tabs">
   <% @container_resources.each_with_index do |resource, i| %>

data/app/views/containers/show.html.erb

@@ -69,7 +69,7 @@
               <td><%= _('Environment Variables') %></td>
               <td>
                 <table id="environment_variables" class="table table-bordered" style="table-layout:fixed; word-wrap: break-word">
-                  <% (@container.in_fog.attributes['config_env'] || []).each do |environment_variable| %>
+                  <% (@container.in_fog.environment_variables || []).each do |environment_variable| %>
                   <% pair = environment_variable.split("=") %>
                     <tr>
                       <td><b><%= pair.first %></b></td>

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

@@ -4,42 +4,52 @@
   :url => wizard_path,
   :method => :put,
   :html => {:data => {:registry => registry}} do |f| %>
+
+  <% model.errors.messages.each do |field, field_errors| %>
+    <div class="alert alert-danger">
+      <span class="pficon pficon-error-circle-o"></span>
+      <ul>
+        <% field_errors.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
   <% if registry == "registry" -%>
     <div class="input-group col-md-6">
       <%= select_registry f %>
     </div>
   <% end -%>
 
-  <div class="form-group">
-    <div class='row'>
-      <% help_type = f.object.errors[:repository_name].present? ? :help_block : :help_inline %>
-      <%= text_f(
-        f,
-        :repository_name,
-        :label => _('Search'),
-        :size => 'col-md-6',
-        :'data-url'  => auto_complete_repository_name_image_search_path(model.compute_resource_id),
-        :value       => f.object.repository_name.present? ? f.object.repository_name : '',
-        :'data-registry' => registry,
-        :'data-search' => true,
-        :focus_on_load => true,
-        :placeholder => _('Find your favorite container, e.g. centos'),
-        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) %>
-    </div>
-    <div class='row'>
-      <%= text_f f, :tag,
+  <% 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),
+    :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-tag' => true,
-        :'data-url' => auto_complete_image_tag_image_search_path(model.compute_resource_id) %>
-    </div>
-  </div>
+        :'data-url' => search_repository_image_search_path(model.compute_resource_id)
+      ) + content_tag(:span, '', :id => 'image-confirmation').html_safe) %>
+
+  <%= 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) %>
 
   <div class="col-md-12">
     <div data-search-spinner=true class='col-md-offset-3 hide'>

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

@@ -1,3 +1,3 @@
-<% title _("New container") %>
+<% title _("Create container") %>
 <%= container_wizard(step) %>
 <%= yield %>

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

@@ -23,7 +23,7 @@
       <% else %>
 
         <div class="alert alert-warning alert-dismissable">
-          <%= image_tag 'false.png' %> <%= (_("You need a Docker compute resource in order to create containers. Please %s and try again.") % link_to('add a new one', new_compute_resource_path)).html_safe %>
+          <%= (_("You need a Docker compute resource in order to create containers. Please %s and try again.") % link_to('add a new one', new_compute_resource_path)).html_safe %>
         </div>
       <% end %>
     </div>

data/app/views/foreman_docker/common_parameters/_dns_entry.html.erb

@@ -1,5 +1,5 @@
 <tr class="fields form-group <%= 'has-error' if f.object.errors.any? %>">
-  <td><%= f.text_field(:name,  :class => "form-control",
+  <td><%= f.text_field(:key,  :class => "form-control",
                        :placeholder => _("DNS e.g. 8.8.8.8")) %></td>
   <td style='vertical-align: middle' class='text-center'>
     <span class="help-block">

data/app/views/foreman_docker/common_parameters/_environment_variable.html.erb

@@ -1,5 +1,5 @@
 <tr class="fields form-group <%= 'error' if f.object.errors.any? %>">
-  <td><%= f.text_field(:name, :class => "form-control",
+  <td><%= f.text_field(:key, :class => "form-control",
                        :placeholder  => _("Name, e.g. PING_HOST")) %></td>
   <td><%= f.text_field(:value, :class => "form-control",
                        :placeholder   => _("Value, e.g. example.org")) %></td>

data/app/views/foreman_docker/common_parameters/_exposed_port.html.erb

@@ -1,5 +1,5 @@
 <tr class="fields form-group <%= 'has-error' if f.object.errors.any? %>">
-  <td><%= f.text_field(:name,  :class => "form-control",
+  <td><%= f.text_field(:key,  :class => "form-control",
                        :placeholder => _("Port number e.g. 22")) %></td>
   <td><%= f.select :value, [['TCP','tcp'],['UDP','udp']]  %></td>
   <td style='vertical-align: middle' class='text-center'>

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

@@ -1,5 +1,5 @@
 <% repositories.each do |repository| %>
-    <h3><%= link_to repository['name'], '#', :onclick => 'repoSelected(this)', "data-hub" => use_hub %></h3>
+    <h3><%= link_to cleanup_image_name(repository['name']), '#', :onclick => 'repoSelected(this)', "data-hub" => use_hub %></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/index.html.erb

@@ -1,8 +1,6 @@
 <% title _("Registries") %>
 
-<%= title_actions(display_link_if_authorized(
-  _('New registry'),
-  hash_for_new_registry_path)) %>
+<%= title_actions(new_link(_("Create Registry"))) %>
 
 <table class="table table-bordered table-striped table-condensed" data-table="inline">
   </thead>

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

@@ -1,3 +1,3 @@
-<% title _("New Registry") %>
+<% title _("Create Registry") %>
 
 <%= render :partial => 'form' %>

data/db/migrate/20160605133025_create_docker_parameters.rb

@@ -0,0 +1,13 @@
+class CreateDockerParameters < ActiveRecord::Migration
+  def change
+    create_table :docker_parameters do |t|
+      t.string :key, :limit => 255
+      t.text  :value
+      t.string :type, :limit => 255
+      t.integer :reference_id
+      t.timestamps
+    end
+
+    add_index :docker_parameters, [:type, :reference_id, :key], :unique => true
+  end
+end

data/db/migrate/20160605134652_move_parameters_to_docker_parameters.rb

@@ -0,0 +1,27 @@
+class MoveParametersToDockerParameters < ActiveRecord::Migration
+  class FakeDockerParameter < ActiveRecord::Base
+    self.table_name = 'docker_parameters'
+  end
+
+  class FakeParameter < ActiveRecord::Base
+    self.table_name = 'parameters'
+  end
+
+  def up
+  # All the  DockerContainerWizardStates::PARAMETER are temporary for the wizard step so no need to keep them
+   docker_params = FakeParameter.unscoped.where(:type => ['EnvironmentVariable', 'ForemanDocker::Dns', 'ExposedPort'])
+   docker_params.each do |param|
+     DockerParameter.create(:key => param['name'], :value => param['value'], :reference_id => param['reference_id'], :type => param['type'])
+   end
+   docker_params.delete_all
+  end
+
+  def down
+    docker_params = FakeDockerParameter.unscoped.where(:type => ['EnvironmentVariable', 'ForemanDocker::Dns', 'ExposedPort'])
+    docker_params.each do |param|
+      Parameter.create(:key => param['name'], :value => param['value'], :reference_id => param['reference_id'], :type => param['type'])
+    end
+
+    docker_params.delete_all
+  end
+end

data/lib/foreman_docker/engine.rb

@@ -42,15 +42,15 @@ module ForemanDocker
 
     initializer 'foreman_docker.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_docker do
-        requires_foreman '>= 1.11'
+        requires_foreman '>= 1.15'
         compute_resource ForemanDocker::Docker
 
         sub_menu :top_menu, :containers_menu, :caption => N_('Containers'),
                                               :after => :monitor_menu do
-          menu :top_menu, :containers,    :caption => N_('All containers'),
+          menu :top_menu, :containers,    :caption => N_('All Containers'),
                                           :url_hash => { :controller => :containers,
                                                          :action => :index }
-          menu :top_menu, :new_container, :caption => N_('New container'),
+          menu :top_menu, :new_container, :caption => N_('Create Container'),
                                           :url_hash => { :controller => :containers,
                                                          :action => :new }
           menu :top_menu, :registries, :caption => N_('Registries'),
@@ -103,6 +103,8 @@ module ForemanDocker
                      :resource_type => 'Docker/ImageSearch'
         end
 
+        add_all_permissions_to_default_roles
+
         parameter_filter ComputeResource, :email
 
         # apipie API documentation
@@ -127,10 +129,6 @@ module ForemanDocker
       end
     end
 
-    rake_tasks do
-      load "#{ForemanDocker::Engine.root}/lib/foreman_docker/tasks/test.rake"
-    end
-
     require 'fog/fogdocker/models/compute/server'
     require 'fog/fogdocker/models/compute/image'
     require 'fog/fogdocker/models/compute/images'
@@ -146,6 +144,7 @@ module ForemanDocker
       # Compatibility fixes - to be removed once 1.7 compatibility is no longer required
       Fog::Compute::Fogdocker::Images.send(:include, ::FogExtensions::Fogdocker::Images)
       ::Taxonomy.send(:include, ForemanDocker::TaxonomyExtensions)
+      ComputeResource.send(:include, ForemanDocker::ComputeResourceExtensions)
     end
   end
 end

data/lib/foreman_docker/version.rb

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

data/lib/tasks/test.rake

@@ -0,0 +1,35 @@
+namespace :test do
+  desc "Test ForemanDocker"
+  Rake::TestTask.new(:docker) do |t|
+    test_dir = File.join(File.dirname(__FILE__), '../..', 'test')
+    t.libs << ['test', test_dir]
+    t.pattern = "#{test_dir}/**/*_test.rb"
+    t.verbose = false
+    t.warning = false
+  end
+end
+
+namespace :docker do
+  task :rubocop do
+    begin
+      require 'rubocop/rake_task'
+      RuboCop::RakeTask.new(:rubocop_docker) do |task|
+        task.patterns = ["#{ForemanDocker::Engine.root}/app/**/*.rb",
+                         "#{ForemanDocker::Engine.root}/lib/**/*.rb",
+                         "#{ForemanDocker::Engine.root}/test/**/*.rb"]
+      end
+    rescue
+      puts "Rubocop not loaded."
+    end
+
+    Rake::Task['rubocop_docker'].invoke
+  end
+end
+
+Rake::Task[:test].enhance ['test:docker']
+
+load 'tasks/jenkins.rake'
+if Rake::Task.task_defined?(:'jenkins:unit')
+  Rake::Task["jenkins:unit"].enhance ['test:docker',
+                                      'docker:rubocop']
+end

data/test/functionals/api/v2/containers_controller_test.rb

@@ -3,6 +3,11 @@ require 'test_plugin_helper'
 module Api
   module V2
     class ContainersControllerTest < ActionController::TestCase
+      setup do
+        stub_image_existance
+        stub_registry_api
+      end
+
       test 'index returns a list of all containers' do
         get :index, {}, set_session_user
         assert_response :success
@@ -109,6 +114,21 @@ module Api
                                           :tag => tag }
             assert_response :created
           end
+
+          test 'creates a container with correct params' do
+            repository_name = "centos"
+            tag = "8"
+            name = "foo2"
+            Service::Containers.any_instance.expects(:pull_image).returns(true)
+            Service::Containers.any_instance.expects(:start_container).returns(true)
+            post :create, :container => { :compute_resource_id => @compute_resource.id,
+                                          :name => name,
+                                          :registry_id => @registry.id,
+                                          :repository_name => repository_name,
+                                          :tag => tag,
+                                          :environment_variables => [{:key => 'ping_host', :value => 'example.com'}]}
+            assert_response :created
+          end
         end
 
         test 'creates a katello container with correct params' do
@@ -145,6 +165,7 @@ module Api
                                         :repository_name => 'centos',
                                         :tag => 'latest' }
           assert_response :unprocessable_entity
+          assert_match /Name has already been taken/, @response.body
         end
       end
     end

data/test/functionals/api/v2/registries_controller_test.rb

@@ -43,15 +43,16 @@ module Api
 
       test 'update a docker registry' do
         DockerRegistry.any_instance.stubs(:attempt_login)
-        put :update, :id => @registry.id, :registry => { :name => 'hello_world' }
+        new_name = 'hello_world'
+        put :update, :id => @registry.id, :registry => { :name => new_name }
         assert_response :success
-        assert DockerRegistry.exists?(:name => 'hello_world')
+        assert_equal new_name, @registry.reload.name
       end
 
       test 'deletes a docker registry' do
         delete :destroy, :id => @registry.id
         assert_response :success
-        refute DockerRegistry.exists?(@registry.id)
+        assert DockerRegistry.where(:id => @registry.id).blank?
       end
     end
   end