Create component linked assets

.circleci/config.yml

@@ -7,7 +7,7 @@ orbs:
 executors:
   nxrm-maven-executor:
     docker:
-      - image: circleci/openjdk:8-jdk
+      - image: cimg/openjdk:8.0
     environment:
       # limit max memory for JVM to allow more memory for non-JVM build processes (e.g. yarn)
       MAVEN_OPTS: -Xmx2700m

nexus-repository-terraform-it/pom.xml

@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>31.1-jre</version>
+      <version>32.0.0-android</version>
     </dependency>
     <!--
     Pax-Exam test driver - end
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.13.4.1</version>
+      <version>2.13.4.2</version>
     </dependency>
 
     <!-- CVE-2020-17521 -->

nexus-repository-terraform/pom.xml

@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.13.4.1</version>
+      <version>2.13.4.2</version>
     </dependency>
 
   </dependencies>

nexus-repository-terraform/src/main/java/org/sonatype/nexus/plugins/terraform/internal/TerraformBrowseNodeGenerator.java

@@ -0,0 +1,19 @@
+package org.sonatype.nexus.plugins.terraform.internal;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.sonatype.nexus.repository.browse.AssetPathBrowseNodeGenerator;
+
+/**
+ * Terraform places components at the same level as their assets.
+ *
+ * @since 0.0.8
+ */
+
+@Singleton
+@Named(TerraformFormat.NAME)
+public class TerraformBrowseNodeGenerator
+        extends AssetPathBrowseNodeGenerator
+{
+}

nexus-repository-terraform/src/main/java/org/sonatype/nexus/plugins/terraform/orient/internal/TerraformProxyFacetImpl.java

@@ -13,7 +13,9 @@
 package org.sonatype.nexus.plugins.terraform.orient.internal;
 
 import java.io.IOException;
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Map.Entry;
 
 import javax.annotation.Nonnull;
@@ -110,24 +112,29 @@ private Content putTerraformPackage(final Content content,
     StorageFacet storageFacet = facet(StorageFacet.class);
 
     try (TempBlob tempBlob = storageFacet.createTempBlob(content.openInputStream(), TerraformDataAccess.HASH_ALGORITHMS)) {
-      Component component = findOrCreateComponent(assetPath);
+      Component component = findOrCreateComponent(assetPath, matcherState);
 
       return findOrCreateAsset(tempBlob, content, assetKind, assetPath, component, matcherState);
     }
   }
 
   @TransactionalStoreBlob
-  protected Component findOrCreateComponent(final String assetPath) {
+  protected Component findOrCreateComponent(final String assetPath, final TokenMatcher.State matcherState) {
     StorageTx tx = UnitOfWork.currentTx();
     Bucket bucket = tx.findBucket(getRepository());
 
+    String componentGroup = new File(assetPath).getParent();
+
     Component component = terraformDataAccess.findComponent(tx,
-        getRepository(),
-        assetPath);
+        getRepository(), assetPath);
 
     if (component == null) {
       component = tx.createComponent(bucket, getRepository().getFormat())
+          .group(componentGroup)
           .name(assetPath);
+      if (matcherState.getTokens().containsKey("version")) {
+        component.version(matcherState.getTokens().get("version"));
+      }
     }
     tx.saveComponent(component);
 
@@ -157,22 +164,24 @@ protected Content findOrCreateAsset(final TempBlob tempBlob,
     Bucket bucket = tx.findBucket(getRepository());
 
     Asset asset = terraformDataAccess.findAsset(tx, bucket, assetPath);
-    // @todo
-//    if (assetKind.equals(AssetKind.PROVIDER_ARCHIVE)) {
-//      if (asset == null) {
-//        asset = tx.createAsset(bucket, component);
-//        asset.name(assetPath);
-//        asset.formatAttributes().set(P_ASSET_KIND, assetKind.name());
-//      }
-//    } else {
-      if (asset == null) {
+
+    ArrayList<AssetKind> artifacts = new ArrayList<>(Arrays.asList(
+            AssetKind.PROVIDER_VERSION,
+            AssetKind.PROVIDER_VERSIONS,
+            AssetKind.PROVIDER_ARCHIVE)
+    );
+
+    if (asset == null) {
+      if (artifacts.contains(assetKind)) {
+        asset = tx.createAsset(bucket, component);
+      } else {
         asset = tx.createAsset(bucket, getRepository().getFormat());
-        asset.name(assetPath);
-        for (String key : matcherState.getTokens().keySet()) {
-          asset.formatAttributes().set(key, matcherState.getTokens().get(key));
-        }
       }
-//    }
+      asset.name(assetPath);
+      for (String key : matcherState.getTokens().keySet()) {
+        asset.formatAttributes().set(key, matcherState.getTokens().get(key));
+      }
+    }
 
     return terraformDataAccess.saveAsset(tx, asset, tempBlob, content);
   }

nexus-repository-terraform/src/main/java/org/sonatype/nexus/plugins/terraform/orient/internal/TerraformRecipeSupport.groovy

@@ -27,7 +27,7 @@ import org.sonatype.nexus.repository.httpclient.HttpClientFacet
 import org.sonatype.nexus.repository.purge.PurgeUnusedFacet
 import org.sonatype.nexus.repository.search.ElasticSearchFacet
 import org.sonatype.nexus.repository.security.SecurityHandler
-import org.sonatype.nexus.repository.storage.DefaultComponentMaintenanceImpl
+import org.sonatype.nexus.repository.storage.SingleAssetComponentMaintenance
 import org.sonatype.nexus.repository.storage.StorageFacet
 import org.sonatype.nexus.repository.storage.UnitOfWorkHandler
 import org.sonatype.nexus.repository.view.ConfigurableViewFacet
@@ -83,7 +83,7 @@ abstract class TerraformRecipeSupport
   HandlerContributor handlerContributor
 
   @Inject
-  Provider<DefaultComponentMaintenanceImpl> componentMaintenanceFacet
+  Provider<SingleAssetComponentMaintenance> componentMaintenanceFacet
 
   @Inject
   Provider<HttpClientFacet> httpClientFacet