Merge branch 'kadraman-fod-scan-entities' into main

fortify · Mar 17, 2023 · ccc1b43 · ccc1b43
2 parents d8c90b8 + 8a828f5
commit ccc1b43
Show file tree

Hide file tree

Showing 44 changed files with 855 additions and 720 deletions.
diff --git a/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java b/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
@@ -2,18 +2,14 @@
 
 import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
 import com.fortify.cli.fod.app.cli.cmd.FoDAppCommands;
-import com.fortify.cli.fod.dast_scan.cli.cmd.FoDDastScanCommands;
 import com.fortify.cli.fod.lookup.cli.cmd.FoDLookupCommands;
 import com.fortify.cli.fod.microservice.cli.cmd.FoDAppMicroserviceCommands;
-import com.fortify.cli.fod.oss_scan.cli.cmd.FoDOssScanCommands;
 import com.fortify.cli.fod.release.cli.cmd.FoDAppRelCommands;
 import com.fortify.cli.fod.rest.cli.cmd.FoDRestCommands;
-import com.fortify.cli.fod.sast_scan.cli.cmd.FoDSastScanCommands;
 import com.fortify.cli.fod.scan.cli.cmd.FoDScanCommands;
 import com.fortify.cli.fod.session.cli.cmd.FoDSessionCommands;
 import com.fortify.cli.fod.user.cli.cmd.FoDUserCommands;
 import com.fortify.cli.fod.user_group.cli.cmd.FoDUserGroupCommands;
-
 import picocli.CommandLine.Command;
 
 @Command(
@@ -28,10 +24,7 @@
                 FoDAppCommands.class,
                 FoDAppRelCommands.class,
                 FoDAppMicroserviceCommands.class,
-                FoDDastScanCommands.class,
                 FoDLookupCommands.class,
-                FoDOssScanCommands.class,
-                FoDSastScanCommands.class,
                 FoDScanCommands.class,
                 FoDUserCommands.class,
                 FoDUserGroupCommands.class

diff --git a/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastScanGetCommand.java b/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastScanGetCommand.java
diff --git a/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastScanListCommand.java b/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastScanListCommand.java
diff --git a/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastScanWaitForCommand.java b/fcli-fod/src/main/java/com/fortify/cli/fod/dast_scan/cli/cmd/FoDDastScanWaitForCommand.java
diff --git a/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java b/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java
@@ -64,7 +64,7 @@ public HttpRequest<?> getBaseRequest(UnirestInstance unirest) {
     public JsonNode transformRecord(JsonNode record) {
         return FoDLookupHelper.renameFields(record);
     }
-    
+
     @Override
     public boolean isSingular() {
         return false;

diff --git a/fcli-fod/src/main/java/com/fortify/cli/fod/oss_scan/cli/cmd/FoDOssScanListCommand.java b/fcli-fod/src/main/java/com/fortify/cli/fod/oss_scan/cli/cmd/FoDOssScanListCommand.java