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

make ModDataExtensions a string slice #4088

Merged
merged 1 commit into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions pkg/constants/extensions.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@ package constants

import "github.com/turbot/go-kit/helpers"

var ModDataExtensions = []string{".sp", "*.pp"}

const (
PluginExtension = ".plugin"
ConfigExtension = ".spc"
SqlExtension = ".sql"
MarkdownExtension = ".md"
ModDataExtension = ".sp"
VariablesExtension = ".spvars"
AutoVariablesExtension = ".auto.spvars"
JsonExtension = ".json"
CsvExtension = ".csv"
TextExtension = ".txt"
SnapshotExtension = ".sps"
TokenExtension = ".tptt"
Expand Down
3 changes: 2 additions & 1 deletion pkg/steampipeconfig/load_mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ func LoadModResourceNames(ctx context.Context, mod *modconfig.Mod, parseCtx *par
// GetModFileExtensions returns list of all file extensions we care about
// this will be the mod data extension, plus any registered extensions registered in fileToResourceMap
func GetModFileExtensions() []string {
return append(modconfig.RegisteredFileExtensions(), constants.ModDataExtension, constants.VariablesExtension)
res := append(modconfig.RegisteredFileExtensions(), constants.ModDataExtensions...)
return append(res, constants.VariablesExtension)
}

// build list of all filepaths we need to parse/load the mod
Expand Down
2 changes: 1 addition & 1 deletion pkg/workspace/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ func (w *Workspace) getParseContext(ctx context.Context) (*parse.ModParseContext
Flags: w.listFlag,
Exclude: w.exclusions,
// only load .sp files
Include: filehelpers.InclusionsFromExtensions([]string{constants.ModDataExtension}),
Include: filehelpers.InclusionsFromExtensions(constants.ModDataExtensions),
})

return parseCtx, nil
Expand Down
Loading