vagrant-gsauth 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53c5257aa38fa117c1ceefa223db18ba419dece1
-  data.tar.gz: dfffba687e143e9326e2c5349101ce9e7dfdeddc
+  metadata.gz: fa08ccdfe0825b1c88e01ba8cfefd747b8f85d4a
+  data.tar.gz: 860077c3ed31bf46484536175ef45cbe0b271e81
 SHA512:
-  metadata.gz: 0c918eafc59052be0732051acfa8d3387f06249ce4fddd8914b58e0bb673fc094016ca3403e9eff87f57afcb25e911c94f2e6155b97edf643f65e60aa543ff79
-  data.tar.gz: accff56a518fb2db6a68fde1ea27c3a978ce7381aeeab5198e7a93db6c9144319b2afaf8ee531f32fd54cad7b1b7058167fe5bf118f7de4bd8130cb6e2a09ed8
+  metadata.gz: 3ba803c2ac2006365c38da434e3990d592389bc2a670b2bc57468d90f8d2e391c7b8465efd8cc378a3d1056e9f3f1083024c0221a81b8f6c8017b68c1cf54f3a
+  data.tar.gz: 7daf4182c6218efca310dcbb57e8c0787d079e0eea89853b9c87052cfe56e8568a6b28de390e6affd14ee1ef0622114a612974bdb30044f2865605fbf54c688a

data/.gitignore

@@ -4,3 +4,6 @@ pkg
 *.gem
 .env
 Gemfile.lock
+
+*.iml
+.idea/

data/CHANGELOG.md

