elastic_beans 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa8b4c3e65d502798c78492a575fd8f2977b5ef
-  data.tar.gz: 4f01b3ca52c88736e1d9c38ac0cfae93e13a65f2
+  metadata.gz: c144928ae084c0496a67956390849f40aae25ed5
+  data.tar.gz: '019811a87002509e40108fdc1d8cc76ae8fa0777'
 SHA512:
-  metadata.gz: f7b3adc0fd44ad475de17d6c846ff5cace585ed29a07715676bd31509f75f4cc44c7284e0ca88660ebbf7724ec0ca7dccc79a3d81ed1a55278a40025766ea52f
-  data.tar.gz: 5f248ed95c125b1bde81186bf6d69157cb52129ea376dcf8618904a3b3ac33a301707ac219e559847ec875b4e99b1a3f7a379aedff264e94dd619ea87f735beb
+  metadata.gz: 5453396cb2fc49b0a58e06a824a37d4c985a93d8ac9d76cb430aba33323cf437063628c49cddc1b40ceadf1031522a020e5fb80caac29619e049700f68f0c797
+  data.tar.gz: 0d6cddec37f72a87367d4b3816b1a763fa86d0aebe5e4e21b50754df97854667890767b45fa2397d78afd2753b467f23f2b340df183e9b878b368c22f903ea37

data/lib/elastic_beans/env_vars/ebextension.yml

@@ -7,20 +7,24 @@ files:
       require "json"
 
       def get_env_vars
-        require "aws-sdk"
         eb_env = JSON.parse(`/opt/elasticbeanstalk/bin/get-config environment`)
 
-        region = eb_env['AWS_REGION'] || eb_env['AWS_DEFAULT_REGION'] || "us-east-1"
         s3_bucket, s3_key = eb_env['ELASTIC_BEANS_ENV_VARS'].split('/', 2)
-        $stderr.puts "Fetching environment variables from s3://#{s3_bucket}/#{s3_key}..."
-        response = Aws::S3::Client.new(region: region).get_object(bucket: s3_bucket, key: s3_key)
-        beans_env_body = response.body.read
+        get_envvars_log("Fetching environment variables from s3://#{s3_bucket}/#{s3_key}...")
+        beans_env_body = `aws s3 cp s3://#{s3_bucket}/#{s3_key} -`
 
         eb_env.merge(JSON.parse(beans_env_body))
       rescue LoadError, StandardError => e
-        $stderr.puts "#{e.class.name}: #{e.message}"
+        get_envvars_log("#{e.class.name}: #{e.message}", level: :warn)
         JSON.parse(`/opt/elasticbeanstalk/bin/get-config environment`)
       end
+
+      def get_envvars_log(msg, level: :info)
+        $stderr.puts(msg)
+        require "logger"
+        @get_envvars_logger ||= Logger.new('/var/log/elastic_beans/env_vars/get_envvars.log', 10, 'daily')
+        @get_envvars_logger.send(level, msg)
+      end
   "/opt/elasticbeanstalk/support/export_envvars":
     mode: "000755"
     owner: root
@@ -29,8 +33,9 @@ files:
       #!/bin/env bash
 
       # execute using Elastic Beanstalk's built-in Ruby with aws-sdk pre-installed
+      ruby_version="`ls /opt/elasticbeanstalk/lib/ruby/lib/ruby/ | grep '^[0-9]\.[0-9]'`"
       export PATH="/opt/elasticbeanstalk/lib/ruby/bin:$PATH"
-      export GEM_PATH="/opt/elasticbeanstalk/lib/ruby/lib/ruby/2.2.0"
+      export GEM_PATH="/opt/elasticbeanstalk/lib/ruby/lib/ruby/$ruby_version"
       exec ruby /opt/elasticbeanstalk/support/export_envvars.rb
   "/opt/elasticbeanstalk/support/export_envvars.rb":
     mode: "000755"
@@ -54,6 +59,8 @@ files:
           File.open(env_file, 'w') { |f| f.write(str) }
       end
 commands:
+  00_directories:
+    command: mkdir -p /var/log/elastic_beans/env_vars
   config_hooks:
     command: |
       cp -v /opt/elasticbeanstalk/support/export_envvars /opt/elasticbeanstalk/hooks/restartappserver/pre/09_update_environment.sh

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk