feat: use .manifest to store metrics metadata

internal/build.go

@@ -32,17 +32,9 @@ type BuildCommandParams struct {
 func RunBuild(args []string, params *BuildCommandParams) error {
 	buf := bytes.NewBuffer(nil)
 
-	var metadataFile = ""
-	rules, err := util.RetrieveRules(args)
-	if err == nil {
-		// choose either one of the locations for the metadata.json
-		// it will be included in the OPA generated data.json
-		metadataFile = path.Join(args[0], "metadata.json")
-		err = os.WriteFile(metadataFile, []byte(fmt.Sprintf("{\"numberOfRules\": %d}", len(rules))),
-			0644)
-		if err != nil {
-			return err
-		}
+	metadataFile, err := createManifest(args)
+	if err == nil && metadataFile != "" {
+		defer os.Remove(metadataFile)
 	}
 
 	var capabilities *ast.Capabilities
@@ -57,19 +49,20 @@ func RunBuild(args []string, params *BuildCommandParams) error {
 	compiler := compile.New().
 		WithCapabilities(capabilities).
 		WithTarget(params.Target.String()).
-		WithAsBundle(false).
+		WithAsBundle(true).
 		WithOptimizationLevel(0).
 		WithOutput(buf).
 		WithEntrypoints(params.Entrypoint.Strings()...).
 		WithPaths(args...).
-		WithFilter(buildCommandLoaderFilter(false, params.Ignore))
+		WithFilter(buildCommandLoaderFilter(true, params.Ignore))
 
 	err = compiler.Build(context.Background())
 	if err != nil {
 		return err
 	}
 
 	out, err := os.Create(params.OutputFile)
+	defer out.Close()
 	if err != nil {
 		return err
 	}
@@ -79,18 +72,33 @@ func RunBuild(args []string, params *BuildCommandParams) error {
 		return err
 	}
 
-	if metadataFile != "" {
-		_ = os.Remove(metadataFile)
-	}
-
-	return out.Close()
+	return nil
 }
 
 func buildCommandLoaderFilter(bundleMode bool, ignore []string) func(string, os.FileInfo, int) bool {
 	return func(abspath string, info os.FileInfo, depth int) bool {
-		if !info.IsDir() && strings.HasSuffix(abspath, ".tar.gz") {
-			return true
+		if !bundleMode {
+			if !info.IsDir() && strings.HasSuffix(abspath, ".tar.gz") {
+				return true
+			}
 		}
 		return util.LoaderFilter{Ignore: ignore}.Apply(abspath, info, depth)
 	}
 }
+
+func createManifest(inputPaths []string) (string, error) {
+	rules, err := util.RetrieveRules(inputPaths)
+	if err != nil {
+		return "", err
+	}
+
+	// choose either one of the locations for the metadata.json
+	// it will be included in the OPA generated data.json
+	metadataFile := path.Join(inputPaths[0], ".manifest")
+	err = os.WriteFile(metadataFile, []byte(fmt.Sprintf("{\"metadata\":{\"numberOfRules\":%d}}", len(rules))),
+		0644)
+	if err != nil {
+		return "", err
+	}
+	return metadataFile, nil
+}

internal/build_test.go

@@ -310,16 +310,12 @@ func TestBuildProducesMetadata(t *testing.T) {
 			}
 			assert.Nil(t, err)
 
-			if f.Name == "/data.json" {
+			if f.Name == "/.manifest" {
 				data := new(bytes.Buffer)
 				_, err := data.ReadFrom(tr)
 				assert.Nil(t, err)
 				assert.Contains(t, data.String(), "{\"numberOfRules\":1}")
 			}
-
-			if f.Name == "/metadata.json" {
-				t.Fatal("unexpected file:", f.Name)
-			}
 		}
 	})
 }