vagrant-s3auth 1.0.2 → 1.0.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +16 -0
- data/Gemfile +1 -0
- data/Gemfile.lock +97 -1
- data/README.md +6 -3
- data/lib/vagrant-s3auth/extension/downloader.rb +2 -2
- data/lib/vagrant-s3auth/util.rb +3 -3
- data/lib/vagrant-s3auth/version.rb +1 -1
- metadata +19 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b66094513a9359fdfaa1bad57c2d96db83972c02
|
4
|
+
data.tar.gz: af829decb08f5da02d44124aa89c88aa39a07d92
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 603e26c2c9ac9f963291aa62fc7c7be32f45ebf4adef3be663b6de60d291756e3d4eea903d37727c8a9608efeb8402e63b2c6e2e3fbc490a1fb10ad7c7174c03
|
7
|
+
data.tar.gz: ea62ef852d128b07ef947eec3eea033a43d811c92dcddb6a87a40d351a2618e16de9a1ec50622600a4ccbc95f19b75f01330f9439e2b3a078202e8e665c807ba
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,14 @@
|
|
1
|
+
## 1.0.3
|
2
|
+
|
3
|
+
**10 March 2015**
|
4
|
+
|
5
|
+
Fixes:
|
6
|
+
|
7
|
+
* fix namespace collisions with [vagrant-aws][vagrant-aws] [#11]
|
8
|
+
|
9
|
+
Thanks, [@andres-rojas][andres-rojas]!
|
10
|
+
|
11
|
+
|
1
12
|
## 1.0.2
|
2
13
|
|
3
14
|
**25 December 2014**
|
@@ -60,3 +71,8 @@ Enhancements:
|
|
60
71
|
[#1]: https://github.com/WhoopInc/vagrant-s3auth/issues/1
|
61
72
|
[#7]: https://github.com/WhoopInc/vagrant-s3auth/issues/7
|
62
73
|
[#9]: https://github.com/WhoopInc/vagrant-s3auth/issues/9
|
74
|
+
[#11]: https://github.com/WhoopInc/vagrant-s3auth/pull/11
|
75
|
+
|
76
|
+
[andres-rojas]: https://github.com/andres-rojas
|
77
|
+
|
78
|
+
[vagrant-aws]: https://github.com/mitchellh/vagrant-aws
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
GIT
|
2
|
+
remote: git://github.com/mitchellh/vagrant-aws.git
|
3
|
+
revision: d77a8b94e24fe3e7864a74634d99b5b1afbf2660
|
4
|
+
ref: master
|
5
|
+
specs:
|
6
|
+
vagrant-aws (0.6.0)
|
7
|
+
fog (~> 1.22)
|
8
|
+
|
1
9
|
GIT
|
2
10
|
remote: git://github.com/mitchellh/vagrant.git
|
3
11
|
revision: 686e940a8474a8733be40b32e5d9107d557c627b
|
@@ -23,12 +31,13 @@ GIT
|
|
23
31
|
PATH
|
24
32
|
remote: .
|
25
33
|
specs:
|
26
|
-
vagrant-s3auth (1.0.
|
34
|
+
vagrant-s3auth (1.0.3)
|
27
35
|
aws-sdk (~> 1.59.1)
|
28
36
|
|
29
37
|
GEM
|
30
38
|
remote: https://rubygems.org/
|
31
39
|
specs:
|
40
|
+
CFPropertyList (2.3.0)
|
32
41
|
akami (1.2.2)
|
33
42
|
gyoku (>= 0.4.0)
|
34
43
|
nokogiri
|
@@ -46,7 +55,91 @@ GEM
|
|
46
55
|
childprocess (0.5.5)
|
47
56
|
ffi (~> 1.0, >= 1.0.11)
|
48
57
|
erubis (2.7.0)
|
58
|
+
excon (0.44.4)
|
49
59
|
ffi (1.9.6)
|
60
|
+
fission (0.5.0)
|
61
|
+
CFPropertyList (~> 2.2)
|
62
|
+
fog (1.28.0)
|
63
|
+
fog-atmos
|
64
|
+
fog-aws (~> 0.0)
|
65
|
+
fog-brightbox (~> 0.4)
|
66
|
+
fog-core (~> 1.27, >= 1.27.3)
|
67
|
+
fog-ecloud
|
68
|
+
fog-json
|
69
|
+
fog-profitbricks
|
70
|
+
fog-radosgw (>= 0.0.2)
|
71
|
+
fog-riakcs
|
72
|
+
fog-sakuracloud (>= 0.0.4)
|
73
|
+
fog-serverlove
|
74
|
+
fog-softlayer
|
75
|
+
fog-storm_on_demand
|
76
|
+
fog-terremark
|
77
|
+
fog-vmfusion
|
78
|
+
fog-voxel
|
79
|
+
fog-xml (~> 0.1.1)
|
80
|
+
ipaddress (~> 0.5)
|
81
|
+
nokogiri (~> 1.5, >= 1.5.11)
|
82
|
+
fog-atmos (0.1.0)
|
83
|
+
fog-core
|
84
|
+
fog-xml
|
85
|
+
fog-aws (0.1.1)
|
86
|
+
fog-core (~> 1.27)
|
87
|
+
fog-json (~> 1.0)
|
88
|
+
fog-xml (~> 0.1)
|
89
|
+
ipaddress (~> 0.8)
|
90
|
+
fog-brightbox (0.7.1)
|
91
|
+
fog-core (~> 1.22)
|
92
|
+
fog-json
|
93
|
+
inflecto (~> 0.0.2)
|
94
|
+
fog-core (1.29.0)
|
95
|
+
builder
|
96
|
+
excon (~> 0.38)
|
97
|
+
formatador (~> 0.2)
|
98
|
+
mime-types
|
99
|
+
net-scp (~> 1.1)
|
100
|
+
net-ssh (>= 2.1.3)
|
101
|
+
fog-ecloud (0.0.2)
|
102
|
+
fog-core
|
103
|
+
fog-xml
|
104
|
+
fog-json (1.0.0)
|
105
|
+
multi_json (~> 1.0)
|
106
|
+
fog-profitbricks (0.0.1)
|
107
|
+
fog-core
|
108
|
+
fog-xml
|
109
|
+
nokogiri
|
110
|
+
fog-radosgw (0.0.3)
|
111
|
+
fog-core (>= 1.21.0)
|
112
|
+
fog-json
|
113
|
+
fog-xml (>= 0.0.1)
|
114
|
+
fog-riakcs (0.1.0)
|
115
|
+
fog-core
|
116
|
+
fog-json
|
117
|
+
fog-xml
|
118
|
+
fog-sakuracloud (1.0.0)
|
119
|
+
fog-core
|
120
|
+
fog-json
|
121
|
+
fog-serverlove (0.1.1)
|
122
|
+
fog-core
|
123
|
+
fog-json
|
124
|
+
fog-softlayer (0.4.1)
|
125
|
+
fog-core
|
126
|
+
fog-json
|
127
|
+
fog-storm_on_demand (0.1.0)
|
128
|
+
fog-core
|
129
|
+
fog-json
|
130
|
+
fog-terremark (0.0.4)
|
131
|
+
fog-core
|
132
|
+
fog-xml
|
133
|
+
fog-vmfusion (0.0.1)
|
134
|
+
fission
|
135
|
+
fog-core
|
136
|
+
fog-voxel (0.0.2)
|
137
|
+
fog-core
|
138
|
+
fog-xml
|
139
|
+
fog-xml (0.1.1)
|
140
|
+
fog-core
|
141
|
+
nokogiri (~> 1.5, >= 1.5.11)
|
142
|
+
formatador (0.2.5)
|
50
143
|
gssapi (1.0.3)
|
51
144
|
ffi (>= 1.0.1)
|
52
145
|
gyoku (1.2.2)
|
@@ -60,6 +153,8 @@ GEM
|
|
60
153
|
httpi (0.9.7)
|
61
154
|
rack
|
62
155
|
i18n (0.6.11)
|
156
|
+
inflecto (0.0.2)
|
157
|
+
ipaddress (0.8.0)
|
63
158
|
json (1.8.1)
|
64
159
|
listen (2.7.12)
|
65
160
|
celluloid (>= 0.15.2)
|
@@ -138,4 +233,5 @@ DEPENDENCIES
|
|
138
233
|
rake (~> 10.3.2)
|
139
234
|
rubocop (~> 0.28.0)
|
140
235
|
vagrant!
|
236
|
+
vagrant-aws!
|
141
237
|
vagrant-s3auth!
|
data/README.md
CHANGED
@@ -82,9 +82,11 @@ IAM accounts will need at least the following policy:
|
|
82
82
|
}
|
83
83
|
```
|
84
84
|
|
85
|
-
|
85
|
+
**IMPORTANT:** You must split up bucket and object permissions into separate policy statements as written above! See [Writing IAM Policies: How to grant access to an Amazon S3 Bucket][aws-s3-iam].
|
86
|
+
|
87
|
+
Also note that `s3:ListBucket` permission is not strictly necessary. vagrant-s3auth will never
|
86
88
|
make a ListBucket request, but without ListBucket permission, a misspelled box
|
87
|
-
name results in a 403 Forbidden error instead of a 404 Not Found error.
|
89
|
+
name results in a 403 Forbidden error instead of a 404 Not Found error. ([Why?][aws-403-404])
|
88
90
|
|
89
91
|
See [AWS S3 Guide: User Policy Examples][aws-user-policy] for more.
|
90
92
|
|
@@ -214,7 +216,8 @@ unless Vagrant.has_plugin?('vagrant-s3auth')
|
|
214
216
|
end
|
215
217
|
```
|
216
218
|
|
217
|
-
|
219
|
+
[aws-403-404]: https://forums.aws.amazon.com/thread.jspa?threadID=56531#jive-message-210346
|
220
|
+
[aws-s3-iam]: http://blogs.aws.amazon.com/security/post/Tx3VRSWZ6B3SHAV/Writing-IAM-Policies-How-to-grant-access-to-an-Amazon-S3-bucket
|
218
221
|
[aws-signed]: http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html#ConstructingTheAuthenticationHeader
|
219
222
|
[aws-user-policy]: http://docs.aws.amazon.com/AmazonS3/latest/dev/example-policies-s3.html
|
220
223
|
[bucket-vhost]: http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#VirtualHostingExamples
|
@@ -35,9 +35,9 @@ module Vagrant
|
|
35
35
|
bucket: s3_object && s3_object.bucket.name)
|
36
36
|
end
|
37
37
|
raise
|
38
|
-
rescue AWS::Errors::MissingCredentialsError
|
38
|
+
rescue ::AWS::Errors::MissingCredentialsError
|
39
39
|
raise VagrantPlugins::S3Auth::Errors::MissingCredentialsError
|
40
|
-
rescue AWS::Errors::Base => e
|
40
|
+
rescue ::AWS::Errors::Base => e
|
41
41
|
raise VagrantPlugins::S3Auth::Errors::S3APIError, error: e
|
42
42
|
end
|
43
43
|
|
data/lib/vagrant-s3auth/util.rb
CHANGED
@@ -27,7 +27,7 @@ module VagrantPlugins
|
|
27
27
|
end
|
28
28
|
|
29
29
|
if bucket && key
|
30
|
-
AWS::S3.new(region: get_bucket_region(bucket))
|
30
|
+
::AWS::S3.new(region: get_bucket_region(bucket))
|
31
31
|
.buckets[bucket].objects[key]
|
32
32
|
elsif follow_redirect
|
33
33
|
response = Net::HTTP.get_response(url) rescue nil
|
@@ -45,8 +45,8 @@ module VagrantPlugins
|
|
45
45
|
end
|
46
46
|
|
47
47
|
def self.get_bucket_region(bucket)
|
48
|
-
LOCATION_TO_REGION[AWS::S3.new.buckets[bucket].location_constraint]
|
49
|
-
rescue AWS::S3::Errors::AccessDenied
|
48
|
+
LOCATION_TO_REGION[::AWS::S3.new.buckets[bucket].location_constraint]
|
49
|
+
rescue ::AWS::S3::Errors::AccessDenied
|
50
50
|
raise Errors::BucketLocationAccessDeniedError,
|
51
51
|
bucket: bucket,
|
52
52
|
access_key: ENV['AWS_ACCESS_KEY_ID']
|
metadata
CHANGED
@@ -1,83 +1,83 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-s3auth
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nikhil Benesch
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2015-03-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - ~>
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 1.59.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - ~>
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: 1.59.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: bundler
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - ~>
|
31
|
+
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '1.5'
|
34
34
|
type: :development
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - ~>
|
38
|
+
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '1.5'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: http
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - ~>
|
45
|
+
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: 0.6.3
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - ~>
|
52
|
+
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: 0.6.3
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: rake
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- - ~>
|
59
|
+
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: 10.3.2
|
62
62
|
type: :development
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- - ~>
|
66
|
+
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: 10.3.2
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rubocop
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- - ~>
|
73
|
+
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: 0.28.0
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - ~>
|
80
|
+
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: 0.28.0
|
83
83
|
description:
|
@@ -87,10 +87,10 @@ executables: []
|
|
87
87
|
extensions: []
|
88
88
|
extra_rdoc_files: []
|
89
89
|
files:
|
90
|
-
- .gitignore
|
91
|
-
- .rubocop.yml
|
92
|
-
- .ruby-version
|
93
|
-
- .travis.yml
|
90
|
+
- ".gitignore"
|
91
|
+
- ".rubocop.yml"
|
92
|
+
- ".ruby-version"
|
93
|
+
- ".travis.yml"
|
94
94
|
- CHANGELOG.md
|
95
95
|
- CONTRIBUTING.md
|
96
96
|
- Gemfile
|
@@ -123,17 +123,17 @@ require_paths:
|
|
123
123
|
- lib
|
124
124
|
required_ruby_version: !ruby/object:Gem::Requirement
|
125
125
|
requirements:
|
126
|
-
- -
|
126
|
+
- - ">="
|
127
127
|
- !ruby/object:Gem::Version
|
128
128
|
version: '0'
|
129
129
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
130
130
|
requirements:
|
131
|
-
- -
|
131
|
+
- - ">="
|
132
132
|
- !ruby/object:Gem::Version
|
133
133
|
version: '0'
|
134
134
|
requirements: []
|
135
135
|
rubyforge_project:
|
136
|
-
rubygems_version: 2.
|
136
|
+
rubygems_version: 2.2.2
|
137
137
|
signing_key:
|
138
138
|
specification_version: 4
|
139
139
|
summary: Private, versioned Vagrant boxes hosted on Amazon S3.
|