jets 2.3.15 → 2.3.16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/jets.gemspec +0 -1
- data/lib/jets.rb +2 -0
- data/lib/jets/builders/code_builder.rb +2 -2
- data/lib/jets/builders/ruby_packager.rb +1 -1
- data/lib/jets/commands/import/base.rb +1 -1
- data/lib/jets/commands/main.rb +1 -1
- data/lib/jets/commands/new.rb +1 -1
- data/lib/jets/commands/templates/skeleton/Gemfile.tt +1 -1
- data/lib/jets/controller/authorization.rb +10 -1
- data/lib/jets/core_ext/bundler.rb +7 -0
- data/lib/jets/rack_server.rb +1 -1
- data/lib/jets/resource/api_gateway/method.rb +2 -0
- data/lib/jets/resource/api_gateway/method/authorization.rb +9 -0
- data/lib/jets/resource/lambda/function.rb +3 -3
- data/lib/jets/router/route/authorizer.rb +4 -0
- data/lib/jets/turbo/rails.rb +1 -1
- data/lib/jets/version.rb +1 -1
- metadata +3 -16
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 044aba70f94ce9b1894daf0a763d0a36bfa5687c79beed5acfebc3f1f0db6086
|
4
|
+
data.tar.gz: 28ce72323a8e5bb93db5598f2a2ba60b60921e3d969fb13f237384489902b734
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 17888c72f237bd56a10c61ecc783ba59ec2aa8ff5345750689ebc1fa7a6d0d221bf604c6879e71cf5787baa45c36cb0b9525a015e0b4159ad7e9a46b58f95d77
|
7
|
+
data.tar.gz: 106ca34b5c04e3c774a27ec9431c0c7cef7b5311ae624e975ee061b31aaa7b3f536c6267d67e34d26ed1504a289b7de46d0746e54cead594c9482b62ab2f8dd8
|
data/CHANGELOG.md
CHANGED
@@ -3,6 +3,14 @@
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
|
5
5
|
|
6
|
+
## [2.3.16]
|
7
|
+
- #466 fix application_config typo
|
8
|
+
- #467 Handle forbidden error from s3
|
9
|
+
- #468 authorization_scopes
|
10
|
+
- #469 Fixed typo from STMP to SMTP
|
11
|
+
- #470 remove json dependency
|
12
|
+
- #471 use `Bundler.with_unbundled_env` remove bundler deprecation
|
13
|
+
|
6
14
|
## [2.3.15]
|
7
15
|
- #461 fix guesser lookup for long function names
|
8
16
|
|
data/jets.gemspec
CHANGED
@@ -50,7 +50,6 @@ Gem::Specification.new do |spec|
|
|
50
50
|
spec.add_dependency "hashie"
|
51
51
|
spec.add_dependency "jets-gems"
|
52
52
|
spec.add_dependency "jets-html-sanitizer"
|
53
|
-
spec.add_dependency "json"
|
54
53
|
spec.add_dependency "kramdown"
|
55
54
|
spec.add_dependency "memoist"
|
56
55
|
spec.add_dependency "mimemagic"
|
data/lib/jets.rb
CHANGED
@@ -18,6 +18,8 @@ $:.unshift("#{gem_root}/lib")
|
|
18
18
|
$:.unshift("#{gem_root}/vendor/cfn-status/lib")
|
19
19
|
require "cfn_status"
|
20
20
|
|
21
|
+
require "jets/core_ext/bundler"
|
22
|
+
|
21
23
|
require "jets/autoloaders"
|
22
24
|
Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
|
23
25
|
Jets::Autoloaders.once.setup
|
@@ -82,7 +82,7 @@ module Jets::Builders
|
|
82
82
|
begin
|
83
83
|
s3.head_object(bucket: s3_bucket, key: s3_key)
|
84
84
|
true
|
85
|
-
rescue Aws::S3::Errors::NotFound
|
85
|
+
rescue Aws::S3::Errors::NotFound, Aws::S3::Errors::Forbidden
|
86
86
|
false
|
87
87
|
end
|
88
88
|
end
|
@@ -235,7 +235,7 @@ module Jets::Builders
|
|
235
235
|
|
236
236
|
# Need to capture JETS_ROOT since can be changed by Turbo mode
|
237
237
|
jets_root = Jets.root
|
238
|
-
Bundler.
|
238
|
+
Bundler.with_unbundled_env do
|
239
239
|
# Switch gemfile for Afterburner mode
|
240
240
|
gemfile = ENV['BUNDLE_GEMFILE']
|
241
241
|
ENV['BUNDLE_GEMFILE'] = "#{jets_root}/rack/Gemfile"
|
@@ -59,7 +59,7 @@ module Jets::Builders
|
|
59
59
|
|
60
60
|
FileUtils.rm_rf("#{cache_area}/.bundle")
|
61
61
|
require "bundler" # dynamically require bundler so user can use any bundler
|
62
|
-
Bundler.
|
62
|
+
Bundler.with_unbundled_env do
|
63
63
|
sh(
|
64
64
|
"cd #{cache_area} && " \
|
65
65
|
"env bundle install --path #{cache_area}/vendor/gems --without development test"
|
data/lib/jets/commands/main.rb
CHANGED
@@ -43,7 +43,7 @@ module Jets::Commands
|
|
43
43
|
puts Jets::Booter.message
|
44
44
|
Jets::Booter.check_config_ru!
|
45
45
|
Jets::RackServer.start(options) unless ENV['JETS_RACK'] == '0' # rack server runs in background by default
|
46
|
-
Bundler.
|
46
|
+
Bundler.with_unbundled_env do
|
47
47
|
system(command)
|
48
48
|
end
|
49
49
|
end
|
data/lib/jets/commands/new.rb
CHANGED
@@ -6,7 +6,8 @@ class Jets::Controller
|
|
6
6
|
class_attribute :auth_type,
|
7
7
|
:auth_to,
|
8
8
|
:auth_options, # for only and except filters
|
9
|
-
:api_key_needed
|
9
|
+
:api_key_needed,
|
10
|
+
:authorization_scopes_value
|
10
11
|
end
|
11
12
|
|
12
13
|
class_methods do
|
@@ -31,6 +32,14 @@ class Jets::Controller
|
|
31
32
|
end
|
32
33
|
end
|
33
34
|
|
35
|
+
def authorization_scopes(value=nil)
|
36
|
+
if !value.nil?
|
37
|
+
self.authorization_scopes_value = value
|
38
|
+
else
|
39
|
+
self.authorization_scopes_value
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
34
43
|
def authorizer_metadata
|
35
44
|
Jets::Router::Route::Authorizer.metadata(auth_to)
|
36
45
|
end
|
data/lib/jets/rack_server.rb
CHANGED
@@ -34,7 +34,7 @@ module Jets
|
|
34
34
|
def serve
|
35
35
|
# Note, looks like stopping jets server with Ctrl-C sends the TERM signal
|
36
36
|
# down to the sub bin/rackup command cleans up the child process fine.
|
37
|
-
Bundler.
|
37
|
+
Bundler.with_unbundled_env do
|
38
38
|
args = ''
|
39
39
|
# only forward the host option, port is always 9292 for simplicity
|
40
40
|
if @options[:host]
|
@@ -28,5 +28,14 @@ class Jets::Resource::ApiGateway::Method
|
|
28
28
|
controller_klass.api_key_required ||
|
29
29
|
Jets.config.api.api_key_required
|
30
30
|
end
|
31
|
+
|
32
|
+
def authorization_scopes
|
33
|
+
if @route.authorization_scopes
|
34
|
+
authorization_scopes = @route.authorization_scopes
|
35
|
+
elsif controller_klass.authorization_scopes
|
36
|
+
authorization_scopes = controller_klass.authorization_scopes
|
37
|
+
end
|
38
|
+
authorization_scopes
|
39
|
+
end
|
31
40
|
end
|
32
41
|
end
|
@@ -52,8 +52,8 @@ module Jets::Resource::Lambda
|
|
52
52
|
environment: { variables: environment },
|
53
53
|
}
|
54
54
|
|
55
|
-
|
56
|
-
baseline.merge(
|
55
|
+
application_config = Jets.application.config.function.to_h
|
56
|
+
baseline.merge(application_config)
|
57
57
|
end
|
58
58
|
|
59
59
|
# Class properties example:
|
@@ -211,4 +211,4 @@ module Jets::Resource::Lambda
|
|
211
211
|
"#{@app_class}##{@task.meth}"
|
212
212
|
end
|
213
213
|
end
|
214
|
-
end
|
214
|
+
end
|
data/lib/jets/turbo/rails.rb
CHANGED
@@ -110,7 +110,7 @@ class Jets::Turbo
|
|
110
110
|
# TODO: remove duplication, copied from jets/commands/import/base.rb
|
111
111
|
# And modified it slightly
|
112
112
|
def bundle_install
|
113
|
-
Bundler.
|
113
|
+
Bundler.with_unbundled_env do
|
114
114
|
sh "cd #{build_area}/#{@project_folder}/rack && bundle install"
|
115
115
|
end
|
116
116
|
end
|
data/lib/jets/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jets
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.3.
|
4
|
+
version: 2.3.16
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tung Nguyen
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-04-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -332,20 +332,6 @@ dependencies:
|
|
332
332
|
- - ">="
|
333
333
|
- !ruby/object:Gem::Version
|
334
334
|
version: '0'
|
335
|
-
- !ruby/object:Gem::Dependency
|
336
|
-
name: json
|
337
|
-
requirement: !ruby/object:Gem::Requirement
|
338
|
-
requirements:
|
339
|
-
- - ">="
|
340
|
-
- !ruby/object:Gem::Version
|
341
|
-
version: '0'
|
342
|
-
type: :runtime
|
343
|
-
prerelease: false
|
344
|
-
version_requirements: !ruby/object:Gem::Requirement
|
345
|
-
requirements:
|
346
|
-
- - ">="
|
347
|
-
- !ruby/object:Gem::Version
|
348
|
-
version: '0'
|
349
335
|
- !ruby/object:Gem::Dependency
|
350
336
|
name: kramdown
|
351
337
|
requirement: !ruby/object:Gem::Requirement
|
@@ -797,6 +783,7 @@ files:
|
|
797
783
|
- lib/jets/controller/response.rb
|
798
784
|
- lib/jets/controller/stage.rb
|
799
785
|
- lib/jets/core.rb
|
786
|
+
- lib/jets/core_ext/bundler.rb
|
800
787
|
- lib/jets/core_ext/kernel.rb
|
801
788
|
- lib/jets/db.rb
|
802
789
|
- lib/jets/dotenv.rb
|