vanagon 0.21.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e832c071ba2d54e8c938fbeace5fe1c0287bc25b2ff405b6b2d1ca5dbc9f44f
-  data.tar.gz: 1af5c0c38870de680a4cc1f037a94fa6595d22d0e9b70147371650beb11d7130
+  metadata.gz: 958967d126de3ae4bf36c6e13f2aa0dcbe387e7cf52621ba5386ef87e470402d
+  data.tar.gz: 57b2cb0b77c9d0fd82d79a935d2c5fd8676c3e46968c036f21dc86128e97303f
 SHA512:
-  metadata.gz: 53756b8e737fbe884d6e5ce934442778d07407b638d34186c1b19f658981b5e36a79d0c7c272b0efe82a7f86ded6479ab0a5e1fc7962b0112dfd85732168095c
-  data.tar.gz: 21b9ebef8bb1d8a54650c4a35551abdf8142d9e28689d843f96278ad81d5081877ec9eb6d4d9432799feb464a2f682754d78d3af6cf4b8c20d17bc0ea3c94145
+  metadata.gz: c6a328120e33ef21de286bbb5f1d086632ac855507c3c3a3913d392a7a99a04f447c90128cfeaca4f37674c8f541e5c07c326a70c5dde79a069a8a8339c052f3
+  data.tar.gz: 98ffb256fbd7b09fc1c7eea5157036ef666cbb80e9bc686077a2722d64b9371a516b60252a5f70f2956451e83a2f68e3538f3369115e8fdf26cbf18402fb030d

data/README.md

@@ -85,6 +85,24 @@ wheezy and build my project against it.
 For more detailed examples of the DSLs available, please see the
 [examples](examples) directory and the YARD documentation for Vanagon.
 
+### CLI commands
+
+The vanagon command line tool contains these commands: 
+
+* `build`               build a package given a project and platform
+* `build_host_info`     print information about build hosts
+* `build_requirements`  print external packages required to build project
+* `completion`          outputs path to tab completion script
+* `inspect`             a build dry-run, printing lots of information about the build
+* `list`                shows a list of available projects and platforms
+* `render`              create local versions of packaging artifacts for project
+* `sign`                sign a package
+* `ship`                upload a package to a distribution server
+* `help`                print this help
+
+Commands are called with a git-like pattern of `vanagon <subcommand>`. 
+For example: `vanagon list`
+
 ### CLI changes and deprecations (from version 0.16.0)
 
 Prior to 0.16.0, the vanagon command line contained these commands
@@ -212,6 +230,13 @@ time. The default value is *7200* seconds(120 minutes) but setting to any
 integer value these components to fail after the `VANAGON_TIMEOUT` count is reached.
 Note that this value is expected to be in seconds.
 
+##### `VANAGON_FORCE_SIGNING`
+By default, Vanagon does not fail if extra files signing fails, it just logs an
+error and continues building the package. This is unwanted behavior in
+environments where we expect a hard failure when signing cannot proceed. To
+force Vanagon to fail if extra files signing fails, ensure this variable is set
+before starting a build.
+
 #### Example usage
 `vanagon build --preserve puppet-agent el-6-i386` will build the puppet-agent project
 on the el-6-i386 platform and leave the host intact afterward.

data/lib/vanagon/cli/dependencies.rb

@@ -0,0 +1,89 @@
+require 'docopt'
+require 'json'
+require 'vanagon/logger'
+
+class Vanagon
+  class CLI
+    class Dependencies < Vanagon::CLI
+      DOCUMENTATION = <<~DOCOPT.freeze
+        Usage:
+        dependencies [options] <project-name> <platforms>
+
+        Options:
+          -h, --help                       Display help
+          -c, --configdir DIRECTORY        Configuration directory [default: #{Dir.pwd}/configs]
+          -w, --workdir DIRECTORY          Working directory on the local host
+          -v, --verbose                    Only here for backwards compatibility. Does nothing.
+
+        Project-Name:
+          May be a project name of a project from the configs/projects directory or 'all' to generate dependencies for all projects.
+        Platforms:
+          May be a platform name of a platform from the configs/platforms directory or 'all' to generate dependencies for all platforms.
+      DOCOPT
+
+      def parse(argv)
+        Docopt.docopt(DOCUMENTATION, { argv: argv })
+      rescue Docopt::Exit => e
+        VanagonLogger.error e.message
+        exit 1
+      end
+
+      def run(options) # rubocop:disable Metrics/AbcSize
+        platforms_directory = File.join(options[:configdir], 'platforms')
+        projects_directory = File.join(options[:configdir], 'projects')
+
+        unless Dir.exist?(projects_directory) && Dir.exist?(platforms_directory)
+          VanagonLogger.error "Path to #{platforms_directory} or #{projects_directory} not found."
+          exit 1
+        end
+
+        projects = [options[:project_name]]
+        if projects.include?('all')
+          projects = Dir.children(projects_directory).map do |project|
+            File.basename(project, File.extname(project))
+          end
+        end
+
+        platforms = options[:platforms].split(',')
+        if platforms.include?('all')
+          platforms = Dir.children(platforms_directory).map do |platform|
+            File.basename(platform, File.extname(platform))
+          end
+        end
+
+        failures = []
+
+        projects.each do |project|
+          platforms.each do |platform|
+            begin
+              artifact = Vanagon::Driver.new(platform, project, options)
+              artifact.dependencies
+            rescue RuntimeError => e
+              failures.push("#{project}, #{platform}: #{e}")
+            end
+          end
+        end
+
+        unless failures.empty?
+          VanagonLogger.info "Failed to generate dependencies for the following:"
+          failures.each do |failure|
+            VanagonLogger.info failure
+          end
+        end
+
+        VanagonLogger.info "Finished generating dependencies"
+      end
+
+      def options_translate(docopt_options)
+        translations = {
+          '--verbose' => :verbose,
+          '--workdir' => :workdir,
+          '--configdir' => :configdir,
+          '<project-name>' => :project_name,
+          '<platforms>' => :platforms
+        }
+        return docopt_options.map { |k, v| [translations[k], v] }.to_h
+      end
+    end
+  end
+end

data/lib/vanagon/cli/list.rb

@@ -39,15 +39,15 @@ class Vanagon
 
         default_list = Dir.children(File.join(File.dirname(__FILE__), '..', 'platform', 'defaults')).map do |platform|
           File.basename(platform, File.extname(platform))
-        end
+        end.sort
 
         platform_list = Dir.children(File.join(options[:configdir], 'platforms')).map do |platform|
           File.basename(platform, File.extname(platform))
-        end
+        end.sort
 
         project_list = Dir.children(File.join(options[:configdir], 'projects')).map do |project|
           File.basename(project, File.extname(project))
-        end
+        end.sort
 
         if options[:defaults]
           puts "- Defaults", output(default_list, options[:use_spaces])

data/lib/vanagon/cli.rb

@@ -14,6 +14,7 @@ require 'vanagon/cli/list'
 require 'vanagon/cli/render'
 require 'vanagon/cli/ship'
 require 'vanagon/cli/sign'
+require 'vanagon/cli/dependencies'
 
 require 'vanagon/logger'
 
@@ -37,6 +38,7 @@ class Vanagon
           render              create local versions of packaging artifacts for project
           sign                sign a package
           ship                upload a package to a distribution server
+          dependencies        write json file to STDOUT that shows all required gems for a given project and platform
           help                print this help
     DOCOPT
 
@@ -64,6 +66,8 @@ class Vanagon
         @sub_parser = Vanagon::CLI::Sign.new
       when 'ship'
         @sub_parser = Vanagon::CLI::Ship.new
+      when 'dependencies'
+        @sub_parser = Vanagon::CLI::Dependencies.new
       when 'help'
         puts DOCUMENTATION
         exit 0

data/lib/vanagon/component/source/git.rb

@@ -13,7 +13,7 @@ class Vanagon
   class Component
     class Source
       class Git
-        attr_accessor :url, :ref, :workdir, :clone_options
+        attr_accessor :url, :log_url, :ref, :workdir, :clone_options
         attr_reader :version, :default_options, :repo
 
         class << self
@@ -73,17 +73,19 @@ class Vanagon
         # @param url [String] url of git repo to use as source
         # @param ref [String] ref to checkout from git repo
         # @param workdir [String] working directory to clone into
-        def initialize(url, workdir:, **options)
+        def initialize(url, workdir:, **options) # rubocop:disable Metrics/AbcSize
           opts = default_options.merge(options.reject { |k, v| v.nil? })
 
           # Ensure that #url returns a URI object
           @url = URI.parse(url.to_s)
+          @log_url = @url.host + @url.path unless @url.host.nil? || @url.path.nil?
           @ref = opts[:ref]
+          @dirname = opts[:dirname]
           @workdir = File.realpath(workdir)
           @clone_options = opts[:clone_options] ||= {}
 
           # We can test for Repo existence without cloning
-          raise Vanagon::InvalidRepo, "#{url} not a valid Git repo" unless valid_remote?
+          raise Vanagon::InvalidRepo, "url is not a valid Git repo" unless valid_remote?
         end
 
         # Fetch the source. In this case, clone the repository into the workdir
@@ -113,7 +115,7 @@ class Vanagon
         #
         # @return [String] the directory where the repo was cloned
         def dirname
-          File.basename(url.path, ".git")
+          @dirname || File.basename(url.path, ".git")
         end
 
         # Use `git describe` to lazy-load a version for this component
@@ -156,10 +158,10 @@ class Vanagon
         # Clone a remote repo, make noise about it, and fail entirely
         # if we're unable to retrieve the remote repo
         def clone!
-          VanagonLogger.info "Cloning Git repo '#{url}'"
+          VanagonLogger.info "Cloning Git repo '#{log_url}'"
           VanagonLogger.info "Successfully cloned '#{dirname}'" if clone
         rescue ::Git::GitExecuteError
-          raise Vanagon::InvalidRepo, "Unable to clone from '#{url}'"
+          raise Vanagon::InvalidRepo, "Unable to clone from '#{log_url}'"
         end
         private :clone!
 
@@ -169,7 +171,7 @@ class Vanagon
           VanagonLogger.info "Checking out '#{ref}' from Git repo '#{dirname}'"
           clone.checkout(ref)
         rescue ::Git::GitExecuteError
-          raise Vanagon::CheckoutFailed, "unable to checkout #{ref} from '#{url}'"
+          raise Vanagon::CheckoutFailed, "unable to checkout #{ref} from '#{log_url}'"
         end
         private :checkout!
 

data/lib/vanagon/component/source/http.rb

@@ -108,6 +108,9 @@ class Vanagon
           uri = URI.parse(target_url.to_s)
           target_file ||= File.basename(uri.path)
 
+          # Add X-RPROXY-PASS to request header if the environment variable exists
+          headers['X-RPROXY-PASS'] = ENV['X-RPROXY-PASS'] if ENV['X-RPROXY-PASS']
+
           VanagonLogger.info "Downloading file '#{target_file}' from url '#{target_url}'"
 
           Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|

data/lib/vanagon/component/source.rb

@@ -37,6 +37,7 @@ class Vanagon
               sum: options[:sum],
               ref: options[:ref],
               workdir: options[:workdir],
+              dirname: options[:dirname],
               clone_options: options[:clone_options]
           end
 

data/lib/vanagon/component.rb

@@ -304,7 +304,7 @@ class Vanagon
     #
     # @param workdir [String] working directory to put the source into
     def get_source(workdir) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
-      opts = options.merge({ workdir: workdir })
+      opts = options.merge({ workdir: workdir, dirname: dirname })
       if url || !mirrors.empty?
         if ENV['VANAGON_USE_MIRRORS'] == 'n' or ENV['VANAGON_USE_MIRRORS'] == 'false'
           fetch_url(opts)

data/lib/vanagon/driver.rb

@@ -171,7 +171,7 @@ class Vanagon
 
     def render # rubocop:disable Metrics/AbcSize
       # Simple sanity check for the project
-      if @project.version.nil? or @project.version.empty?
+      if @project.version.nil? || @project.version.empty?
         raise Vanagon::Error, "Project requires a version set, all is lost."
       end
 
@@ -182,6 +182,17 @@ class Vanagon
       @project.make_makefile(workdir)
     end
 
+    def dependencies
+      # Simple sanity check for the project
+      if @project.version.nil? || @project.version.empty?
+        raise Vanagon::Error, "Project requires a version set, all is lost."
+      end
+
+      VanagonLogger.info "creating dependencies list"
+      @project.fetch_sources(workdir, retry_count, timeout)
+      @project.cli_manifest_json(@platform)
+    end
+
     # Initialize the logging instance
     def loginit(logfile)
       @@logger = Logger.new(logfile)

data/lib/vanagon/engine/pooler.rb

@@ -15,7 +15,10 @@ class Vanagon
       def initialize(platform, target = nil, **opts)
         super
 
-        @available_poolers = ["https://vmpooler.delivery.puppetlabs.net", "https://nspooler-service-prod-1.delivery.puppetlabs.net"]
+        @available_poolers = %w[
+          https://vmpooler-prod.k8s.infracore.puppet.net
+          https://nspooler-prod.k8s.infracore.puppet.net
+        ]
         @token = load_token
         @required_attributes << "vmpooler_template"
       end

data/lib/vanagon/platform/defaults/debian-11-amd64.rb

@@ -0,0 +1,11 @@
+platform "debian-11-amd64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "bullseye"
+
+  packages = %w(build-essential devscripts make quilt pkg-config debhelper rsync fakeroot cmake)
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
+  plat.vmpooler_template "debian-11-x86_64"
+end

data/lib/vanagon/platform/defaults/el-8-aarch64.rb

@@ -3,7 +3,7 @@ platform "el-8-aarch64" do |plat|
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "systemd"
 
-  packages = %w(autoconf automake createrepo gcc gcc-c++ rsync cmake make rpm-libs rpm-build)
+  packages = %w(autoconf automake createrepo gcc gcc-c++ rsync cmake make rpm-libs rpm-build libarchive)
   plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
   plat.install_build_dependencies_with "dnf install -y --allowerasing "
   plat.vmpooler_template "redhat-8-arm64"

data/lib/vanagon/platform/defaults/el-8-x86_64.rb

@@ -3,7 +3,7 @@ platform "el-8-x86_64" do |plat|
   plat.defaultdir "/etc/sysconfig"
   plat.servicetype "systemd"
 
-  packages = %w(gcc gcc-c++ autoconf automake createrepo rsync cmake make rpm-libs rpm-build rpm-sign libtool)
+  packages = %w(gcc gcc-c++ autoconf automake createrepo rsync cmake make rpm-libs rpm-build rpm-sign libtool libarchive)
   plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
   plat.install_build_dependencies_with "dnf install -y --allowerasing "
   plat.vmpooler_template "redhat-8-x86_64"

data/lib/vanagon/platform/defaults/el-9-aarch64.rb

@@ -0,0 +1,10 @@
+platform "el-9-aarch64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(autoconf automake createrepo gcc gcc-c++ rsync cmake make rpm-libs rpm-build libarchive)
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "redhat-9-arm64"
+end

data/lib/vanagon/platform/defaults/el-9-x86_64.rb

@@ -0,0 +1,10 @@
+platform "el-9-x86_64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(gcc gcc-c++ autoconf automake createrepo rsync cmake make rpm-libs rpm-build rpm-sign libtool libarchive)
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "redhat-9-x86_64"
+end

data/lib/vanagon/platform/defaults/fedora-34-x86_64.rb

@@ -0,0 +1,17 @@
+platform 'fedora-34-x86_64' do |plat|
+    plat.servicedir '/usr/lib/systemd/system'
+    plat.defaultdir '/etc/sysconfig'
+    plat.servicetype 'systemd'
+    plat.dist 'fc34'
+
+    packages = %w[
+      autoconf automake bzip2-devel gcc gcc-c++ libselinux-devel
+      libsepol libsepol-devel make cmake pkgconfig readline-devel
+      rpmdevtools rsync swig zlib-devel systemtap-sdt-devel
+      perl-lib perl-FindBin
+    ]
+    plat.provision_with("/usr/bin/dnf install -y --best --allowerasing #{packages.join(' ')}")
+
+    plat.install_build_dependencies_with '/usr/bin/dnf install -y --best --allowerasing'
+    plat.vmpooler_template 'fedora-34-x86_64'
+  end

data/lib/vanagon/platform/defaults/{osx-10.14-x86_64.rb → osx-11-x86_64.rb}

@@ -1,8 +1,7 @@
-platform "osx-10.14-x86_64" do |plat|
+platform "osx-11-x86_64" do |plat|
   plat.servicetype "launchd"
   plat.servicedir "/Library/LaunchDaemons"
-  plat.codename "mojave"
-
+  plat.codename "bigsur"
   plat.provision_with "export HOMEBREW_NO_EMOJI=true"
   plat.provision_with "export HOMEBREW_VERBOSE=true"
   plat.provision_with "sudo dscl . -create /Users/test"
@@ -15,8 +14,7 @@ platform "osx-10.14-x86_64" do |plat|
   plat.provision_with "echo 'test ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/username"
   plat.provision_with "mkdir -p /etc/homebrew"
   plat.provision_with "cd /etc/homebrew"
-  plat.provision_with %Q(su test -c 'echo | /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"')
+  plat.provision_with %Q(su test -c 'echo | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"')
   plat.provision_with "sudo chown -R test:admin /Users/test/"
-  plat.vmpooler_template "osx-1014-x86_64"
-  plat.output_dir File.join("apple", "10.14", "puppet6", "x86_64")
+  plat.vmpooler_template "macos-112-x86_64"
 end

data/lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb

@@ -0,0 +1,28 @@
+platform "redhatfips-8-x86_64" do |plat|
+  plat.servicedir "/usr/lib/systemd/system"
+  plat.defaultdir "/etc/sysconfig"
+  plat.servicetype "systemd"
+
+  packages = %w(
+    cmake
+    gcc-c++
+    java-1.8.0-openjdk-devel
+    libarchive
+    libsepol-devel
+    libselinux-devel
+    openssl-devel
+    pkgconfig
+    readline-devel
+    rpm-build
+    rpmdevtools
+    rsync
+    swig
+    systemtap-sdt-devel
+    yum-utils
+    zlib-devel
+  )
+
+  plat.provision_with "dnf install -y --allowerasing #{packages.join(' ')}"
+  plat.install_build_dependencies_with "dnf install -y --allowerasing "
+  plat.vmpooler_template "redhat-fips-8-x86_64"
+end

data/lib/vanagon/platform/defaults/ubuntu-18.04-aarch64.rb

@@ -0,0 +1,11 @@
+platform "ubuntu-18.04-aarch64" do |plat|
+  plat.servicedir "/lib/systemd/system"
+  plat.defaultdir "/etc/default"
+  plat.servicetype "systemd"
+  plat.codename "bionic"
+
+  packages = %w(build-essential devscripts make quilt pkg-config debhelper rsync fakeroot cmake)
+  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
+  plat.install_build_dependencies_with "DEBIAN_FRONTEND=noninteractive; apt-get install -qy --no-install-recommends "
+  plat.vmpooler_template "ubuntu-1804-arm64"
+end

data/lib/vanagon/platform/dsl.rb

@@ -214,6 +214,11 @@ class Vanagon
         @platform.provision_with(command)
       end
 
+      # Clears the provisioning commands array
+      def clear_provisioning
+        @platform.provisioning.clear
+      end
+
       # Set the command to install any needed build dependencies for the target machine
       #
       # @param command [String] Command to install build dependencies for the target machine

data/lib/vanagon/platform/osx.rb

@@ -35,6 +35,11 @@ class Vanagon
           bom_install = []
         end
 
+        if project.extra_files_to_sign.any?
+          sign_commands = Vanagon::Utilities::ExtraFilesSigner.commands(project, @mktemp, "/osx/build/root/#{project.name}-#{project.version}")
+        else
+          sign_commands = []
+        end
 
          # Setup build directories
         ["bash -c 'mkdir -p $(tempdir)/osx/build/{dmg,pkg,scripts,resources,root,payload,plugins}'",
@@ -51,11 +56,15 @@ class Vanagon
 
          bom_install,
 
+         # Sign extra files
+         sign_commands,
+
          # Package the project
          "(cd $(tempdir)/osx/build/; #{@pkgbuild} --root root/#{project.name}-#{project.version} \
           --scripts $(tempdir)/osx/build/scripts \
           --identifier #{project.identifier}.#{project.name} \
           --version #{project.version} \
+          --preserve-xattr \
           --install-location / \
           payload/#{project.name}-#{project.version}-#{project.release}.pkg)",
          # Create a custom installer using the pkg above

data/lib/vanagon/platform/windows.rb

@@ -214,28 +214,10 @@ class Vanagon
           "gunzip -c #{project.name}-#{project.version}.tar.gz | '#{@tar}' -C '$(tempdir)/SourceDir' --strip-components 1 -xf -"
         ]
 
-        unless project.extra_files_to_sign.empty?
-          begin
-            tempdir = nil
-            # Skip signing extra files if logging into the signing_host fails
-            # This enables things like CI being able to sign the additional files,
-            # but locally triggered builds by developers who don't have access to
-            # the signing host just print a message and skip the signing.
-            Vanagon::Utilities.retry_with_timeout(3, 5) do
-              tempdir = Vanagon::Utilities::remote_ssh_command("#{project.signing_username}@#{project.signing_hostname}", "#{@mktemp} 2>/dev/null", return_command_output: true)
-            end
-            project.extra_files_to_sign.each do |file|
-              file_location = File.join(tempdir, File.basename(file))
-              make_commands << [
-                "rsync -e '#{Vanagon::Utilities.ssh_command}' -rHlv --no-perms --no-owner --no-group #{File.join('$(tempdir)', 'SourceDir', file)} #{project.signing_username}@#{project.signing_hostname}:#{tempdir}",
-                "#{Vanagon::Utilities.ssh_command} #{project.signing_username}@#{project.signing_hostname} #{project.signing_command} #{file_location}",
-                "rsync -e '#{Vanagon::Utilities.ssh_command}' -rHlv -O --no-perms --no-owner --no-group #{project.signing_username}@#{project.signing_hostname}:#{file_location} #{File.join('$(tempdir)', 'SourceDir', file)}"
-              ]
-            end
-          rescue RuntimeError
-            VanagonLogger.error "Unable to connect to #{project.signing_username}@#{project.signing_hostname}, skipping signing extra files: #{project.extra_files_to_sign.join(',')}"
-          end
+        if project.extra_files_to_sign.any?
+          make_commands << Vanagon::Utilities::ExtraFilesSigner.commands(project, @mktemp, 'SourceDir')
         end
+
         make_commands << [
           "mkdir -p $(tempdir)/#{misc_dir}",
           # Need to use awk here to convert to DOS format so that notepad can display file correctly.

data/lib/vanagon/platform.rb

@@ -339,10 +339,20 @@ class Vanagon
       return !!@name.match(/^(el|redhat|redhatfips)-.*$/)
     end
 
+    # Utility matcher to determine if the platform is of an EL 8 variety
+    #
+    # @return [true, false] true if it is an EL 8 variety, false otherwise
     def is_el8?
       return !!@name.match(/^(el|redhat|redhatfips)-8.*$/)
     end
 
+    # Utility matcher to determine if the platform is a FIPS platform
+    #
+    # @return [true, false] true if it is a FIPS platform, false otherwise
+    def is_fips?
+      return @name.include?('fips')
+    end
+
     # Utility matcher to determine is the platform is a sles variety
     #
     # @return [true, false] true if it is a sles variety, false otherwise

data/lib/vanagon/project.rb

@@ -762,6 +762,17 @@ class Vanagon
       end
     end
 
+    # Writes a json file to STDOUT containing information
+    # about what will go into an artifact
+    #
+    # @param platform [String] platform we're writing metadata for
+    def cli_manifest_json(platform)
+      manifest = build_manifest_json
+      metadata = metadata_merge(manifest, @upstream_metadata)
+
+      puts JSON.pretty_generate(metadata)
+    end
+
     # Writes a yaml file at `output/<name>-<version>.<platform>.settings.yaml`
     # containing settings used to build the current project on the platform
     # provided (and a corresponding sha1sum file) if `yaml_settings` has been

data/lib/vanagon/utilities/extra_files_signer.rb

@@ -0,0 +1,42 @@
+class Vanagon
+  module Utilities
+    module ExtraFilesSigner
+      class << self
+        def commands(project, mktemp, source_dir) # rubocop:disable Metrics/AbcSize
+          tempdir = nil
+          commands = []
+          # Skip signing extra files if logging into the signing_host fails
+          # This enables things like CI being able to sign the additional files,
+          # but locally triggered builds by developers who don't have access to
+          # the signing host just print a message and skip the signing.
+          Vanagon::Utilities.retry_with_timeout(3, 5) do
+            tempdir = Vanagon::Utilities::remote_ssh_command("#{project.signing_username}@#{project.signing_hostname}", "#{mktemp} 2>/dev/null", return_command_output: true)
+          end
+
+          project.extra_files_to_sign.each do |file|
+            file_location = File.join(tempdir, File.basename(file))
+            local_source_path = File.join('$(tempdir)', source_dir, file)
+            remote_host = "#{project.signing_username}@#{project.signing_hostname}"
+            remote_destination_path = "#{remote_host}:#{tempdir}"
+            remote_file_location = "#{remote_host}:#{file_location}"
+            extra_flags = ''
+            extra_flags = '--extended-attributes' if project.platform.is_macos?
+
+            commands += [
+              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group #{extra_flags} #{local_source_path} #{remote_destination_path}",
+              "#{Vanagon::Utilities.ssh_command} #{remote_host} #{project.signing_command} #{file_location}",
+              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group #{extra_flags} #{remote_file_location} #{local_source_path}"
+            ]
+          end
+
+          commands
+        rescue RuntimeError
+          require 'vanagon/logger'
+          VanagonLogger.error "Unable to connect to #{project.signing_username}@#{project.signing_hostname}, skipping signing extra files: #{project.extra_files_to_sign.join(',')}"
+          raise if ENV['VANAGON_FORCE_SIGNING']
+          []
+        end
+      end
+    end
+  end
+end

data/lib/vanagon/utilities.rb

@@ -10,6 +10,7 @@ require 'timeout'
 require 'English'
 require 'vanagon/extensions/string'
 require 'vanagon/logger'
+require 'vanagon/utilities/extra_files_signer'
 
 class Vanagon
   module Utilities

data/resources/rpm/project.spec.erb

@@ -33,15 +33,11 @@
 <%= var %>
 <% end -%>
 
-# This breaks on el8. This is a hack to unblock development.
 <%- if @platform.is_el8? %>
-%undefine __debug_package
-
 # Build el-8 packages without build-id files to prevent collision
 %define _build_id_links none
 <% end -%>
 
-
 # To avoid files installed but not packaged errors
 %global __os_install_post %{__os_install_post} \
     rm -rf %{buildroot}/usr/lib/debug
@@ -85,7 +81,7 @@ Requires:  <%= requires.requirement %><%= requires.version ? " #{requires.versio
 # did not specify a dependency on these.
 # In the future, we will supress pre/post scripts completely if there's nothing
 # specified by the project or the components.
-<%- if @platform.is_fedora? && @platform.os_version.to_i >= 29 -%>
+<%- if @platform.is_fedora? || (@platform.is_el? && @platform.os_version.to_i >= 9) -%>
 Requires(pre): /usr/bin/mkdir
 Requires(pre): /usr/bin/touch
 Requires(post): /usr/bin/mkdir

data/spec/lib/vanagon/cli_spec.rb

@@ -98,9 +98,9 @@ describe Vanagon::CLI::List do
     let(:platforms){ ['1', '2', '3'] }
     let(:output_both){
 "- Projects
-foo
 bar
 baz
+foo
 
 - Platforms
 1
@@ -167,7 +167,7 @@ baz
       
       let(:output_both_space){
 "- Projects
-foo bar baz
+bar baz foo
 
 - Platforms
 1 2 3
@@ -194,9 +194,9 @@ foo bar baz
 
       let(:output_projects){
 "- Projects
-foo
 bar
 baz
+foo
 "
 }
       it "outputs only projects when projects is passed" do 

data/spec/lib/vanagon/component/source/git_spec.rb

@@ -60,6 +60,7 @@ describe "Vanagon::Component::Source::Git" do
       allow(::Git).to receive(:clone).and_return(clone)
       expect(File).to receive(:realpath).and_return(@file_path)
     end
+
     it "repository" do
       git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
       expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
@@ -72,6 +73,12 @@ describe "Vanagon::Component::Source::Git" do
       expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
       git_source.clone
     end
+
+    it 'uses a custom dirname' do
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", dirname: 'facter-ng')
+      expect(::Git).to receive(:clone).with(git_source.url, 'facter-ng', path: @file_path)
+      git_source.clone
+    end
   end
 
   describe "#dirname" do
@@ -86,6 +93,12 @@ describe "Vanagon::Component::Source::Git" do
       expect(git_source.dirname)
         .to eq('facter')
     end
+
+    it "returns @dirname if is set" do
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir, dirname: 'facter-ng')
+      expect(git_source.dirname)
+          .to eq('facter-ng')
+    end
   end
 
   describe "#ref" do

data/spec/lib/vanagon/component_spec.rb

@@ -151,8 +151,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -173,8 +173,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -190,8 +190,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -206,8 +206,8 @@ describe "Vanagon::Component" do
       # Initialize a new instance of Vanagon::Component and define a
       # new secondary source that's *compressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @platform = plat._platform
 
       comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
@@ -225,8 +225,8 @@ describe "Vanagon::Component" do
     end
 
     let(:platform) do
-      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       plat._platform
     end
 

data/spec/lib/vanagon/platform/dsl_spec.rb

@@ -2,7 +2,6 @@ require 'vanagon/platform/dsl'
 
 describe 'Vanagon::Platform::DSL' do
   let (:deb_platform_block)    { "platform 'debian-test-fixture' do |plat| end" }
-  let (:el_5_platform_block)   { "platform 'el-5-fixture'        do |plat| end" }
   let (:el_6_platform_block)   { "platform 'el-6-fixture'        do |plat| end" }
   let (:redhat_7_platform_block) { "platform 'redhat-7-fixture' do |plat| end" }
   let (:sles_platform_block)   { "platform 'sles-test-fixture'   do |plat| end" }
@@ -62,9 +61,9 @@ describe 'Vanagon::Platform::DSL' do
 
   describe '#yum_repo' do
     it "grabs the file and adds .repo to it" do
-      plat = Vanagon::Platform::DSL.new('el-5-fixture')
+      plat = Vanagon::Platform::DSL.new('el-6-fixture')
       expect(SecureRandom).to receive(:hex).and_return(hex_value)
-      plat.instance_eval(el_5_platform_block)
+      plat.instance_eval(el_6_platform_block)
       plat.yum_repo(el_definition)
       expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
       expect(plat._platform.provisioning[1]).to include(
@@ -97,8 +96,8 @@ describe 'Vanagon::Platform::DSL' do
 
     describe "installs a rpm when given a rpm" do
       it 'uses rpm everywhere' do
-        plat = Vanagon::Platform::DSL.new('el-5-fixture')
-        plat.instance_eval(el_5_platform_block)
+        plat = Vanagon::Platform::DSL.new('el-6-fixture')
+        plat.instance_eval(el_6_platform_block)
         plat.yum_repo(el_definition_rpm)
         expect(plat._platform.provisioning[0]).to include('rpm -q curl', 'yum -y install curl')
         expect(plat._platform.provisioning[1]).to include(

data/spec/lib/vanagon/platform/rpm_spec.rb

@@ -2,7 +2,7 @@ require 'vanagon/platform'
 
 describe 'Vanagon::Platform::RPM' do
   platforms = [
-    { name: 'el-5-i386' },
+    { name: 'el-6-i386' },
     { name: 'fedora-21-x86_64', dist: 'f21' },
     { name: 'cisco-wrlinux-7-x86_64' }
   ]

data/spec/lib/vanagon/platform_spec.rb

@@ -49,19 +49,19 @@ describe "Vanagon::Platform" do
           end ],
       },
       {
-        :name                           => "el-5-i386",
+        :name                           => "el-6-i386",
         :os_name                        => "el",
-        :os_version                     => "5",
+        :os_version                     => "6",
         :architecture                   => "i386",
-        :output_dir                     => "el/5/products/i386",
-        :output_dir_with_target         => "el/5/thing/i386",
-        :output_dir_empty_string        => "el/5/i386",
-        :source_output_dir              => "el/5/products/SRPMS",
-        :source_output_dir_with_target  => "el/5/thing/SRPMS",
-        :source_output_dir_empty_string => "el/5/SRPMS",
+        :output_dir                     => "el/6/products/i386",
+        :output_dir_with_target         => "el/6/thing/i386",
+        :output_dir_empty_string        => "el/6/i386",
+        :source_output_dir              => "el/6/products/SRPMS",
+        :source_output_dir_with_target  => "el/6/thing/SRPMS",
+        :source_output_dir_empty_string => "el/6/SRPMS",
         :is_rpm                         => true,
         :is_el                          => true,
-        :block                          => %Q[ platform "el-5-i386" do |plat| end ],
+        :block                          => %Q[ platform "el-6-i386" do |plat| end ],
       },
       {
         :name                           => "redhat-7-x86_64",

data/spec/lib/vanagon/project/dsl_spec.rb

@@ -244,8 +244,8 @@ end" }
   describe "#provides" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
       @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
     end
@@ -326,8 +326,8 @@ end" }
   describe "#replaces" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
       @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
     end
@@ -404,8 +404,8 @@ end" }
   describe "#conflicts" do
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @deb_plat = Vanagon::Platform::DSL.new('ubuntu-16.04-amd64')
       @deb_plat.instance_eval("platform 'ubuntu-16.04-amd64' do |plat| end")
     end
@@ -488,8 +488,8 @@ end"
 
     before do
       allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
-      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
-      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @el_plat = Vanagon::Platform::DSL.new('el-6-x86_64')
+      @el_plat.instance_eval("platform 'el-6-x86_64' do |plat| end")
       @osx_plat = Vanagon::Platform::DSL.new('osx-10.10-x86_64')
       @osx_plat.instance_eval("platform 'osx-10.10-x86_64' do |plat| end")
 

data/spec/lib/vanagon/utilities/extra_files_signer_spec.rb

@@ -0,0 +1,123 @@
+require 'vanagon/platform'
+require 'vanagon/project'
+require 'vanagon/utilities/extra_files_signer'
+
+describe Vanagon::Utilities::ExtraFilesSigner do
+  let(:platform_block) do
+    %( platform "osx-11-x86_64" do |plat|
+    end
+    )
+  end
+  let (:project_block) do
+    <<-HERE.undent
+      project 'test-fixture' do |proj|
+        proj.version '0.0.0'
+      end
+    HERE
+  end
+  let(:configdir) { '/a/b/c' }
+  let(:platform) { Vanagon::Platform::DSL.new('osx-11-x86_64') }
+  let(:project) do
+    Vanagon::Project::DSL.new('test-fixture', configdir, platform._platform, [])
+  end
+  let(:mktemp) { '/tmp/xyz' }
+  let(:source_dir) { '/dir/source_dir' }
+
+  before do
+    allow(VanagonLogger).to receive(:error)
+    platform.instance_eval(platform_block)
+    project.instance_eval(project_block)
+    allow(Vanagon::Utilities).to receive(:remote_ssh_command).and_return(mktemp)
+  end
+
+  describe '.commands' do
+    context 'without extra files to sign' do
+      it 'returns empty array' do
+        commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+        expect(commands).to eql([])
+      end
+    end
+
+    context 'with extra files to sign' do
+      let (:project_block) do
+        <<-HERE.undent
+          project 'test-fixture' do |proj|
+            proj.version '0.0.0'
+            proj.extra_file_to_sign '/test1/a.rb'
+            proj.extra_file_to_sign '/test2/b.rb'
+            proj.signing_hostname('abc')
+            proj.signing_username('test')
+             proj.signing_command('codesign')
+          end
+        HERE
+      end
+
+      context 'when it cannot connect to signing hostname' do
+        before do
+          allow(Vanagon::Utilities).to receive(:remote_ssh_command)
+            .with('test@abc', '/tmp/xyz 2>/dev/null', return_command_output: true)
+            .and_raise RuntimeError
+        end
+
+        it 'returns empty array' do
+          commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+          expect(commands).to eql([])
+        end
+
+        it 'logs error' do
+          Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+          expect(VanagonLogger).to have_received(:error).with(/Unable to connect to test@abc/)
+        end
+
+        it 'fails the build if VANAGON_FORCE_SIGNING is set' do
+          allow(ENV).to receive(:[]).with('VANAGON_FORCE_SIGNING').and_return('true')
+          expect {
+            Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+          }.to raise_error(RuntimeError)
+        end
+      end
+
+      context 'when success' do
+        context 'when macos' do
+          it 'generates signing commands for each file using --extended-attributes' do
+            commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+            expect(commands).to match(
+              [
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/b.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb"
+              ]
+            )
+          end
+        end
+
+        context 'when other platform' do
+          let(:platform_block) do
+            %( platform "windows-2012r2-x86_64" do |plat|
+            end
+            )
+          end
+
+          let(:platform) { Vanagon::Platform::DSL.new('windows-2012r2-x86_64') }
+
+          it 'generates signing commands for each file' do
+            commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+            expect(commands).to match(
+              [
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/b.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb"
+              ]
+            )
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -118,6 +118,7 @@ files:
 - lib/vanagon/cli/build_host_info.rb
 - lib/vanagon/cli/build_requirements.rb
 - lib/vanagon/cli/completion.rb
+- lib/vanagon/cli/dependencies.rb
 - lib/vanagon/cli/inspect.rb
 - lib/vanagon/cli/list.rb
 - lib/vanagon/cli/render.rb
@@ -153,6 +154,7 @@ files:
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
 - lib/vanagon/platform/defaults/debian-10-amd64.rb
+- lib/vanagon/platform/defaults/debian-11-amd64.rb
 - lib/vanagon/platform/defaults/debian-8-amd64.rb
 - lib/vanagon/platform/defaults/debian-8-i386.rb
 - lib/vanagon/platform/defaults/debian-9-amd64.rb
@@ -163,18 +165,21 @@ files:
 - lib/vanagon/platform/defaults/el-7-x86_64.rb
 - lib/vanagon/platform/defaults/el-8-aarch64.rb
 - lib/vanagon/platform/defaults/el-8-x86_64.rb
-- lib/vanagon/platform/defaults/fedora-30-x86_64.rb
-- lib/vanagon/platform/defaults/fedora-31-x86_64.rb
+- lib/vanagon/platform/defaults/el-9-aarch64.rb
+- lib/vanagon/platform/defaults/el-9-x86_64.rb
 - lib/vanagon/platform/defaults/fedora-32-x86_64.rb
-- lib/vanagon/platform/defaults/osx-10.14-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-34-x86_64.rb
 - lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
+- lib/vanagon/platform/defaults/osx-11-x86_64.rb
 - lib/vanagon/platform/defaults/redhatfips-7-x86_64.rb
+- lib/vanagon/platform/defaults/redhatfips-8-x86_64.rb
 - lib/vanagon/platform/defaults/sles-12-x86_64.rb
 - lib/vanagon/platform/defaults/sles-15-x86_64.rb
 - lib/vanagon/platform/defaults/solaris-11-i386.rb
 - lib/vanagon/platform/defaults/solaris-11-sparc.rb
 - lib/vanagon/platform/defaults/ubuntu-16.04-amd64.rb
 - lib/vanagon/platform/defaults/ubuntu-16.04-i386.rb
+- lib/vanagon/platform/defaults/ubuntu-18.04-aarch64.rb
 - lib/vanagon/platform/defaults/ubuntu-18.04-amd64.rb
 - lib/vanagon/platform/defaults/ubuntu-20.04-aarch64.rb
 - lib/vanagon/platform/defaults/ubuntu-20.04-amd64.rb
@@ -191,6 +196,7 @@ files:
 - lib/vanagon/project.rb
 - lib/vanagon/project/dsl.rb
 - lib/vanagon/utilities.rb
+- lib/vanagon/utilities/extra_files_signer.rb
 - lib/vanagon/utilities/shell_utilities.rb
 - resources/Makefile.erb
 - resources/deb/changelog.erb
@@ -292,6 +298,7 @@ files:
 - spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
 - spec/spec_helper.rb
@@ -319,41 +326,42 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/git/rev_list_spec.rb
-- spec/lib/makefile_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/git/rev_list_spec.rb
+- spec/lib/makefile_spec.rb

data/lib/vanagon/platform/defaults/fedora-30-x86_64.rb

@@ -1,11 +0,0 @@
-platform "fedora-30-x86_64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
-  plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
-  plat.dist "fc30"
-
-  packages = %w(autoconf automake createrepo rsync gcc gcc-c++ make rpmdevtools rpm-libs cmake rpm-sign yum-utils)
-  plat.provision_with "/usr/bin/dnf install -y --best --allowerasing #{packages.join(' ')}"
-  plat.install_build_dependencies_with "/usr/bin/dnf install -y --best --allowerasing"
-  plat.vmpooler_template "fedora-30-x86_64"
-end

data/lib/vanagon/platform/defaults/fedora-31-x86_64.rb

@@ -1,11 +0,0 @@
-platform "fedora-31-x86_64" do |plat|
-  plat.servicedir "/usr/lib/systemd/system"
-  plat.defaultdir "/etc/sysconfig"
-  plat.servicetype "systemd"
-  plat.dist "fc31"
-
-  packages = %w(autoconf automake cmake createrepo rsync gcc gcc-c++ make rpmdevtools rpm-libs rpm-sign)
-  plat.provision_with "/usr/bin/dnf install -y --best --allowerasing  #{packages.join(' ')}"
-  plat.install_build_dependencies_with "/usr/bin/dnf install -y --best --allowerasing"
-  plat.vmpooler_template "fedora-31-x86_64"
-end