chore: Action schema handling fixes

fortify · May 14, 2024 · 5f6fafd · 5f6fafd
1 parent 83c73f4
commit 5f6fafd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/...re/fcli-common/src/main/java/com/fortify/cli/common/action/helper/ActionLoaderHelper.java b/...re/fcli-common/src/main/java/com/fortify/cli/common/action/helper/ActionLoaderHelper.java
@@ -263,7 +263,7 @@ private final String updateSchema(String actionText) {
             }
             var schemaVersion = ActionSchemaHelper.getSchemaVersion(schemaUri);
             if ( !ActionSchemaHelper.isSupportedSchemaVersion(schemaVersion) ) {
-                LOG.warn("WARN: Action was designed for fcli version "+schemaVersion+" and may fail");
+                LOG.warn("WARN: Action uses unsupported schema version "+schemaVersion+" and may fail");
             }
             return result;
         }

diff --git a/...oc/src/main/java/com/fortify/cli/common/action/schema/generator/GenerateActionSchema.java b/...oc/src/main/java/com/fortify/cli/common/action/schema/generator/GenerateActionSchema.java
@@ -46,24 +46,33 @@ public static void main(String[] args) throws Exception {
         var newSchema = generateSchema();
         var existingSchema = loadExistingSchema(actionSchemaVersion);
         checkSchemaCompatibility(actionSchemaVersion, existingSchema, newSchema);
+        writeGitHubWarning(actionSchemaVersion, existingSchema);
 
         // If this is an fcli development release, we output the schema as a development release.
         // Note that the same output file name will be used for any branch.
         var outputVersion = isDevelopmentRelease.equals("true") ? DEV_VERSION : actionSchemaVersion;
+        if ( existingSchema!=null && !DEV_VERSION.equals(outputVersion) ) {
+            System.out.println("Fortify CLI action schema not being generated as "+outputVersion+" schema already exists");
+        } else {
+            writeSchema(outputPath, newSchema, outputVersion);
+        }
+    }
+
+    private static void writeSchema(Path outputPath, JsonNode newSchema, String outputVersion) throws IOException {
+        Files.createDirectories(outputPath);
+        var outputFile = outputPath.resolve(String.format("fcli-action-schema-%s.json", outputVersion));
+        Files.writeString(outputFile, newSchema.toPrettyString(), StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING);
+        System.out.println("Fortify CLI action schema written to "+outputFile.toString());
+    }
+
+    private static void writeGitHubWarning(String actionSchemaVersion, JsonNode existingSchema) {
         if ( existingSchema==null ) {
             System.out.println("::warning ::New fcli action schema version "+actionSchemaVersion+
                     " will be published upon fcli release. Please ensure that this version number" +
                     " properly represents schema changes (patch increase for non-structural changes" +
                     " like description changes, minor increase for backward-compatible structural" +
                     " changes like new optional properties, major increase for non-backward-compatible" +
                     " structural changes like new required properties or removed properties).");
-        } else if ( !DEV_VERSION.equals(outputVersion) ) {
-            System.out.println("Fortify CLI action schema not being generated as "+outputVersion+" schema already exists");
-        } else {
-            Files.createDirectories(outputPath);
-            var outputFile = outputPath.resolve(String.format("fcli-action-schema-%s.json", outputVersion));
-            Files.writeString(outputFile, newSchema.toPrettyString(), StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING);
-            System.out.println("Fortify CLI action schema written to "+outputFile.toString());
         }
     }