machinery-tool 1.16.4 → 1.17.0

data/lib/system_description.rb

@@ -26,7 +26,7 @@
 # The sub directories storing the data for specific scopes are handled by the
 # ScopeFileStore class.
 class SystemDescription < Machinery::Object
-  CURRENT_FORMAT_VERSION = 5
+  CURRENT_FORMAT_VERSION = 6
   EXTRACTABLE_SCOPES = [
     "changed_managed_files",
     "config_files",
@@ -285,7 +285,7 @@ class SystemDescription < Machinery::Object
   end
 
   def runs_service?(name)
-    self["services"].services.any? { |service| service.name == "#{name}.service" }
+    self["services"].any? { |service| service.name == "#{name}.service" }
   end
 
   def has_file?(name)
@@ -300,7 +300,7 @@ class SystemDescription < Machinery::Object
   def read_config(path, key)
     EXTRACTABLE_SCOPES.each do |scope|
       if scope_extracted?(scope)
-        file = self[scope].files.find { |f| f.name == path }
+        file = self[scope].find { |f| f.name == path }
         return parse_variable_assignment(file.content, key) if file
       end
     end

data/lib/version.rb

@@ -17,6 +17,6 @@
 
 module Machinery
 
-  VERSION = "1.16.4"
+  VERSION = "1.17.0"
 
 end

data/lib/workload_mapper.rb

@@ -98,8 +98,8 @@ class WorkloadMapper
         system_description.unmanaged_files.export_files_as_tarballs(dir)
         workloads.each do |workload, config|
           config.fetch("data", {}).each do |origin, destination|
-            file = system_description.unmanaged_files.files.find { |f| f.name == origin }
-            file ||= system_description.config_files.files.find { |f| f.name == origin }
+            file = system_description.unmanaged_files.find { |f| f.name == origin }
+            file ||= system_description.config_files.find { |f| f.name == origin }
             if file && file.directory?
               tgz_file = File.join(dir, "trees", "#{origin.chop}.tgz")
               output_path = File.join(path, workload, destination)

data/machinery-helper/machinery_helper.go

@@ -18,211 +18,285 @@
 package main
 
 import (
-  "os/exec"
-  "bytes"
-  "log"
-  "strings"
-  "io/ioutil"
-  "encoding/json"
-  "os"
-  "sort"
-  "fmt"
-  "path/filepath"
-  "unicode/utf8"
-  "flag"
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"sort"
+	"strings"
+	"unicode/utf8"
 )
 
-func getRpms() []string {
-  cmd := exec.Command("rpm", "-qlav")
-  var out bytes.Buffer
-  cmd.Stdout = &out
-  err := cmd.Run()
-  if err != nil {
-    log.Fatal(err)
-  }
-
-  f := func(c rune) bool {
-    return c == '\n'
-  }
-  packages := strings.FieldsFunc(out.String(), f)
-  return packages
+func getDpkgContent() []string {
+	cmd := exec.Command("bash", "-c", "dpkg --get-selections | grep -v deinstall | awk '{print $1}'")
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	var files []string
+
+	for _, pkg := range strings.Split(out.String(), "\n") {
+		cmd := exec.Command("dpkg", "-L", pkg)
+		var out1 bytes.Buffer
+		cmd.Stdout = &out1
+		cmd.Run()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		files = append(files, strings.Split(out1.String(), "\n")...)
+	}
+
+	return files
+}
+
+func getRpmContent() []string {
+	cmd := exec.Command("rpm", "-qlav")
+	var out bytes.Buffer
+	cmd.Stdout = &out
+	err := cmd.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	f := func(c rune) bool {
+		return c == '\n'
+	}
+	files := strings.FieldsFunc(out.String(), f)
+	return files
 }
 
 func parseRpmLine(line string) (fileType string, fileName string, linkTarget string) {
-  fileType = line[0:1]
-
-  index := strings.Index(line, "/")
-  if index < 0 {
-    panic(line)
-  }
-  file := line[index:]
-  fields := strings.Split(file, " -> ")
-  if len(fields) == 2 {
-    fileName = fields[0]
-    linkTarget = fields[1]
-  } else {
-    fileName = file
-  }
-  return
+	fileType = line[0:1]
+
+	index := strings.Index(line, "/")
+	if index < 0 {
+		panic(line)
+	}
+	file := line[index:]
+	fields := strings.Split(file, " -> ")
+	if len(fields) == 2 {
+		fileName = fields[0]
+		linkTarget = fields[1]
+	} else {
+		fileName = file
+	}
+	return
 }
 
 func addImplicitlyManagedDirs(dirs map[string]bool, files map[string]string) {
-  for file, target := range files {
-    for i:= 1; i < len(file); i++ {
-      if file[i] == '/' {
-        topdir := file[:i]
-        if _, ok := dirs[topdir]; !ok {
-          dirs[topdir] = false
-        }
-      }
-    }
-
-    if target != "" {
-      if _, ok := dirs[target]; ok {
-        dirs[file] = false
-      }
-    }
-  }
-  return
+	for file, target := range files {
+		for i := 1; i < len(file); i++ {
+			if file[i] == '/' {
+				topdir := file[:i]
+				if _, ok := dirs[topdir]; !ok {
+					dirs[topdir] = false
+				}
+			}
+		}
+
+		if target != "" {
+			if _, ok := dirs[target]; ok {
+				dirs[file] = false
+			}
+		}
+	}
+	return
+}
+
+func getManagedFilesDpkg() (map[string]string, map[string]bool) {
+	files := make(map[string]string)
+	dirs := make(map[string]bool)
+
+	for _, file := range getDpkgContent() {
+		if len(file) > 0 {
+			reg := regexp.MustCompile(`/(?:$|(.+?)(?:(/.[^.]*$)|$))`)
+			segs := reg.FindAllString(file, -1)
+			if len(segs) > 0 {
+				fileInfo, err := os.Lstat(segs[0])
+
+				if err == nil {
+					if fileInfo.IsDir() {
+						dirs[segs[0]] = true
+					} else {
+						files[segs[0]] = ""
+					}
+				}
+			}
+		}
+	}
+
+	return files, dirs
+}
+func getManagedFilesRpm() (map[string]string, map[string]bool) {
+	files := make(map[string]string)
+	dirs := make(map[string]bool)
+
+	for _, pkg := range getRpmContent() {
+		if pkg != "(contains no files)" {
+			fileType, fileName, linkTarget := parseRpmLine(pkg)
+			switch fileType {
+			case "-":
+				files[fileName] = ""
+			case "d":
+				dirs[fileName] = true
+			case "l":
+				files[fileName] = linkTarget
+			}
+		}
+	}
+
+	addImplicitlyManagedDirs(dirs, files)
+
+	return files, dirs
+}
+
+func hasExecutable(name string) bool {
+	_, err := exec.LookPath(name)
+	if err != nil {
+		return false
+	}
+
+	return true
 }
 
 func getManagedFiles() (map[string]string, map[string]bool) {
-  files := make(map[string]string)
-  dirs := make(map[string]bool)
-
-  for _, pkg := range getRpms() {
-    if pkg != "(contains no files)" {
-      fileType, fileName, linkTarget := parseRpmLine(pkg)
-      switch fileType {
-        case "-":
-          files[fileName] = ""
-        case "d":
-          dirs[fileName] = true
-        case "l":
-          files[fileName] = linkTarget
-      }
-    }
-  }
-
-  addImplicitlyManagedDirs(dirs, files)
-
-  return files, dirs
+	files := make(map[string]string)
+	dirs := make(map[string]bool)
+
+	switch {
+	case hasExecutable("rpm"):
+		files, dirs = getManagedFilesRpm()
+	case hasExecutable("dpkg"):
+		files, dirs = getManagedFilesDpkg()
+	}
+
+	return files, dirs
 }
 
 func assembleJSON(unmanagedFilesMap interface{}) string {
-  jsonMap := map[string]interface{}{ "extracted": false, "files": unmanagedFilesMap }
-  json, _ := json.MarshalIndent(jsonMap, " ", "  ")
-  return string(json)
+	jsonMap := map[string]interface{}{"extracted": false, "files": unmanagedFilesMap}
+	json, _ := json.MarshalIndent(jsonMap, " ", "  ")
+	return string(json)
 }
 
 var readDir = func(dir string) ([]os.FileInfo, error) {
-  return ioutil.ReadDir(dir)
+	return ioutil.ReadDir(dir)
 }
 
 func hasManagedDirs(dir string, rpmDirs map[string]bool) bool {
-  for rpmDir := range rpmDirs {
-    if strings.HasPrefix(rpmDir, dir + "/") {
-       return true
-    }
-  }
-  return false
+	for rpmDir := range rpmDirs {
+		if strings.HasPrefix(rpmDir, dir+"/") {
+			return true
+		}
+	}
+	return false
 }
 
 func findUnmanagedFiles(dir string, rpmFiles map[string]string, rpmDirs map[string]bool,
-    unmanagedFiles map[string]string, ignoreList map[string]bool) {
-  files, _ := readDir(dir)
-  for _, f := range files {
-    fileName := dir + f.Name()
-    if !utf8.ValidString(fileName) {
-      fmt.Fprintln(os.Stderr, fileName, "contains invalid UTF-8 characters. Skipping.")
-    } else {
-      if _, ok := ignoreList[fileName]; !ok {
-        if f.IsDir() {
-          if _, ok := rpmDirs[fileName]; ok {
-            findUnmanagedFiles(fileName + "/", rpmFiles, rpmDirs, unmanagedFiles, ignoreList)
-          } else {
-            if !hasManagedDirs(fileName, rpmDirs) {
-              unmanagedFiles[fileName + "/"] = "dir"
-            }
-          }
-        } else {
-          if _, ok := rpmFiles[fileName]; !ok {
-            if f.Mode() &
-              (os.ModeSocket | os.ModeNamedPipe | os.ModeDevice | os.ModeCharDevice) != 0 {
-              // Ignore sockets, named pipes and devices
-            } else if f.Mode() & os.ModeSymlink == os.ModeSymlink {
-              unmanagedFiles[fileName] = "link"
-            } else {
-              unmanagedFiles[fileName] = "file"
-            }
-          }
-        }
-      }
-    }
-  }
+	unmanagedFiles map[string]string, ignoreList map[string]bool) {
+	files, _ := readDir(dir)
+	for _, f := range files {
+		fileName := dir + f.Name()
+		if !utf8.ValidString(fileName) {
+			fmt.Fprintln(os.Stderr, fileName, "contains invalid UTF-8 characters. Skipping.")
+		} else {
+			if _, ok := ignoreList[fileName]; !ok {
+				if f.IsDir() {
+					if _, ok := rpmDirs[fileName]; ok {
+						findUnmanagedFiles(fileName+"/", rpmFiles, rpmDirs, unmanagedFiles, ignoreList)
+					} else {
+						if !hasManagedDirs(fileName, rpmDirs) {
+							unmanagedFiles[fileName+"/"] = "dir"
+						}
+					}
+				} else {
+					if _, ok := rpmFiles[fileName]; !ok {
+						if f.Mode()&
+							(os.ModeSocket|os.ModeNamedPipe|os.ModeDevice|os.ModeCharDevice) != 0 {
+							// Ignore sockets, named pipes and devices
+						} else if f.Mode()&os.ModeSymlink == os.ModeSymlink {
+							unmanagedFiles[fileName] = "link"
+						} else {
+							unmanagedFiles[fileName] = "file"
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 func printVersion() {
-  fmt.Println("Version:", VERSION)
-  os.Exit(0)
+	fmt.Println("Version:", VERSION)
+	os.Exit(0)
 }
 
 func main() {
-  // check for tar extraction
-  if len(os.Args) >= 2 {
-    switch os.Args[1] {
-    case "tar":
-      Tar(os.Args[2:])
-      os.Exit(0)
-    }
-  }
-
-  // parse CLI arguments
-  var versionFlag = flag.Bool("version", false, "shows the version number")
-  flag.Parse()
-
-  // show version
-  if (*versionFlag == true) {
-    printVersion()
-  }
-
-  // fetch unmanaged files
-  unmanagedFiles := make(map[string]string)
-  thisBinary, _ := filepath.Abs(os.Args[0])
-
-  ignoreList := map[string]bool{
-    thisBinary: true,
-  }
-  for _, mount := range RemoteMounts() {
-    ignoreList[mount] = true
-  }
-  for _, mount := range SpecialMounts() {
-    ignoreList[mount] = true
-  }
-
-  for _, mount := range RemoteMounts() {
-    unmanagedFiles[mount + "/"] = "remote_dir"
-  }
-
-  rpmFiles, rpmDirs := getManagedFiles()
-  findUnmanagedFiles("/", rpmFiles, rpmDirs, unmanagedFiles, ignoreList)
-
-  files := make([]string, len(unmanagedFiles))
-  i := 0
-  for k := range unmanagedFiles {
-    files[i] = k
-    i++
-  }
-  sort.Strings(files)
-
-  unmanagedFilesMap := make([]map[string]string, len(unmanagedFiles))
-  for j := range files {
-    entry := make(map[string]string)
-    entry["name"] = files[j]
-    entry["type"] = unmanagedFiles[files[j]]
-    unmanagedFilesMap[j] = entry
-  }
-
-  json := assembleJSON(unmanagedFilesMap)
-  fmt.Println(json)
+	// check for tar extraction
+	if len(os.Args) >= 2 {
+		switch os.Args[1] {
+		case "tar":
+			Tar(os.Args[2:])
+			os.Exit(0)
+		}
+	}
+
+	// parse CLI arguments
+	var versionFlag = flag.Bool("version", false, "shows the version number")
+	flag.Parse()
+
+	// show version
+	if *versionFlag == true {
+		printVersion()
+	}
+
+	// fetch unmanaged files
+	unmanagedFiles := make(map[string]string)
+	thisBinary, _ := filepath.Abs(os.Args[0])
+
+	ignoreList := map[string]bool{
+		thisBinary: true,
+	}
+	for _, mount := range RemoteMounts() {
+		ignoreList[mount] = true
+	}
+	for _, mount := range SpecialMounts() {
+		ignoreList[mount] = true
+	}
+
+	for _, mount := range RemoteMounts() {
+		unmanagedFiles[mount+"/"] = "remote_dir"
+	}
+
+	managedFiles, managedDirs := getManagedFiles()
+	findUnmanagedFiles("/", managedFiles, managedDirs, unmanagedFiles, ignoreList)
+
+	files := make([]string, len(unmanagedFiles))
+	i := 0
+	for k := range unmanagedFiles {
+		files[i] = k
+		i++
+	}
+	sort.Strings(files)
+
+	unmanagedFilesMap := make([]map[string]string, len(unmanagedFiles))
+	for j := range files {
+		entry := make(map[string]string)
+		entry["name"] = files[j]
+		entry["type"] = unmanagedFiles[files[j]]
+		unmanagedFilesMap[j] = entry
+	}
+
+	json := assembleJSON(unmanagedFilesMap)
+	fmt.Println(json)
 }