object type info in object metadata in xray

Signed-off-by: Kyle Quest <[email protected]>

Author: kcq

pkg/app/master/command/build/flags.go

@@ -34,39 +34,39 @@ const (
 	FlagIncludeExeFile   = "include-exe-file"
 	FlagIncludeShell     = "include-shell"
 
-	FlagIncludeDirBins = "include-dir-bins"
+	FlagIncludeDirBins      = "include-dir-bins"
 	FlagIncludeDirBinsUsage = "Keep binaries in the target directory (executables or shared objects) and their dependencies, which could be in other locations"
 
-	FlagIncludeWorkdir            = "include-workdir"
+	FlagIncludeWorkdir      = "include-workdir"
 	FlagIncludeWorkdirUsage = "Keep files in working directory"
 
 	//TBD
 	FlagWorkdirExclude      = "workdir-exclude"
 	FlagWorkdirExcludeUsage = "Exclude filter for artifacts when working directory is included"
 
 	FlagIncludeAppImageAddCopyAll = "include-app-image-addcopy-all" //TBD
-	FlagIncludeAppImageRun        = "include-app-image-run" //TBD
+	FlagIncludeAppImageRun        = "include-app-image-run"         //TBD
 
-	FlagIncludeAppImageAll        = "include-app-image-all"
-	FlagIncludeAppImageAllUsage   = "Keep everything in the app part of the container image"
+	FlagIncludeAppImageAll      = "include-app-image-all"
+	FlagIncludeAppImageAllUsage = "Keep everything in the app part of the container image"
 
-	FlagAppImageStartInst       = "app-image-start-instruction"
-	FlagAppImageStartInstUsage  = "Instruction (prefix) that indicates where the app starts in the container image"
+	FlagAppImageStartInst      = "app-image-start-instruction"
+	FlagAppImageStartInstUsage = "Instruction (prefix) that indicates where the app starts in the container image"
 
 	FlagAppImageStartLayerCount = "app-image-start-layer-count" //TBD
 
-	FlagAppImageStartInstGroup  = "app-image-start-instruction-group"
+	FlagAppImageStartInstGroup      = "app-image-start-instruction-group"
 	FlagAppImageStartInstGroupUsage = "Instruction group (reverse) index that indicates where the app starts in the container image"
 
-	FlagAppImageStartDetect     = "app-image-start-detect" //TBD
+	FlagAppImageStartDetect = "app-image-start-detect" //TBD
 
 	FlagAppImageDockerfile      = "app-image-dockerfile" //TODO: make it work with FlagBuildFromDockerfile too
-	FlagAppImageDockerfileUsage     = "Path to app image Dockerfile (used to determine where the application part of the image starts)"
+	FlagAppImageDockerfileUsage = "Path to app image Dockerfile (used to determine where the application part of the image starts)"
 
-	FlagIncludePathsCreportFile = "include-paths-creport-file"
+	FlagIncludePathsCreportFile      = "include-paths-creport-file"
 	FlagIncludePathsCreportFileUsage = "Keep files from the referenced creport"
 
-	FlagIncludeOSLibsNet = "include-oslibs-net"
+	FlagIncludeOSLibsNet      = "include-oslibs-net"
 	FlagIncludeOSLibsNetUsage = "Keep the common networking OS libraries"
 
 	FlagIncludeSSHClient           = "include-ssh-client"

pkg/app/master/command/merge/handler.go

@@ -446,18 +446,3 @@ func tarFromMap(logger *log.Entry, outputPath string, tarMap map[string]*tfInfo)
 
 	return out.Name(), nil
 }
-
-func TarTypeName(flag byte) string {
-	switch flag {
-	case tar.TypeDir:
-		return "dir"
-	case tar.TypeReg, tar.TypeRegA:
-		return "file"
-	case tar.TypeSymlink:
-		return "symlink"
-	case tar.TypeLink:
-		return "hardlink"
-	default:
-		return fmt.Sprintf("%v", flag)
-	}
-}

pkg/app/sensor/artifact/artifact.go

@@ -769,21 +769,21 @@ func (p *store) prepareArtifacts() {
 
 			bprops.Flags = p.getArtifactFlags(bpath)
 
-			fsType := "unknown"
+			fsType := report.UnknownArtifactTypeName
 			switch {
 			case bpathFileInfo.Mode().IsRegular():
-				fsType = "file"
+				fsType = report.FileArtifactTypeName
 				p.rawNames[bpath] = bprops
 				//use a separate file map, so we can save them last
 				//in case we are dealing with intermediate symlinks
 				//and to better track what bin deps are not covered by dynamic analysis
 				p.saFileMap[bpath] = bprops
 			case (bpathFileInfo.Mode() & os.ModeSymlink) != 0:
-				fsType = "symlink"
+				fsType = report.SymlinkArtifactTypeName
 				p.linkMap[bpath] = bprops
 				p.rawNames[bpath] = bprops
 			default:
-				fsType = "unexpected"
+				fsType = report.UnexpectedArtifactTypeName
 				log.Debugf("prepareArtifacts.binArtifacts[bsa] - unexpected ft - %s", bpath)
 			}