Add custom resources in fs scanning and add deregister analyzers (aqu…

…asecurity#564) * Add deregister analyzers * feat(fs): add CustomResources
MrQuiet · Jun 14, 2022 · 29c7165 · 29c7165
1 parent 981bf73
commit 29c7165
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/analyzer/analyzer.go b/analyzer/analyzer.go
@@ -66,10 +66,20 @@ func RegisterAnalyzer(analyzer analyzer) {
 	analyzers[analyzer.Type()] = analyzer
 }
 
+// DeregisterAnalyzer is mainly for testing
+func DeregisterAnalyzer(t Type) {
+	delete(analyzers, t)
+}
+
 func RegisterConfigAnalyzer(analyzer configAnalyzer) {
 	configAnalyzers[analyzer.Type()] = analyzer
 }
 
+// DeregisterConfigAnalyzer is mainly for testing
+func DeregisterConfigAnalyzer(t Type) {
+	delete(configAnalyzers, t)
+}
+
 // CustomGroup returns a group name for custom analyzers
 // This is mainly intended to be used in Aqua products.
 type CustomGroup interface {

diff --git a/artifact/local/fs.go b/artifact/local/fs.go
@@ -113,12 +113,13 @@ func (a Artifact) Inspect(ctx context.Context) (types.ArtifactReference, error)
 	result.Sort()
 
 	blobInfo := types.BlobInfo{
-		SchemaVersion: types.BlobJSONSchemaVersion,
-		OS:            result.OS,
-		Repository:    result.Repository,
-		PackageInfos:  result.PackageInfos,
-		Applications:  result.Applications,
-		Secrets:       result.Secrets,
+		SchemaVersion:   types.BlobJSONSchemaVersion,
+		OS:              result.OS,
+		Repository:      result.Repository,
+		PackageInfos:    result.PackageInfos,
+		Applications:    result.Applications,
+		Secrets:         result.Secrets,
+		CustomResources: result.CustomResources,
 	}
 
 	if err = a.handlerManager.PostHandle(ctx, result, &blobInfo); err != nil {