katello 4.0.3 → 4.1.0.rc1

data/app/services/katello/pulp3/migration_switchover.rb

@@ -1,126 +0,0 @@
-require 'pulp_2to3_migration_client'
-
-module Katello
-  module Pulp3
-    class SwitchOverError < StandardError; end
-
-    class MigrationSwitchover
-      def initialize(*argv)
-        @migration = Katello::Pulp3::Migration.new(*argv)
-      end
-
-      def content_types
-        @migration.content_types_for_migration
-      end
-
-      def run
-        Katello::Logging.time("CONTENT_SWITCHOVER - Total Switchover Process") do
-          Katello::Logging.time("CONTENT_SWITCHOVER - check_already_migrated_content") { check_already_migrated_content }
-          Katello::Logging.time("CONTENT_SWITCHOVER - cleanup_v1_docker_tags") { cleanup_v1_docker_tags } if docker_migration?
-          Katello::Logging.time("CONTENT_SWITCHOVER - migrated_content_type_check") { migrated_content_type_check }
-          Katello::Logging.time("CONTENT_SWITCHOVER - combine_duplicate_content_types") { combine_duplicate_content_types }
-          Katello::Logging.time("CONTENT_SWITCHOVER - combine_duplicate_docker_tags") { combine_duplicate_docker_tags } if docker_migration?
-          Katello::Logging.time("CONTENT_SWITCHOVER - migrate_pulp3_hrefs") { migrate_pulp3_hrefs }
-        end
-      end
-
-      def deduplicated_content_types
-        #even though YumMetatadataFile is de-depulicated, we're not indexing it in pulp3
-        [Katello::PackageGroup]
-      end
-
-      def docker_migration?
-        content_types.any? { |content_type| content_type.model_class::CONTENT_TYPE == "docker_tag" }
-      end
-
-      def migrate_pulp3_hrefs
-        content_types.each do |content_type|
-          content_type.model_class
-              .where.not("pulp_id=migrated_pulp3_href")
-              .update_all("pulp_id = migrated_pulp3_href")
-        end
-      end
-
-      def check_already_migrated_content
-        (content_types - Migration.ignorable_content_types).each do |content_type|
-          if content_type.model_class.where("pulp_id=migrated_pulp3_href").any?
-            Rails.logger.error("Content Switchover: #{content_type.label} seems to have already migrated content, switchover may fail.  Did you already perform the switchover?")
-          end
-        end
-      end
-
-      def cleanup_v1_docker_tags
-        unmigrated_docker_tags = Katello::DockerTag.includes(:schema1_meta_tag, :schema2_meta_tag).where(migrated_pulp3_href: nil)
-        unmigrated_docker_tags.find_in_batches(batch_size: 50_000) do |batch|
-          to_delete = []
-
-          batch.each do |unmigrated_tag|
-            if unmigrated_tag.schema1_meta_tag && unmigrated_tag.schema1_meta_tag.schema2.try(:migrated_pulp3_href)
-              Rails.logger.warn("Content Switchover: Deleting Docker tag #{unmigrated_tag.name} with pulp id: #{unmigrated_tag.pulp_id}")
-              to_delete << unmigrated_tag.id
-            end
-          end
-          Katello::DockerMetaTag.where(:schema1_id => to_delete).update_all(:schema1_id => nil)
-          Katello::RepositoryDockerTag.where(:docker_tag_id => to_delete).delete_all
-          Katello::DockerTag.where(:id => to_delete).delete_all
-        end
-
-        Katello::DockerMetaTag.cleanup_tags
-      end
-
-      def combine_duplicate_content_types
-        deduplicated_content_types.each do |content_class|
-          to_delete = []
-          content_class.having("count(migrated_pulp3_href) > 1").group(:migrated_pulp3_href).pluck(:migrated_pulp3_href).each do |duplicate_href|
-            units = content_class.where(:migrated_pulp3_href => duplicate_href).to_a
-            main_unit = units.pop
-            content_class.repository_association_class.where(content_class.unit_id_field => units.map(&:id)).update_all(content_class.unit_id_field => main_unit.id)
-            to_delete += units.map(&:id)
-          end
-
-          to_delete.each_slice(10_000) do |group|
-            content_class.where(:id => group).delete_all
-          end
-        end
-      end
-
-      def combine_duplicate_docker_tags
-        to_delete = []
-        Katello::DockerTag.having("count(migrated_pulp3_href) > 1").group(:migrated_pulp3_href).pluck(:migrated_pulp3_href).each do |duplicate_href|
-          tags = Katello::DockerTag.where(:migrated_pulp3_href => duplicate_href).includes(:schema1_meta_tag, :schema2_meta_tag).to_a
-          main_tag = tags.pop
-          main_meta_v1 = main_tag.schema1_meta_tag
-          main_meta_v2 = main_tag.schema2_meta_tag
-
-          Katello::RepositoryDockerTag.where(:docker_tag_id => tags.map(&:id)).update_all(:docker_tag_id => main_tag.id)
-          Katello::RepositoryDockerMetaTag.joins(:docker_meta_tag).where("#{Katello::DockerMetaTag.table_name}.schema1_id" => tags).update_all(:docker_meta_tag_id => main_meta_v1.id) if main_meta_v1
-          Katello::RepositoryDockerMetaTag.joins(:docker_meta_tag).where("#{Katello::DockerMetaTag.table_name}.schema2_id" => tags).update_all(:docker_meta_tag_id => main_meta_v2.id) if main_meta_v2
-
-          to_delete += tags.map(&:id)
-        end
-
-        to_delete.each_slice(10_000) do |group|
-          Katello::RepositoryDockerTag.where(:docker_tag_id => group).delete_all
-          Katello::DockerMetaTag.where(:schema1_id => group).or(Katello::DockerMetaTag.where(:schema2_id => group)).delete_all
-          Katello::DockerTag.where(:id => group).delete_all
-        end
-      end
-
-      def migrated_content_type_check
-        content_types.each do |content_type|
-          if content_type.model_class == Katello::Erratum
-            migrated_errata_check
-          elsif content_type.model_class.where(migrated_pulp3_href: nil).any?
-            fail SwitchOverError, "ERROR: at least one #{content_type.model_class.table_name} record has migrated_pulp3_href NULL value\n"
-          end
-        end
-      end
-
-      def migrated_errata_check
-        if Katello::RepositoryErratum.where(:erratum_pulp3_href => nil).any?
-          fail SwitchOverError, "ERROR: at least one Erratum record has migrated_pulp3_href NULL value\n"
-        end
-      end
-    end
-  end
-end

