omnibus 9.0.8 → 9.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f05719c1cecdc2defbb5641b5a61517b84f88a844932ca0568e3b435997e6fd9
-  data.tar.gz: 7593e4150d3222b368a722f84f92755a4f246e2a31fc8bdb72b8bc9495c42420
+  metadata.gz: 4c7c8bc84ab97c3a75715fc42df6d16ea4df3a301cc24fd6b6b096f65684790f
+  data.tar.gz: 70613619043bc015ad98e7748f4bf93ba6daad5c41eb41155bb817edd2e06d98
 SHA512:
-  metadata.gz: bb4cd2da9b1baab9d1b2555f498d0efdf71627a0a8686654ebdab0e1da8546004b48215ac907e768c964409f8f08caa0a91cd75d664de76d8b7607f509795c5c
-  data.tar.gz: e1a6e11eac83c8e192c2468fbd457b20eacecca8d0aa7c2e286f77cdc1357cba4a9cb1618c0c03014fb7fdb4d7f9bfd346036abe277abed169d1b26f74f833e7
+  metadata.gz: 060c19bb8659c184104e6dd7e4a035ff6250098b555948202a5ecaaf11af00f94e9625c8a07aeb337ec9748c3a8e5b6c2e48edd866b85a582387dbe8db26f1df
+  data.tar.gz: fd7b52b9bf73774a0b42b3dc5bca7e367abce0660c64e1df1d26bb78b77b106e33f9e759c52caf526445392bcd52fc6f41fe3a54006aec055cce5a776b807d89

data/lib/omnibus/config.rb

@@ -601,6 +601,18 @@ module Omnibus
     # @return [true, false]
     default(:fatal_transitive_dependency_licensing_warnings, false)
 
+    # Fail the build when health check does not succeed. This may only be set to false
+    # for very specific use-cases in the omnibus project. e.g. creating a wrapper installer
+    #
+    # @return [true, false]
+    default(:health_check, true)
+
+    # Use the internal_source URL when fetching software dependencies. e.g. when creating an
+    # omnibus package using artifactory as the source url.
+    #
+    # @return [true, false]
+    default(:use_internal_sources, false)
+
     # --------------------------------------------------
     # @!endgroup
     #

data/lib/omnibus/exceptions.rb

@@ -351,4 +351,15 @@ module Omnibus
       EOH
     end
   end
+
+  class InternalSourceMissing < Error
+    def initialize(software)
+      super <<~EOH
+        Internal source missing for #{software.name}.
+
+        When :use_internal_sources is set in the configuration you must specify an
+        internal_source for sources fetched from a url.
+      EOH
+    end
+  end
 end

data/lib/omnibus/fetchers/net_fetcher.rb

@@ -147,6 +147,8 @@ module Omnibus
     def download_url
       if Config.use_s3_caching
         S3Cache.url_for(self)
+      elsif Config.use_internal_sources && !source[:internal]
+        raise InternalSourceMissing.new(self)
       else
         source[:url]
       end

data/lib/omnibus/health_check.rb

@@ -64,6 +64,10 @@ module Omnibus
     #   if the healthchecks pass
     #
     def run!
+      unless Config.health_check
+        log.info(log_key) { "Health check skipped as specified in config for #{project.name}" }
+        return true
+      end
       measure("Health check time") do
         log.info(log_key) { "Running health on #{project.name}" }
         bad_libs, good_libs =

data/lib/omnibus/software.rb

@@ -336,7 +336,7 @@ module Omnibus
         extra_keys = val.keys - [
           :git, :file, :path, :url, # fetcher types
           :md5, :sha1, :sha256, :sha512, # hash type - common to all fetchers
-          :cookie, :warning, :unsafe, :extract, :cached_name, :authorization, # used by net_fetcher
+          :cookie, :warning, :unsafe, :extract, :cached_name, :authorization, :internal, # used by net_fetcher
           :options, # used by path_fetcher
           :submodules # used by git_fetcher
         ]
@@ -351,8 +351,21 @@ module Omnibus
             "not include duplicate keys. Duplicate keys: #{duplicate_keys.inspect}")
         end
 
-        @source ||= {}
-        @source.merge!(val)
+        if Config.use_internal_sources && val[:url]
+          if internal_source_set? && val[:internal].nil?
+            # We only want to replace the hash types here
+            hash_types = %i{md5 sha1 sha256 sha512}
+            val.each_key do |key|
+              val.delete(key) unless hash_types.include?(key)
+            end
+          end
+
+          @source ||= {}
+          @source.merge!(val)
+        else
+          @source ||= {}
+          @source.merge!(val)
+        end
       end
 
       override = canonicalize_source(overrides[:source])
@@ -360,6 +373,22 @@ module Omnibus
     end
     expose :source
 
+    def internal_source_set?
+      @source && @source[:internal] == true
+    end
+
+    def internal_source(val = NULL)
+      unless val.is_a?(Hash)
+        raise InvalidValue.new(:internal_source,
+          "be a kind of `Hash', but was `#{val.class.inspect}'")
+      end
+      if Config.use_internal_sources
+        val[:internal] = true
+        source(val)
+      end
+    end
+    expose :internal_source
+
     #
     # Set or retrieve the {#default_version} of the software to build.
     #

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "9.0.8".freeze
+  VERSION = "9.0.11".freeze
 end

data/omnibus.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "aws-sdk-s3",       "~> 1"
+  gem.add_dependency "aws-sdk-s3",       "~> 1.116.0"
   gem.add_dependency "chef-utils",       ">= 15.4"
   gem.add_dependency "chef-cleanroom",   "~> 1.0"
   gem.add_dependency "ffi-yajl",         "~> 2.2"

data/spec/functional/fetchers/net_fetcher_spec.rb

@@ -173,6 +173,26 @@ module Omnibus
         end
       end
 
+      context "when use_internal_sources is true and no internal source url" do
+        before { Omnibus::Config.use_internal_sources(true) }
+
+        it "raises an exception" do
+          expect { fetch! }.to raise_error(InternalSourceMissing)
+        end
+      end
+
+      context "when use_internal_sources is true and internal source url given" do
+        before { Omnibus::Config.use_internal_sources(true) }
+        let(:source) do
+          { url: source_url, md5: source_md5, internal: true }
+        end
+
+        it "downloads the file" do
+          fetch!
+          expect(downloaded_file).to be_a_file
+        end
+      end
+
       context "source with sha1" do
         let(:source) do
           { url: source_url, sha1: source_sha1 }

data/spec/unit/config_spec.rb

@@ -45,6 +45,7 @@ module Omnibus
     include_examples "a configurable", :fetcher_read_timeout, 60
     include_examples "a configurable", :fetcher_retries, 5
     include_examples "a configurable", :fatal_licensing_warnings, false
+    include_examples "a configurable", :health_check, true
     include_examples "a configurable", :fips_mode, false
 
     describe "#workers" do

data/spec/unit/software_spec.rb

@@ -16,10 +16,18 @@ module Omnibus
       }
     end
 
+    let(:internal_source) do
+      {
+        url: "http://internal.com/",
+        md5: "efgh5678",
+      }
+    end
+
     let(:rel_path) { "software" }
 
     subject do
       local_source = source
+      local_internal_source = internal_source
       local_rel_path = rel_path
 
       described_class.new(project).evaluate do
@@ -27,6 +35,7 @@ module Omnibus
         default_version "1.2.3"
 
         source local_source
+        internal_source local_internal_source
         relative_path local_rel_path
       end
     end
@@ -592,6 +601,14 @@ module Omnibus
       end
     end
 
+    context "when software internal_source is given" do
+      before { Omnibus::Config.use_internal_sources(true) }
+
+      it "sets the source with internal: true" do
+        expect(subject.source).to eq(url: "http://internal.com/", md5: "efgh5678", internal: true)
+      end
+    end
+
     describe "#fetcher" do
       before do
         expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", source).and_return("1.2.8")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 9.0.8
+  version: 9.0.11
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.116.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.116.0
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement