From 6ab01b64b791f2f8116b9b019de56b8dddb7c4b9 Mon Sep 17 00:00:00 2001 From: iseki Date: Tue, 29 Oct 2024 11:35:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20sbom=20=E7=B1=BB=E5=9E=8B=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E5=8F=98=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/murphy/internal/common/sbom_format_flag.go | 4 ++-- cmd/murphy/internal/scan/cmd.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/murphy/internal/common/sbom_format_flag.go b/cmd/murphy/internal/common/sbom_format_flag.go index d11548d..1930ad1 100644 --- a/cmd/murphy/internal/common/sbom_format_flag.go +++ b/cmd/murphy/internal/common/sbom_format_flag.go @@ -13,12 +13,12 @@ func (t *SBOMFormatFlag) String() string { if !t.Valid { return "invalid" } - return "murphysec1.1+json" + return "msdx1.1+json" } func (t *SBOMFormatFlag) Set(s string) error { // temporary implementation - if s != "murphysec1.1+json" { + if s != "msdx1.1+json" { return fmt.Errorf("unsupported format: %s", s) } t.Valid = true diff --git a/cmd/murphy/internal/scan/cmd.go b/cmd/murphy/internal/scan/cmd.go index 7afc475..72ffe20 100644 --- a/cmd/murphy/internal/scan/cmd.go +++ b/cmd/murphy/internal/scan/cmd.go @@ -69,7 +69,7 @@ func DfCmd() *cobra.Command { c.Flags().BoolVar(&onlyTaskId, "only-task-id", false, "print task id after task created, the scan result will not be printed") c.Flags().StringArrayVar(&projectTagNames, "project-tag", make([]string, 0), "specify the tag of the project") c.Flags().StringVar(&sbomOutputConfig, "sbom-output", "-", "Specify the SBOM output file path, use \"-\" to output to stdout") - c.Flags().Var(&sbomOutputType, "sbom-format", "(Required) Specify the SBOM format, currently supports: murphysec1.1+json") + c.Flags().Var(&sbomOutputType, "sbom-format", "(Required) Specify the SBOM format, currently supports: msdx1.1+json") return &c } @@ -83,7 +83,7 @@ func EnvCmd() *cobra.Command { c.Flags().BoolVar(&onlyTaskId, "only-task-id", false, "print task id after task created, the scan result will not be printed") c.Flags().StringArrayVar(&projectTagNames, "project-tag", make([]string, 0), "specify the tag of the project") c.Flags().StringVar(&sbomOutputConfig, "sbom-output", "-", "Specify the SBOM output file path, use \"-\" to output to stdout") - c.Flags().Var(&sbomOutputType, "sbom-format", "(Required) Specify the SBOM format, currently supports: murphysec1.1+json") + c.Flags().Var(&sbomOutputType, "sbom-format", "(Required) Specify the SBOM format, currently supports: msdx1.1+json") return &c }