diff --git a/internal/cmd/fingerprint/fingerprint.go b/internal/cmd/fingerprint/fingerprint.go index 8d3d08e1..0d25623f 100644 --- a/internal/cmd/fingerprint/fingerprint.go +++ b/internal/cmd/fingerprint/fingerprint.go @@ -13,7 +13,7 @@ import ( var exclusions = file.DefaultExclusionsFingerprint() const ( - ExclusionFlag = "exclusion-fingerprint" + ExclusionFlag = "exclusion" FingerprintCompressedContent = "fingerprint-compressed-content" ) @@ -21,8 +21,8 @@ var shouldFingerprintCompressedContent bool func NewFingerprintCmd(fingerprinter fingerprint.IFingerprint) *cobra.Command { - short := "Fingerprints files to match against the Debricked knowledge base. [beta feature]" - long := fmt.Sprintf("Fingerprint files for identification in a given path and writes it to %s. [beta feature]\nThis hashes all files and matches them against the Debricked knowledge base.", fingerprint.OutputFileNameFingerprints) + short := "Fingerprints files to match against the Debricked knowledge base." + long := fmt.Sprintf("Fingerprint files for identification in a given path and writes it to %s.\nThis hashes all files to be used for matching against the Debricked knowledge base.", fingerprint.OutputFileNameFingerprints) cmd := &cobra.Command{ Use: "fingerprint [path]", Short: short, @@ -47,7 +47,7 @@ Special Terms | Meaning Example: $ debricked files fingerprint . `+exampleFlags) - cmd.Flags().BoolVar(&shouldFingerprintCompressedContent, FingerprintCompressedContent, true, `Fingerprint the contents of compressed files by unpacking them in memory, Supported files: `+fmt.Sprintf("%v", fingerprint.FILES_TO_UNPACK)) + cmd.Flags().BoolVar(&shouldFingerprintCompressedContent, FingerprintCompressedContent, false, `Fingerprint the contents of compressed files by unpacking them in memory, Supported files: `+fmt.Sprintf("%v", fingerprint.FILES_TO_UNPACK)) viper.MustBindEnv(ExclusionFlag) diff --git a/internal/cmd/scan/scan.go b/internal/cmd/scan/scan.go index d73c106a..45b2a672 100644 --- a/internal/cmd/scan/scan.go +++ b/internal/cmd/scan/scan.go @@ -116,7 +116,7 @@ $ debricked scan . `+exampleFlags) cmd.Flags().BoolVarP(&passOnDowntime, PassOnTimeOut, "p", false, "pass scan if there is a service access timeout") cmd.Flags().BoolVar(&noResolve, NoResolveFlag, false, `disables resolution of manifest files that lack lock files. Resolving manifest files enables more accurate dependency scanning since the whole dependency tree will be analysed. For example, if there is a "go.mod" in the target path, its dependencies are going to get resolved onto a lock file, and latter scanned.`) - cmd.Flags().BoolVar(&noFingerprint, FingerprintFlag, false, "enables fingerprinting for undeclared component identification. Can be run as a standalone command [files fingerprint] with more granular options. [beta feature]") + cmd.Flags().BoolVar(&noFingerprint, FingerprintFlag, false, "enables fingerprinting for undeclared component identification. Can be run as a standalone command [files fingerprint] with more granular options. Will be default in an upcoming major release.") cmd.Flags().MarkHidden(FingerprintFlag) //nolint:errcheck cmd.Flags().BoolVar(&callgraph, CallGraphFlag, false, `Enables call graph generation during scan.`) cmd.Flags().IntVar(&callgraphUploadTimeout, CallGraphUploadTimeoutFlag, 10*60, "Set a timeout (in seconds) on call graph upload.") diff --git a/internal/fingerprint/fingerprint.go b/internal/fingerprint/fingerprint.go index 1e586044..55be4b30 100644 --- a/internal/fingerprint/fingerprint.go +++ b/internal/fingerprint/fingerprint.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - "log" "os" "path/filepath" "strings" @@ -126,7 +125,6 @@ func (f FileFingerprint) ToString() string { } func (f *Fingerprinter) FingerprintFiles(rootPath string, exclusions []string, fingerprintCompressedContent bool) (Fingerprints, error) { - log.Println("Warning: Fingerprinting is beta and may not work as expected.") if len(rootPath) == 0 { rootPath = filepath.Base("") }