packaging 0.106.0 → 0.106.3

data/lib/packaging/config/params.rb

@@ -3,194 +3,191 @@ require "packaging/platforms"
 # These are all of the parameters known to our packaging system.
 # They are ingested by the config class as class instance variables
 module Pkg::Params
-  BUILD_PARAMS = [:allow_dirty_tree,
-                  :answer_override,
-                  :apt_archive_path,
-                  :apt_archive_repo_command,
-                  :apt_host,
-                  :apt_releases,
-                  :apt_repo_command,
-                  :apt_repo_name,
-                  :apt_repo_path,
-                  :apt_repo_staging_path,
-                  :apt_repo_url,
-                  :apt_signing_server,
-                  :apt_staging_server,
-                  :author,
-                  :benchmark,
-                  :build_data_repo,
-                  :build_date,
-                  :build_defaults,
-                  :build_dmg,
-                  :build_doc,
-                  :build_gem,
-                  :build_ips,
-                  :build_msi,
-                  :build_pe,
-                  :build_tar,
-                  :builder_data_file,
-                  :builds_server,
-                  :bundle_platforms,
-                  :certificate_pem,
-                  :cows,
-                  :db_table,
-                  :deb_build_host,
-                  :deb_build_mirrors,
-                  :deb_targets,
-                  :debug,
-                  :debversion,
-                  :default_cow,
-                  :default_mock,
-                  :dev_build,
-                  :description,
-                  :distribution_server,
-                  :dmg_host,
-                  :dmg_path,
-                  :dmg_staging_server,
-                  :downloads_archive_path,
-                  :email,
-                  :files,
-                  :final_mocks,
-                  :foss_only,
-                  :foss_platforms,
-                  :freight_archive_path,
-                  :freight_conf,
-                  :gem_default_executables,
-                  :gem_dependencies,
-                  :gem_description,
-                  :gem_devel_dependencies,
-                  :gem_development_dependencies,
-                  :gem_excludes,
-                  :gem_executables,
-                  :gem_files,
-                  :gem_forge_project,
-                  :gem_host,
-                  :gem_license,
-                  :gem_name,
-                  :gem_path,
-                  :gem_platform_dependencies,
-                  :gem_rdoc_options,
-                  :gem_require_path,
-                  :gem_required_ruby_version,
-                  :gem_required_rubygems_version,
-                  :gem_runtime_dependencies,
-                  :gem_summary,
-                  :gem_test_files,
-                  :gemversion,
-                  :gpg_key,
-                  :gpg_name,
-                  :homepage,
-                  :internal_gem_host,
-                  :ips_build_host,
-                  :ips_host,
-                  :ips_inter_cert,
-                  :ips_package_host,
-                  :ips_path,
-                  :ips_repo,
-                  :ips_root_cert,
-                  :ips_signing_cert,
-                  :ips_signing_key,
-                  :ips_signing_server,
-                  :ips_signing_ssh_key,
-                  :ips_store,
-                  :jenkins_build_host,
-                  :jenkins_packaging_job,
-                  :jenkins_repo_path,
-                  :metrics,
-                  :metrics_url,
-                  :msi_host,
-                  :msi_name,
-                  :msi_path,
-                  :msi_signing_cert,
-                  :msi_signing_cert_pw,
-                  :msi_signing_server,
-                  :msi_signing_ssh_key,
-                  :msi_staging_server,
-                  :name,
-                  :nonfinal_apt_repo_command,
-                  :nonfinal_apt_repo_path,
-                  :nonfinal_apt_repo_staging_path,
-                  :nonfinal_dmg_path,
-                  :nonfinal_gem_path,
-                  :nonfinal_ips_path,
-                  :nonfinal_msi_path,
-                  :nonfinal_p5p_path,
-                  :nonfinal_repo_name,
-                  :nonfinal_repo_link_target,
-                  :nonfinal_svr4_path,
-                  :nonfinal_swix_path,
-                  :nonfinal_yum_repo_path,
-                  :notify,
-                  :nuget_host,
-                  :nuget_repo_path,
-                  :origversion,
-                  :osx_build_host,
-                  :osx_signing_cert,
-                  :osx_signing_keychain,
-                  :osx_signing_keychain_pw,
-                  :osx_signing_server,
-                  :osx_signing_ssh_key,
-                  :p5p_host,
-                  :p5p_path,
-                  :packager,
-                  :packaging_repo,
-                  :packaging_root,
-                  :packaging_url,
-                  :pbuild_conf,
-                  :pe_feature_branch,
-                  :pe_release_branch,
-                  :pe_name,
-                  :pe_platforms,
-                  :pe_version,
-                  :pg_major_version,
-                  :platform_repos,
-                  :pre_tar_task,
-                  :pre_tasks,
-                  :privatekey_pem,
-                  :project,
-                  :project_root,
-                  :random_mockroot,
-                  :rc_mocks,
-                  :redis_hostname,
-                  :ref,
-                  :release,
-                  :repo_link_target,
-                  :repo_name,
-                  :rpm_build_host,
-                  :rpm_targets,
-                  :rpmrelease,
-                  :rpmversion,
-                  :rsync_servers,
-                  :s3_ship,
-                  :short_ref,
-                  :sign_tar,
-                  :signing_server,
-                  :staging_server,
-                  :summary,
-                  :svr4_host,
-                  :svr4_path,
-                  :swix_host,
-                  :swix_path,
-                  :swix_staging_server,
-                  :tar_excludes,
-                  :tar_host,
-                  :tar_staging_server,
-                  :tarball_path,
-                  :task,
-                  :team,
-                  :templates,
-                  :update_version_file,
-                  :vanagon_project,
-                  :version,
-                  :version_file,
-                  :version_strategy,
-                  :yum_archive_path,
-                  :yum_host,
-                  :yum_repo_command,
-                  :yum_repo_name,
-                  :yum_repo_path,
-                  :yum_staging_server,
-                 ]
+  BUILD_PARAMS = %i[allow_dirty_tree
+                  answer_override
+                  apt_archive_path
+                  apt_archive_repo_command
+                  apt_host
+                  apt_releases
+                  apt_repo_command
+                  apt_repo_name
+                  apt_repo_path
+                  apt_repo_staging_path
+                  apt_repo_url
+                  apt_signing_server
+                  apt_staging_server
+                  author
+                  benchmark
+                  build_data_repo
+                  build_date
+                  build_defaults
+                  build_dmg
+                  build_doc
+                  build_gem
+                  build_ips
+                  build_msi
+                  build_pe
+                  build_tar
+                  builder_data_file
+                  builds_server
+                  bundle_platforms
+                  certificate_pem
+                  cows
+                  db_table
+                  deb_build_host
+                  deb_build_mirrors
+                  deb_targets
+                  debug
+                  debversion
+                  default_cow
+                  default_mock
+                  dev_build
+                  description
+                  distribution_server
+                  dmg_host
+                  dmg_path
+                  dmg_staging_server
+                  downloads_archive_path
+                  email
+                  files
+                  final_mocks
+                  foss_only
+                  foss_platforms
+                  freight_archive_path
+                  freight_conf
+                  gem_default_executables
+                  gem_dependencies
+                  gem_description
+                  gem_devel_dependencies
+                  gem_development_dependencies
+                  gem_excludes
+                  gem_executables
+                  gem_files
+                  gem_forge_project
+                  gem_host
+                  gem_license
+                  gem_name
+                  gem_path
+                  gem_platform_dependencies
+                  gem_rdoc_options
+                  gem_require_path
+                  gem_required_ruby_version
+                  gem_required_rubygems_version
+                  gem_runtime_dependencies
+                  gem_summary
+                  gem_test_files
+                  gemversion
+                  gpg_key
+                  gpg_name
+                  homepage
+                  internal_gem_host
+                  ips_build_host
+                  ips_host
+                  ips_inter_cert
+                  ips_package_host
+                  ips_path
+                  ips_repo
+                  ips_root_cert
+                  ips_signing_cert
+                  ips_signing_key
+                  ips_signing_server
+                  ips_signing_ssh_key
+                  ips_store
+                  jenkins_build_host
+                  jenkins_packaging_job
+                  jenkins_repo_path
+                  metrics
+                  metrics_url
+                  msi_host
+                  msi_name
+                  msi_path
+                  msi_signing_gcp_service_account_credentials
+                  msi_signing_service_url
+                  msi_staging_server
+                  name
+                  nonfinal_apt_repo_command
+                  nonfinal_apt_repo_path
+                  nonfinal_apt_repo_staging_path
+                  nonfinal_dmg_path
+                  nonfinal_gem_path
+                  nonfinal_ips_path
+                  nonfinal_msi_path
+                  nonfinal_p5p_path
+                  nonfinal_repo_name
+                  nonfinal_repo_link_target
+                  nonfinal_svr4_path
+                  nonfinal_swix_path
+                  nonfinal_yum_repo_path
+                  notify
+                  nuget_host
+                  nuget_repo_path
+                  origversion
+                  osx_build_host
+                  osx_signing_cert
+                  osx_signing_keychain
+                  osx_signing_keychain_pw
+                  osx_signing_server
+                  osx_signing_ssh_key
+                  p5p_host
+                  p5p_path
+                  packager
+                  packaging_repo
+                  packaging_root
+                  packaging_url
+                  pbuild_conf
+                  pe_feature_branch
+                  pe_release_branch
+                  pe_name
+                  pe_platforms
+                  pe_version
+                  pg_major_version
+                  platform_repos
+                  pre_tar_task
+                  pre_tasks
+                  privatekey_pem
+                  project
+                  project_root
+                  random_mockroot
+                  rc_mocks
+                  redis_hostname
+                  ref
+                  release
+                  repo_link_target
+                  repo_name
+                  rpm_build_host
+                  rpm_targets
+                  rpmrelease
+                  rpmversion
+                  rsync_servers
+                  s3_ship
+                  short_ref
+                  sign_tar
+                  signing_server
+                  staging_server
+                  summary
+                  svr4_host
+                  svr4_path
+                  swix_host
+                  swix_path
+                  swix_staging_server
+                  tar_excludes
+                  tar_host
+                  tar_staging_server
+                  tarball_path
+                  task
+                  team
+                  templates
+                  update_version_file
+                  vanagon_project
+                  version
+                  version_file
+                  version_strategy
+                  yum_archive_path
+                  yum_host
+                  yum_repo_command
+                  yum_repo_name
+                  yum_repo_path
+                  yum_staging_server]
 
   # Environment variable overrides for Pkg::Config parameters
   #
@@ -204,7 +201,7 @@ module Pkg::Params
               { :var => :apt_archive_path,        :envvar => :APT_ARCHIVE_PATH },
               { :var => :apt_archive_repo_command, :envvar => :APT_ARCHIVE_REPO_COMMAND },
               { :var => :apt_host,                :envvar => :APT_HOST },
-              { :var => :apt_releases,            :envvar => :APT_RELEASES,    :type => :array },
+              { :var => :apt_releases,            :envvar => :APT_RELEASES, :type => :array },
               { :var => :apt_repo_path,           :envvar => :APT_REPO },
               { :var => :apt_repo_staging_path,   :envvar => :APT_REPO_STAGING_PATH },
               { :var => :apt_signing_server,      :envvar => :APT_SIGNING_SERVER },
@@ -219,10 +216,10 @@ module Pkg::Params
               { :var => :build_tar,               :envvar => :TAR,             :type => :bool },
               { :var => :certificate_pem,         :envvar => :CERT_PEM },
               { :var => :cows,                    :envvar => :COW },
-              { :var => :debug,                   :envvar => :DEBUG,           :type => :bool },
+              { :var => :debug,                   :envvar => :DEBUG, :type => :bool },
               { :var => :default_cow,             :envvar => :COW },
               { :var => :default_mock,            :envvar => :MOCK },
-              { :var => :dev_build,               :envvar => :DEV_BUILD,       :type => :bool },
+              { :var => :dev_build,               :envvar => :DEV_BUILD, :type => :bool },
               { :var => :dmg_host,                :envvar => :DMG_HOST },
               { :var => :dmg_path,                :envvar => :DMG_PATH },
               { :var => :dmg_staging_server,      :envvar => :DMG_STAGING_SERVER },
@@ -245,13 +242,11 @@ module Pkg::Params
               { :var => :ips_signing_ssh_key,     :envvar => :IPS_SIGNING_SSH_KEY },
               { :var => :msi_host,                :envvar => :MSI_HOST },
               { :var => :msi_path,                :envvar => :MSI_PATH },
-              { :var => :msi_signing_cert,        :envvar => :MSI_SIGNING_CERT },
-              { :var => :msi_signing_cert_pw,     :envvar => :MSI_SIGNING_CERT_PW },
-              { :var => :msi_signing_server,      :envvar => :MSI_SIGNING_SERVER },
-              { :var => :msi_signing_ssh_key,     :envvar => :MSI_SIGNING_SSH_KEY },
+              { :var => :msi_signing_gcp_service_account_credentials, :envvar => :MSI_SIGNING_GCP_SERVICE_ACCOUNT_CREDENTIALS },
+              { :var => :msi_signing_service_url, :envvar => :MSI_SIGNING_SERVICE_URL },
               { :var => :msi_staging_server,      :envvar => :MSI_STAGING_SERVER },
               { :var => :nonfinal_apt_repo_command, :envvar => :NONFINAL_APT_REPO_COMMAND },
-              { :var => :nonfinal_apt_repo_path,  :envvar => :NONFINAL_APT_REPO_PATH },
+              { :var => :nonfinal_apt_repo_path, :envvar => :NONFINAL_APT_REPO_PATH },
               { :var => :nonfinal_apt_repo_staging_path, :envvar => :NONFINAL_APT_REPO_STAGING_PATH },
               { :var => :nonfinal_dmg_path,       :envvar => :NONFINAL_DMG_PATH },
               { :var => :nonfinal_gem_path,       :envvar => :NONFINAL_GEM_PATH },
@@ -329,8 +324,6 @@ module Pkg::Params
               { :var => :ips_inter_cert,          :val => '$IPS_INTER_CERT' },
               { :var => :ips_root_cert,           :val => '$IPS_ROOT_CERT' },
               { :var => :ips_signing_key,         :val => '$IPS_SIGNING_KEY' },
-              { :var => :msi_signing_cert,        :val => '$MSI_SIGNING_CERT' },
-              { :var => :msi_signing_cert_pw,     :val => '$MSI_SIGNING_CERT_PW' },
               { :var => :pe_feature_branch,       :val => false },
               { :var => :pe_release_branch,       :val => false },
               { :var => :s3_ship,                 :val => false },
@@ -384,5 +377,4 @@ module Pkg::Params
   VALIDATIONS = [
     { :var => :project, :validations => [:not_empty?] }
   ]
-
 end

data/lib/packaging/config/validations.rb

@@ -1,8 +1,6 @@
 module Pkg
   class ConfigValidations
-
     class << self
-
       # As a validation, this one is kindof lame but is intended as a seed pattern for possibly
       # more robust ones.
       def not_empty?(value)

data/lib/packaging/config.rb

@@ -81,11 +81,11 @@ module Pkg
         dir = "/opt/jenkins-builds/#{self.project}/#{self.ref}"
         cmd = "if [ -s \"#{dir}/artifacts\" ]; then cd #{dir};"\
               "find ./artifacts -mindepth 2 -type f; fi"
-        artifacts, _ = Pkg::Util::Net.remote_execute(
-                     self.builds_server,
+        artifacts, = Pkg::Util::Net.remote_execute(
+          self.builds_server,
                      cmd,
                      { capture_output: true }
-                   )
+        )
 
         artifacts = artifacts.split("\n")
         data = {}
@@ -118,8 +118,8 @@ module Pkg
           if platform == 'solaris'
             next if version == '10' && File.extname(artifact) != '.gz'
             next if version == '11' && File.extname(artifact) != '.p5p'
-          else
-            next if File.extname(artifact) != ".#{package_format}"
+          elsif File.extname(artifact) != ".#{package_format}"
+            next
           end
 
           # Don't want to include debian debug packages
@@ -231,8 +231,8 @@ module Pkg
       # the debian changelog.
       #
       def cow_list
-        self.cows.split(' ').map do
-          |cow| cow.split('-')[1]
+        self.cows.split(' ').map do |cow|
+          cow.split('-')[1]
         end.uniq.join(' ')
       end
 
@@ -426,7 +426,7 @@ module Pkg
       def string_to_array(str)
         delimiters = /[,\s;]/
         return str if str.respond_to?('each')
-        str.split(delimiters).reject { |s| s.empty? }.map { |s| s.strip }
+        str.split(delimiters).reject(&:empty?).map(&:strip)
       end
 
       # This method is duplicated from enterprise-dist so we can access it here.

data/lib/packaging/deb/repo.rb

@@ -2,9 +2,7 @@
 require 'fileutils'
 
 module Pkg::Deb::Repo
-
   class << self
-
     # This is the default set of arches we are using for our reprepro repos. We
     # take this list and combine it with the list of supported arches for each
     # given platform to ensure a complete set of architectures. We use this
@@ -43,7 +41,7 @@ module Pkg::Deb::Repo
       # First test if the directory even exists
       #
       begin
-        stdout, _, _ = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{repo_base} 2>&1")
+        stdout, = Pkg::Util::Execution.capture3("#{wget} --spider -r -l 1 --no-parent #{repo_base} 2>&1")
       rescue RuntimeError
         warn "No debian repos available for #{Pkg::Config.project} at #{Pkg::Config.ref}."
         return
@@ -62,7 +60,7 @@ module Pkg::Deb::Repo
         # We want to skip the base_url, which wget returns as one of the results
         next if "#{url}/" == repo_base
         platform_tag = Pkg::Paths.tag_from_artifact_path(url)
-        platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+        platform, version, = Pkg::Platforms.parse_platform_tag(platform_tag)
         codename = Pkg::Platforms.codename_for_platform_version(platform, version)
         repoconfig = ["# Packages for #{Pkg::Config.project} built from ref #{Pkg::Config.ref}",
                       "deb #{url} #{codename} #{reprepro_repo_name}"]
@@ -76,9 +74,9 @@ module Pkg::Deb::Repo
       wget = Pkg::Util::Tool.check_tool("wget")
       FileUtils.mkdir_p("pkg/#{target}")
       config_url = "#{base_url}/#{target}/deb/"
-      stdout, _, _ = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
+      stdout, = Pkg::Util::Execution.capture3("#{wget} -r -np -nH --cut-dirs 3 -P pkg/#{target} --reject 'index*' #{config_url}")
       stdout
-    rescue => e
+    rescue StandardError => e
       fail "Couldn't retrieve deb apt repo configs.\n#{e}"
     end
 
@@ -95,13 +93,13 @@ module Pkg::Deb::Repo
 
       artifact_paths.each do |path|
         platform_tag = Pkg::Paths.tag_from_artifact_path(path)
-        platform, version, _ = Pkg::Platforms. parse_platform_tag(platform_tag)
+        platform, version, = Pkg::Platforms. parse_platform_tag(platform_tag)
         codename = Pkg::Platforms.codename_for_platform_version(platform, version)
         arches = Pkg::Platforms.arches_for_codename(codename)
 
         cmd << "mkdir -p #{codename}/conf && "
         cmd << "pushd #{codename} ; "
-        cmd << %Q( [ -e 'conf/distributions' ] || echo "
+        cmd << %( [ -e 'conf/distributions' ] || echo "
 Origin: Puppet Labs
 Label: Puppet Labs
 Codename: #{codename}
@@ -139,7 +137,7 @@ Description: Apt repository for acceptance testing" >> conf/distributions ; )
     end
 
     def ship_repo_configs(target = "repo_configs")
-      if (!File.exist?("pkg/#{target}/deb")) || Pkg::Util::File.empty_dir?("pkg/#{target}/deb")
+      if !File.exist?("pkg/#{target}/deb") || Pkg::Util::File.empty_dir?("pkg/#{target}/deb")
         warn "No repo configs have been generated! Try pl:deb_repo_configs."
         return
       end
@@ -178,7 +176,7 @@ Description: #{message} for #{dist}
 SignWith: #{Pkg::Config.gpg_key}"
           end
 
-          stdout, _, _ = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
+          stdout, = Pkg::Util::Execution.capture3("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
           stdout
         end
       end
@@ -204,7 +202,7 @@ SignWith: #{Pkg::Config.gpg_key}"
       # You may think "rsync doesn't actually remove the sticky bit, let's
       # remove the Dugo-s from the chmod". However, that will make your rsyncs
       # fail due to permission errors.
-      options = %w(
+      options = %w[
         rsync
         --itemize-changes
         --hard-links
@@ -222,14 +220,14 @@ SignWith: #{Pkg::Config.gpg_key}"
         --no-group
         --exclude='dists/*-*'
         --exclude='pool/*-*'
-      )
+      ]
 
       options << '--dry-run' if dryrun
       options << path
       if !destination.nil?
         options << "#{destination}:#{dest_path.parent}"
       else
-        options << "#{dest_path.parent}"
+        options << dest_path.parent.to_s
       end
       options.join("\s")
     end
@@ -259,6 +257,5 @@ SignWith: #{Pkg::Config.gpg_key}"
         Pkg::Util::Net.remote_execute(destination_server, cp_command)
       end
     end
-
   end
 end

data/lib/packaging/gem.rb

@@ -21,7 +21,7 @@ module Pkg::Gem
         data['number'] == gem_version && data['platform'] == gem_platform
       end
       return !gem.empty?
-    rescue => e
+    rescue StandardError => e
       puts "Something went wrong searching for gem '#{gem_name}':"
       puts e
       puts "Perhaps you're shipping '#{gem_name}' for the first time?"
@@ -49,7 +49,7 @@ module Pkg::Gem
       gem_push_command << " --host #{options[:host]}" if options[:host]
       gem_push_command << " --key #{options[:key]}" if options[:key]
       Pkg::Util::Execution.capture3(gem_push_command)
-    rescue => e
+    rescue StandardError => e
       puts "###########################################"
       puts "#  Publishing to rubygems failed. Make sure your .gem/credentials"
       puts "#  file is set up and you are an owner of #{Pkg::Config.gem_name}"

data/lib/packaging/metrics.rb

@@ -3,13 +3,13 @@ module Pkg::Metrics
 
   def update_release_metrics
     metrics_repo = 'release-metrics'
-    command = <<CMD
-git clone git@github.com:puppetlabs/#{metrics_repo}.git
-cd #{metrics_repo}
-bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
-cd ..
-rm -r #{metrics_repo}
-CMD
+    command = <<~CMD
+      git clone git@github.com:puppetlabs/#{metrics_repo}.git
+      cd #{metrics_repo}
+      bundle exec add-release --date #{Pkg::Util::Date.today} --project #{Pkg::Config.project} --version #{Pkg::Config.ref}
+      cd ..
+      rm -r #{metrics_repo}
+    CMD
     Pkg::Util::Execution.capture3(command, true)
   end
 end

data/lib/packaging/nuget.rb

@@ -32,7 +32,6 @@ module Pkg::Nuget
           stdout, retval = Pkg::Util::Net.curl_form_data("#{uri}/#{package_path}", form_data + package_form_data)
         end
         fail "The Package upload (curl) failed with error #{retval}" unless Pkg::Util::Execution.success?(retval)
-        stdout
       end
     end
   end