Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

eMASS V3.9 Specification Updates #1426

Merged
merged 10 commits into from
May 30, 2023
Merged

eMASS V3.9 Specification Updates #1426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b52cb36
Updates to the artifacts put flags
georgedias May 23, 2023
f9dd08d
Added additional dashboards, updates test suite
georgedias May 25, 2023
1605b8e
DeepSource Javascript fixes
georgedias May 25, 2023
aa6630e
Merge branch 'main' into emass_v3_9
georgedias May 25, 2023
b107dc0
added clarification for argument list format case
georgedias May 26, 2023
480fff0
Merge branch 'emass_v3_9' of github.com:mitre/saf into emass_v3_9
georgedias May 26, 2023
c921377
fixed deepsource: javascript findings
georgedias May 26, 2023
de15e5a
Added override oclif help class to modify how arguments are displayed…
georgedias May 28, 2023
84b2c27
DeepSource:Javascript fixes
georgedias May 28, 2023
01fc000
Update help.ts
em-c-rod May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"bugs": "https://github.com/mitre/saf/issues",
"dependencies": {
"@aws-sdk/client-config-service": "^3.53.0",
"@mitre/emass_client": "^3.4.1",
"@mitre/emass_client": "^3",
"@mitre/hdf-converters": "^2.6.49",
"@mitre/heimdall-lite": "^2.6.49",
"@mitre/inspec-objects": "^1.0.0",
Expand Down Expand Up @@ -98,6 +98,7 @@
"main": "lib/index.js",
"oclif": {
"commands": "./lib/commands",
"helpClass": "./lib/help/help",
"additionalHelpFlags": [
"-h"
],
Expand Down
12 changes: 7 additions & 5 deletions src/commands/emasser/delete/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import colorize from 'json-colorizer'
import {Command, Flags} from '@oclif/core'
import {ArtifactsApi} from '@mitre/emass_client'
import {ArtifactsResponseDel} from '@mitre/emass_client/dist/api'

import {outputError} from '../../../utils/emasser/outputError'
import {ApiConnection} from '../../../utils/emasser/apiConnection'
import {ArtifactsRequestDeleteBodyInner as ArtifactDeleteBody} from '@mitre/emass_client/dist/api'
import {outputFormat} from '../../../utils/emasser/outputFormatter'
import {outputError} from '../../../utils/emasser/outputError'
import {FlagOptions, getFlagsForEndpoint} from '../../../utils/emasser/utilities'

import {ArtifactsApi} from '@mitre/emass_client'
import {ArtifactsResponseDel,
ArtifactsRequestDeleteBodyInner as ArtifactDeleteBody} from '@mitre/emass_client/dist/api'

export default class EmasserDeleteArtifacts extends Command {
static usage = '<%= command.id %> [ARGUMENTS]';
static usage = '<%= command.id %> [options]';

static description = 'Remove one or many artifacts in a system identified by system Id';

Expand Down
12 changes: 7 additions & 5 deletions src/commands/emasser/delete/milestones.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import colorize from 'json-colorizer'
import {Command, Flags} from '@oclif/core'
import {MilestonesApi} from '@mitre/emass_client'
import {MilestonesPutPostDelete} from '@mitre/emass_client/dist/api'

import {outputError} from '../../../utils/emasser/outputError'
import {ApiConnection} from '../../../utils/emasser/apiConnection'
import {MilestonesRequestDeleteBodyInner as MilestoneDeleteBody} from '@mitre/emass_client/dist/api'
import {outputFormat} from '../../../utils/emasser/outputFormatter'
import {outputError} from '../../../utils/emasser/outputError'
import {FlagOptions, getFlagsForEndpoint} from '../../../utils/emasser/utilities'

import {MilestonesApi} from '@mitre/emass_client'
import {MilestonesPutPostDelete,
MilestonesRequestDeleteBodyInner as MilestoneDeleteBody} from '@mitre/emass_client/dist/api'

export default class EmasserDeleteMilestones extends Command {
static usage = '<%= command.id %> [ARGUMENTS]';
static usage = '<%= command.id %> [options]';

static description = 'Remove milestones in a system for one or many POA&M items identified by system, poam, and milestone Id';

Expand Down
12 changes: 7 additions & 5 deletions src/commands/emasser/delete/poams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import colorize from 'json-colorizer'
import {Command, Flags} from '@oclif/core'
import {POAMApi} from '@mitre/emass_client'
import {PoamResponseDelete} from '@mitre/emass_client/dist/api'

import {outputError} from '../../../utils/emasser/outputError'
import {ApiConnection} from '../../../utils/emasser/apiConnection'
import {PoamRequestDeleteBodyInner as PoamDeleteBody} from '@mitre/emass_client/dist/api'
import {outputFormat} from '../../../utils/emasser/outputFormatter'
import {outputError} from '../../../utils/emasser/outputError'
import {FlagOptions, getFlagsForEndpoint} from '../../../utils/emasser/utilities'

import {POAMApi} from '@mitre/emass_client'
import {PoamResponseDelete,
PoamRequestDeleteBodyInner as PoamDeleteBody} from '@mitre/emass_client/dist/api'

export default class EmasserDeletePoams extends Command {
static usage = '<%= command.id %> [ARGUMENTS]';
static usage = '<%= command.id %> [options]';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the difference between ARGUMENTS and options?

Copy link
Contributor Author

@georgedias georgedias May 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

options are actually the FLAGS, I contemplated what to put there.
Should we use [flag options] or [FLAG options] or simply [flags] or just [FLAGS] - what do you think?


static description = 'Remove one or many POA&M items in a system identified by system and poam Id';

Expand Down
2 changes: 1 addition & 1 deletion src/commands/emasser/get/artifacts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {FlagOptions,
const endpoint = 'artifacts'

export default class EmasserGetArtifacts extends Command {
static usage = '<%= command.id %> [ARGUMENTS]';
static usage = '<%= command.id %> [ARGUMENT] \n \x1B[93m NOTE: see EXAMPLES for argument case format\x1B[0m';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which command makes this show up?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bin/run emasser get artifacts -h or --help


static description = getDescriptionForEndpoint(process.argv, endpoint);

Expand Down
2 changes: 1 addition & 1 deletion src/commands/emasser/get/cac.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {outputError} from '../../../utils/emasser/outputError'
import {FlagOptions, getFlagsForEndpoint} from '../../../utils/emasser/utilities'

export default class EmasserGetCac extends Command {
static usage = '<%= command.id %> [ARGUMENTS]'
static usage = '<%= command.id %> [options]'

static description = 'View one or many Control Approval Chain (CAC) in a system specified system ID'

Expand Down
2 changes: 1 addition & 1 deletion src/commands/emasser/get/cmmc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {outputError} from '../../../utils/emasser/outputError'
import {FlagOptions, getFlagsForEndpoint} from '../../../utils/emasser/utilities'

export default class EmasserGetCmmc extends Command {
static usage = '<%= command.id %> [ARGUMENTS]'
static usage = '<%= command.id %> [options]'

static description = 'View Cybersecurity Maturity Model Certification (CMMC) Assessments'

Expand Down
Loading