data/app/services/katello/puppet_class_importer_extensions.rb

@@ -1,32 +0,0 @@
-module Katello
-  module Services
-    module PuppetClassImporterExtensions
-      extend ActiveSupport::Concern
-
-      def update_environment
-        change_types = %w(new obsolete updated)
-        changed = self.changes
-
-        change_types.each do |kind|
-          changed[kind].slice!(@environment) unless changed[kind].empty?
-        end
-
-        #prevent the puppet environment from being deleted, by removing special '_destroy_' String
-        if changed['obsolete'][@environment]
-          changed['obsolete'][@environment] = changed['obsolete'][@environment].select { |klass| klass != '_destroy_' }
-        end
-
-        # PuppetClassImporter expects [kind][env] to be in json format
-        change_types.each do |kind|
-          unless (envs = changed[kind]).empty?
-            envs.keys.sort.each do |env|
-              changed[kind][env] = changed[kind][env].to_json
-            end
-          end
-        end
-
-        self.obsolete_and_new(changed)
-      end
-    end
-  end
-end

data/app/views/foreman/hosts/_registration.html.erb

@@ -1,12 +0,0 @@
-<div class='form-group'>
-  <label class='col-md-2 control-label'>
-    <%= _('Activation Key(s)') %>
-    <% help = _('Activation key(s) for Subscription Manager. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3.') %>
-    <a rel="popover" data-content="<%= help %>" data-trigger="focus" data-container="body" data-html="true" tabindex="-1">
-      <span class="pficon pficon-info "></span>
-    </a>
-  </label>
-  <div class='col-md-4'>
-    <%= text_field_tag 'activation_key', params[:activation_key], class: 'form-control' %>
-  </div>
-</div>

