ocean-rails 7.4.0 → 7.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ocean/version.rb +1 -1
- metadata +2 -3
- data/config/initializers/_aws_config.rb +0 -35
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5434efb6b5ac373b19585426920f41b323de6f895320ea8f8d8a83de9e479247
|
|
4
|
+
data.tar.gz: 818e5b98c28161297512ce289ad57f4b1816fc4a8caef3f90b21c38921e421fb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: eac2a7b3ffccc9250e4e3acf42b65076e9ccf6f7333e70d51768a3bea1661235efb05f2f185899286d0fc327efa953cceb6539fd4d2dc5a1671a41ae65c599be
|
|
7
|
+
data.tar.gz: 15d0d3b9d04f4caee144823df773714131df669a6bce61ea9bc4a7369d2c4dd4389c11bed2b2be8594ea62df075b6264c6d4fdc280b04b42387a7ec0236a199d
|
data/lib/ocean/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ocean-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 7.
|
|
4
|
+
version: 7.5.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Bengtson
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-06-
|
|
11
|
+
date: 2018-06-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: typhoeus
|
|
@@ -193,7 +193,6 @@ files:
|
|
|
193
193
|
- app/controllers/alive_controller.rb
|
|
194
194
|
- app/controllers/errors_controller.rb
|
|
195
195
|
- config/initializers/_api_constants.rb
|
|
196
|
-
- config/initializers/_aws_config.rb
|
|
197
196
|
- config/initializers/_ocean_constants.rb
|
|
198
197
|
- config/initializers/_ocean_logger.rb
|
|
199
198
|
- config/routes.rb
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
# Check if the ENV vars are set; if so, don't read any file
|
|
2
|
-
if (ENV['AWS_ACCESS_KEY_ID'].present? &&
|
|
3
|
-
ENV['AWS_SECRET_ACCESS_KEY'].present? &&
|
|
4
|
-
ENV['AWS_REGION'].present?)
|
|
5
|
-
Aws.config
|
|
6
|
-
else
|
|
7
|
-
f = File.join(Rails.root, "config/aws.yml")
|
|
8
|
-
if f
|
|
9
|
-
template = ERB.new(File.read(f))
|
|
10
|
-
processed = YAML.load(template.result(binding))
|
|
11
|
-
cfg = processed[Rails.env]
|
|
12
|
-
# Set the ENV variables
|
|
13
|
-
ENV['AWS_ACCESS_KEY_ID'] = cfg[:access_key_id] || cfg['access_key_id']
|
|
14
|
-
ENV['AWS_SECRET_ACCESS_KEY'] = cfg[:secret_access_key] || cfg['secret_access_key']
|
|
15
|
-
ENV['AWS_REGION'] ||= cfg[:region] || cfg['region']
|
|
16
|
-
# Configure AWS with the raw cfg data
|
|
17
|
-
AWS.config(cfg)
|
|
18
|
-
# Configure Aws with a massaged version of the cfg data
|
|
19
|
-
config = { region: ENV['AWS_REGION'],
|
|
20
|
-
credentials: Aws::Credentials.new(ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY'])
|
|
21
|
-
}
|
|
22
|
-
config[:endpoint] = cfg["endpoint"] if cfg["endpoint"]
|
|
23
|
-
Aws.config.update(config)
|
|
24
|
-
else
|
|
25
|
-
# Otherwise print an error message and exit with an error.
|
|
26
|
-
puts
|
|
27
|
-
puts "-----------------------------------------------------------------------"
|
|
28
|
-
puts "AWS config file missing. Please copy config/aws.yml from the ocean-rails"
|
|
29
|
-
puts "gem. Alternatively export environment variables AWS_ACCESS_KEY_ID,"
|
|
30
|
-
puts "AWS_SECRET_ACCESS_KEY, and AWS_REGION."
|
|
31
|
-
puts "-----------------------------------------------------------------------"
|
|
32
|
-
puts
|
|
33
|
-
exit 1
|
|
34
|
-
end
|
|
35
|
-
end
|