diff --git a/internal/tests/db.go b/internal/tests/db.go index fa32e865..022f923c 100644 --- a/internal/tests/db.go +++ b/internal/tests/db.go @@ -110,7 +110,7 @@ func (m *TXMock) Query(ctx context.Context, sql string, args ...interface{}) (pg return nil, nil } -// Query implements the pgx.Tx interface. +// QueryFunc implements the pgx.Tx interface. func (m *TXMock) QueryFunc( ctx context.Context, sql string, diff --git a/internal/tracker/source/helm/helm.go b/internal/tracker/source/helm/helm.go index ef5af524..0b8b59d7 100644 --- a/internal/tracker/source/helm/helm.go +++ b/internal/tracker/source/helm/helm.go @@ -372,6 +372,9 @@ func enrichPackageFromArchive(p *hub.Package, chart *chart.Chart) error { p.Data["dependencies"] = dependencies } + // Kubernetes version + p.Data["kubeVersion"] = chart.Metadata.KubeVersion + // License licenseFile := getFile(chart, "LICENSE") if licenseFile != nil { @@ -415,6 +418,9 @@ func enrichPackageFromArchive(p *hub.Package, chart *chart.Chart) error { p.Readme = string(readme.Data) } + // Type + p.Data["type"] = chart.Metadata.Type + // Enrich package with information from annotations if err := enrichPackageFromAnnotations(p, md.Annotations); err != nil { return fmt.Errorf("error enriching package from annotations: %w", err) diff --git a/internal/tracker/source/helm/helm_test.go b/internal/tracker/source/helm/helm_test.go index 05747d96..1e2f517f 100644 --- a/internal/tracker/source/helm/helm_test.go +++ b/internal/tracker/source/helm/helm_test.go @@ -56,7 +56,9 @@ func TestTrackerSource(t *testing.T) { }, }, Data: map[string]interface{}{ - "apiVersion": "v2", + "apiVersion": "v2", + "kubeVersion": ">= 1.13.0 < 1.15.0", + "type": "application", }, Version: "1.0.0", AppVersion: "1.0.0", diff --git a/internal/tracker/source/helm/testdata/pkg1-1.0.0.tgz b/internal/tracker/source/helm/testdata/pkg1-1.0.0.tgz index 427d638a..c0efafae 100644 Binary files a/internal/tracker/source/helm/testdata/pkg1-1.0.0.tgz and b/internal/tracker/source/helm/testdata/pkg1-1.0.0.tgz differ