From 34892642e9f8c8aade0865f45e21964e12a29e4c Mon Sep 17 00:00:00 2001
From: Jules Jans <julian.jans@royalacademy.org.uk>
Date: Mon, 18 Jan 2021 13:39:58 +0000
Subject: [PATCH] Removed AWS credentials for roles

---
 boucher.gemspec              | 2 +-
 lib/boucher/compute.rb       | 5 ++---
 lib/boucher/storage.rb       | 3 +--
 spec/boucher/compute_spec.rb | 2 --
 spec/boucher/storage_spec.rb | 2 --
 spec/spec_helper.rb          | 2 --
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/boucher.gemspec b/boucher.gemspec
index 49e50fe..4f8602e 100644
--- a/boucher.gemspec
+++ b/boucher.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "boucher"
-  s.version     = "0.4.0"
+  s.version     = "0.5.0"
   s.authors     = ["'Micah Micah'"]
   s.email       = ["'micah@8thlight.com'"]
   s.homepage    = "http://github.com/8thlight/boucher"
diff --git a/lib/boucher/compute.rb b/lib/boucher/compute.rb
index 6c759a1..28d3a7c 100644
--- a/lib/boucher/compute.rb
+++ b/lib/boucher/compute.rb
@@ -8,9 +8,8 @@ module Boucher
 
   EC2_CONFIG = {
           :provider => 'AWS',
-          :aws_secret_access_key => Boucher::Config[:aws_secret_access_key],
-          :aws_access_key_id => Boucher::Config[:aws_access_key_id],
-          :region => Boucher::Config[:aws_region]
+          :region => Boucher::Config[:aws_region],
+          :use_iam_profile => true
   }
 
   def self.compute
diff --git a/lib/boucher/storage.rb b/lib/boucher/storage.rb
index 65f8b25..f44bbe1 100644
--- a/lib/boucher/storage.rb
+++ b/lib/boucher/storage.rb
@@ -6,8 +6,7 @@ module Boucher
 
   S3_CONFIG = {
           :provider => 'AWS',
-          :aws_secret_access_key => Boucher::Config[:aws_secret_access_key],
-          :aws_access_key_id => Boucher::Config[:aws_access_key_id]
+          :use_iam_profile => true
   }
 
   def self.storage
diff --git a/spec/boucher/compute_spec.rb b/spec/boucher/compute_spec.rb
index 39331b5..0f96549 100644
--- a/spec/boucher/compute_spec.rb
+++ b/spec/boucher/compute_spec.rb
@@ -11,8 +11,6 @@
   it "knows connections options" do
     connection = Boucher.compute
     connection.should_not == nil
-    Boucher::EC2_CONFIG[:aws_secret_access_key].should == "secret key"
-    Boucher::EC2_CONFIG[:aws_access_key_id].should == "public id"
   end
 
   it "ssh's a command" do
diff --git a/spec/boucher/storage_spec.rb b/spec/boucher/storage_spec.rb
index 37c5fec..2853e19 100644
--- a/spec/boucher/storage_spec.rb
+++ b/spec/boucher/storage_spec.rb
@@ -7,8 +7,6 @@
   it "knows connections options" do
     connection = Boucher.storage
     connection.should_not == nil
-    Boucher::S3_CONFIG[:aws_secret_access_key].should == Boucher::Config[:aws_secret_access_key]
-    Boucher::S3_CONFIG[:aws_access_key_id].should == Boucher::Config[:aws_access_key_id]
   end
 
   context "with dir" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ba4fc96..99a3510 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,6 @@
 module Boucher
   NO_LOAD_CONFIG = true
   Config = {
-          :aws_secret_access_key => "secret key",
-          :aws_access_key_id => "public id",
           :aws_key_filename => "test_key"
   }
 end