diff --git a/exit_code_redirect.sh b/exit_code_redirect.sh index b44a19ad65..ea4391ead9 100755 --- a/exit_code_redirect.sh +++ b/exit_code_redirect.sh @@ -28,7 +28,7 @@ last_arg="${!total_args}" # Remove the last argument from the list args=${@:1:$((total_args - 1))} -# () inteprets spaces as spearate entries in an array +# () interprets spaces as separate entries in an array # tr replaces newlines with spaces split_args=($(echo "$last_arg" | tr '\n' ' ')) diff --git a/internal/customgitignore/dir_test.go b/internal/customgitignore/dir_test.go index 30a43674cf..947a0c5da8 100644 --- a/internal/customgitignore/dir_test.go +++ b/internal/customgitignore/dir_test.go @@ -721,7 +721,7 @@ func hasPatternContaining(gips []gitignore.Pattern, test string) bool { // // ... because the changes in customgitignore adjust the // implementation details of the upstream package so that -// it doesn't read .gitingore files from ignored dirs. +// it doesn't read .gitignore files from ignored dirs. // This means that before _and_ after the change p.Match() // will return false. func patternContains(gip gitignore.Pattern, test string) bool { diff --git a/internal/customgitignore/walk_up_to_root.go b/internal/customgitignore/walk_up_to_root.go index 9d23db2ee2..f925662574 100644 --- a/internal/customgitignore/walk_up_to_root.go +++ b/internal/customgitignore/walk_up_to_root.go @@ -28,9 +28,9 @@ import ( // // It also returns the path to the root of the git-repo, // or "" if this path isn't within a git repo, allowing -// a caller to know how .gitingore files were parsed. +// a caller to know how .gitignore files were parsed. // -// The actual parsing is inteded to be similar to how tools +// The actual parsing is intended to be similar to how tools // like rg work, but means that `path` may not necessarily be // the root of a git repo, and can produces these parsing // behaviours: diff --git a/internal/sourceanalysis/go.go b/internal/sourceanalysis/go.go index 231594ae26..db31d33e3c 100644 --- a/internal/sourceanalysis/go.go +++ b/internal/sourceanalysis/go.go @@ -127,7 +127,7 @@ func fillNotImportedAnalysisInfo(vulnsByID map[string]models.Vulnerability, vuln } func runGovulncheck(moddir string, vulns []models.Vulnerability, goVersion string) (map[string][]*govulncheck.Finding, error) { - // Create a temporary directory containing all of the vulnerabilities that + // Create a temporary directory containing all the vulnerabilities that // are passed in to check against govulncheck. // // This enables OSV scanner to supply the OSV vulnerabilities to run diff --git a/pkg/lockfile/parse-conan-lock.go b/pkg/lockfile/parse-conan-lock.go index 50cfb9a5ae..eee1eac241 100644 --- a/pkg/lockfile/parse-conan-lock.go +++ b/pkg/lockfile/parse-conan-lock.go @@ -47,7 +47,7 @@ type ConanLockFile struct { // TODO this is tentative and subject to change depending on the OSV schema const ConanEcosystem Ecosystem = "ConanCenter" -func parseConanRenference(ref string) ConanReference { +func parseConanReference(ref string) ConanReference { // very flexible format name/version[@username[/channel]][#rrev][:pkgid[#prev]][%timestamp] var reference ConanReference @@ -110,9 +110,9 @@ func parseConanV1Lock(lockfile ConanLockFile) []PackageDetails { if node.Pref != "" { // old format 0.3 (conan 1.27-) lockfiles use "pref" instead of "ref" - reference = parseConanRenference(node.Pref) + reference = parseConanReference(node.Pref) } else if node.Ref != "" { - reference = parseConanRenference(node.Ref) + reference = parseConanReference(node.Ref) } else { continue } @@ -134,7 +134,7 @@ func parseConanV1Lock(lockfile ConanLockFile) []PackageDetails { func parseConanRequires(packages *[]PackageDetails, requires []string, group string) { for _, ref := range requires { - reference := parseConanRenference(ref) + reference := parseConanReference(ref) // skip entries with no name, they are most likely consumer's conanfiles // and not dependencies to be searched in a database anyway if reference.Name == "" { diff --git a/pkg/osv/osv.go b/pkg/osv/osv.go index 4715dc65f8..e27d700e60 100644 --- a/pkg/osv/osv.go +++ b/pkg/osv/osv.go @@ -19,7 +19,7 @@ import ( const ( // QueryEndpoint is the URL for posting queries to OSV. QueryEndpoint = "https://api.osv.dev/v1/querybatch" - // GetEndpoint is the URL for getting vulenrabilities from OSV. + // GetEndpoint is the URL for getting vulnerabilities from OSV. GetEndpoint = "https://api.osv.dev/v1/vulns" // DetermineVersionEndpoint is the URL for posting determineversion queries to OSV. DetermineVersionEndpoint = "https://api.osv.dev/v1experimental/determineversion" diff --git a/pkg/osvscanner/vulnerability_result.go b/pkg/osvscanner/vulnerability_result.go index 0b83cc9608..d41f5700e2 100644 --- a/pkg/osvscanner/vulnerability_result.go +++ b/pkg/osvscanner/vulnerability_result.go @@ -14,7 +14,7 @@ import ( "github.com/google/osv-scanner/pkg/reporter" ) -// buildVulnerablityResults takes the responses from the OSV API and the deps.dev API +// buildVulnerabilityResults takes the responses from the OSV API and the deps.dev API // and converts this into a VulnerabilityResults. As part is this, it groups // vulnerability information by source location. // TODO: This function is getting long, we should refactor it