refactor(catalog): Tweaks to SLSA cataloger

Relates to #1349
jreleaser · May 26, 2023 · 5db74c1 · 5db74c1
1 parent c6708a7
commit 5db74c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/core/jreleaser-engine/src/main/java/org/jreleaser/engine/catalog/Slsa.java b/core/jreleaser-engine/src/main/java/org/jreleaser/engine/catalog/Slsa.java
@@ -234,8 +234,8 @@ private static void handleDeployer(JReleaserContext context, Set<String> staging
     private static class Attestations {
         private final Set<Attestation> attestations = new LinkedHashSet<>();
 
-        public String getVersion() {
-            return "1";
+        public Integer getVersion() {
+            return 1;
         }
 
         public Set<Attestation> getAttestations() {

diff --git a/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/catalog/Catalog.java b/core/jreleaser-model-impl/src/main/java/org/jreleaser/model/internal/catalog/Catalog.java
@@ -112,7 +112,7 @@ public Map<String, Object> asMap(boolean full) {
         map.put("enabled", isEnabled());
         map.put("active", getActive());
         map.put("sbom", sbom.asMap(full));
-        map.put("slsa", slsa.asMap(full));
+        map.putAll(slsa.asMap(full));
         return map;
     }
 }
diff --git a/...-impl/src/main/java/org/jreleaser/model/internal/validation/catalog/CatalogValidator.java b/...-impl/src/main/java/org/jreleaser/model/internal/validation/catalog/CatalogValidator.java
@@ -23,7 +23,7 @@
 import org.jreleaser.model.internal.catalog.Catalog;
 import org.jreleaser.util.Errors;
 
-import static org.jreleaser.model.internal.validation.catalog.SlsaValidator.validateSlsa;
+import static org.jreleaser.model.internal.validation.catalog.SlsaCatalogerValidator.validateSlsaCataloger;
 import static org.jreleaser.model.internal.validation.catalog.sbom.SbomCatalogersValidator.validateSbomCatalogers;
 import static org.jreleaser.model.internal.validation.common.Validator.resolveActivatable;
 
@@ -41,7 +41,7 @@ public static void validateCatalog(JReleaserContext context, Mode mode, Errors e
 
         Catalog catalog = context.getModel().getCatalog();
         validateSbomCatalogers(context, mode, errors);
-        validateSlsa(context, mode, errors);
+        validateSlsaCataloger(context, mode, errors);
 
         if (mode.validateConfig()) {
             boolean activeSet = catalog.isActiveSet();

diff --git a/...nal/validation/catalog/SlsaValidator.java → ...ation/catalog/SlsaCatalogerValidator.java b/...nal/validation/catalog/SlsaValidator.java → ...ation/catalog/SlsaCatalogerValidator.java
@@ -30,12 +30,12 @@
  * @author Andres Almiray
  * @since 1.7.0
  */
-public final class SlsaValidator {
-    private SlsaValidator() {
+public final class SlsaCatalogerValidator {
+    private SlsaCatalogerValidator() {
         // noop
     }
 
-    public static void validateSlsa(JReleaserContext context, Mode mode, Errors errors) {
+    public static void validateSlsaCataloger(JReleaserContext context, Mode mode, Errors errors) {
         SlsaCataloger slsa = context.getModel().getCatalog().getSlsa();
         context.getLogger().debug("catalog.slsa");
 
@@ -47,7 +47,7 @@ public static void validateSlsa(JReleaserContext context, Mode mode, Errors erro
 
         slsa.setAttestationName(
             checkProperty(context,
-                "slsa.attestation.name",
+                "catalog.slsa.attestation.name",
                 "slsa.attestationName",
                 slsa.getAttestationName(),
                 "{{projectName}}-{{projectEffectiveVersion}}"));