machinery-tool 1.16.4 → 1.17.0

data/plugins/repositories/repositories_inspector.rb

@@ -27,9 +27,11 @@ class RepositoriesInspector < Inspector
       @description.repositories = inspect_zypp_repositories
     elsif system.has_command?("yum")
       @description.repositories = inspect_yum_repositories
+    elsif system.has_command?("apt")
+      @description.repositories = inspect_apt_repositories
     else
       raise Machinery::Errors::MissingRequirement.new(
-        "Need either the binary 'zypper' or 'yum' to be available on the inspected system."
+        "Need either the binary 'zypper', 'yum' or 'apt' to be available on the inspected system."
       )
     end
   end
@@ -66,7 +68,7 @@ class RepositoriesInspector < Inspector
       result = parse_repositories_from_xml(xml, priorities, credentials)
     end
 
-    RepositoriesScope.new(result)
+    RepositoriesScope.new(result, repository_system: "zypp")
   end
 
   def inspect_yum_repositories
@@ -74,14 +76,7 @@ class RepositoriesInspector < Inspector
     begin
       repositories = JSON.parse(system.run_command(
         "bash", "-c", "python", stdin: script, stdout: :capture
-      ).split("\n").last).map { |element| Repository.new(element) }
-      repositories.each do |repository|
-        if repository.url.empty?
-          raise Machinery::Errors::InspectionFailed.new(
-            "Yum repository baseurl is missing. Metalinks are not supported at the moment."
-          )
-        end
-      end
+      ).split("\n").last).map { |element| YumRepository.new(element) }
     rescue JSON::ParserError
       raise Machinery::Errors::InspectionFailed.new("Extraction of YUM repositories failed.")
     rescue Cheetah::ExecutionFailed => e
@@ -90,7 +85,40 @@ class RepositoriesInspector < Inspector
       )
     end
 
