dpl 1.8.33.travis.2043.5 → 1.8.33.travis.2048.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dpl/provider/elastic_beanstalk.rb +2 -2
- data/spec/provider/elastic_beanstalk_spec.rb +19 -13
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 94eaa89e30d693a6e71a6cf33f6decbefb3c39c6
|
4
|
+
data.tar.gz: b9e874e25b2b74f510cb2809accda9594244d7d6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: edbd02e1311a6a921580251ff95af76f1847fd38b6c4c758eee65de8d497ae0dd07ec169e4d3bae7b389ada7af259e1f1433542aeab121aea77f72983afce963
|
7
|
+
data.tar.gz: 3c33befa02377155159e082347c75e82aa46f09ed5e783529d0ec499bda9e41ed6c59102c5296a7e4557a0ccf3b752698a2358ef5674a332bdcd5d271810a5ea
|
@@ -99,11 +99,11 @@ module DPL
|
|
99
99
|
end
|
100
100
|
|
101
101
|
def bucket_exists?
|
102
|
-
s3.
|
102
|
+
s3.bucket(bucket_name).exists?
|
103
103
|
end
|
104
104
|
|
105
105
|
def create_bucket
|
106
|
-
s3.
|
106
|
+
s3.bucket(bucket_name).create
|
107
107
|
end
|
108
108
|
|
109
109
|
def files_to_pack
|
@@ -23,7 +23,7 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
23
23
|
|
24
24
|
let(:s3_mock) do
|
25
25
|
hash_dbl = double("Hash", :[] => bucket_mock, :map => [])
|
26
|
-
double("Aws::S3",
|
26
|
+
double("Aws::S3", bucket: hash_dbl, config: hash_dbl)
|
27
27
|
end
|
28
28
|
|
29
29
|
let(:io_double) do
|
@@ -69,7 +69,8 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
69
69
|
end
|
70
70
|
|
71
71
|
example 'bucket exists already' do
|
72
|
-
allow(s3_mock
|
72
|
+
allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
|
73
|
+
allow(bucket_mock).to receive(:exists?).and_return(true)
|
73
74
|
allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
|
74
75
|
|
75
76
|
expect(provider).to receive(:s3).and_return(s3_mock).twice
|
@@ -85,7 +86,8 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
85
86
|
end
|
86
87
|
|
87
88
|
example 'bucket doesnt exist yet' do
|
88
|
-
allow(s3_mock
|
89
|
+
allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
|
90
|
+
allow(bucket_mock).to receive(:exists?).and_return(false)
|
89
91
|
allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
|
90
92
|
|
91
93
|
expect(provider).to receive(:s3).and_return(s3_mock).twice
|
@@ -104,11 +106,12 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
104
106
|
let(:only_create_app_version) { true }
|
105
107
|
|
106
108
|
example 'verify the app is not updated' do
|
107
|
-
allow(s3_mock
|
109
|
+
allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
|
110
|
+
allow(bucket_mock).to receive(:exists?).and_return(false)
|
111
|
+
allow(bucket_mock).to receive(:create)
|
108
112
|
allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
|
109
113
|
|
110
|
-
expect(provider).to receive(:s3).and_return(s3_mock).
|
111
|
-
expect(provider).to receive(:create_bucket)
|
114
|
+
expect(provider).to receive(:s3).and_return(s3_mock).at_least(3).times
|
112
115
|
expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
|
113
116
|
expect(provider).to receive(:archive_name).and_return('file.zip')
|
114
117
|
expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
|
@@ -122,11 +125,12 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
122
125
|
|
123
126
|
context 'When the bucket_path option is not set' do
|
124
127
|
example 'Does not prepend bucket_path to the s3 bucket' do
|
128
|
+
allow(s3_mock).to receive(:bucket).with(bucket_name).and_return(bucket_mock)
|
125
129
|
allow(bucket_mock).to receive(:object).with("file.zip").and_return(s3_obj_double)
|
126
|
-
allow(
|
130
|
+
allow(bucket_mock).to receive(:exists?).and_return(false)
|
131
|
+
allow(bucket_mock).to receive(:create)
|
127
132
|
|
128
|
-
expect(provider_without_bucket_path).to receive(:s3).and_return(s3_mock).
|
129
|
-
expect(provider_without_bucket_path).not_to receive(:create_bucket)
|
133
|
+
expect(provider_without_bucket_path).to receive(:s3).and_return(s3_mock).at_least(3).times
|
130
134
|
expect(provider_without_bucket_path).to receive(:create_zip).and_return('/path/to/file.zip')
|
131
135
|
expect(provider_without_bucket_path).to receive(:archive_name).and_return('file.zip')
|
132
136
|
expect(provider_without_bucket_path).to receive(:bucket_path).and_return(nil)
|
@@ -143,10 +147,11 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
143
147
|
let(:wait_until_deployed) { true }
|
144
148
|
|
145
149
|
example 'Waits until deployment completes' do
|
150
|
+
allow(bucket_mock).to receive(:exists?).and_return(false)
|
151
|
+
allow(bucket_mock).to receive(:create)
|
146
152
|
allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
|
147
153
|
|
148
|
-
expect(provider).to receive(:s3).and_return(s3_mock).
|
149
|
-
expect(provider).to receive(:create_bucket)
|
154
|
+
expect(provider).to receive(:s3).and_return(s3_mock).at_least(3).times
|
150
155
|
expect(provider).to receive(:create_zip).and_return('/path/to/file.zip')
|
151
156
|
expect(provider).to receive(:archive_name).and_return('file.zip')
|
152
157
|
expect(provider).to receive(:upload).with('file.zip', '/path/to/file.zip').and_call_original
|
@@ -162,8 +167,9 @@ describe DPL::Provider::ElasticBeanstalk do
|
|
162
167
|
context "when zip_file option is given" do
|
163
168
|
before :each do
|
164
169
|
allow(bucket_mock).to receive(:object).with("some/app/file.zip").and_return(s3_obj_double)
|
165
|
-
|
166
|
-
|
170
|
+
allow(bucket_mock).to receive(:exists?).and_return(false)
|
171
|
+
allow(bucket_mock).to receive(:create)
|
172
|
+
expect(provider).to receive(:s3).and_return(s3_mock).at_least(3).times
|
167
173
|
expect(provider).to receive(:archive_name).and_return('file.zip')
|
168
174
|
expect(provider).to receive(:sleep).with(5)
|
169
175
|
expect(provider).to receive(:create_app_version).with(s3_obj_double).and_return(app_version)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dpl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.33.travis.
|
4
|
+
version: 1.8.33.travis.2048.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Konstantin Haase
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-05-
|
11
|
+
date: 2017-05-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|