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.

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

Spelling #4008

Merged
merged 44 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
416d9c1
spelling: addresses
jsoref Jul 30, 2023
ac14f72
spelling: asynchronous
jsoref Jul 30, 2023
d814582
spelling: basic
jsoref Jul 30, 2023
b6ff750
spelling: brute force
jsoref Jul 30, 2023
40bf5e6
spelling: constant
jsoref Jul 30, 2023
81bdbce
spelling: disables
jsoref Jul 30, 2023
d667e4d
spelling: engine
jsoref Jul 30, 2023
ecd4c0c
spelling: every time
jsoref Jul 30, 2023
dbbeb60
spelling: execution
jsoref Jul 30, 2023
9dac5d0
spelling: false positives
jsoref Jul 30, 2023
03a129d
spelling: from
jsoref Jul 30, 2023
c34c34b
spelling: further
jsoref Jul 30, 2023
70c6bd8
spelling: github
jsoref Jul 30, 2023
cc3fc7a
spelling: gitlab
jsoref Jul 30, 2023
b103691
spelling: highlight
jsoref Jul 30, 2023
ccfa6ba
spelling: hygiene
jsoref Jul 30, 2023
2f3500c
spelling: ignore
jsoref Jul 30, 2023
de95b22
spelling: input
jsoref Jul 30, 2023
4e2cef6
spelling: item
jsoref Jul 30, 2023
d881c57
spelling: itself
jsoref Jul 30, 2023
2c5be54
spelling: latestxxx
jsoref Jul 30, 2023
dc15543
spelling: navigation
jsoref Jul 30, 2023
377a4b5
spelling: negative
jsoref Jul 30, 2023
ab42b7e
spelling: nonexistent
jsoref Jul 30, 2023
43854f4
spelling: occurred
jsoref Jul 30, 2023
d09a8ab
spelling: override
jsoref Jul 30, 2023
fbd3659
spelling: overrides
jsoref Jul 30, 2023
41f670f
spelling: payload
jsoref Jul 30, 2023
7e2ee19
spelling: performed
jsoref Jul 30, 2023
c2b20b5
spelling: respective
jsoref Jul 30, 2023
6256017
spelling: retrieve
jsoref Jul 30, 2023
9cf7f1c
spelling: scanlist
jsoref Jul 30, 2023
a382995
spelling: separated
jsoref Jul 30, 2023
9cfbbae
spelling: separator
jsoref Jul 30, 2023
6189fbe
spelling: severity
jsoref Jul 30, 2023
3945755
spelling: source
jsoref Jul 30, 2023
8eec901
spelling: strategy
jsoref Jul 30, 2023
4444df9
spelling: string
jsoref Jul 30, 2023
a01a43e
spelling: templates
jsoref Jul 30, 2023
ab56982
spelling: terminal
jsoref Jul 30, 2023
fa1d834
spelling: timeout
jsoref Jul 30, 2023
0cce344
spelling: trailing slash
jsoref Jul 30, 2023
6f93353
spelling: trailing
jsoref Jul 30, 2023
cf3c00d
spelling: websocket
jsoref Jul 30, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Check out code
uses: actions/checkout@v3

- name: Go Mod hygine
- name: Go Mod hygiene
run: |
go clean -modcache
go mod tidy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Git Checkout
uses: actions/checkout@v3