data/app/views/katello/api/v2/activation_keys/product_content.json.rabl

@@ -1,30 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-child @collection[:results] => :results do
-  child :product => :product do
-    attributes :id, :name
-  end
-
-  child :content => :content do
-    attributes :id, :name, :label, :vendor, :content_type, :content_url, :gpg_url
-  end
-
-  node :override do |pc|
-    pc.legacy_content_override
-  end
-
-  node :overrides do |pc|
-    pc.content_overrides.map do |override|
-      {:name => override.name, :value => override.computed_value}
-    end
-  end
-
-  node :enabled_content_override do |pc|
-    override = pc.enabled_content_override
-    override&.computed_value
-  end
-
-  attributes :enabled
-end

data/app/views/katello/api/v2/content_view_puppet_modules/create.json.rabl

@@ -1,3 +0,0 @@
-object @resource
-
-extends "katello/api/v2/puppet_modules/base"

data/app/views/katello/api/v2/content_view_puppet_modules/index.json.rabl

@@ -1,7 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-child @collection[:results] => :results do
-  extends "katello/api/v2/content_view_puppet_modules/show"
-end

data/app/views/katello/api/v2/content_view_puppet_modules/show.json.rabl

@@ -1,9 +0,0 @@
-object @resource
-
-attributes :id
-attributes :uuid
-attributes :name
-attributes :author
-attributes :created_at
-attributes :updated_at
-attributes :computed_version

data/app/views/katello/api/v2/content_views/puppet_modules.json.rabl

@@ -1,7 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-child @collection[:results] => :results do |_results|
-  extends 'katello/api/v2/puppet_modules/base'
-end

data/app/views/katello/api/v2/host_subscriptions/content_override.json.rabl

@@ -1,3 +0,0 @@
-object false
-
-extends "katello/api/v2/host_subscriptions/product_content"

data/app/views/katello/api/v2/host_subscriptions/product_content.json.rabl

@@ -1,29 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-child @collection[:results] => :results do
-  child :product => :product do
-    attributes :id, :name
-  end
-
-  child :content => :content do
-    attributes :id, :name, :label, :vendor, :content_type, :content_url, :gpg_url
-  end
-
-  child :content_overrides => :overrides do
-    attributes :name
-    attribute :computed_value => :value
-  end
-
-  node :enabled_content_override do |pc|
-    override = pc.enabled_content_override
-
-    override&.computed_value
-  end
-
-  attributes :override, :enabled
-
-  #TODO: deprecate with 6.4
-  attributes :override => :enabled_override
-end

data/app/views/katello/api/v2/puppet_modules/backend.json.rabl

@@ -1,7 +0,0 @@
-attributes :description
-attributes :license
-attributes :project_page
-attributes :source
-attributes :dependencies
-attributes :checksums
-attributes :tag_list

data/app/views/katello/api/v2/puppet_modules/base.json.rabl

@@ -1,9 +0,0 @@
-object @resource
-
-attributes :id
-attributes :pulp_id
-attributes :pulp_id => :uuid
-attributes :name
-attributes :version
-attributes :author
-attributes :summary

data/app/views/katello/api/v2/puppet_modules/compare.json.rabl

@@ -1,10 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-child @collection[:results] => :results do
-  extends 'katello/api/v2/puppet_modules/base'
-  node :comparison do |result|
-    result.comparison
-  end
-end

data/app/views/katello/api/v2/puppet_modules/name.json.rabl

@@ -1,3 +0,0 @@
-object @object
-
-attributes :name

data/app/views/katello/api/v2/puppet_modules/names.json.rabl

@@ -1,7 +0,0 @@
-object false
-
-extends "katello/api/v2/common/metadata"
-
-child @collection[:results] => :results do |_results|
-  extends 'katello/api/v2/puppet_modules/name'
-end

data/app/views/katello/api/v2/puppet_modules/show.json.rabl

@@ -1,4 +0,0 @@
-object @resource
-
-extends 'katello/api/v2/puppet_modules/base'
-extends 'katello/api/v2/puppet_modules/backend', :object => Katello::Pulp::PuppetModule.new(@resource.pulp_id)

