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

fix(upgrade): error handling for non-existent oscal #529

Merged
merged 1 commit into from
Jul 10, 2024
Merged

fix(upgrade): error handling for non-existent oscal #529

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/cmd/tools/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,17 @@ func init() {
upgradeOpts.OutputFile = upgradeOpts.InputFile
}

revisionResponse, err := revision.RevisionCommand(&upgradeOpts.RevisionOptions)
revisionResponse, revisionErr := revision.RevisionCommand(&upgradeOpts.RevisionOptions)

if upgradeOpts.ValidationResult != "" {
validation.WriteValidationResult(revisionResponse.Result, upgradeOpts.ValidationResult)
err := validation.WriteValidationResult(revisionResponse.Result, upgradeOpts.ValidationResult)
if err != nil {
message.Fatalf("Failed to write validation result to %s: %s\n", upgradeOpts.ValidationResult, err)
}
}

if revisionErr != nil {
message.Fatalf(revisionErr, "Failed to upgrade %s: %s", upgradeOpts.InputFile, revisionErr)
}

if len(revisionResponse.Warnings) > 0 {
Expand All @@ -51,7 +58,7 @@ func init() {
}
}

err = files.WriteOutput(revisionResponse.RevisedBytes, upgradeOpts.OutputFile)
err := files.WriteOutput(revisionResponse.RevisedBytes, upgradeOpts.OutputFile)
if err != nil {
message.Fatalf(err, "Failed to write upgraded %s with: %s", upgradeOpts.OutputFile, err)
}
Expand All @@ -67,6 +74,7 @@ func init() {
toolsCmd.AddCommand(upgradeCmd)

upgradeCmd.Flags().StringVarP(&upgradeOpts.InputFile, "input-file", "f", "", "the path to a oscal json schema file")
upgradeCmd.MarkFlagRequired("input-file")
upgradeCmd.Flags().StringVarP(&upgradeOpts.OutputFile, "output-file", "o", "", "the path to write the linted oscal json schema file (default is the input file)")
upgradeCmd.Flags().StringVarP(&upgradeOpts.Version, "version", "v", versioning.GetLatestSupportedVersion(), "the version of the oscal schema to validate against (default is the latest supported version)")
upgradeCmd.Flags().StringVarP(&upgradeOpts.ValidationResult, "validation-result", "r", "", "the path to write the validation result file")
Expand Down