compose-hook 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d427520abbe59d4d4aa9b24270c7d54a2c5e286062c29710333f7ff55c32880b
-  data.tar.gz: 4300439a695628b7741d9b52fa3de99d4d48f766e5c6821415966763b71a6fdf
+  metadata.gz: d6af1586d6748a6aa330311bd40f8b7814c2b75de17b7cd1d8a41ebcab5c5f70
+  data.tar.gz: d090d9aa9581fb85f0aa3d0471ed9fe581afac047fb14aa40276c84b53a59ac3
 SHA512:
-  metadata.gz: 6a460dd5dd9a6c3d1e543c895089a2a994e7ea0256e5773d8578009996fee3c28f33471ee984d2d28d105107eab06408ebe14df7465d81e3f24f96997d64fba0
-  data.tar.gz: 56b536867cf8a10d78d0b89e7c9b42263e8de99842376e9281baa4e39fdd116b108e60d8c05599d540f5585b95ac8f41c9f8a71dfa0293c77865d817adbcff79
+  metadata.gz: 88738ed3b89d1153c023504b662681197cf7c29f47acba4146216df4cedcd1101bf64b02883d9e5179b89c4d2deeaca8c6341b3bbdf60b59fe40be9b0161932e
+  data.tar.gz: 130429b7385c4e9c8e9bcd9545d366ccbcf07e61e9c2ccccf42745fc18ade73b06bd63e0fdbe89bed435bde69727bd1f0f0451a43ced243db923853bcac2f1fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compose-hook (0.1.2)
+    compose-hook (0.1.3)
       faraday
       jwt (~> 2.2)
       puma

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/config/docker-compose.yml

@@ -0,0 +1,6 @@
+---
+version: '3.6'
+services:
+  barong:
+    restart: always
+    image: quay.io/openware/barong:2.4.6

data/lib/compose_hook/webhook.rb

@@ -4,22 +4,29 @@ class ComposeHook::WebHook < Sinatra::Base
   class RequestError < StandardError; end
   class ServerError < StandardError; end
 
-  attr_accessor :config, :secret, :decoder
-
   set :show_exceptions, false
 
   def initialize(app=nil)
     super
 
-    @secret = ENV["WEBHOOK_JWT_SECRET"]
     raise "WEBHOOK_JWT_SECRET is not set" if secret.to_s.empty?
     raise "CONFIG_PATH is not set" if ENV["CONFIG_PATH"].to_s.empty?
     raise "File #{ENV['CONFIG_PATH']} not found" unless File.exist?(ENV["CONFIG_PATH"])
+  end
+
+  def secret
+    ENV["WEBHOOK_JWT_SECRET"]
+  end
 
-    @config = YAML.load_file(ENV["CONFIG_PATH"])
-    raise "The config file is empty or non-existent" if @config.empty?
+  def decoder
+    ComposeHook::Payload.new(secret: secret)
+  end
+
+  def config
+    config = YAML.load_file(ENV["CONFIG_PATH"])
+    raise "The config file is empty or non-existent" if config.empty?
 
-    @decoder = ComposeHook::Payload.new(secret: secret)
+    config
   end
 
   def update_service(path, service, image)
@@ -30,17 +37,16 @@ class ComposeHook::WebHook < Sinatra::Base
   end
 
   def find_service(service, path)
-    res = ""
+    puts "find_service: #{path}"
 
     Dir[File.join(path, "*.yml")].each do |file|
       begin
-        res = file.path unless YAML.load_file(file)["services"][service].empty?
+        return file unless YAML.load_file(file)["services"][service].empty?
       rescue StandardError => e
-        puts "Error while parsing deployment files:", e
+        warn "Error while parsing deployment files:", e
       end
     end
-
-    res
+    raise RequestError.new("service #{service} not found")
   end
 
   before do
@@ -53,31 +59,35 @@ class ComposeHook::WebHook < Sinatra::Base
 
   get "/deploy/:token" do |token|
     begin
-      decoded = @decoder.safe_decode(token)
+      decoded = decoder.safe_decode(token)
       return answer(400, "invalid token") unless decoded
 
       service = decoded["service"]
       image = decoded["image"]
       hostname = request.host
+      return answer(500, "configuration must be an array of hash") unless config.is_a?(Array)
+
       deployment = config.find {|d| d["domain"] == hostname }
-      service_file = find_service(service, File.join(deployment["path"], deployment["subpath"]))
+      return answer(400, "unknown domain #{hostname}") unless deployment
+      return answer(400, "root missing for #{hostname}") unless deployment["root"]
 
+      service_file = find_service(service, File.join(deployment["root"], deployment["subpath"].to_s))
       return answer(400, "service is not specified") unless service
       return answer(400, "image is not specified") unless image
       return answer(404, "invalid domain") unless deployment
       return answer(404, "invalid service") unless service_file
-      return answer(400, "invalid image") if (%r(^(([-_\w\.]){,20}(\/|:))+([-\w\.]{,20})$) =~ image).nil?
+      return answer(400, "invalid image format") if (%r(^(([-_\w\.]){,20}(\/|:))+([-\w\.]{,20})$) =~ image).nil?
 
-      system "docker image pull #{image}"
+      Kernel.system "docker image pull #{image}"
 
       unless $CHILD_STATUS.success?
-        system("docker image inspect #{image} > /dev/null")
+        Kernel.system("docker image inspect #{image} > /dev/null")
         return answer(404, "invalid image") unless $CHILD_STATUS.success?
       end
 
       Dir.chdir(deployment["root"]) do
         update_service(service_file, service, image)
-        system "docker-compose up -Vd #{service}"
+        Kernel.system "docker-compose up -Vd #{service}"
         raise ServerError.new("could not recreate the container") unless $CHILD_STATUS.success?
       end
 
@@ -86,6 +96,9 @@ class ComposeHook::WebHook < Sinatra::Base
       return answer(400, e.to_s)
     rescue ServerError => e
       return answer(500, e.to_s)
+    rescue StandardError => e
+      warn "Error: #{e}:\n#{e.backtrace.join("\n")}"
+      return answer(500, "Internal server error")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compose-hook
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Danylo P.
@@ -246,7 +246,7 @@ files:
 - bin/install_webhook
 - compose-hook.gemspec
 - config.ru
-- config/deployments.yml
+- config/docker-compose.yml
 - lib/compose-hook.rb
 - lib/compose_hook/payload.rb
 - lib/compose_hook/webhook.rb

data/config/deployments.yml

@@ -1,3 +0,0 @@
-- domain:  "www.example.com"
-  root:    "/home/deploy/example"
-  subpath: "compose"