data/db/migrate/20210512192745_fix_red_hat_root_repository_arch.rb

@@ -1,11 +0,0 @@
-class FixRedHatRootRepositoryArch < ActiveRecord::Migration[6.0]
-  def up
-    ::Katello::RootRepository.
-      joins("INNER JOIN katello_contents ON katello_contents.cp_content_id = katello_root_repositories.content_id").
-      where.not(arch: 'noarch').where.not("katello_contents.content_url ILIKE '%$basearch%'").update(arch: 'noarch')
-  end
-
-  def down
-    fail ActiveRecord::IrreversibleMigration
-  end
-end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-client.directive.js

@@ -1,6 +0,0 @@
-angular.module('Bastion.content-hosts').directive('registerClient', function () {
-    return {
-        restrict: 'E',
-        templateUrl: 'content-hosts/views/register-client.html'
-    };
-});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-os-client.directive.js

@@ -1,17 +0,0 @@
-angular.module('Bastion.content-hosts').directive('registerOsClient', function () {
-    return {
-    restrict: 'E',
-    scope: {
-      userOs: '='
-    },
-    link: function($scope) {
-        $scope.$watch('userOs', function(userOs) {
-            if (userOs && userOs.length) {
-                $scope.dynamicTemplateUrl = 'content-hosts/views/register-' + userOs + '.html';
-            }
-        });
-    },
-
-    template: '<ng-include src="dynamicTemplateUrl"></ng-include>'
-  };
-});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register.controller.js

@@ -1,44 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-hosts.controller:ContentHostRegisterController
- *
- * @requires $scope
- * @requires $location
- * @requires Capsule
- * @requires Organization
- * @requires CurrentOrganization
- * @requires BastionConfig
- *
- * @description
- *     Provides values to populate the code commands for registering a content host.
- */
-angular.module('Bastion.content-hosts').controller('ContentHostRegisterController',
-    ['$scope', '$location', 'Capsule', 'Organization', 'CurrentOrganization', 'BastionConfig',
-    function ($scope, $location, Capsule, Organization, CurrentOrganization, BastionConfig) {
-
-        $scope.organization = Organization.get({id: CurrentOrganization});
-        $scope.consumerCertRPM = BastionConfig.consumerCertRPM;
-        $scope.katelloHostname = $location.host();
-        $scope.noCapsulesFound = true;
-
-        $scope.capsules = Capsule.queryUnpaged(function (data) {
-            var defaultCapsule = _.filter(data.results, function (result) {
-                var featureNames = _.map(result.features, 'name');
-                return _.includes(featureNames, 'Pulp');
-            });
-
-            $scope.noCapsulesFound = _.isEmpty(data.results);
-            $scope.selectedCapsule = _.isEmpty(defaultCapsule) ? data.results[0] : defaultCapsule[0];
-        });
-        $scope.hideSwitcher = true;
-
-        $scope.hostname = function (url) {
-            if (url) {
-                url = url.split('://')[1].split(':')[0];
-            }
-
-            return url;
-        };
-
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html

@@ -1,28 +0,0 @@
-<div ng-controller="ContentHostRegisterController"><li>
-        <p translate>Register using subscription-manager:</p>
-        <p translate>Using an Activation Key:</p>
-        <pre><code>subscription-manager register --org="{{ organization.label }}" --activationkey="&ltActivation Key Name&gt"</code></pre>
-        <p translate>Using a username and password:</p>
-        <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
-      </li>
-<li>
-  <p translate>Install client package:</p>
-
-  <p translate>To report package & errata information:</p>
-  <pre><code>yum -y install katello-host-tools</code></pre>
-
-  <p translate>Tracer helps administrators identify applications that need to be restarted after a system is patched. To optionally report tracer information:</p>
-  <pre><code>yum -y install katello-host-tools-tracer</code></pre>
-
-  <p  ng-hide="remoteExecutionByDefault" translate>For remote actions via katello-agent:</p>
-  <pre ng-hide="remoteExecutionByDefault" ><code>yum -y install katello-agent</code></pre>
-  <section ng-hide="remoteExecutionByDefault" >
-    <p bst-alert="warning" >
-    <span translate>
-      Katello-agent is deprecated and will be removed in a future release.
-    </span>
-    </p>
-  </section>
-
-  <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
-</li></div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-deb-client.html

@@ -1,38 +0,0 @@
-<div ng-controller="ContentHostRegisterController">
-<li ng-hide="noCapsulesFound">
-    <p translate>Select a Content Source:</p>
-    <p><select ng-model="selectedCapsule" ng-options="capsule.name for capsule in capsules.results"></select></p>
-</li>
-
-<li>
-  <p>Add the GPG public key used to sign DEB packages from your system to download the Debian/Ubuntu client from your system:</p>
-
-<pre><code>apt-get -y install gnupg
-mkdir -p /etc/apt/trusted.gpg.d
-wget "https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/pulp_deb_signing.key" -O - | apt-key add -</code></pre>
-</li>
-
-<li>
-Create a new repository file which contains the Debian/Ubuntu client. This example chooses Ubuntu 20.04:
-
-<pre><code>mkdir -p /etc/apt/sources.list.d
-cat &lt /etc/apt/sources.list &lt&lt'EOF'
-deb http://{{  noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pulp/deb/{{ organization.label }}/Library/custom/Ubuntu_Client/Ubuntu_Client_20_04/ default all
-EOF</code></pre>
-<p>Here Ubuntu_Client is a product name, Ubuntu_Client_20_04 is the repository inside the product, and Library is a lifecycle environment.</p>
-</li>
-<li>
-Install apt-transport-katello and katello-upload-profile. This depends on and automatically installs the subscription-manager for Debian/Ubuntu:
-
-<pre><code>apt-get update && apt-get -y install apt-transport-katello katello-upload-profile</code></pre></li>
-<li>
-Download and execute a script from your system to install all necessary certificates:
-
-<pre><code>wget --no-check-certificate -O katello-rhsm-consumer https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/katello-rhsm-consumer
-/bin/bash -x katello-rhsm-consumer 2&lt /root/katello-rhsm-consumer.log</code></pre></li>
-<li>
-Register your host with an appropriate activation key:
-
-<pre><code>subscription-manager register --org="{{ organization.label }}" --name="&ltHost Name&gt" --activationkey="&ltActivation Key Name&gt"</code></pre>
-
-</li></div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-oracle-client.html

@@ -1,5 +0,0 @@
-<li>
-    <p translate>Install the Subscription Manager package:</p>
-    <pre><code>yum install -y subscription-manager</code></pre>
-</li>
-<register-client/>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-sles-client.html

@@ -1,28 +0,0 @@
-<div ng-controller="ContentHostRegisterController"><li>
-        <p translate>Register using subscription-manager:</p>
-        <p translate>Using an Activation Key:</p>
-        <pre><code>subscription-manager register --org="{{ organization.label }}" --activationkey="&ltActivation Key Name&gt"</code></pre>
-        <p translate>Using a username and password:</p>
-        <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
-      </li>
-<li>
-  <p translate>Install client package:</p>
-
-  <p translate>To report package & errata information:</p>
-  <pre><code>zypper -y install katello-host-tools</code></pre>
-
-  <p translate>Tracer helps administrators identify applications that need to be restarted after a system is patched. To optionally report tracer information:</p>
-  <pre><code>zypper -y install katello-host-tools-tracer</code></pre>
-
-  <p translate>For remote actions via katello-agent:</p>
-  <pre><code>zypper -y install katello-agent</code></pre>
-  <section>
-    <p bst-alert="warning" >
-    <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
-    </span>
-    </p>
-  </section>
-
-  <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
-</li></div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-puppet-modules.controller.js

@@ -1,9 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:AvailablePuppetModulesController
- *
- * @description
- */
-angular.module('Bastion.content-views').controller('AvailablePuppetModulesController',
-    [function () {}]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-names.controller.js

@@ -1,45 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:ContentViewPuppetModulesController
- *
- * @requires $scope
- * @requires Nutupane
- * @requires ContentView
- *
- * @description
- *   Provides functionality to the puppet modules name list.
- */
-angular.module('Bastion.content-views').controller('ContentViewPuppetModuleNamesController',
-    ['$scope', 'Nutupane', 'ContentView', 'CurrentOrganization', 'PuppetModule',
-    function ($scope, Nutupane, ContentView, CurrentOrganization, PuppetModule) {
-
-        var nutupane = new Nutupane(
-            ContentView,
-            {id: $scope.$stateParams.contentViewId},
-            'availablePuppetModuleNames'
-        );
-        $scope.controllerName = 'katello_content_views';
-        nutupane.primaryOnly = true;
-        $scope.table = nutupane.table;
-
-        $scope.table.fetchAutocomplete = function (term) {
-            var promise;
-
-            promise = PuppetModule.autocomplete({'organization_id': CurrentOrganization, search: term}).$promise;
-
-            return promise.then(function (data) {
-                return data;
-            });
-        };
-
-        $scope.selectVersion = function (moduleName) {
-            $scope.transitionTo('content-view.puppet-modules.versions',
-                {
-                    contentViewId: $scope.$stateParams.contentViewId,
-                    moduleName: moduleName
-                }
-            );
-        };
-
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js

@@ -1,61 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:ContentViewPuppetModulesController
- *
- * @requires $scope
- * @requires translate
- * @requires Nutupane
- * @requires ContentView
- * @requires ContentViewPuppetModule
- * @requires Notification
- *
- * @description
- *   Provides the ability to select a version of a Puppet Module for a Content View.
- */
-angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersionsController',
-    ['$scope', 'translate', 'Nutupane', 'ContentView', 'ContentViewPuppetModule', 'Notification',
-    function ($scope, translate, Nutupane, ContentView, ContentViewPuppetModule, Notification) {
-        var success, error, nutupane, params;
-
-        params = {
-            name: $scope.$stateParams.moduleName,
-            id: $scope.$stateParams.contentViewId,
-            'full_result': true
-        };
-
-        nutupane = new Nutupane(ContentView, params, 'availablePuppetModules');
-        $scope.controllerName = 'katello_content_views';
-        nutupane.primaryOnly = true;
-        $scope.table = nutupane.table;
-
-        $scope.selectVersion = function (module) {
-            var contentViewPuppetModule, contentViewPuppetModuleData = {
-                contentViewId: $scope.$stateParams.contentViewId,
-                uuid: module.uuid,
-                author: module.author,
-                name: module.name
-            };
-
-            contentViewPuppetModule = new ContentViewPuppetModule(contentViewPuppetModuleData);
-
-            if ($scope.$stateParams.moduleId) {
-                contentViewPuppetModule.id = $scope.$stateParams.moduleId;
-                contentViewPuppetModule.$update(success, error);
-            } else {
-                contentViewPuppetModule.$save(success, error);
-            }
-        };
-
-        success = function () {
-            $scope.transitionTo('content-view.puppet-modules.list',
-                {contentViewId: $scope.$stateParams.contentViewId});
-            Notification.setSuccessMessage(translate('Puppet module added to Content View'));
-        };
-
-        error = function (response) {
-            angular.forEach(response.data.errors, function (errorMessage) {
-                Notification.setErrorMessage(translate("An error occurred updating the Content View: ") + errorMessage);
-            });
-        };
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module.factory.js

@@ -1,23 +0,0 @@
-/**
- * @ngdoc service
- * @name  Bastion.content-views.factory:ContentViewPuppetModule
- *
- * @requires BastionResource
- * @requires CurrentOrganization
- *
- * @description
- *   Provides a BastionResource for interacting with content view puppet modules.
- */
-angular.module('Bastion.content-views').factory('ContentViewPuppetModule',
-    ['BastionResource', 'CurrentOrganization',
-    function (BastionResource, CurrentOrganization) {
-
-        return BastionResource('katello/api/v2/content_views/:contentViewId/content_view_puppet_modules/:id/:action',
-            {id: '@id', contentViewId: '@contentViewId', 'organization_id': CurrentOrganization},
-            {
-                update: {method: 'PUT'},
-                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
-            }
-        );
-    }]
-);