omnibus 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1743d10eeba568049429e83ffe6c49ee3d03af8
-  data.tar.gz: d3ddb3b93766faa83e19cf591c4324c9a6392797
+  metadata.gz: d528e6f65a006c07fab5ba8eb1274a8f8960e19f
+  data.tar.gz: 6f434ffc471faddb0fda4a0ed5cf9520ae201115
 SHA512:
-  metadata.gz: 834462aa9e01a2086d7058c51a595a2ece8ff28d64a7d4166952e950558e5657e9e5e191df2bdbe667c0edb6fbefa72dd5f216668e6d3502dbc64a1aa677b446
-  data.tar.gz: 106d58b1f31a951a25412caa752506fd39979e65f5a584190820ae72781e9c7a350a2f9b5a9acd5fb73c68ef62ac9b13eeef1a7566a609fcb8a4e4173f151294
+  metadata.gz: d37ccec9688a74a78dbd847a1096daa29e75a2d41f8fa57e7ba0e5fa2ffe1afc3ba72dde544c82a35d8c98a6da1220f2863ff12fe0656715ea80c0d0d53d2189
+  data.tar.gz: 2cd1aa5e70388fde16a4e600b69decbac1c1bd5184dcf54d9530cd088c1d885ab97ace3f090127a21531efdfc5d1d16ad3be6539fce5c05076b353f96b097a00

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Omnibus CHANGELOG
 =================
 
+v5.6.1 (June 22, 2017)
+----------------------
+### Bug Fixes
+- S3 cache: fix bug using access_key_id/secret_access_key (#786)
+
 v5.6.0 (June 20, 2017)
 ----------------------
 ### New Features

data/lib/omnibus/s3_cache.rb

@@ -149,7 +149,7 @@ module Omnibus
         if Config.s3_profile
           config[:profile] = Config.s3_profile
         else
-          config[:access_key_id] = Config.s3_access_key,
+          config[:access_key_id] = Config.s3_access_key
           config[:secret_access_key] = Config.s3_secret_key
         end
 

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = "5.6.0"
+  VERSION = "5.6.1"
 end

data/spec/unit/fetchers/net_fetcher_spec.rb

@@ -448,6 +448,10 @@ module Omnibus
           Config.cache_dir("/")
           stub_ohai(platform: "ubuntu", version: "12.04")
           stub_const("File::ALT_SEPARATOR", nil)
+
+          allow(Omnibus).to receive(:which)
+            .with("gtar")
+            .and_return(false)
         end
 
         context "when gtar is not present" do
@@ -479,8 +483,8 @@ module Omnibus
             stub_const("File::ALT_SEPARATOR", nil)
 
             allow(Omnibus).to receive(:which)
-            .with("gtar")
-            .and_return("/path/to/gtar")
+              .with("gtar")
+              .and_return("/path/to/gtar")
           end
 
           it_behaves_like "an extractor", "7z", {},

data/spec/unit/s3_cacher_spec.rb

@@ -106,5 +106,52 @@ module Omnibus
         expect(S3Cache.key_for(ruby_19)).to eq("ruby-1.9.3-abcd1234")
       end
     end
+
+    describe ".s3_configuration" do
+      let (:s3_bucket) { "omnibus-cache" }
+      let (:s3_region) { "eu-west-1" }
+      let (:s3_access_key) { nil }
+      let (:s3_secret_key) { nil }
+      let (:s3_profile) { nil }
+
+      before do
+        Config.s3_bucket s3_bucket
+        Config.s3_region s3_region
+        Config.s3_profile s3_profile
+        Config.s3_access_key s3_access_key
+        Config.s3_secret_key s3_secret_key
+      end
+
+      it "sets region and bucket" do
+        config = S3Cache.send(:s3_configuration)
+        expect(config[:region]).to eq(s3_region)
+        expect(config[:bucket_name]).to eq(s3_bucket)
+      end
+
+      context "s3_profile is not configured" do
+        let(:s3_access_key) { "ACCESS_KEY_ID" }
+        let(:s3_secret_key) { "SECRET_ACCESS_KEY" }
+
+        it "sets access_key_id and secret_access_key" do
+          config = S3Cache.send(:s3_configuration)
+          expect(config[:profile]).to eq(nil)
+          expect(config[:access_key_id]).to eq(s3_access_key)
+          expect(config[:secret_access_key]).to eq(s3_secret_key)
+        end
+      end
+
+      context "s3_profile is configured" do
+        let(:s3_profile) { "SHAREDPROFILE" }
+        let(:s3_access_key) { "ACCESS_KEY_ID" }
+        let(:s3_secret_key) { "SECRET_ACCESS_KEY" }
+
+        it "sets s3_profile only" do
+          config = S3Cache.send(:s3_configuration)
+          expect(config[:profile]).to eq(s3_profile)
+          expect(config[:access_key_id]).to eq(nil)
+          expect(config[:secret_access_key]).to eq(nil)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -588,7 +588,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software