omnibus 6.1.9 → 8.0.15

data/lib/omnibus/packagers/solaris.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "socket"
+require "socket" unless defined?(Socket)
 
 module Omnibus
   class Packager::Solaris < Packager::Base

data/lib/omnibus/project.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require "time"
-require "ffi_yajl"
+require "time" unless defined?(Time.zone_offset)
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require "omnibus/manifest"
 require "omnibus/manifest_entry"
 require "omnibus/reports"

data/lib/omnibus/publishers/artifactory_publisher.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "uri"
-require "benchmark"
+require "uri" unless defined?(URI)
+require "benchmark" unless defined?(Benchmark)
 
 module Omnibus
   class ArtifactoryPublisher < Publisher

data/lib/omnibus/publishers/s3_publisher.rb

@@ -65,11 +65,13 @@ module Omnibus
         bucket_name: @options[:bucket],
       }
 
-      if Config.publish_s3_profile
-        config[:profile]            = Config.publish_s3_profile
+      if Config.publish_s3_iam_role_arn
+        config[:publish_s3_iam_role_arn] = Config.publish_s3_iam_role_arn
+      elsif Config.publish_s3_profile
+        config[:profile] = Config.publish_s3_profile
       else
-        config[:access_key_id]      = Config.publish_s3_access_key
-        config[:secret_access_key]  = Config.publish_s3_secret_key
+        config[:access_key_id] = Config.publish_s3_access_key
+        config[:secret_access_key] = Config.publish_s3_secret_key
       end
 
       config

data/lib/omnibus/s3_cache.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 require "omnibus/s3_helpers"
 
 module Omnibus
@@ -147,7 +147,9 @@ module Omnibus
           force_path_style: Config.s3_force_path_style,
         }
 
-        if Config.s3_profile
+        if Config.s3_iam_role_arn
+          config[:iam_role_arn] = Config.s3_iam_role_arn
+        elsif Config.s3_profile
           config[:profile] = Config.s3_profile
         else
           config[:access_key_id] = Config.s3_access_key

data/lib/omnibus/s3_helpers.rb

@@ -17,7 +17,7 @@
 require "aws-sdk-s3"
 require "aws-sdk-core/credentials"
 require "aws-sdk-core/shared_credentials"
-require "base64"
+require "base64" unless defined?(Base64)
 
 module Omnibus
   module S3Helpers
@@ -53,10 +53,7 @@ module Omnibus
       # @return [Aws::S3::Resource]
       #
       def client
-        Aws.config.update(
-          region: s3_configuration[:region],
-          credentials: get_credentials
-        )
+        Aws.config.update(region: s3_configuration[:region])
 
         @s3_client ||= Aws::S3::Resource.new(resource_params)
       end
@@ -70,6 +67,7 @@ module Omnibus
         params = {
           use_accelerate_endpoint: s3_configuration[:use_accelerate_endpoint],
           force_path_style: s3_configuration[:force_path_style],
+          credentials: get_credentials,
         }
 
         if s3_configuration[:use_accelerate_endpoint]
@@ -84,12 +82,14 @@ module Omnibus
       end
 
       #
-      # Create credentials object based on credential profile or access key
+      # Create credentials object based on AWS IAM role arn, credential profile or access key
       # parameters for use by the client object.
       #
       # @return [Aws::SharedCredentials, Aws::Credentials]
       def get_credentials
-        if s3_configuration[:profile]
+        if s3_configuration[:iam_role_arn]
+          Aws::AssumeRoleCredentials.new(role_arn: s3_configuration[:iam_role_arn], role_session_name: "omnibus-assume-role-s3-access")
+        elsif s3_configuration[:profile]
           Aws::SharedCredentials.new(profile_name: s3_configuration[:profile])
         elsif s3_configuration[:access_key_id] && s3_configuration[:secret_access_key]
           Aws::Credentials.new(s3_configuration[:access_key_id], s3_configuration[:secret_access_key])

data/lib/omnibus/software.rb

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 
-require "fileutils"
-require "uri"
+require "fileutils" unless defined?(FileUtils)
+require "uri" unless defined?(URI)
 require "omnibus/manifest_entry"
 
 module Omnibus
@@ -205,6 +205,46 @@ module Omnibus
     end
     expose :maintainer
 
+    #
+    # Sets the bin_dirs where this software installs bins.
+    #
+    # @example
+    #   bin_dirs ['/opt/chef-workstation/bin']
+    #
+    # @param [Array<String>] val
+    #   the bin_dirs of the software
+    #
+    # @return [Array<String>]
+    #
+    def bin_dirs(val = NULL)
+      if null?(val)
+        @bin_dirs || [windows_safe_path("#{install_dir}/bin"), windows_safe_path("#{install_dir}/embedded/bin")]
+      else
+        @bin_dirs = val
+      end
+    end
+    expose :bin_dirs
+
+    #
+    # Sets the lib_dirs where this software installs libs.
+    #
+    # @example
+    #   lib_dirs ['/opt/chef-workstation/bin']
+    #
+    # @param [Array<String>] val
+    #   the lib_dirs of the software
+    #
+    # @return [Array<String>]
+    #
+    def lib_dirs(val = NULL)
+      if null?(val)
+        @lib_dirs || [windows_safe_path("#{install_dir}/embedded/lib")]
+      else
+        @lib_dirs = val
+      end
+    end
+    expose :lib_dirs
+
     #
     # Add a software dependency to this software.
     #
@@ -485,7 +525,7 @@ module Omnibus
       return if final_version.nil?
 
       begin
-        Chef::Sugar::Constraints::Version.new(final_version)
+        ChefUtils::VersionString.new(final_version)
       rescue ArgumentError
         log.warn(log_key) do
           "Version #{final_version} for software #{name} was not parseable. " \
@@ -668,40 +708,18 @@ module Omnibus
             "ARFLAGS" => "-X64 cru",
           }
         when "solaris2"
-          if platform_version.satisfies?("<= 5.10")
-            solaris_flags = {
-              # this override is due to a bug in libtool documented here:
-              # http://lists.gnu.org/archive/html/bug-libtool/2005-10/msg00004.html
-              "CC" => "gcc -static-libgcc",
-              "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
-              "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
-            }
-          elsif platform_version.satisfies?(">= 5.11")
-            solaris_flags = {
-              "CC" => "gcc -m64 -static-libgcc",
-              "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
-              "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
-            }
-          end
-          solaris_flags
+          {
+            "CC" => "gcc -m64 -static-libgcc",
+            "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
+            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
+          }
         when "freebsd"
           {
             "CC" => "clang",
             "CXX" => "clang++",
             "LDFLAGS" => "-L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
-          }
-        when "suse"
-          suse_flags = {
-            "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
+            "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
-          # Enable gcc version 4.8 if it is available
-          if which("gcc-4.8") && platform_version.satisfies?("< 12")
-            suse_flags["CC"] = "gcc-4.8"
-            suse_flags["CXX"] = "g++-4.8"
-          end
-          suse_flags
         when "windows"
           arch_flag = windows_arch_i386? ? "-m32" : "-m64"
           opt_flag = windows_arch_i386? ? "-march=i686" : "-march=x86-64"
@@ -721,7 +739,7 @@ module Omnibus
         else
           {
             "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib",
-            "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
+            "CFLAGS" => "-I#{install_dir}/embedded/include -O2 -D_FORTIFY_SOURCE=2 -fstack-protector",
           }
         end
 
@@ -1075,8 +1093,8 @@ module Omnibus
           log.info(log_key) do
             "Forcing a build because resolved version is nil"
           end
-          execute_build
-          project.dirty!(self)
+          execute_build(build_wrappers)
+          project.dirty!(self) unless project.dirty? # omnibus can only be mildly dirty
         elsif project.dirty?
           log.info(log_key) do
             "Building because `#{project.culprit.name}' dirtied the cache"

data/lib/omnibus/sugarable.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2018 Chef Software, Inc.
+# Copyright 2014-2020, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,31 +14,22 @@
 # limitations under the License.
 #
 
-require "chef/sugar/architecture"
-require "chef/sugar/cloud"
-require "chef/sugar/constraints"
-require "chef/sugar/ip"
-require "chef/sugar/init"
-require "chef/sugar/platform"
-require "chef/sugar/platform_family"
-require "chef/sugar/ruby"
-require "chef/sugar/shell"
-require "chef/sugar/vagrant"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 
 module Omnibus
   module Sugarable
     def self.extended(base)
-      base.send(:extend, Chef::Sugar::DSL)
+      base.send(:extend, ChefUtils)
       base.send(:extend, Omnibus::Sugar)
     end
 
     def self.included(base)
-      base.send(:include, Chef::Sugar::DSL)
+      base.send(:include, ChefUtils)
       base.send(:include, Omnibus::Sugar)
 
       if base < Cleanroom
         # Make all the "sugars" available in the cleanroom (DSL)
-        Chef::Sugar::DSL.instance_methods.each do |instance_method|
+        ChefUtils.instance_methods.each do |instance_method|
           base.send(:expose, instance_method)
         end
 

data/lib/omnibus/templating.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require "erb"
+require "erb" unless defined?(Erb)
 
 module Omnibus
   module Templating

data/lib/omnibus/thread_pool.rb

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-require "thread"
-
 module Omnibus
   class ThreadPool
 

data/lib/omnibus/util.rb

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module Omnibus
   module Util

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "6.1.9".freeze
+  VERSION = "8.0.15".freeze
 end

data/lib/omnibus/whitelist.rb

@@ -1,5 +1,5 @@
 
-# Copyright 2012-2018 Chef Software, Inc.
+# Copyright 2012-2020, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 WHITELIST_LIBS = [
     /ld-linux/,
+    /libanl\.so/,
     /libc\.so/,
     /libcrypt\.so/,
     /libdl/,
@@ -33,6 +34,7 @@ WHITELIST_LIBS = [
   ].freeze
 
 ARCH_WHITELIST_LIBS = [
+  /libanl\.so/,
   /libc\.so/,
   /libcrypt\.so/,
   /libdb-5\.3\.so/,
@@ -56,6 +58,27 @@ AIX_WHITELIST_LIBS = [
   /unix$/,
 ].freeze
 
+OMNIOS_WHITELIST_LIBS = [
+  /libc\.so\.1/,
+  /libcrypt\./,
+  /libcrypt\.so\.1/,
+  /libdl\.so\.1/,
+  /libgcc_s\.so\.1/,
+  /libgen\.so\.1/,
+  /libm\.so\.2/,
+  /libmd\.so\.1/,
+  /libmp\.so/,
+  /libmp\.so\.2/,
+  /libnsl\.so\.1/,
+  /libpthread\.so\.1/,
+  /librt\.so\.1/,
+  /libsocket\.so\.1/,
+  /libssp\.s/,
+  /libssp\.so./,
+  /libssp\.so\.0/,
+  /libgcc_s\.so\.1/,
+].freeze
+
 SOLARIS_WHITELIST_LIBS = [
   /libaio\.so/,
   /libavl\.so/,

data/omnibus.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "omnibus/version"
 
@@ -13,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.description    = gem.summary
   gem.homepage       = "https://github.com/chef/omnibus"
 
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.files = %w{ LICENSE README.md Rakefile Gemfile } + Dir.glob("*.gemspec") + Dir.glob("{bin,lib,resources,spec}/**/{*,.kitchen*}")
   gem.bindir = "bin"
@@ -22,13 +21,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "aws-sdk-s3",       "~> 1"
-  gem.add_dependency "chef-sugar-ng",    ">= 3.3"
+  gem.add_dependency "chef-utils",       ">= 15.4"
   gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"
   gem.add_dependency "mixlib-shellout",  ">= 2.0", "< 4.0"
-  gem.add_dependency "ohai",             ">= 13", "< 16"
+  gem.add_dependency "ohai",             ">= 15"
   gem.add_dependency "ruby-progressbar", "~> 1.7"
-  gem.add_dependency "thor",             "~> 0.18"
+  gem.add_dependency "thor",             ">= 0.18", "< 2.0"
   gem.add_dependency "license_scout",    "~> 1.0"
 
   gem.add_dependency "mixlib-versioning"
@@ -36,8 +35,8 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "artifactory", "~> 3.0"
   gem.add_development_dependency "aruba",       "~> 0.5"
-  gem.add_development_dependency "chefstyle",   "= 0.13.3"
-  gem.add_development_dependency "fauxhai",     ">= 5.2"
+  gem.add_development_dependency "chefstyle",   "= 1.6.2"
+  gem.add_development_dependency "fauxhai-ng",  ">= 7.5"
   gem.add_development_dependency "rspec",       "~> 3.0"
   gem.add_development_dependency "rspec-json_expectations"
   gem.add_development_dependency "rspec-its"

data/resources/ips/doc-transform.erb

@@ -2,3 +2,4 @@
 <transform file depend -> edit pkg.debug.depend.file ruby env>
 <transform file depend -> edit pkg.debug.depend.file make env>
 <transform file depend -> edit pkg.debug.depend.file perl env>
+<transform file depend -> edit pkg.debug.depend.path usr/local/bin usr/bin>

data/resources/msi/source.wxs.erb

@@ -21,20 +21,12 @@
     <Media Id="1" Cabinet="Project.cab" EmbedCab="yes" CompressionLevel="high" />
 
     <!--
-      Take advantage of Windows Installer 5.0 feature (if available) to disable 
-      checkpointing and other costings that take significant amounts of time 
+      Take advantage of Windows Installer 5.0 feature (if available) to disable
+      checkpointing and other costings that take significant amounts of time
       ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd408005(v=vs.85).aspx
     -->
     <Property Id="MSIFASTINSTALL" Value="7" />
 
-    <!--
-      Uncomment launch condition below to check for minimum OS
-      601 = Windows 7/Server 2008R2.
-    -->
-    <!-- Condition Message="!(loc.MinimumOSVersionMessage)">
-      <![CDATA[Installed OR VersionNT >= 601]]>
-    </Condition -->
-
     <!-- We always do Major upgrades -->
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />