Set TOSCA meta file version to 1.1 in YAML mode

Signed-off-by: Michael Wurster <[email protected]>
OpenTOSCA · Jan 18, 2021 · 7e2301b · 7e2301b
1 parent fde6ef4
commit 7e2301b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 12 deletions.
diff --git a/...le/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileAttributes.java b/...le/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileAttributes.java
@@ -21,9 +21,11 @@ public class TOSCAMetaFileAttributes {
     // of block 0
     final public static String TOSCA_META_VERSION = "TOSCA-Meta-Version";
     final public static String TOSCA_META_VERSION_VALUE = "1.0";
+    final public static String TOSCA_META_FILE_VERSION = "TOSCA-Meta-File-Version";
+    final public static String TOSCA_META_FILE_VERSION_VALUE = "1.1";
     final public static String CSAR_VERSION = "CSAR-Version";
     final public static String CSAR_VERSION_VALUE = "1.0";
-    final public static String YAML_CSAR_VERSION_VALUE = "1.1";
+    final public static String CSAR_VERSION_VALUE_FOR_YAML = "1.1";
     final public static String CREATED_BY = "Created-By";
     final public static String ENTRY_DEFINITIONS = "Entry-Definitions";
     final public static String TOPOLOGY = "Topology";

diff --git a/...le/src/main/java/org/eclipse/winery/model/csar/toscametafile/YamlTOSCAMetaFileParser.java b/...le/src/main/java/org/eclipse/winery/model/csar/toscametafile/YamlTOSCAMetaFileParser.java
@@ -14,19 +14,52 @@
 
 package org.eclipse.winery.model.csar.toscametafile;
 
-import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.YAML_CSAR_VERSION_VALUE;
+import java.util.Map;
+
+import org.eclipse.virgo.util.parser.manifest.ManifestContents;
+
+import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.CSAR_VERSION_VALUE_FOR_YAML;
 
 public class YamlTOSCAMetaFileParser extends TOSCAMetaFileParser {
 
+    @Override
+    protected int validateBlock0(ManifestContents mf) {
+        int numErrors = 0;
+        Map<String, String> mainAttr = mf.getMainAttributes();
+
+        numErrors += validateMetaVersion(mainAttr.get(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION));
+        numErrors += validateCsarVersion(mainAttr.get(TOSCAMetaFileAttributes.CSAR_VERSION));
+        numErrors += validateCreatedBy(mainAttr.get(TOSCAMetaFileAttributes.CREATED_BY));
+        numErrors += validateEntryDefinitions(mainAttr.get(TOSCAMetaFileAttributes.ENTRY_DEFINITIONS));
+        numErrors += validateDescription(mainAttr.get(TOSCAMetaFileAttributes.DESCRIPTION));
+        numErrors += validateTopology(mainAttr.get(TOSCAMetaFileAttributes.TOPOLOGY));
+
+        return numErrors;
+    }
+
+    @Override
+    protected int validateMetaVersion(String metaFileVersion) {
+        int errors = 0;
+
+        if (metaFileVersion == null) {
+            this.logAttrMissing(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION, 0);
+            errors++;
+        } else if (!metaFileVersion.trim().equals(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION_VALUE)) {
+            this.logAttrWrongVal(TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION, 0, TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION_VALUE);
+            errors++;
+        }
+        return errors;
+    }
+
     @Override
     protected int validateCsarVersion(String csarVersion) {
         int errors = 0;
 
         if (csarVersion == null) {
             this.logAttrMissing(TOSCAMetaFileAttributes.CSAR_VERSION, 0);
             errors++;
-        } else if (!(csarVersion.trim()).equals(YAML_CSAR_VERSION_VALUE)) {
-            this.logAttrWrongVal(TOSCAMetaFileAttributes.CSAR_VERSION, 0, TOSCAMetaFileAttributes.YAML_CSAR_VERSION_VALUE);
+        } else if (!csarVersion.trim().equals(CSAR_VERSION_VALUE_FOR_YAML)) {
+            this.logAttrWrongVal(TOSCAMetaFileAttributes.CSAR_VERSION, 0, TOSCAMetaFileAttributes.CSAR_VERSION_VALUE_FOR_YAML);
             errors++;
         }
         return errors;

diff --git a/...nery.repository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlExporter.java b/...nery.repository/src/main/java/org/eclipse/winery/repository/yaml/export/YamlExporter.java
@@ -27,20 +27,20 @@
 import org.eclipse.winery.common.Constants;
 import org.eclipse.winery.common.configuration.Environments;
 import org.eclipse.winery.common.constants.MimeTypes;
-import org.eclipse.winery.repository.backend.IRepository;
 import org.eclipse.winery.model.ids.definitions.DefinitionsChildId;
+import org.eclipse.winery.repository.backend.IRepository;
+import org.eclipse.winery.repository.datatypes.ids.elements.DirectoryId;
+import org.eclipse.winery.repository.exceptions.RepositoryCorruptException;
 import org.eclipse.winery.repository.export.CsarContentProperties;
 import org.eclipse.winery.repository.export.CsarExporter;
 import org.eclipse.winery.repository.export.ExportedState;
-import org.eclipse.winery.repository.export.entries.DefinitionsBasedCsarEntry;
-import org.eclipse.winery.repository.yaml.YamlRepository;
-import org.eclipse.winery.repository.datatypes.ids.elements.DirectoryId;
-import org.eclipse.winery.repository.exceptions.RepositoryCorruptException;
 import org.eclipse.winery.repository.export.entries.CsarEntry;
+import org.eclipse.winery.repository.export.entries.DefinitionsBasedCsarEntry;
 import org.eclipse.winery.repository.export.entries.DocumentBasedCsarEntry;
 import org.eclipse.winery.repository.export.entries.RemoteRefBasedCsarEntry;
 import org.eclipse.winery.repository.export.entries.RepositoryRefBasedCsarEntry;
 import org.eclipse.winery.repository.export.entries.XMLDefinitionsBasedCsarEntry;
+import org.eclipse.winery.repository.yaml.YamlRepository;
 import org.eclipse.winery.repository.yaml.export.entries.YAMLDefinitionsBasedCsarEntry;
 
 import org.apache.commons.io.IOUtils;
@@ -50,9 +50,11 @@
 import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.CONTENT_TYPE;
 import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.CREATED_BY;
 import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.CSAR_VERSION;
+import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.CSAR_VERSION_VALUE_FOR_YAML;
 import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.ENTRY_DEFINITIONS;
 import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.NAME;
-import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_VERSION;
+import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION;
+import static org.eclipse.winery.model.csar.toscametafile.TOSCAMetaFileAttributes.TOSCA_META_FILE_VERSION_VALUE;
 
 public class YamlExporter extends CsarExporter {
 
@@ -161,8 +163,8 @@ private String addManifest(IRepository repository, DefinitionsChildId id, Map<Cs
         StringBuilder stringBuilder = new StringBuilder();
 
         // Setting Versions
-        stringBuilder.append(TOSCA_META_VERSION).append(": 1.0").append("\n");
-        stringBuilder.append(CSAR_VERSION).append(": 1.1").append("\n");
+        stringBuilder.append(TOSCA_META_FILE_VERSION).append(": ").append(TOSCA_META_FILE_VERSION_VALUE).append("\n");
+        stringBuilder.append(CSAR_VERSION).append(": ").append(CSAR_VERSION_VALUE_FOR_YAML).append("\n");
         stringBuilder.append(CREATED_BY).append(": Winery ").append(Environments.getInstance().getVersion()).append("\n");
 
         // Winery currently is unaware of tDefinitions, therefore, we use the