katello 3.14.1 → 3.15.0.rc1

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -25,16 +25,16 @@ const recommendedRepositoriesRHEL = [
 ];
 
 const recommendedRepositoriesSatTools = [
-  'satellite-tools-6.6-for-rhel-8-x86_64-rpms',
-  'rhel-7-server-satellite-tools-6.6-rpms',
-  'rhel-6-server-satellite-tools-6.6-rpms',
-  'rhel-5-server-els-satellite-tools-6.6-rpms',
+  'satellite-tools-6.7-for-rhel-8-x86_64-rpms',
+  'rhel-7-server-satellite-tools-6.7-rpms',
+  'rhel-6-server-satellite-tools-6.7-rpms',
+  'rhel-5-server-els-satellite-tools-6.7-rpms',
   'rhel-7-server-satellite-maintenance-6-rpms',
 ];
 
 const recommendedRepositoriesMisc = [
   'rhel-server-rhscl-7-rpms',
-  'rhel-7-server-satellite-capsule-6.6-rpms',
+  'rhel-7-server-satellite-capsule-6.7-rpms',
   'rhel-7-server-ansible-2.8-rpms',
 ];
 

data/webpack/redux/reducers/RedHatRepositories/repositorySetRepositories.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import Immutable from 'seamless-immutable';
 
 import {
@@ -12,9 +13,23 @@ import {
 
 import { normalizeContentSetRepositories } from '../../actions/RedHatRepositories/repositorySetRepositories';
 
+const normalizeArch = (arch) => {
+  if (arch === 'noarch') {
+    return undefined;
+  }
+  return arch;
+};
+
+const substitutionMatches = (value1, value2) => {
+  if (_.isEmpty(value1) && _.isEmpty(value2)) {
+    return true;
+  }
+  return value1 === value2;
+};
+
 const reposMatch = (repoA, repoB) => (
-  repoA.arch === repoB.arch &&
-  repoA.releasever === repoB.releasever
+  substitutionMatches(normalizeArch(repoA.arch), normalizeArch(repoB.arch)) &&
+    substitutionMatches(repoA.releasever, repoB.releasever)
 );
 
 const changeRepoState = (state, repoToChange, stateDiff) => {

data/webpack/scenes/RedHatRepositories/components/RepositorySet.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { ListView, Icon } from 'patternfly-react';
 
 import RepositoryTypeIcon from './RepositoryTypeIcon';
+// eslint-disable-next-line import/no-named-as-default
 import RepositorySetRepositories from './RepositorySetRepositories';
 
 const RepositorySet = ({

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepositories.js

@@ -8,7 +8,7 @@ import loadRepositorySetRepos from '../../../redux/actions/RedHatRepositories/re
 import RepositorySetRepository from './RepositorySetRepository/';
 import { yStream } from './RepositorySetRepositoriesHelpers';
 
-class RepositorySetRepositories extends Component {
+export class RepositorySetRepositories extends Component {
   componentDidMount() {
     const { contentId, productId } = this.props;
 

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/RepositorySetRepository.js

@@ -19,12 +19,11 @@ class RepositorySetRepository extends Component {
 
   repoForAction = () => {
     const {
-      productId, contentId, arch, displayArch, releasever, label,
+      productId, contentId, arch, releasever, label,
     } = this.props;
 
-    const derivedArch = arch || displayArch;
     return {
-      arch: derivedArch,
+      arch,
       productId,
       contentId,
       releasever,

data/webpack/scenes/RedHatRepositories/components/__tests__/RepositorySetRepositories.test.js

@@ -1,44 +1,60 @@
 import React from 'react';
-import thunk from 'redux-thunk';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
-import configureMockStore from 'redux-mock-store';
-import RepositorySetRepositories from '../RepositorySetRepositories';
-
-const mockStore = configureMockStore([thunk]);
-const store = mockStore({ katello: { redHatRepositories: { repositorySetRepositories: [] } } });
+import { RepositorySetRepositories } from '../RepositorySetRepositories';
 
 describe('RepositorySetRepositories Component', () => {
-  let shallowWrapper;
-  beforeEach(() => {
-    shallowWrapper = shallow(<RepositorySetRepositories
-      store={store}
+  it('should render with sorted repos', async () => {
+    const shallowWrapper = shallow(<RepositorySetRepositories
+      loadRepositorySetRepos={() => null}
       contentId={1}
       productId={2}
-      type="foo"
+      data={{
+        loading: false,
+        repositories: [
+          { arch: 'x86_64', releasever: '5.11' },
+          { arch: 'x86_64', releasever: '7Server' },
+          { arch: 'x86_64', releasever: '7.10' },
+          { arch: 'x86_64', releasever: '7.1' },
+          { arch: 'i386', releasever: '5.11' },
+          { arch: 'i386', releasever: '5Workstation' },
+          { arch: 'x86_64', releasever: '7.11' }],
+      }}
     />);
-  });
-
-  it('sorts repos correctly', async () => {
-    const repos = [
-      { arch: 'x86_64', releasever: '5.11' },
-      { arch: 'x86_64', releasever: '7Server' },
-      { arch: 'x86_64', releasever: '7.10' },
-      { arch: 'x86_64', releasever: '7.1' },
-      { arch: 'i386', releasever: '5.11' },
-      { arch: 'i386', releasever: '5Workstation' },
-      { arch: 'x86_64', releasever: '7.11' }];
 
-    const result = shallowWrapper.dive().instance().sortedRepos(repos);
+    expect(toJson(shallowWrapper)).toMatchSnapshot();
+  });
 
-    const expectedIndices = [1, 5, 6, 2, 3, 0, 4];
+  it('should render loading', async () => {
+    const shallowWrapper = shallow(<RepositorySetRepositories
+      loadRepositorySetRepos={() => null}
+      contentId={1}
+      productId={2}
+      type="foo"
+      data={{
+        loading: true,
+        repositories: [],
+      }}
+    />);
 
-    expectedIndices.forEach((expected, i) => {
-      expect(result[i]).toEqual(repos[expected]);
-    });
+    expect(toJson(shallowWrapper)).toMatchSnapshot();
   });
 
-  it('should render', async () => {
+  it('should render with error', async () => {
+    const shallowWrapper = shallow(<RepositorySetRepositories
+      loadRepositorySetRepos={() => null}
+      contentId={1}
+      productId={2}
+      type="foo"
+      data={{
+        loading: false,
+        repositories: [],
+        error: {
+          displayMessage: 'some error',
+        },
+      }}
+    />);
+
     expect(toJson(shallowWrapper)).toMatchSnapshot();
   });
 });

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RepositorySetRepositories.test.js.snap

@@ -1,48 +1,80 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`RepositorySetRepositories Component should render 1`] = `
-<RepositorySetRepositories
-  contentId={1}
-  data={
-    Object {
-      "error": null,
-      "loading": true,
-      "repositories": Array [],
-    }
-  }
-  loadRepositorySetRepos={[Function]}
-  productId={2}
-  store={
-    Object {
-      "clearActions": [Function],
-      "dispatch": [Function],
-      "getActions": [Function],
-      "getState": [Function],
-      "replaceReducer": [Function],
-      "subscribe": [Function],
-    }
-  }
-  storeSubscription={
-    Subscription {
-      "listeners": Object {
-        "clear": [Function],
-        "get": [Function],
-        "notify": [Function],
-        "subscribe": [Function],
-      },
-      "onStateChange": [Function],
-      "parentSub": undefined,
-      "store": Object {
-        "clearActions": [Function],
-        "dispatch": [Function],
-        "getActions": [Function],
-        "getState": [Function],
-        "replaceReducer": [Function],
-        "subscribe": [Function],
-      },
-      "unsubscribe": [Function],
-    }
-  }
-  type="foo"
-/>
+exports[`RepositorySetRepositories Component should render loading 1`] = `
+<Spinner
+  className=""
+  inline={false}
+  inverse={false}
+  loading={true}
+  size="md"
+>
+  <div>
+    No repositories available.
+  </div>
+</Spinner>
+`;
+
+exports[`RepositorySetRepositories Component should render with error 1`] = `
+<Alert
+  className=""
+  onDismiss={null}
+  type="danger"
+>
+  <span>
+    some error
+  </span>
+</Alert>
+`;
+
+exports[`RepositorySetRepositories Component should render with sorted repos 1`] = `
+<Spinner
+  className=""
+  inline={false}
+  inverse={false}
+  loading={false}
+  size="md"
+>
+  <Connect(RepositorySetRepository)
+    arch="x86_64"
+    key="x86_647Server"
+    releasever="7Server"
+    type=""
+  />
+  <Connect(RepositorySetRepository)
+    arch="i386"
+    key="i3865Workstation"
+    releasever="5Workstation"
+    type=""
+  />
+  <Connect(RepositorySetRepository)
+    arch="x86_64"
+    key="x86_647.11"
+    releasever="7.11"
+    type=""
+  />
+  <Connect(RepositorySetRepository)
+    arch="x86_64"
+    key="x86_647.10"
+    releasever="7.10"
+    type=""
+  />
+  <Connect(RepositorySetRepository)
+    arch="x86_64"
+    key="x86_647.1"
+    releasever="7.1"
+    type=""
+  />
+  <Connect(RepositorySetRepository)
+    arch="x86_64"
+    key="x86_645.11"
+    releasever="5.11"
+    type=""
+  />
+  <Connect(RepositorySetRepository)
+    arch="i386"
+    key="i3865.11"
+    releasever="5.11"
+    type=""
+  />
+</Spinner>
 `;

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/__tests__/__snapshots__/UpstreamSubscriptionsPage.test.js.snap

@@ -200,11 +200,7 @@ exports[`upstream subscriptions page should render 1`] = `
         >
           Submit
         </Button>
-        <LinkContainer
-          activeClassName="active"
-          exact={false}
-          replace={false}
-          strict={false}
+        <withRouter(LinkContainer)
           style={
             Object {
               "marginTop": "10px",
@@ -221,7 +217,7 @@ exports[`upstream subscriptions page should render 1`] = `
           >
             Cancel
           </Button>
-        </LinkContainer>
+        </withRouter(LinkContainer)>
       </Col>
     </Row>
   </LoadingState>

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/__tests__/__snapshots__/SubscriptionTypeFormatter.test.js.snap

@@ -6,7 +6,6 @@ exports[`subscriptionTypeFormatter renders link to a host 1`] = `
     Guests of
      
     <Link
-      replace={false}
       to="/content_hosts/83/"
     >
       host.example.com

data/webpack/test_setup.js

@@ -1,6 +1,8 @@
 // Setup file for enzyme
 // See http://airbnb.io/enzyme/docs/installation/react-16.html
-import 'babel-polyfill';
+import 'core-js/shim';
+import 'regenerator-runtime/runtime';
+
 import { configure } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import * as Services from './services/api';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.14.1
+  version: 3.15.0.rc1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,9 +84,6 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
@@ -94,9 +91,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
@@ -210,70 +204,84 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0rc8.dev01571235538
+        version: 3.1.0.dev01574423031
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0rc8.dev01571235538
+        version: 3.1.0.dev01574423031
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.1.0b5.dev01571253617
+        version: 0.2.0.dev01574442231
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.1.0b5.dev01571253617
+        version: 0.2.0.dev01574442231
 - !ruby/object:Gem::Dependency
   name: pulp_ansible_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.2.0b6.dev01570985981
+        version: 0.2.0b7.dev01574717759
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 0.2.0b6.dev01570985981
+        version: 0.2.0b7.dev01574717759
 - !ruby/object:Gem::Dependency
-  name: pulp_docker_client
+  name: pulp_container_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 4.0.0b8.dev01571062112
+        version: 1.1.0.dev01574357179
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 4.0.0b8.dev01571062112
+        version: 1.1.0.dev01574357179
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0b71571331815
+        version: 3.1.0b1.dev01576187357
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0b71571331815
+        version: 3.1.0b1.dev01576187357
+- !ruby/object:Gem::Dependency
+  name: pulp_2to3_migration_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.0.1a1.dev01573066581
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.0.1a1.dev01573066581
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -758,7 +766,6 @@ files:
 - app/lib/actions/katello/host/reassign.rb
 - app/lib/actions/katello/host/recalculate_errata_status.rb
 - app/lib/actions/katello/host/remove_subscriptions.rb
-- app/lib/actions/katello/host/update.rb
 - app/lib/actions/katello/host/update_content_overrides.rb
 - app/lib/actions/katello/host/update_content_view.rb
 - app/lib/actions/katello/host/update_release_version.rb
@@ -907,25 +914,30 @@ files:
 - app/lib/actions/pulp3/capsule_content/generate_metadata.rb
 - app/lib/actions/pulp3/capsule_content/refresh_distribution.rb
 - app/lib/actions/pulp3/capsule_content/sync.rb
+- app/lib/actions/pulp3/content_migration.rb
+- app/lib/actions/pulp3/import_migration.rb
 - app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb
 - app/lib/actions/pulp3/orchestration/repository/create.rb
 - app/lib/actions/pulp3/orchestration/repository/delete.rb
 - app/lib/actions/pulp3/orchestration/repository/generate_metadata.rb
 - app/lib/actions/pulp3/orchestration/repository/import_upload.rb
+- app/lib/actions/pulp3/orchestration/repository/refresh_if_needed.rb
 - app/lib/actions/pulp3/orchestration/repository/refresh_repos.rb
 - app/lib/actions/pulp3/orchestration/repository/remove_units.rb
 - app/lib/actions/pulp3/orchestration/repository/sync.rb
 - app/lib/actions/pulp3/orchestration/repository/update.rb
 - app/lib/actions/pulp3/orchestration/repository/upload_content.rb
+- app/lib/actions/pulp3/orphan_cleanup/delete_orphan_distributions.rb
+- app/lib/actions/pulp3/orphan_cleanup/delete_orphan_remotes.rb
 - app/lib/actions/pulp3/orphan_cleanup/delete_orphan_repository_versions.rb
+- app/lib/actions/pulp3/orphan_cleanup/remove_orphans.rb
 - app/lib/actions/pulp3/orphan_cleanup/remove_unneeded_repos.rb
 - app/lib/actions/pulp3/repository/copy_content.rb
 - app/lib/actions/pulp3/repository/copy_version.rb
 - app/lib/actions/pulp3/repository/create.rb
 - app/lib/actions/pulp3/repository/create_publication.rb
 - app/lib/actions/pulp3/repository/create_remote.rb
-- app/lib/actions/pulp3/repository/create_version.rb
 - app/lib/actions/pulp3/repository/delete.rb
 - app/lib/actions/pulp3/repository/delete_distributions.rb
 - app/lib/actions/pulp3/repository/delete_remote.rb
@@ -1271,19 +1283,35 @@ files:
 - app/services/katello/pulp/srpm.rb
 - app/services/katello/pulp/yum_metadata_file.rb
 - app/services/katello/pulp3/ansible_collection.rb
+- app/services/katello/pulp3/api/ansible_collection.rb
+- app/services/katello/pulp3/api/core.rb
+- app/services/katello/pulp3/api/docker.rb
+- app/services/katello/pulp3/api/file.rb
+- app/services/katello/pulp3/api/yum.rb
 - app/services/katello/pulp3/content.rb
+- app/services/katello/pulp3/distribution.rb
 - app/services/katello/pulp3/docker_blob.rb
 - app/services/katello/pulp3/docker_manifest.rb
 - app/services/katello/pulp3/docker_manifest_list.rb
 - app/services/katello/pulp3/docker_tag.rb
+- app/services/katello/pulp3/erratum.rb
 - app/services/katello/pulp3/file_unit.rb
+- app/services/katello/pulp3/migration.rb
+- app/services/katello/pulp3/migration_plan.rb
+- app/services/katello/pulp3/module_stream.rb
+- app/services/katello/pulp3/package_group.rb
 - app/services/katello/pulp3/pulp_content_unit.rb
 - app/services/katello/pulp3/repository.rb
 - app/services/katello/pulp3/repository/ansible_collection.rb
 - app/services/katello/pulp3/repository/docker.rb
 - app/services/katello/pulp3/repository/file.rb
 - app/services/katello/pulp3/repository/yum.rb
+- app/services/katello/pulp3/repository_mirror.rb
+- app/services/katello/pulp3/rpm.rb
+- app/services/katello/pulp3/smart_proxy_mirror_repository.rb
 - app/services/katello/pulp3/smart_proxy_repository.rb
+- app/services/katello/pulp3/srpm.rb
+- app/services/katello/pulp3/yum_metadata_file.rb
 - app/services/katello/puppet_class_importer_extensions.rb
 - app/services/katello/pxe_files_downloader.rb
 - app/services/katello/registration_manager.rb
@@ -1501,7 +1529,7 @@ files:
 - app/views/katello/api/v2/repository_sets/index.json.rabl
 - app/views/katello/api/v2/repository_sets/show.json.rabl
 - app/views/katello/api/v2/root/resource_list.json.rabl
-- app/views/katello/api/v2/smart_proxies/download_policy.json.rabl
+- app/views/katello/api/v2/smart_proxies/pulp_info.json.rabl
 - app/views/katello/api/v2/srpms/index.json.rabl
 - app/views/katello/api/v2/srpms/show.json.rabl
 - app/views/katello/api/v2/subscription_facet/base.json.rabl
@@ -1559,6 +1587,7 @@ files:
 - app/views/overrides/taxonomies/_action_buttons.html.erb
 - app/views/smart_proxies/_disk_usage.html.erb
 - app/views/smart_proxies/plugins/_pulp.html.erb
+- app/views/smart_proxies/plugins/_pulp3.html.erb
 - app/views/smart_proxies/plugins/_pulp_node.html.erb
 - app/views/smart_proxies/pulp_status.html.erb
 - app/views/smart_proxies/pulp_storage.html.erb
@@ -1837,6 +1866,11 @@ files:
 - db/migrate/20190816162733_rename_ansible_collection_whitelist_to_requirements.rb
 - db/migrate/20190822144300_add_ansible_fields.rb
 - db/migrate/20190912210927_rename_repository_file_unit.rb
+- db/migrate/20190930192813_add_pulp3_hrefs_to_content_types.rb
+- db/migrate/20191204020703_migrate_distribution_reference_to_use_repo_id.rb
+- db/migrate/20191204214919_add_content_view_version_counts.rb
+- db/migrate/20191213161248_add_dmi_uuid_to_katello_subscription_facets.rb
+- db/migrate/20200109162354_drop_host_update_lock_setting.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4071,6 +4105,8 @@ files:
 - lib/katello/tasks/import_subscriptions.rake
 - lib/katello/tasks/jenkins.rake
 - lib/katello/tasks/job_templates.rake
+- lib/katello/tasks/pulp3_content_switchover.rake
+- lib/katello/tasks/pulp3_migration.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
 - lib/katello/tasks/reimport.rake
 - lib/katello/tasks/repository.rake
@@ -4087,6 +4123,8 @@ files:
 - lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake
 - lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake
 - lib/katello/tasks/upgrades/3.13/republish_deb_metadata.rake
+- lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake
+- lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
@@ -4573,9 +4611,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: