on_container 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20a0354095f53ceb65e945d63fb79c4daaac2c20
-  data.tar.gz: bcf5aa4c31eeeb52a7ac97ecbfa8f9fa4ee7ca4c
+  metadata.gz: 047f95a8b1aa08140e835430767a983ba4f70e98
+  data.tar.gz: 93bee7ffc095b037ebd8abf97ee87ee207643bdc
 SHA512:
-  metadata.gz: ce35b61eb314e07871f4e2004dedaff36c3c64d3abcd3e303b43d33c1a079ab115ea9ae8921cf07601c7275a678783d6fb6c28649b985937abe621703ccde6bf
-  data.tar.gz: 51f7dee953ae4692733673f72cd0c87ed08ec32b341f82e3baa767ae5cdc2c4aab1791a3239b829af842d7438d277a34ab36994dcb9a36aac0af9e1feeb78f32
+  metadata.gz: 416751bf09182242b57efad9b7c6224c137cb7e4ca065e69fd614836a1e0f90eef88f9df869484d175d120d232b7cdc332e3f32e54f9b76a16325b2a66f5d86e
+  data.tar.gz: e556def5df06b70d854db1317b6471af52460d7535aa678e836dcda4695ec8028cbb9e884dec104369fe260d3d3fb68179f25ab07a459d6ebd3e45cf958aeb8f

data/lib/on_container/dev/rails.rb

@@ -12,4 +12,8 @@ include OnContainer::Dev::SetupOps
 include OnContainer::Dev::BundlerOps
 include OnContainer::Dev::NodeModulesOps
 include OnContainer::Dev::ActiveRecordOps
-include OnContainer::Dev::ContainerCommandOps
+include OnContainer::Dev::ContainerCommandOps
+
+require 'on_container/ops/service_connection_checks'
+
+include OnContainer::Ops::ServiceConnectionChecks

data/lib/on_container/dev/setup_ops.rb

@@ -21,12 +21,19 @@ module OnContainer
         puts 'Waiting for app setup to finish...'
         sleep app_setup_wait
       end
-      
+
       def on_setup_lock_acquired
         wait_setup while File.exist?(app_setup_lock_path)
-      
+
         lock_setup
+
+        %w[HUP INT QUIT TERM EXIT].each do |signal_string|
+          Signal.trap(signal_string) { unlock_setup }
+        end
+
         yield
+
+      ensure
         unlock_setup
       end
 

data/lib/on_container/load_env_secrets.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# Reads the specified secret paths (i.e. Docker Secrets) into environment
+# variables:
+
+require 'active_support'
+require 'active_support/core_ext/object'
+
+# Process only a known list of env vars that can filled by reading a file (i.e.
+# a docker secret):
+Dir["#{ENV.fetch('SECRETS_PATH', '/run/secrets/')}*"].each do |secret_filepath|
+  next unless File.file?(secret_filepath)
+
+  secret_envvarname = File.basename(secret_filepath, '.*').upcase
+
+  # Skip if variable is already set - already-set variables have precedence over
+  # the secret files:
+  next if ENV.key?(secret_envvarname) && ENV[secret_envvarname].present?
+
+  ENV[secret_envvarname] = File.read(secret_filepath).strip
+end
+
+# For each *_URL environment variable where there's also a *_(USER|USERNAME) or
+# *_(PASS|PASSWORD), update the URL environment variable with the given
+# credentials. For example:
+#
+# DATABASE_URL: postgres://postgres:5432/demo_production
+# DATABASE_USERNAME: lalito
+# DATABASE_PASSWORD: lepass
+#
+# Results in the following updated DATABASE_URL:
+#  DATABASE_URL = postgres://lalito:lepass@postgres:5432/demo_production
+require 'uri' if (url_keys = ENV.keys.select { |key| key =~ /_URL/ }).any?
+
+url_keys.each do |url_key|
+  credential_pattern_string = url_key.gsub('_URL', '_(USER(NAME)?|PASS(WORD)?)')
+  credential_pattern = Regexp.new "\\A#{credential_pattern_string}\\z"
+  credential_keys = ENV.keys.select { |key| key =~ credential_pattern }
+  next unless credential_keys.any?
+
+  uri = URI(ENV[url_key])
+  username = URI.encode_www_form_component ENV[credential_keys.detect { |key| key =~ /USER/ }]
+  password = URI.encode_www_form_component ENV[credential_keys.detect { |key| key =~ /PASS/ }]
+
+  uri.user = username if username
+  uri.password = password if password
+  ENV[url_key] = uri.to_s
+end
+
+# STDERR.puts ENV.inspect

data/lib/on_container/ops/service_connection_checks.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'socket'
+require 'timeout'
+require 'uri'
+
+module OnContainer
+  module Ops
+    module ServiceConnectionChecks
+      def service_accepts_connections?(service_uri, seconds_to_wait = 30)
+        uri = URI(service_uri)
+
+        Timeout::timeout(seconds_to_wait) do
+          TCPSocket.new(uri.host, uri.port).close
+        end
+
+        true
+
+      rescue => e
+        puts "Connection to #{uri.to_s} failed: '#{e.inspect}'"
+      end
+      
+      def wait_for_service_to_accept_connections(service_uri, seconds_to_wait = 30, exit_on_fail = true)
+        return if service_accepts_connections?(service_uri, seconds_to_wait)
+      
+        exit 1 if exit_on_fail
+      end
+    end
+  end
+end

data/lib/on_container/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OnContainer
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: on_container
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,6 +45,8 @@ files:
 - lib/on_container/dev/rails.rb
 - lib/on_container/dev/rails_ops.rb
 - lib/on_container/dev/setup_ops.rb
+- lib/on_container/load_env_secrets.rb
+- lib/on_container/ops/service_connection_checks.rb
 - lib/on_container/step_down_from_root.rb
 - lib/on_container/version.rb
 - on_container.gemspec