diff --git a/_typos.tom b/_typos.tom index 6b20d6b1..6eb8b460 100644 --- a/_typos.tom +++ b/_typos.tom @@ -1,6 +1,7 @@ [default.extend-words] testng = "testng" afe = "afe" +Bouned = "Bouned" [type.po] extend-glob = ["**/tests/testdata/**"] diff --git a/cli/docs/flags.go b/cli/docs/flags.go index bf9643e7..8dfc42be 100644 --- a/cli/docs/flags.go +++ b/cli/docs/flags.go @@ -265,7 +265,7 @@ var flagsMap = map[string]components.Flag{ InputFile: components.NewStringFlag(InputFile, "Path to an input file in YAML format contains multiple git providers. With this option, all other scm flags will be ignored and only git servers mentioned in the file will be examined.."), ScmType: components.NewStringFlag(ScmType, fmt.Sprintf("SCM type. Possible values are: %s.", git.NewScmType().GetValidScmTypeString()), components.SetMandatory()), ScmApiUrl: components.NewStringFlag(ScmApiUrl, "SCM API URL. For example: 'https://api.github.com'.", components.SetMandatory()), - Token: components.NewStringFlag(Token, fmt.Sprintf("SCM API token. In the absence of a flag, tokens should be passed in the %s enviroment variable, or in the corresponding environment variables '%s'.", git.GenericGitTokenEnvVar, git.NewScmType().GetOptionalScmTypeTokenEnvVars()), components.SetMandatory()), + Token: components.NewStringFlag(Token, fmt.Sprintf("SCM API token. In the absence of a flag, tokens should be passed in the %s environment variable, or in the corresponding environment variables '%s'.", git.GenericGitTokenEnvVar, git.NewScmType().GetOptionalScmTypeTokenEnvVars()), components.SetMandatory()), Owner: components.NewStringFlag(Owner, "The format of the owner key depends on the Git provider: On GitHub and GitLab, the owner is typically an individual or an organization, On Bitbucket, the owner can also be a project. In the case of a private instance on Bitbucket, the individual or organization name should be prefixed with '~'.", components.SetMandatory()), RepoName: components.NewStringFlag(RepoName, "List of semicolon-separated(;) repositories names to analyze, If not provided all repositories related to the provided owner will be analyzed."), Months: components.NewStringFlag(Months, "Number of months to analyze.", components.WithIntDefaultValue(git.DefaultContContributorsMonths)), diff --git a/cli/gitcommands.go b/cli/gitcommands.go index b26d64b8..69b799a3 100644 --- a/cli/gitcommands.go +++ b/cli/gitcommands.go @@ -63,7 +63,7 @@ func GetCountContributorsParams(c *components.Context) (*git.CountContributorsPa if envVarToken != "" { params.Token = envVarToken } else { - return nil, errorutils.CheckErrorf("Providing a token is mandatory. should use --%s flag, the token enviromment variable %s, or coresponding provider enviromment variable %s.", flags.Token, git.GenericGitTokenEnvVar, scmTypes.GetOptionalScmTypeTokenEnvVars()) + return nil, errorutils.CheckErrorf("Providing a token is mandatory. should use --%s flag, the token environment variable %s, or corresponding provider environment variable %s.", flags.Token, git.GenericGitTokenEnvVar, scmTypes.GetOptionalScmTypeTokenEnvVars()) } } } diff --git a/commands/curation/curationaudit.go b/commands/curation/curationaudit.go index 3e721450..3b177eb4 100644 --- a/commands/curation/curationaudit.go +++ b/commands/curation/curationaudit.go @@ -68,7 +68,7 @@ const ( MinArtiPassThroughSupport = "7.82.0" MinArtiGolangSupport = "7.87.0" MinArtiNuGetSupport = "7.93.0" - MinXrayPassTHroughSupport = "3.92.0" + MinXrayPassThroughSupport = "3.92.0" ) var CurationOutputFormats = []string{string(outFormat.Table), string(outFormat.Json)} @@ -105,7 +105,7 @@ func (ca *CurationAuditCommand) checkSupportByVersionOrEnv(tech techutils.Techno return false, err } - xrayVersionErr := clientutils.ValidateMinimumVersion(clientutils.Xray, xrayVersion, MinXrayPassTHroughSupport) + xrayVersionErr := clientutils.ValidateMinimumVersion(clientutils.Xray, xrayVersion, MinXrayPassThroughSupport) rtVersionErr := clientutils.ValidateMinimumVersion(clientutils.Artifactory, artiVersion, minArtiVersion) if xrayVersionErr != nil || rtVersionErr != nil { return false, errors.Join(xrayVersionErr, rtVersionErr) diff --git a/commands/scan/buildscan.go b/commands/scan/buildscan.go index 30c4f390..848324cd 100644 --- a/commands/scan/buildscan.go +++ b/commands/scan/buildscan.go @@ -123,7 +123,7 @@ func (bsc *BuildScanCommand) runBuildScanAndPrintResults(xrayManager *xray.XrayS return false, err } - // A patch for Xray issue where it returns Base URL from the API but it is somtimes not the URL that is configured in the CLI + // A patch for Xray issue where it returns Base URL from the API but it is sometimes not the URL that is configured in the CLI // More info in https://jfrog-int.atlassian.net/browse/XRAY-77451 url, endpoint, trimerr := trimUrl(buildScanResults.MoreDetailsUrl)