From 1a67472d2bd6efaf0d0698365d877145f8bc7551 Mon Sep 17 00:00:00 2001 From: Nikita Pivkin Date: Fri, 29 Mar 2024 06:55:00 +0300 Subject: [PATCH] perf(helm): load in-memory files (#6383) --- pkg/iac/scanners/helm/parser/parser.go | 58 +++++++++-------------- pkg/iac/scanners/helm/test/parser_test.go | 5 +- 2 files changed, 24 insertions(+), 39 deletions(-) diff --git a/pkg/iac/scanners/helm/parser/parser.go b/pkg/iac/scanners/helm/parser/parser.go index 20228258e5d..3123b04e4b9 100644 --- a/pkg/iac/scanners/helm/parser/parser.go +++ b/pkg/iac/scanners/helm/parser/parser.go @@ -7,7 +7,6 @@ import ( "fmt" "io" "io/fs" - "os" "path/filepath" "regexp" "sort" @@ -192,17 +191,7 @@ func (p *Parser) extractChartName(chartPath string) error { } func (p *Parser) RenderedChartFiles() ([]ChartFile, error) { - - tempDir, err := os.MkdirTemp(os.TempDir(), "defsec") - if err != nil { - return nil, err - } - - if err := p.writeBuildFiles(tempDir); err != nil { - return nil, err - } - - workingChart, err := loadChart(tempDir) + workingChart, err := p.loadChart() if err != nil { return nil, err } @@ -246,19 +235,36 @@ func (p *Parser) getRelease(chrt *chart.Chart) (*release.Release, error) { return r, nil } -func loadChart(tempFs string) (*chart.Chart, error) { - loadedChart, err := loader.Load(tempFs) +func (p *Parser) loadChart() (*chart.Chart, error) { + + var files []*loader.BufferedFile + + for _, filePath := range p.filepaths { + b, err := fs.ReadFile(p.workingFS, filePath) + if err != nil { + return nil, err + } + + filePath = strings.TrimPrefix(filePath, p.rootPath+"/") + filePath = filepath.ToSlash(filePath) + files = append(files, &loader.BufferedFile{ + Name: filePath, + Data: b, + }) + } + + c, err := loader.LoadFiles(files) if err != nil { return nil, err } - if req := loadedChart.Metadata.Dependencies; req != nil { - if err := action.CheckDependencies(loadedChart, req); err != nil { + if req := c.Metadata.Dependencies; req != nil { + if err := action.CheckDependencies(c, req); err != nil { return nil, err } } - return loadedChart, nil + return c, nil } func (*Parser) getRenderedManifests(manifestsKeys []string, splitManifests map[string]string) []ChartFile { @@ -290,24 +296,6 @@ func getManifestPath(manifest string) string { return manifestFilePathParts[0] } -func (p *Parser) writeBuildFiles(tempFs string) error { - for _, path := range p.filepaths { - content, err := fs.ReadFile(p.workingFS, path) - if err != nil { - return err - } - workingPath := strings.TrimPrefix(path, p.rootPath) - workingPath = filepath.Join(tempFs, workingPath) - if err := os.MkdirAll(filepath.Dir(workingPath), os.ModePerm); err != nil { - return err - } - if err := os.WriteFile(workingPath, content, os.ModePerm); err != nil { - return err - } - } - return nil -} - func (p *Parser) required(path string, workingFS fs.FS) bool { if p.skipRequired { return true diff --git a/pkg/iac/scanners/helm/test/parser_test.go b/pkg/iac/scanners/helm/test/parser_test.go index 6d9f5ad0cff..0d12f33fe82 100644 --- a/pkg/iac/scanners/helm/test/parser_test.go +++ b/pkg/iac/scanners/helm/test/parser_test.go @@ -32,11 +32,8 @@ func Test_helm_parser(t *testing.T) { for _, test := range tests { t.Run(test.testName, func(t *testing.T) { chartName := test.chartName - - t.Logf("Running test: %s", test.testName) - helmParser := parser.New(chartName) - err := helmParser.ParseFS(context.TODO(), os.DirFS(filepath.Join("testdata", chartName)), ".") + err := helmParser.ParseFS(context.TODO(), os.DirFS("testdata"), chartName) require.NoError(t, err) manifests, err := helmParser.RenderedChartFiles() require.NoError(t, err)