Merge pull request #1267 from jdcasey/indy-1.7.x

Constrain path-mask calculation to maven-type archives from Koji/Brew

Author: jdcasey

addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiContentManagerDecorator.java

@@ -282,7 +282,9 @@ private <T> T findKojiBuildAnd( ArtifactStore store, String path, EventMetadata
 
         Logger logger = LoggerFactory.getLogger( getClass() );
         logger.debug("When the koji is enabled , path:{},config instance is {}",path,config.toString());
+
         // TODO: This won't work for maven-metadata.xml files! We need to hit a POM or jar or something first.
+        // FIXME: This won't work for NPM!
         ArtifactPathInfo pathInfo = ArtifactPathInfo.parse( path );
         if ( pathInfo != null )
         {
@@ -459,7 +461,7 @@ private RemoteRepository createRemoteRepository( StoreKey inStore, ArtifactRef a
                 }
 
                 // set pathMaskPatterns using build output paths
-                Set<String> patterns = pathFormatter.getPatterns( artifactRef, archives );
+                Set<String> patterns = pathFormatter.getPatterns( inStore, artifactRef, archives );
 
                 // pre-index the koji build artifacts and set authoritative index of the remote to let the
                 // koji remote repo directly go through the content index

addons/koji/common/src/main/java/org/commonjava/indy/koji/content/KojiPathPatternFormatter.java

@@ -17,10 +17,10 @@
 
 import com.redhat.red.build.koji.model.xmlrpc.KojiArchiveInfo;
 import org.apache.commons.lang.StringUtils;
-import org.commonjava.indy.koji.conf.IndyKojiConfig;
-import org.commonjava.indy.koji.util.KojiUtils;
 import org.commonjava.atlas.maven.ident.ref.ArtifactRef;
 import org.commonjava.atlas.maven.ident.ref.SimpleProjectRef;
+import org.commonjava.indy.koji.util.KojiUtils;
+import org.commonjava.indy.model.core.StoreKey;
 import org.commonjava.maven.galley.TransferException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,7 +30,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 import static org.commonjava.indy.pkg.maven.content.group.MavenMetadataMerger.METADATA_NAME;
 import static org.commonjava.maven.galley.maven.util.ArtifactPathUtils.formatMetadataPath;
@@ -44,25 +43,42 @@ public class KojiPathPatternFormatter
 
     private final Logger logger = LoggerFactory.getLogger( getClass() );
 
-    public Set<String> getPatterns( ArtifactRef artifactRef, List<KojiArchiveInfo> archives )
+    public Set<String> getPatterns( final StoreKey inStore, ArtifactRef artifactRef, List<KojiArchiveInfo> archives )
     {
-        return getPatterns( artifactRef, archives, false );
+        return getPatterns( inStore, artifactRef, archives, false );
     }
 
-    public Set<String> getPatterns( ArtifactRef artifactRef, List<KojiArchiveInfo> archives, boolean skipVersionTest )
+    public Set<String> getPatterns( final StoreKey inStore, ArtifactRef artifactRef, List<KojiArchiveInfo> archives, boolean skipVersionTest )
     {
         Set<String> patterns = new HashSet<>();
         for ( KojiArchiveInfo a : archives )
         {
+            if ( !inStore.getPackageType().equals( a.getBuildType() ) )
+            {
+                logger.info( "Discarding non-{} archive from path patterns: {}", inStore.getPackageType(), a );
+                continue;
+            }
+
             ArtifactRef ar = a.asArtifact();
+
             if ( !skipVersionTest && !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) )
             {
                 logger.warn(
                         "Cannot use Koji archive for path_mask_patterns: {}. Version '{}' is not allowed from Koji.", a,
                         a.getVersion() );
                 continue;
             }
+
             String pattern = getPatternString( ar, a );
+
+            if ( !skipVersionTest && !kojiUtils.isVersionSignatureAllowedWithVersion( a.getVersion() ) )
+            {
+                logger.warn(
+                        "Cannot use Koji archive for path_mask_patterns: {}. Version '{}' is not allowed from Koji.", a,
+                        a.getVersion() );
+                continue;
+            }
+
             if ( pattern != null )
             {
                 patterns.add( pattern );

addons/koji/common/src/main/java/org/commonjava/indy/koji/data/KojiRepairManager.java

@@ -228,7 +228,7 @@ public KojiRepairResult repairPathMask( KojiRepairRequest request, String user,
                         }
 
                         // set pathMaskPatterns using build output paths
-                        Set<String> patterns = kojiPathFormatter.getPatterns( artifactRef, archives, true );
+                        Set<String> patterns = kojiPathFormatter.getPatterns( store.getKey(), artifactRef, archives, true );
                         logger.debug( "For repo: {}, resetting path_mask_patterns to:\n\n{}\n\n", store.getKey(),
                                      patterns );
 

pom.xml

@@ -71,8 +71,8 @@
     <kafkaVersion>1.1.0</kafkaVersion>
     <logbackVersion>1.2.3</logbackVersion>
     <logbackContribVersion>0.1.5</logbackContribVersion>
-    <jacksonVersion>2.9.9</jacksonVersion>
-    <metricsVersion>4.0.2</metricsVersion>
+    <jackson-version>2.9.9</jackson-version>
+    <metrics.version>4.0.2</metrics.version>
     <httpcoreVersion>4.4.9</httpcoreVersion>
     <httpclientVersion>4.5.9</httpclientVersion>