- name: Get Github tag
- name: Get GitHub tag
id: meta
run: |
curl --silent "https://api.github.com/repos/projectdiscovery/nuclei/releases/latest" | jq -r .tag_name | xargs -I {} echo TAG={} >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions DESIGN.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ type Exporter interface {
}
```

Exporters include `Elasticsearch`, `markdown`, `sarif` . Trackers include `GitHub` , `Gitlab` and `Jira`.
Exporters include `Elasticsearch`, `markdown`, `sarif` . Trackers include `GitHub` , `GitLab` and `Jira`.

Each exporter and trackers implement their own configuration in YAML format and are very modular in nature, so adding new ones is easy.

Expand Down Expand Up @@ -484,7 +484,7 @@ $ go tool pprof -http=:8081 mem.pprof
- [v2/pkg/reporting/exporters/markdown](./v2/pkg/reporting/exporters/markdown) - Markdown Result Exporter
- [v2/pkg/reporting/exporters/es](./v2/pkg/reporting/exporters/es) - Elasticsearch Result Exporter
- [v2/pkg/reporting/dedupe](./v2/pkg/reporting/dedupe) - Dedupe module for Results
- [v2/pkg/reporting/trackers/gitlab](./v2/pkg/reporting/trackers/gitlab) - Gitlab Issue Tracker Exporter
- [v2/pkg/reporting/trackers/gitlab](./v2/pkg/reporting/trackers/gitlab) - GitLab Issue Tracker Exporter
- [v2/pkg/reporting/trackers/jira](./v2/pkg/reporting/trackers/jira) - Jira Issue Tracker Exporter
- [v2/pkg/reporting/trackers/github](./v2/pkg/reporting/trackers/github) - GitHub Issue Tracker Exporter
- [v2/pkg/reporting/format](./v2/pkg/reporting/format) - Result Formatting Functions
Expand Down
2 changes: 1 addition & 1 deletion SYNTAX-REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ Variables contains any variables for the current request.
</div>
<div class="dt">

Constants contains any scalar costant for the current template
Constants contains any scalar constant for the current template

</div>

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [ $1 = "-h" ]; then
printf " \$ ./debug.sh http self\n\n"
printf "3. To run all integration tests of 'x' protocol that contains 'y' in template name and pass extra args to nuclei:\n"
printf " \$ ./debug.sh http self -svd -debug-req\n\n"
printf "nuclei binary is created everytime script is run but integration-test binary is not"
printf "nuclei binary is created every time script is run but integration-test binary is not"
exit 0
fi

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/workflow/shared-cookie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ workflows:
- template: workflow/http-2.yaml
# store cookie in native browser context
- template: workflow/headless-1.yaml
# retrive 2 standard library cookies + headless cookie
# retrieve 2 standard library cookies + headless cookie
- template: workflow/http-3.yaml
2 changes: 1 addition & 1 deletion nuclei-jsonschema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@
}
},
"type": "object",
"title": "payloads for the webosocket request",
"title": "payloads for the websocket request",
"description": "Payloads contains any payloads for the current request"
}
},
Expand Down
2 changes: 1 addition & 1 deletion v2/cmd/integration-test/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ func (h *httpInteractshStopAtFirstMatchRequest) Execute(filePath string) error {
if err != nil {
return err
}
// polling is asyncronous, so the interactions may be retrieved after the first request
// polling is asynchronous, so the interactions may be retrieved after the first request
return expectResultsCount(results, 1)
}

Expand Down
6 changes: 3 additions & 3 deletions v2/cmd/nuclei/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -422,11 +422,11 @@ func printTemplateVersion() {
if fileutil.FolderExists(cfg.CustomS3TemplatesDirectory) {
gologger.Info().Msgf("Custom S3 templates location: %s\n", cfg.CustomS3TemplatesDirectory)
}
if fileutil.FolderExists(cfg.CustomGithubTemplatesDirectory) {
gologger.Info().Msgf("Custom Github templates location: %s ", cfg.CustomGithubTemplatesDirectory)
if fileutil.FolderExists(cfg.CustomGitHubTemplatesDirectory) {
gologger.Info().Msgf("Custom GitHub templates location: %s ", cfg.CustomGitHubTemplatesDirectory)
}
if fileutil.FolderExists(cfg.CustomGitLabTemplatesDirectory) {
gologger.Info().Msgf("Custom Gitlab templates location: %s ", cfg.CustomGitLabTemplatesDirectory)
gologger.Info().Msgf("Custom GitLab templates location: %s ", cfg.CustomGitLabTemplatesDirectory)
}
if fileutil.FolderExists(cfg.CustomAzureTemplatesDirectory) {
gologger.Info().Msgf("Custom Azure templates location: %s ", cfg.CustomAzureTemplatesDirectory)
Expand Down
2 changes: 1 addition & 1 deletion v2/cmd/tmc/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type options struct {
func main() {
opts := options{}
flagSet := goflags.NewFlagSet()
flagSet.SetDescription(`TemplateMan CLI is baisc utility built on the TemplateMan API to standardize nuclei templates.`)
flagSet.SetDescription(`TemplateMan CLI is basic utility built on the TemplateMan API to standardize nuclei templates.`)

flagSet.CreateGroup("Input", "input",
flagSet.StringVarP(&opts.input, "input", "i", "", "Templates to annotate"),
Expand Down
4 changes: 2 additions & 2 deletions v2/gh_retry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LIMIT=30
BEFORE="30 mins ago"
WORKFLOW="Build Test"

# You can add multiple patterns seperated by |
# You can add multiple patterns separated by |
GREP_ERROR_PATTERN='Test "http/interactsh.yaml" failed'

#Set fonts for Help.
Expand Down Expand Up @@ -81,7 +81,7 @@ function retry_failed_jobs() {
select ( .conclusion=="failure" ) |
select ( .updatedAt > $date) ' --arg date "$date" --arg branch "$BRANCH" --arg workflow "$WORKFLOW" | jq .databaseId)

# convert line seperated by space to array
# convert line separated by space to array
eval "arr=($workflowIds)"

if [[ -z $arr ]]
Expand Down
4 changes: 2 additions & 2 deletions v2/internal/installer/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ func (t *TemplateManager) summarizeChanges(old, new map[string]string) *template
// getAbsoluteFilePath returns an absolute path where a file should be written based on given uri(i.e., files in zip)
// if a returned path is empty, it means that file should not be written and skipped
func (t *TemplateManager) getAbsoluteFilePath(templateDir, uri string, f fs.FileInfo) string {
// overwrite .nuclei-ignore everytime nuclei-templates are downloaded
// overwrite .nuclei-ignore every time nuclei-templates are downloaded
if f.Name() == config.NucleiIgnoreFileName {
return config.DefaultConfig.GetIgnoreFilePath()
}
Expand All @@ -206,7 +206,7 @@ func (t *TemplateManager) getAbsoluteFilePath(templateDir, uri string, f fs.File
gologger.Warning().Msgf("failed to get directory name from uri: %s", uri)
return filepath.Join(templateDir, uri)
}
// seperator is also included in rootDir
// separator is also included in rootDir
rootDirectory := uri[:index+1]
relPath := strings.TrimPrefix(uri, rootDirectory)

Expand Down
2 changes: 1 addition & 1 deletion v2/internal/installer/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestTemplateInstallation(t *testing.T) {

// we should have at least 1000 templates
require.Greater(t, counter, 1000)
// everytime we install templates, it should override the ignore file with latest one
// every time we install templates, it should override the ignore file with latest one
require.FileExists(t, config.DefaultConfig.GetIgnoreFilePath())
t.Logf("Installed %d templates", counter)
}
4 changes: 2 additions & 2 deletions v2/internal/installer/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func GetNewTemplatesInVersions(versions ...string) []string {
continue
}

arr, err := getNewAdditionsFileFromGithub(v)
arr, err := getNewAdditionsFileFromGitHub(v)
if err != nil {
gologger.Error().Msgf("failed to fetch new additions for %v got: %v", v, err)
continue
Expand All @@ -46,7 +46,7 @@ func GetNewTemplatesInVersions(versions ...string) []string {
return allTemplates
}

func getNewAdditionsFileFromGithub(version string) ([]string, error) {
func getNewAdditionsFileFromGitHub(version string) ([]string, error) {
resp, err := retryableHttpClient.Get(fmt.Sprintf("https://raw.githubusercontent.com/projectdiscovery/nuclei-templates/%s/.new-additions", version))
if err != nil {
return nil, err
Expand Down
4 changes: 2 additions & 2 deletions v2/internal/runner/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,8 @@ func (r *Runner) addCloudDataSource(source string) error {
return err
}
case "github":
for _, repo := range r.options.GithubTemplateRepo {
if _, err := r.processDataSourceItem(repo, r.options.GithubToken, "github"); err != nil {
for _, repo := range r.options.GitHubTemplateRepo {
if _, err := r.processDataSourceItem(repo, r.options.GitHubToken, "github"); err != nil {
return err
}
}
Expand Down
18 changes: 9 additions & 9 deletions v2/internal/runner/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ func ParseOptions(options *types.Options) {
gologger.Fatal().Msgf("Could not initialize protocols: %s\n", err)
}

// Set Github token in env variable. runner.getGHClientWithToken() reads token from env
if options.GithubToken != "" && os.Getenv("GITHUB_TOKEN") != options.GithubToken {
os.Setenv("GITHUB_TOKEN", options.GithubToken)
// Set GitHub token in env variable. runner.getGHClientWithToken() reads token from env
if options.GitHubToken != "" && os.Getenv("GITHUB_TOKEN") != options.GitHubToken {
os.Setenv("GITHUB_TOKEN", options.GitHubToken)
}

if options.UncoverQuery != nil {
Expand Down Expand Up @@ -203,7 +203,7 @@ func validateCloudOptions(options *types.Options) error {
case "s3":
missing = validateMissingS3Options(options)
case "github":
missing = validateMissingGithubOptions(options)
missing = validateMissingGitHubOptions(options)
case "gitlab":
missing = validateMissingGitLabOptions(options)
case "azure":
Expand Down Expand Up @@ -253,12 +253,12 @@ func validateMissingAzureOptions(options *types.Options) []string {
return missing
}

func validateMissingGithubOptions(options *types.Options) []string {
func validateMissingGitHubOptions(options *types.Options) []string {
var missing []string
if options.GithubToken == "" {
if options.GitHubToken == "" {
missing = append(missing, "GITHUB_TOKEN")
}
if len(options.GithubTemplateRepo) == 0 {
if len(options.GitHubTemplateRepo) == 0 {
missing = append(missing, "GITHUB_TEMPLATE_REPO")
}
return missing
Expand Down Expand Up @@ -360,10 +360,10 @@ func readEnvInputVars(options *types.Options) {
}
options.CloudAPIKey = os.Getenv("NUCLEI_CLOUD_API")

options.GithubToken = os.Getenv("GITHUB_TOKEN")
options.GitHubToken = os.Getenv("GITHUB_TOKEN")
repolist := os.Getenv("GITHUB_TEMPLATE_REPO")
if repolist != "" {
options.GithubTemplateRepo = append(options.GithubTemplateRepo, stringsutil.SplitAny(repolist, ",")...)
options.GitHubTemplateRepo = append(options.GitHubTemplateRepo, stringsutil.SplitAny(repolist, ",")...)
}

// GitLab options for downloading templates from a repository
Expand Down
2 changes: 1 addition & 1 deletion v2/internal/runner/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
proxyutils "github.com/projectdiscovery/utils/proxy"
)

// loadProxyServers load list of proxy servers from file or comma seperated
// loadProxyServers load list of proxy servers from file or comma separated
func loadProxyServers(options *types.Options) error {
if len(options.Proxy) == 0 {
return nil
Expand Down
4 changes: 2 additions & 2 deletions v2/internal/runner/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {
path = aurora.Cyan(tpl.Path).String()
tplBody, err = r.highlightTemplate(&tplBody)
if err != nil {
gologger.Error().Msgf("Could not hihglight the template %s: %s", tpl.Path, err)
gologger.Error().Msgf("Could not highlight the template %s: %s", tpl.Path, err)
continue
}

Expand All @@ -74,7 +74,7 @@ func (r *Runner) listAvailableStoreTemplates(store *loader.Store) {

func (r *Runner) highlightTemplate(body *[]byte) ([]byte, error) {
var buf bytes.Buffer
// YAML lexer, true color terminar formatter and monokai style
// YAML lexer, true color terminal formatter and monokai style
err := quick.Highlight(&buf, string(*body), "yaml", "terminal16m", "monokai")
if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/catalog/aws/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func (c Catalog) ResolvePath(templateName, second string) (string, error) {

// if c second path is given, it's c folder and we join the two and check against keys
if second != "" {
// Note: Do not replace `path` with `filepath` since filepath is aware of Os path seperator
// Note: Do not replace `path` with `filepath` since filepath is aware of Os path separator
// and we only see `/` in s3 paths changing it to filepath cause build fail and other errors
target := path.Join(path.Dir(second), templateName)
for _, key := range keys {
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/catalog/aws/catalog_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestCatalog_OpenFile(t *testing.T) {
false,
},
{
"non-existent key",
"nonexistent key",
"something/that-doesnt-exist.yaml",
true,
},
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/catalog/config/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const (
Version = `v2.9.10`
// Directory Names of custom templates
CustomS3TemplatesDirName = "s3"
CustomGithubTemplatesDirName = "github"
CustomGitHubTemplatesDirName = "github"
CustomAzureTemplatesDirName = "azure"
CustomGitLabTemplatesDirName = "gitlab"
)
Expand Down
12 changes: 6 additions & 6 deletions v2/pkg/catalog/config/nucleiconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ type Config struct {
TemplatesDirectory string `json:"nuclei-templates-directory,omitempty"`

// customtemplates exists in templates directory with the name of custom-templates provider
// below custom paths are absolute paths to respecitive custom-templates directories
// below custom paths are absolute paths to respective custom-templates directories
CustomS3TemplatesDirectory string `json:"custom-s3-templates-directory"`
CustomGithubTemplatesDirectory string `json:"custom-github-templates-directory"`
CustomGitHubTemplatesDirectory string `json:"custom-github-templates-directory"`
CustomGitLabTemplatesDirectory string `json:"custom-gitlab-templates-directory"`
CustomAzureTemplatesDirectory string `json:"custom-azure-templates-directory"`

TemplateVersion string `json:"nuclei-templates-version,omitempty"`
NucleiIgnoreHash string `json:"nuclei-ignore-hash,omitempty"`

// Latestxxx are not meant to be used directly and is used as
// LatestXXX are not meant to be used directly and is used as
// local cache of nuclei version check endpoint
// these fields are only update during nuclei version check
// TODO: move these fields to a separate unexported struct as they are not meant to be used directly
Expand Down Expand Up @@ -83,7 +83,7 @@ func (c *Config) NeedsTemplateUpdate() bool {
return !c.disableUpdates && (c.TemplateVersion == "" || IsOutdatedVersion(c.TemplateVersion, c.LatestNucleiTemplatesVersion) || !fileutil.FolderExists(c.TemplatesDirectory))
}

// NeedsIngoreFileUpdate returns true if Ignore file hash is different (aka ignore file is outdated)
// NeedsIgnoreFileUpdate returns true if Ignore file hash is different (aka ignore file is outdated)
func (c *Config) NeedsIgnoreFileUpdate() bool {
return c.NucleiIgnoreHash == "" || c.NucleiIgnoreHash != c.LatestNucleiIgnoreHash
}
Expand Down Expand Up @@ -111,7 +111,7 @@ func (c *Config) GetConfigDir() string {

// GetAllCustomTemplateDirs returns all custom template directories
func (c *Config) GetAllCustomTemplateDirs() []string {
return []string{c.CustomS3TemplatesDirectory, c.CustomGithubTemplatesDirectory, c.CustomGitLabTemplatesDirectory, c.CustomAzureTemplatesDirectory}
return []string{c.CustomS3TemplatesDirectory, c.CustomGitHubTemplatesDirectory, c.CustomGitLabTemplatesDirectory, c.CustomAzureTemplatesDirectory}
}

// GetReportingConfigFilePath returns the nuclei reporting config file path
Expand Down Expand Up @@ -188,7 +188,7 @@ func (c *Config) SetTemplatesDir(dirPath string) {
}
c.TemplatesDirectory = dirPath
// Update the custom templates directory
c.CustomGithubTemplatesDirectory = filepath.Join(dirPath, CustomGithubTemplatesDirName)
c.CustomGitHubTemplatesDirectory = filepath.Join(dirPath, CustomGitHubTemplatesDirName)
c.CustomS3TemplatesDirectory = filepath.Join(dirPath, CustomS3TemplatesDirName)
c.CustomGitLabTemplatesDirectory = filepath.Join(dirPath, CustomGitLabTemplatesDirName)
c.CustomAzureTemplatesDirectory = filepath.Join(dirPath, CustomAzureTemplatesDirName)
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/catalog/disk/find.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func (c *DiskCatalog) GetTemplatesPath(definitions []string) ([]string, map[stri
}
}
}
// purge all falsepositivies
// purge all false positives
filteredTemplates := []string{}
for _, v := range allTemplates {
// TODO: this is a temporary fix to avoid treating these files as templates
Expand Down Expand Up @@ -129,7 +129,7 @@ func (c *DiskCatalog) convertPathToAbsolute(t string) (string, error) {

// findGlobPathMatches returns the matched files from a glob path
func (c *DiskCatalog) findGlobPathMatches(absPath string, processed map[string]struct{}) ([]string, error) {
// to support globbing on old paths we use bruteforce to find matches with exit on first match
// to support globbing on old paths we use brute force to find matches with exit on first match
// trim templateDir if any
relPath := strings.TrimPrefix(absPath, c.templatesDirectory)
// trim leading slash if any
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/catalog/disk/path.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func BackwardsCompatiblePaths(templateDir string, oldPath string) string {
// trim the template directory from the path
return newPathCallback(tmp)
case strings.Contains(oldPath, urlutil.SchemeSeparator):
// scheme seperator is used to identify the path as url
// scheme separator is used to identify the path as url
// TBD: add support for url directories ??
return oldPath
case strings.Contains(oldPath, "*"):
Expand Down
4 changes: 2 additions & 2 deletions v2/pkg/catalog/loader/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type Store struct {
preprocessor templates.Preprocessor

// NotFoundCallback is called for each not found template
// This overrides error handling for not found templatesss
// This overrides error handling for not found templates
NotFoundCallback func(template string) bool
}

Expand Down Expand Up @@ -187,7 +187,7 @@ func (store *Store) ValidateTemplates() error {
if areTemplatesValid(store, filteredTemplatePaths) && areWorkflowsValid(store, filteredWorkflowPaths) {
return nil
}
return errors.New("errors occured during template validation")
return errors.New("errors occurred during template validation")
}

func areWorkflowsValid(store *Store, filteredWorkflowPaths map[string]struct{}) bool {
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/core/execute_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (e *Engine) ExecuteWithResults(templatesList []*templates.Template, target
return e.ExecuteScanWithOpts(templatesList, target, false)
}

// ExecuteScanWithOpts executes scan with given scanStatergy
// ExecuteScanWithOpts executes scan with given scanStrategy
func (e *Engine) ExecuteScanWithOpts(templatesList []*templates.Template, target InputProvider, noCluster bool) *atomic.Bool {
results := &atomic.Bool{}
selfcontainedWg := &sync.WaitGroup{}
Expand Down
2 changes: 1 addition & 1 deletion v2/pkg/core/inputs/hybrid/hmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func (i *Input) setItem(metaInput *contextargs.MetaInput) {
}
}

// setHostMapStream sets iteam in stream mode
// setHostMapStream sets item in stream mode
func (i *Input) setHostMapStream(data string) {
if _, err := i.hostMapStream.Merge([][]byte{[]byte(data)}); err != nil {
gologger.Warning().Msgf("%s\n", err)
Expand Down
Loading