Add support to serve /assets/apps

Author: ehelms

manifests/apache.pp

@@ -1,14 +1,23 @@
 # @summary Setups Apache for Katello development
 # @api private
 class katello_devel::apache {
+  $proxy_no_proxy_uris = ['/pulp', '/pub', '/icons', '/images', '/server-status']
+
+  if $katello_devel::enable_iop and !$katello_devel::iop_proxy_assets_apps {
+    $_proxy_no_proxy_uris = $proxy_no_proxy_uris + ['/assets/apps']
+  } else {
+    $_proxy_no_proxy_uris = $proxy_no_proxy_uris
+  }
+
   class { 'foreman::config::apache':
-    ssl           => true,
-    ssl_cert      => $certs::apache::apache_cert,
-    ssl_key       => $certs::apache::apache_key,
-    ssl_ca        => $certs::apache::apache_client_ca_cert,
-    ssl_chain     => $certs::apache::apache_ca_cert,
-    proxy_backend => "http://localhost:${katello_devel::rails_port}/",
-    proxy_assets  => true,
+    ssl                 => true,
+    ssl_cert            => $certs::apache::apache_cert,
+    ssl_key             => $certs::apache::apache_key,
+    ssl_ca              => $certs::apache::apache_client_ca_cert,
+    ssl_chain           => $certs::apache::apache_ca_cert,
+    proxy_backend       => "http://localhost:${katello_devel::rails_port}/",
+    proxy_assets        => true,
+    proxy_no_proxy_uris => $_proxy_no_proxy_uris,
   }
 
   # required by configuration in katello/katello-apache-ssl.conf
@@ -18,5 +27,11 @@
     ssl_content => file('katello/katello-apache-ssl.conf'),
   }
 
+  if $katello_devel::iop_proxy_assets_apps {
+    foreman::config::apache::fragment { 'katello-iop-assets':
+      ssl_content => 'ProxyPass /assets/apps http://localhost:8002/',
+    }
+  }
+
   User<|title == apache|> { groups +> $katello_devel::group }
 }

manifests/init.pp

@@ -77,6 +77,9 @@
 # @param enable_iop
 #   Enable iop integration
 #
+# @param iop_proxy_assets_apps
+#   Configure Apache to proxy /assets/apps to a backend running on localhost:8002
+#
 class katello_devel (
   String $user = undef,
   Stdlib::Absolutepath $deployment_dir = '/home/vagrant',
@@ -103,7 +106,12 @@
   Boolean $rex_manage_repo = true,
   Hash[String, Any] $rails_cache_store = { 'type' => 'redis' },
   Boolean $enable_iop = false,
+  Boolean $iop_proxy_assets_apps = false,
 ) inherits katello_devel::params {
+  if $iop_proxy_assets_apps and !$enable_iop {
+    fail('iop_proxy_assets_apps requires enable_iop to be true')
+  }
+
   $group = $user
 
   $changeme = '$6$lb06/IMy$nZhR3LkR2tUunTQm68INFWMyb/8VA2vfYq0/fRzLoKSfuri.vvtjeLJf9V.wuHzw92.aw8NgUlJchMy/qK25x.'

spec/acceptance/iop_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: install katello_devel' do
+describe 'Scenario: install katello_devel with IoP' do
   let(:manifest) do
     <<-PUPPET
       class { 'katello_devel':
@@ -13,4 +13,30 @@ class { 'katello_devel':
   it 'applies with no errors' do
     apply_manifest(manifest, catch_failures: true)
   end
+
+  describe file('/etc/httpd/conf.d/05-foreman-ssl.conf') do
+    it { is_expected.to be_file }
+    its(:content) { should match /ProxyPass \/assets\/apps !/ }
+  end
+end
+
+describe 'Scenario: install katello_devel with IoP proxy assets apps' do
+  let(:manifest) do
+    <<-PUPPET
+      class { 'katello_devel':
+        user                  => 'vagrant',
+        enable_iop            => true,
+        iop_proxy_assets_apps => true,
+      }
+    PUPPET
+  end
+
+  it 'applies with no errors' do
+    apply_manifest(manifest, catch_failures: true)
+  end
+
+  describe file('/etc/httpd/conf.d/05-foreman-ssl.d/katello-iop-assets.conf') do
+    it { is_expected.to be_file }
+    its(:content) { should match /ProxyPass \/assets\/apps http:\/\/localhost:8002\// }
+  end
 end

spec/classes/katello_devel_spec.rb

@@ -253,6 +253,45 @@
         it { is_expected.to contain_katello_devel__plugin('theforeman/foreman_remote_execution') }
         it { is_expected.to contain_katello_devel__git_repo('foreman_remote_execution').with_revision('1.2.z') }
       end
+
+      context 'with enable_iop true' do
+        let(:params) do
+          {
+            :user => 'vagrant',
+            :enable_iop => true,
+          }
+        end
+
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('katello_devel::iop') }
+        it { is_expected.to contain_class('katello_devel::apache') }
+      end
+
+      context 'with iop_proxy_assets_apps true' do
+        let(:params) do
+          {
+            :user => 'vagrant',
+            :enable_iop => true,
+            :iop_proxy_assets_apps => true,
+          }
+        end
+
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('katello_devel::iop') }
+        it { is_expected.to contain_class('katello_devel::apache') }
+      end
+
+      context 'with iop_proxy_assets_apps true but enable_iop false' do
+        let(:params) do
+          {
+            :user => 'vagrant',
+            :enable_iop => false,
+            :iop_proxy_assets_apps => true,
+          }
+        end
+
+        it { is_expected.to compile.and_raise_error(/iop_proxy_assets_apps requires enable_iop to be true/) }
+      end
     end
   end
 end