upstream: b=main,r=d1b53261c4e0be93305cd292084dfb83d4cd63dd,t=2023-12…

…-29-1342-43360

buildsupport/testing/pom.xml

@@ -283,7 +283,7 @@
       <dependency>
         <groupId>org.xmlunit</groupId>
         <artifactId>xmlunit-core</artifactId>
-        <version>2.3.0</version>
+        <version>2.9.1</version>
       </dependency>
 
       <dependency>

components/nexus-common/src/main/java/org/sonatype/nexus/common/app/FeatureFlags.java

@@ -116,4 +116,9 @@ public interface FeatureFlags
   String REACT_PRIVILEGES = "nexus.react.privileges";
 
   String REACT_PRIVILEGES_NAMED = "${nexus.react.privileges:-false}";
+
+  /**
+   * Feature flag to determine if we should include the repository sizes feature
+   */
+  String REPOSITORY_SIZE_ENABLED = "nexus.repository.size";
 }

components/nexus-rapture/src/main/resources/static/rapture/NX/view/Main.js

@@ -70,12 +70,6 @@ Ext.define('NX.view.Main', {
         border: true
       },
 
-      {
-        xtype: 'nx-coreui-react-footer-container',
-        reactView: window.ReactComponents.UsageMetricsAlert,
-        region: 'south'
-      },
-
       {
         xtype: 'nx-footer-analytics-opt-out',
         region: 'south'

components/nexus-repository-content/src/main/java/org/sonatype/nexus/repository/content/upgrades/BrowseNodeMigrationStep_1_36.java

@@ -0,0 +1,184 @@
+/*
+ * Sonatype Nexus (TM) Open Source Version
+ * Copyright (c) 2008-present Sonatype, Inc.
+ * All rights reserved. Includes the third-party code listed at http://links.sonatype.com/products/nexus/oss/attributions.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse Public License Version 1.0,
+ * which accompanies this distribution and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Sonatype Nexus (TM) Professional Version is available from Sonatype, Inc. "Sonatype" and "Sonatype Nexus" are trademarks
+ * of Sonatype, Inc. Apache Maven is a trademark of the Apache Software Foundation. M2eclipse is a trademark of the
+ * Eclipse Foundation. All other trademarks are the property of their respective owners.
+ */
+package org.sonatype.nexus.repository.content.upgrades;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.sonatype.goodies.common.ComponentSupport;
+import org.sonatype.nexus.repository.Format;
+import org.sonatype.nexus.repository.RepositoryTaskSupport;
+import org.sonatype.nexus.repository.browse.node.RebuildBrowseNodesTaskDescriptor;
+import org.sonatype.nexus.scheduling.PostStartupTaskScheduler;
+import org.sonatype.nexus.scheduling.TaskConfiguration;
+import org.sonatype.nexus.scheduling.TaskScheduler;
+import org.sonatype.nexus.upgrade.datastore.DatabaseMigrationStep;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Identifies repositories whose browse nodes were co-mingled with groups they were a member of and schedules them for
+ * rebuilding.
+ *
+ * Also schedules all pypi groups for rebuilding due to a relocation of metadata.
+ */
+@Named
+public class BrowseNodeMigrationStep_1_36
+    extends ComponentSupport implements DatabaseMigrationStep
+{
+  private static final String ASSET = "asset";
+
+  private static final String COMPONENT = "component";
+
+  private static final String SELECT = "SELECT DISTINCT B.repository_id, A.repository_id " + //
+      "FROM %s_browse_node B, %s_%s A " + //
+      "WHERE B.repository_id <> A.repository_id AND A.%s_id = B.%s_id";
+
+  private static final String SELECT_REPOSITORY_NAME = "SELECT R.name " + //
+      "FROM repository R, %s_content_repository C " + //
+      "WHERE R.id = C.config_repository_id AND C.repository_id = ?";
+
+  private static final String SELECT_PYPI_GROUP = "SELECT name FROM repository WHERE recipe_name = 'pypi-group'";
+
+  private final List<Format> formats;
+
+  private final TaskScheduler taskScheduler;
+
+  private final PostStartupTaskScheduler postStartupTaskScheduler;
+
+  @Inject
+  public BrowseNodeMigrationStep_1_36(
+      final List<Format> formats,
+      final TaskScheduler ts,
+      final PostStartupTaskScheduler psts)
+  {
+    this.formats = checkNotNull(formats);
+    this.taskScheduler = checkNotNull(ts);
+    this.postStartupTaskScheduler = checkNotNull(psts);
+  }
+
+  @Override
+  public Optional<String> version() {
+    return Optional.of("1.36");
+  }
+
+  @Override
+  public void migrate(final Connection connection) throws Exception {
+    String names = formats.stream()
+        .flatMap(format -> migrateFormat(connection, format))
+        .collect(Collectors.joining(","));
+
+    if (!names.isEmpty()) {
+      scheduleRebuildBrowseNodesTask(names);
+    }
+    else {
+      log.debug("Found no repositories requiring rebuild");
+    }
+  }
+
+  private Stream<String> migrateFormat(final Connection connection, final Format format) {
+      String formatName = format.getValue();
+      // We use linked here as we want to rebuild group repositories first
+      Set<Integer> repositoryIds = new LinkedHashSet<>();
+      executeStatement(repositoryIds, connection, formatName, ASSET);
+      executeStatement(repositoryIds, connection, formatName, COMPONENT);
+      return repositoryIdToName(connection, formatName, repositoryIds);
+  }
+
+  private void executeStatement(
+      final Set<Integer> repositoryIds,
+      final Connection connection,
+      final String formatName,
+      final String type)
+  {
+    String query = String.format(SELECT, formatName, formatName, type, type, type);
+    try (PreparedStatement select = connection.prepareStatement(query);
+        ResultSet results = select.executeQuery()) {
+
+      while (results.next()) {
+        repositoryIds.add(results.getInt(1));
+        repositoryIds.add(results.getInt(2));
+      }
+    }
+    catch (SQLException e) {
+      log.error("Failed to identify browse node tables with repository missmatches ('{}')", query, e);
+    }
+  }
+
+  /*
+   * Find repository names associated with the repository Ids.
+   */
+  private Stream<String> repositoryIdToName(
+      final Connection connection,
+      final String formatName,
+      final Set<Integer> repositoryIds)
+  {
+    // Maintain order, we use a set still due to pypi below
+    Set<String> repositoryNames = new LinkedHashSet<>();
+
+    for (Integer repositoryId : repositoryIds) {
+      try (PreparedStatement select = connection.prepareStatement(String.format(SELECT_REPOSITORY_NAME, formatName))) {
+        select.setInt(1, repositoryId);
+
+        try (ResultSet results = select.executeQuery()) {
+          if (!results.next()) {
+            log.warn("Unable to locate repository associated with {} id {}", formatName, repositoryId);
+            continue;
+          }
+          repositoryNames.add(results.getString(1));
+        }
+      }
+      catch (SQLException e) {
+        log.error("Failed to locate repositories for {}", formatName, e);
+      }
+    }
+
+    // PyPi had an additional issue with group metadata created in an unexpected location
+    if ("pypi".equals(formatName)) {
+      try (PreparedStatement select = connection.prepareStatement(SELECT_PYPI_GROUP);
+          ResultSet results = select.executeQuery()) {
+
+        while (results.next()) {
+          repositoryNames.add(results.getString(1));
+        }
+      }
+      catch (SQLException e) {
+        log.error("Failed to identify pypi-group repositories", e);
+      }
+    }
+
+    return repositoryNames.stream();
+  }
+
+  /*
+   * Ask the postStartupTaskscheduler to schedule a build after startup
+   */
+  private void scheduleRebuildBrowseNodesTask(final String repositories) {
+    TaskConfiguration configuration =
+        taskScheduler.createTaskConfigurationInstance(RebuildBrowseNodesTaskDescriptor.TYPE_ID);
+    configuration.setString(RepositoryTaskSupport.REPOSITORY_NAME_FIELD_ID, repositories);
+    postStartupTaskScheduler.schedule(configuration);
+    log.info("Scheduled post-startup task to rebuild browse nodes for repositories: {}", repositories);
+  }
+}

components/nexus-repository-content/src/test/java/org/sonatype/nexus/repository/content/store/ExampleContentTestSupport.java

@@ -61,7 +61,6 @@
 import static java.lang.Integer.toHexString;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
-import static java.util.Collections.unmodifiableSet;
 import static java.util.UUID.randomUUID;
 import static java.util.stream.Collectors.toList;
 import static org.hamcrest.Matchers.is;
@@ -112,6 +111,13 @@ public ExampleContentTestSupport(final Class<? extends DataAccess> accessType) {
     sessionRule.access(accessType);
   }
 
+  @SafeVarargs
+  public ExampleContentTestSupport(final Class<? extends DataAccess>... accessTypes) {
+    for (Class<? extends DataAccess> accessType : accessTypes) {
+      sessionRule.access(accessType);
+    }
+  }
+
   protected List<ContentRepositoryData> generatedRepositories() {
     return unmodifiableList(repositories);
   }