@@ -1,135 +1,5 @@
-## 1.3.0
-
-**18 January 2016**
-
-Enhancements:
-
-* upgrade to AWS SDK v2.2.10
-
-Fixes:
-
-* allow box update checks when offline ([#26])
-* support the Vagrant 1.8.x series ([#27])
-
-## 1.2.0
-
-**20 August 2015**
-
-Enhancements:
-
-* output the discovered AWS access key and its source (environment variable or
-  profile) when downloading an authenticated S3 box ([#21])
-
-Thanks, [@Daemoen][Daemoen]!
-
-## 1.1.1
-
-**6 August 2015**
-
-Enhancements:
-
-* bump dependencies to latest patch versions and dev dependencies to latest
-  versions
-
-## 1.1.0
-
-**1 June 2015**
-
-Enhancements:
-
-* upgrade to AWS SDK v2 ([#15])
-* recommend the use of the AWS SDK's centralized credential file ([#14])
-
-Fixes:
-
-* allow up to ten minutes of time skew ([#16])
-* try an unauthenticated download before demanding AWS credentials ([#10])
-
-Thanks, [@kimpepper][kimpepper] and [@companykitchen-dev][companykitchen-dev]!
-
-## 1.0.3
-
-**10 March 2015**
-
-Fixes:
-
-* fix namespace collisions with [vagrant-aws][vagrant-aws] ([#11])
-
-Thanks, [@andres-rojas][andres-rojas]!
-
-
-## 1.0.2
-
-**25 December 2014**
-
-Enhancements:
-
-* provide better error messages when S3 API requests are denied ([#9])
-* include IAM policy recommendations in README
-
-## 1.0.1
-
-**21 December 2014**
-
-Enhancements:
-
-* support bucket-in-host style S3 URLs to simplify usage instructions
-
-Fixes:
-
-* internal cleanup
-* improved detection of incompatible Vagrant versions
-
 ## 1.0.0
 
-**16 December 2014**
-
-Enhancements:
-
-* passes a complete acceptance test suite
-* detects full and shorthand S3 URLs at all download stages
-
-Fixes:
-
-* automatically determines region for shorthand S3 URLs ([#1], [#7])
-
-## 0.1.0
-
-**13 June 2014**
-
-Enhancements:
-
-* support buckets hosted in any S3 region ([#1])
-
-Fixes:
-
-* properly authenticate requests for simple (non-metadata) S3 boxes ([#1])
-
-## 0.0.2
-
-**6 June 2014**
-
-Enhancements:
-
-* formally license under MIT
-
-## 0.0.1
-
-* initial release
-
-[#1]: https://github.com/WhoopInc/vagrant-s3auth/issues/1
-[#7]: https://github.com/WhoopInc/vagrant-s3auth/issues/7
-[#9]: https://github.com/WhoopInc/vagrant-s3auth/issues/9
-[#10]: https://github.com/WhoopInc/vagrant-s3auth/issues/10
-[#11]: https://github.com/WhoopInc/vagrant-s3auth/pull/11
-[#14]: https://github.com/WhoopInc/vagrant-s3auth/issues/14
-[#15]: https://github.com/WhoopInc/vagrant-s3auth/issues/15
-[#16]: https://github.com/WhoopInc/vagrant-s3auth/issues/16
-[#21]: https://github.com/WhoopInc/vagrant-s3auth/issues/21
-
-[Daemoen]: https://github.com/Daemoen
-[andres-rojas]: https://github.com/andres-rojas
-[companykitchen-dev]: https://github.com/companykitchen-dev
-[kimpepper]: https://github.com/kimpepper
+**December 1 2016**
 
-[vagrant-aws]: https://github.com/mitchellh/vagrant-aws
+* initial fork and release

data/Gemfile

@@ -9,5 +9,4 @@ end
 group :plugins do
   gemspec
   gem 'google-api-client', require: 'google/apis/storage_v1'
-  gem 'vagrant-aws', git: 'git://github.com/mitchellh/vagrant-aws.git', ref: 'master'
 end

data/lib/vagrant-gsauth/errors.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module GSAuth
     module Errors
       class VagrantGSAuthError < Vagrant::Errors::VagrantError
-        error_namespace('vagrant_s3auth.errors')
+        error_namespace('vagrant_gsauth.errors')
       end
 
       class UnknownBucketError < VagrantGSAuthError

data/lib/vagrant-gsauth/extension/downloader.rb

@@ -27,8 +27,9 @@ module Vagrant
         auth_headers = GSAuth::Util.authorization_header
 
         options.insert(0, *auth_headers.map { |k, v| ['-H', "#{k}: #{v}"] }.flatten)
+        @logger.debug("gsauth: curl options: #{options}")
 
-        execute_curl_without_gsauth(options, subprocess_options, &data_proc)
+        _execute_curl(options, subprocess_options, &data_proc)
       rescue Errors::DownloaderError => e
         if e.message =~ /403 Forbidden/
           e.message << "\n\n"
@@ -38,22 +39,24 @@ module Vagrant
         raise
       rescue Google::Apis::Error => e
         raise Errors::DownloaderError, message: e
-      rescue ::Seahorse::Client::NetworkingError => e
-        # Vagrant ignores download errors during e.g. box update checks
-        # because an internet connection isn't necessary if the box is
-        # already downloaded. Vagrant isn't expecting AWS's
-        # Seahorse::Client::NetworkingError, so we cast it to the
-        # DownloaderError Vagrant expects.
-        raise Errors::DownloaderError, message: e
       end
 
       def execute_curl_with_gsauth(options, subprocess_options, &data_proc)
+        url = options.last
+        if url.include?('storage.cloud.google')
+          # If the URL was expanded attempt a gsauth download first.
+          # Needed for grabbing metadata
+          gsauth_download(options, subprocess_options, &data_proc)
+        end
+
+        _execute_curl(options, subprocess_options, &data_proc)
+      rescue Errors::DownloaderError => e
         @ui.clear_line if @ui
 
         gsauth_download(options, subprocess_options, &data_proc) || (raise e)
       end
 
-      alias execute_curl_without_gsauth execute_curl
+      alias _execute_curl execute_curl
       alias execute_curl execute_curl_with_gsauth
     end
   end

data/lib/vagrant-gsauth/util.rb

@@ -27,7 +27,7 @@ module VagrantPlugins
 
         if url.scheme == 'gs'
           bucket = url.host
-          key = url.path.split('/').last
+          key = url.path
         elsif match = MEDIA_URL_MATCHER.match(url.path)
           bucket = match['bucket']
           key = match['key']

data/lib/vagrant-gsauth/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GSAuth
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

data/locales/en.yml

@@ -1,28 +1,6 @@
 en:
-  vagrant_s3auth:
-    downloader:
-      env_credential_provider: |-
-        Signing S3 request with key '%{access_key}' loaded from $%{env_var}
-
-      profile_credential_provider: |-
-        Signing S3 request with key '%{access_key}' loaded from profile '%{profile}'
-
+  vagrant_gsauth:
     errors:
-      missing_credentials: |-
-        Unable to find AWS credentials.
-
-        Ensure the following variables are set in your environment, or set
-        them at the top of your Vagrantfile:
-
-            AWS_ACCESS_KEY_ID
-            AWS_SECRET_ACCESS_KEY
-
-        Alternatively, you can create a credential profile and set the
-
-            AWS_PROFILE
-
-        environment variable. Consult the documentation for details.
-
       malformed_shorthand_url: |-
         Malformed shorthand GS box URL:
 
@@ -30,27 +8,5 @@ en:
 
         Check your `box_url` setting.
 
-      s3_api_error: |-
-        Unable to communicate with Amazon S3 to download box. The S3 API reports:
-
-            %{error}
-
-      bucket_location_access_denied_error: |-
-        Request for box's Amazon S3 region was denied.
-
-        This usually indicates that your user account is misconfigured. Ensure
-        your IAM policy allows the "s3:GetBucketLocation" action for your bucket:
-
-            arn:aws:s3:::%{bucket}
-
-      box_download_forbidden: |-
-        This box is hosted on Amazon S3. A 403 Forbidden error usually indicates
-        that your user account is misconfigured. Ensure your IAM policy allows
-        the "s3:GetObject" action for your bucket:
-
-            arn:aws:s3:::%{bucket}/*
-
-        It may also indicate the box does not exist, so check your spelling.
-
       unknown_bucket: |-
         Unable to determine the bucket

data/test/run.bats

@@ -33,3 +33,7 @@ teardown() {
   [[ "$status" -eq 1 ]]
   [[ "$output" == *"Malformed shorthand GS box URL"* ]]
 }
+
+@test "standard boxes still work" {
+  bundle exec vagrant box add unbuntu/trusty64
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-gsauth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Nikhil Benesch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -107,13 +107,6 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
-- ".vagrant/machines/default/virtualbox/action_provision"
-- ".vagrant/machines/default/virtualbox/action_set_name"
-- ".vagrant/machines/default/virtualbox/creator_uid"
-- ".vagrant/machines/default/virtualbox/id"
-- ".vagrant/machines/default/virtualbox/index_uuid"
-- ".vagrant/machines/default/virtualbox/private_key"
-- ".vagrant/machines/default/virtualbox/synced_folders"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile

data/.vagrant/machines/default/virtualbox/action_provision

@@ -1 +0,0 @@
-1.5:e21ed4ad-df79-4ce2-92e7-737f03004c9a

data/.vagrant/machines/default/virtualbox/action_set_name

@@ -1 +0,0 @@
-1480608574

data/.vagrant/machines/default/virtualbox/creator_uid

@@ -1 +0,0 @@
-501

data/.vagrant/machines/default/virtualbox/id

@@ -1 +0,0 @@
-e21ed4ad-df79-4ce2-92e7-737f03004c9a

data/.vagrant/machines/default/virtualbox/index_uuid

@@ -1 +0,0 @@
-b8501bb300114a7fb421a3e4ddc35121

data/.vagrant/machines/default/virtualbox/private_key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA1ZRGw9t6XM5AAMPcRFHYyJkhSLSXhD0Y3VThjVCiazc23xvO
-FQL/wd7Cz7UkjwplHOP2CN2FPFHJqLHVhn5PtCYIZLOHAHL4WzhYqm2sIVyLBbWI
-lsHHgH25wRXrR50za437QtqPIb/brs5auNKOi4Q0elIeCah9G8tKBf/jbDB1ibXY
-L3XVALvBIb6U0dtf0mURgdaT+Ql35UzH5hqQDuT+uB0sfKgKozl9LnxGN0MG45L/
-jqmOBfffLAnHGe7EOTQFIli9hgIbliwgZfTpCY4wQrOyceCvzU/R11QH/+zbsUQe
-hAoRjWob0uENeI7qOYs4ea2t/A/BfWjgJJtk1wIDAQABAoIBAA4dRWvuFjEJ5Ero
-pqbRLd1b2Uo/vP+dNgZydJFtMb6aIIMwCDd1QkeinAcz9l2Jl1MIcZr2YLayxPvj
-/LNtp4DFPqrA/nv2HRmSKLHim4x83CcdbxBfb/q61ErBUxIhfmNuN5uca/cUAcWU
-l4Q9TfREYV9wC9Ihk1sB3Tt2RKZCkqn2DJ8zmeOktNQEU4CvHjRu7/SD58scE3Db
-gEZfaUDKPdzhDvnHtSiP1g+NJRYvY5zPZLcjwA8XEJw0qrIwpK7hDYJ0iTtqPWRR
-z+54sy9rp85BzRbM+UpRiP0RRDrFrP6Suz+vAm7wXE5ivwHEMfAAfeqE4fk2emIU
-Et1+GkECgYEA6ya2bsj8X1yiMdxfwjaKrPpEm3zaxiRHavKS8H9I7fiPs88dbEL1
-uP0P/SMFzb1ipoLZ1goQLsLs1XIrdZhNwEpG3nPUBUkz5hiGipa2gKG2Nt108L6P
-Dawd1t/vhzU2JVIjG6EKKNoWBx2UEOc6/LYXsw6crxpT1cVzXTDkACECgYEA6IPw
-L7IAk6df7igpW4+iVZjfPbifk31nKvq1hMZqkdIIh+c6/Iadom9PO96WSuI8AcrD
-l+bPceP9Kkdq4oIzMuTVmlPXyTRiWM4FzKVMYLbhp5gaFrjuNP9lNaAxLdwoCaQg
-BFcDzaG56Sj5NM8VpQjVlmG9NZxfcIDIl5tKpfcCgYB4L5kelmsm8lmT0ma/BNFs
-B535Op82lmRKLSEc+nFz747DACCxrKeanP0HDFdzCFDbehWMaChNPiN+FJRRzj4v
-Acem+txqtzdnazGYs98jb4OKFzYltb+35Th7EomCOZgrCwgWnwBqUMzhZiS/Xu+v
-KgKC6fz7IiGnKPwFrW9bAQKBgGjPgKefT48/dYi/ZdU2K/D11jvWS2iKsMS4+rX9
-UvCkgt/wJbDLZadhEZBlR849qNsN8Zk5m+003lv+kXnFQxr/+CF3BeBW0rZBOHAF
-WyaFibaoY6o2dnpBXfgMW97WTN37s8sBBl/dNRabN6rMZm9cShtdt5LBCGyIQOPG
-RqIFAoGBAMm5MPvX/rtJO8XeQVOZ0o3Rv/zpOjA/gqAhQbiMTHaPkWHBfLD0Vgmj
-zehNrSp1kKaITcpf6M0XeaXX63M3tM8Vdw2vftdkR6wLMiemImNkOk7gahBieqMv
-7AU6AtLW1PdwQU6cXyRY0t4fjC5FWhdNWnLJ8Os7Qs0BajWP6PK3
------END RSA PRIVATE KEY-----

data/.vagrant/machines/default/virtualbox/synced_folders

@@ -1 +0,0 @@
-{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/jdipierro/Source/vagrant-s3auth","disabled":false,"__vagrantfile":true}}}