Skip to content

Commit

Permalink
chore: fcli fod mast-scan start fixes
Browse files Browse the repository at this point in the history
fix: `fcli fod mast-scan start`: Add `--platform` option as required by current FoD API

fix: `fcli fod mast-scan start`: Fix description for `--file` option
  • Loading branch information
rsenden committed Aug 14, 2024
1 parent 78fc1de commit 7703939
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static final FoDScanDescriptor startScan(UnirestInstance unirest, IProgre
.queryString("startDate", (req.getStartDate()))
.queryString("assessmentTypeId", req.getAssessmentTypeId())
.queryString("frameworkType", req.getFrameworkType())
.queryString("platformType", req.getPlatformType())
.queryString("timeZone", req.getTimeZone())
.queryString("entitlementFrequencyType", req.getEntitlementFrequencyType());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public class FoDScanMobileStartRequest {
private String timeZone;

private String frameworkType;
private String platformType;
private Boolean isRemediationScan;
//private Boolean isBundledAssessment;
//private Integer parentAssessmentTypeId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public class FoDMastScanStartCommand extends AbstractFoDScanStartCommand {
private enum MobileFrameworks { iOS, Android }
@Option(names = {"--framework"}, required = true)
private MobileFrameworks mobileFramework;
private enum MobilePlatforms { Phone, Tablet, Both }
@Option(names = {"--platform"}, required = true)
private MobilePlatforms mobilePlatform;
@Option(names = {"--timezone"})
private String timezone;
@Option(names = {"--start-date"})
Expand Down Expand Up @@ -144,6 +147,7 @@ protected FoDScanDescriptor startScan(UnirestInstance unirest, FoDReleaseDescrip
.entitlementFrequencyType(entitlementFrequencyTypeMixin.getEntitlementFrequencyType().name())
.timeZone(timeZoneToUse)
.frameworkType(mobileFramework.name())
.platformType(mobilePlatform.name())
.scanMethodType("Other")
.notes(notes != null && !notes.isEmpty() ? notes : "")
.scanTool(fcliProperties.getProperty("projectName", "fcli"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,9 @@ fcli.fod.mast-scan.start.assessment-type = The type of MAST assessment to carry
fcli.fod.mast-scan.start.entitlement-id = ${fcli.fod.sast-scan.start.entitlement-id}
fcli.fod.mast-scan.start.entitlement-frequency = The Entitlement Frequency to use. Valid values: ${COMPLETION-CANDIDATES}.
fcli.fod.mast-scan.start.notes = ${fcli.fod.sast-scan.start.notes}
fcli.fod.mast-scan.start.file = ${fcli.fod.sast-scan.start.file}
fcli.fod.mast-scan.start.file = Absolute path of the mobile application file to upload, for example .apk or .ipa file. See FoD documentation for supported file types and packaging instructions.
fcli.fod.mast-scan.start.framework = The Mobile Framework to use. Valid values: ${COMPLETION-CANDIDATES}.
fcli.fod.mast-scan.start.platform = The Mobile Platform to use. Valid values: ${COMPLETION-CANDIDATES}.
fcli.fod.mast-scan.start.timezone = The timezone to use for starting the scan - default is UTC. Use 'fod rest lookup TimeZones' to see the values.
fcli.fod.mast-scan.import.usage.header = Import existing MAST scan results (from an FPR file).
fcli.fod.mast-scan.import.usage.description = As FoD doesn't return a scan id for imported scans, the output of this command cannot be used with commands that expect a scan id, like the wait-for command.
Expand Down

0 comments on commit 7703939

Please sign in to comment.