-    RepositoriesScope.new(repositories)
+    RepositoriesScope.new(repositories, repository_system: "yum")
+  end
+
+  def inspect_apt_repositories
+    content = system.read_file("/etc/apt/sources.list")
+    begin
+      content += "\n" + system.run_command(
+        "bash", "-c", "cat /etc/apt/sources.list.d/*.list", stdout: :capture
+      )
+    rescue Cheetah::ExecutionFailed
+    end
+
+    RepositoriesScope.new(
+      parse_apt_repositories(content), repository_system: "apt"
+    )
+  end
+
+  def parse_apt_repositories(content)
+    repositories = []
+    content.each_line do |line|
+      if line =~ /^\s*(deb|deb-src)\s+(\S+)\s+(\S+)(\s+\S[^#]*\S)?(\s*|\s*#.*)$/
+        repositories << AptRepository.new(
+          type: $1,
+          url: $2,
+          distribution: $3,
+          components: $4 ? $4.strip.split(" ") : []
+        )
+      elsif line =~ /Types: deb/
+        Machinery::Ui.warn(
+          "Warning: An unsupported rfc822 style repository was found, which will be ignored."
+        )
+      end
+    end
+    repositories.uniq
   end
 
   def parse_priorities_from_details(details)
@@ -154,7 +182,7 @@ class RepositoriesInspector < Inspector
         password = credentials[cred_value][:password]
       end
 
-      repository = Repository.new(
+      repository = ZyppRepository.new(
         alias:       rep["alias"],
         name:        rep["name"],
         type:        rep["type"],
@@ -162,8 +190,7 @@ class RepositoriesInspector < Inspector
         enabled:     rep["enabled"] == "1",
         autorefresh: rep["autorefresh"] == "1",
         gpgcheck:    rep["gpgcheck"] == "1",
-        priority:    pri_value,
-        package_manager: "zypp"
+        priority:    pri_value
       )
       if username && password
         repository[:username] = username

data/plugins/repositories/repositories_model.rb

@@ -22,22 +22,65 @@ class Repository < Machinery::Object
   end
 end
 
+class ZyppRepository < Repository
+  class << self
+    def key
+      "alias"
+    end
+
+    def attributes
+      ["name", "url", "type", "enabled", "autorefresh", "gpgcheck", "priority", "gpgkey"]
+    end
+  end
+end
+
+class YumRepository < Repository
+  class << self
+    def key
+      "alias"
+    end
+
+    def attributes
+      ["name", "url", "type", "enabled", "gpgcheck", "priority", "mirrorlist", "gpgkey"]
+    end
+  end
+end
+
+class AptRepository < Repository
+  class << self
+    def key
+      "url"
+    end
+
+    def attributes
+      ["url", "type", "distribution", "components"]
+    end
+  end
+end
+
 class RepositoriesScope < Machinery::Array
   include Machinery::Scope
 
-  has_elements class: Repository
+  has_attributes :repository_system
+  has_elements class: ZyppRepository, if: { repository_system: "zypp" }
+  has_elements class: YumRepository, if: { repository_system: "yum" }
+  has_elements class: AptRepository, if: { repository_system: "apt" }
 
   def compare_with(other)
-    only_self = self - other
-    only_other = other - self
-    common = self & other
-    changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :alias)
-
-    [
-      only_self,
-      only_other,
-      changed,
-      common
-    ].map { |e| (e && !e.empty?) ? e : nil }
+    if self.repository_system != other.repository_system
+      [self, other, nil, nil]
+    else
+      only_self = self - other
+      only_other = other - self
+      changed = Machinery::Scope.extract_changed_elements(only_self, only_other, :alias)
+      common = self & other
+
+      [
+        only_self,
+        only_other,
+        changed,
+        common
+      ].map { |e| (e && !e.empty?) ? e : nil }
+    end
   end
 end

data/plugins/repositories/repositories_renderer.rb

@@ -25,13 +25,29 @@ class RepositoriesRenderer < Renderer
 
     list do
       description.repositories.each do |p|
-        item "#{p.name}" do
-          puts "URI: #{p.url}"
-          puts "Alias: #{p.alias}"
-          puts "Enabled: #{p.enabled ? "Yes" : "No"}"
-          puts "Refresh: #{p.autorefresh ? "Yes" : "No"}" if p.autorefresh != nil
-          puts "Priority: #{p.priority}" if p.priority != nil
-          puts "Package Manager: #{p.package_manager}"
+        item_name = if p.name
+          p.name
+        else
+          "URI: #{p.url}"
+        end
+        item item_name do
+          if p.url.is_a?(Array)
+            list "URI", sublist: true do
+              p.url.each do |url|
+                item url
+              end
+            end
+          elsif p.name
+            puts "URI: #{p.url}"
+          end
+          puts "Mirrorlist: #{!p.mirrorlist.empty? ? p.mirrorlist : "N/A"}" if p.mirrorlist
+          puts "Alias: #{p.alias}" if p.alias
+          puts "Distribution: #{p.distribution}" if p.distribution
+          puts "Components: #{p.components.join(", ")}" if p.components
+          puts "Enabled: #{p.enabled ? "Yes" : "No"}" unless p.enabled.nil?
+          puts "Refresh: #{p.autorefresh ? "Yes" : "No"}" unless p.autorefresh.nil?
+          puts "Priority: #{p.priority}" unless p.priority.nil?
+          puts "Type: #{p.type || "N/A"}"
         end
       end
     end

data/plugins/repositories/schema/system-description-repositories.schema-v6.json

@@ -0,0 +1,165 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "oneOf": [
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "repository_system"
+          ],
+          "properties": {
+            "repository_system": {
+              "enum": ["zypp"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["alias", "name", "url", "type", "enabled", "gpgcheck", "autorefresh", "priority"],
+            "properties": {
+              "alias": {
+                "type": "string",
+                "minLength": 1
+              },
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "type": {
+                "enum": ["yast2", "rpm-md", "plaindir", null]
+              },
+              "url": {
+                "type": "string",
+                "format": "uri",
+                "minLength": 1
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "autorefresh": {
+                "type": "boolean"
+              },
+              "gpgcheck": {
+                "type": "boolean"
+              },
+              "priority": {
+                "type": "integer",
+                "minimum": 1
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "repository_system"
+          ],
+          "properties": {
+            "repository_system": {
+              "enum": ["yum"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["alias", "name", "url", "type", "enabled", "gpgcheck", "gpgkey", "mirrorlist"],
+            "properties": {
+              "alias": {
+                "type": "string",
+                "minLength": 1
+              },
+              "mirrorlist": {
+                "type": "string"
+              },
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "type": {
+                "enum": ["rpm-md", null]
+              },
+              "url": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "format": "url",
+                  "minLength": 1
+                }
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "gpgcheck": {
+                "type": "boolean"
+              },
+              "gpgkey": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "format": "url",
+                  "minLength": 1
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "repository_system"
+          ],
+          "properties": {
+            "repository_system": {
+              "enum": ["apt"]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": ["url", "type", "distribution", "components"],
+            "properties": {
+              "distribution": {
+                "type": "string",
+                "minLength": 1
+              },
+              "type": {
+                "enum": ["deb", "deb-src"]
+              },
+              "url": {
+                "type": "string",
+                "format": "uri",
+                "minLength": 1
+              },
+              "components": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

data/plugins/services/schema/system-description-services.schema-v6.json

@@ -0,0 +1,93 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+
+  "type": "object",
+  "required": [
+    "_elements"
+  ],
+  "oneOf": [
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "init_system"
+          ],
+          "properties": {
+            "init_system": {
+              "not": {
+                "enum": [
+                  "upstart"
+                ]
+              },
+              "type": "string",
+              "minLength": 1
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "state"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "state": {
+                "type": "string",
+                "minLength": 1
+              }
+            }
+          }
+        }
+      }
+    },
+    {
+      "properties": {
+        "_attributes": {
+          "type": "object",
+          "required": [
+            "init_system"
+          ],
+          "properties": {
+            "init_system": {
+              "enum": [
+                "upstart"
+              ]
+            }
+          }
+        },
+        "_elements": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "name",
+              "state",
+              "legacy_sysv"
+            ],
+            "properties": {
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "state": {
+                "type": "string",
+                "minLength": 1
+              },
+              "legacy_sysv": {
+                "type": "boolean"
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}
+