fpm-fry 0.7.2.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4775633d070116e35a3bdfb7bdb0359d8af49b29b08f9b68e862b5dfd6a0a91d
-  data.tar.gz: b6b317af4559f1deeca752e42a96c9973885e1014caa0fd5fac22d6653644617
+  metadata.gz: 0544f44b67264b68111bb6f5a96e8132a423e8816afd6367fede81aa505bf1aa
+  data.tar.gz: 1e987b5493f30d69e0cf7501dcf4acec92f5190825f701c0401f9e1d72df97f3
 SHA512:
-  metadata.gz: c05ab42fc6a12903c1987313a07cdb27b7fcbd46bf3b995f20745a7da7c358b1e00ffde004eeebdcf99a4ebe05069fb6f45e9c77b7d0a2de9c19874e9f70a86d
-  data.tar.gz: af93127bbfc24a0bf3de4250523e86004ec49548b4517e2f55b2ddb3bb30639f669889e2ee8b83bd58a8b21d2ff314b290c60c380be3962ef69882b6752c69c0
+  metadata.gz: b32603c869cfb37fb0062996affc6dddee51d3bd55d92c2fb6ce16560f18fb078c3399626537d8c79a8f57db72c56876bfc7fa18563cb4052505255e36caf7b0
+  data.tar.gz: 991eff30e175e76f634a120ee8fe14c45c7a04034f66af39bc24912c91b7d1c7e928b9de7ca272d205540432408cd1c9fc0c1033753a61020714a13204ad3db0

data/lib/fpm/fry/client.rb

@@ -22,6 +22,10 @@ class FPM::Fry::Client
     include FPM::Fry::WithData
   end
 
+  class ContainerDeletionFailed < StandardError
+    include FPM::Fry::WithData
+  end
+
   # Raised when trying to read file that can't be read e.g. because it's a
   # directory.
   class NotAFile < StandardError
@@ -111,7 +115,7 @@ class FPM::Fry::Client
               )
             end
           rescue Excon::Error => e
-            @logger.error("unexpected response when reading resource: url: #{url}, error: #{e}")
+            logger.error("unexpected response when reading resource: url: #{url}, error: #{e}")
             raise
           end
     if [404,500].include? res.status
@@ -165,14 +169,14 @@ class FPM::Fry::Client
   end
 
   def copy(name, resource, map, options = {})
-    ex = FPM::Fry::Tar::Extractor.new(logger: @logger)
+    ex = FPM::Fry::Tar::Extractor.new(logger: logger)
     base = File.dirname(resource)
     read(name, resource) do | entry |
       file = File.join(base, entry.full_name).chomp('/')
       file = file.sub(%r"\A\./",'')
       to = map[file]
       next unless to
-      @logger.debug("Copy",name: file, to: to)
+      logger.debug("Copy",name: file, to: to)
       ex.extract_entry(to, entry, options)
     end
   end
@@ -182,7 +186,7 @@ class FPM::Fry::Client
     res = agent.get(path: url, expects: [200, 204])
     return JSON.parse(res.body)
   rescue Excon::Error => e
-    @logger.error("could not retrieve changes for: #{name}, url: #{url}, error: #{e}")
+    logger.error("could not retrieve changes for: #{name}, url: #{url}, error: #{e}")
     raise
   end
 
@@ -220,27 +224,35 @@ class FPM::Fry::Client
     )
     data = JSON.parse(res.body)
     if res.status != 201
-      @logger.error(data["message"])
+      logger.error(data["message"])
       if res.status == 404
-        @logger.info("execute docker pull #{image} first or specify --pull argument for fpm-fry")
+        logger.info("execute docker pull #{image} first or specify --pull argument for fpm-fry")
       end
       raise ContainerCreationFailed.new("could not create container from #{image}", message: data["message"])
     end
     data['Id']
   rescue Excon::Error => e
-    @logger.error("could not create container from #{image}, url: #{url}, error: #{e}")
+    logger.error("could not create container from #{image}, url: #{url}, error: #{e}")
     raise
   end
 
   def destroy(container)
     return unless container
+
     url = self.url('containers', container)
-    agent.delete(
+    res = agent.delete(
       path: url,
-      expects: [204]
+      expects: [204, 409]
     )
+    return unless res.status == 409
+    data = JSON.parse(res.body) rescue ({"message" => "could not parse response body: '#{res.body}'"})
+    if data["message"] =~ /removal of container .* is already in progress/
+      logger.info(data["message"])
+    else
+      raise ContainerDeletionFailed.new("could not destroy container #{container}", data)
+    end
   rescue Excon::Error => e
-    @logger.error("could not destroy container: #{container}, url: #{url}, error: #{e}")
+    logger.error("could not destroy container: #{container}, url: #{url}, error: #{e}")
     raise
   end
 

data/lib/fpm/fry/command/cook.rb

@@ -2,6 +2,10 @@ require 'fpm/fry/command'
 module FPM; module Fry
   class Command::Cook < Command
 
+    class BuildFailed < StandardError
+      include FPM::Fry::WithData
+    end
+
     option '--keep', :flag, 'Keep the container after build'
     option '--overwrite', :flag, 'Overwrite package', default: true
     option '--verbose', :flag, 'Verbose output', default: false
@@ -212,79 +216,81 @@ module FPM; module Fry
     end
 
     def build!
-      body = begin
-              url = client.url('containers','create')
-              args = {
-                headers: {
-                  'Content-Type' => 'application/json'
-                },
-                path: url,
-                expects: [201],
-                body: JSON.generate({"Image" => build_image})
-              }
-              args[:query] = { platform: platform } if platform
-              res = client.post(args)
-              JSON.parse(res.body)
-            rescue Excon::Error
-              logger.error "could not create #{build_image}, url: #{url}"
-              raise
-            end
-      container = body['Id']
-      begin
-        begin
-          url = client.url('containers',container,'start')
-          client.post(
-            headers: {
-              'Content-Type' => 'application/json'
-            },
-            path: url,
-            expects: [204],
-            body: JSON.generate({})
-          )
-        rescue Excon::Error
-          logger.error "could not start container #{container}, url: #{url}"
-          raise
-        end
+      container = create_build_container
+      start_build_container(container)
+      attach_to_build_container_and_stream_logs(container)
+      wait_for_build_container_to_shut_down(container)
+      yield container
+    ensure
+      unless keep?
+        client.destroy(container) if container
+      end
+    end
 
-        begin
-          url = client.url('containers',container,'attach?stderr=1&stdout=1&stream=1&logs=1')
-          client.post(
-            path: url,
-            body: '',
-            expects: [200],
-            middlewares: [
-              StreamParser.new(out,err),
-              Excon::Middleware::Expects,
-              Excon::Middleware::Instrumentor,
-              Excon::Middleware::Mock
-            ]
-          )
-        rescue Excon::Error
-          logger.error "could not attach to container #{container}, url: #{url}"
-          raise
-        end
+    def create_build_container
+      url = client.url('containers','create')
+      args = {
+        headers: {
+          'Content-Type' => 'application/json'
+        },
+        path: url,
+        expects: [201],
+        body: JSON.generate({"Image" => build_image})
+      }
+      args[:query] = { platform: platform } if platform
+      res = client.post(args)
+      JSON.parse(res.body)['Id']
+    rescue Excon::Error
+      logger.error "could not create #{build_image}, url: #{url}"
+      raise
+    end
 
-        begin
-          res = client.post(
-            path: client.url('containers',container,'wait'),
-            expects: [200],
-            body: ''
-          )
-          json = JSON.parse(res.body)
-          if json["StatusCode"] != 0
-            raise Fry::WithData("Build failed", exit_code: json["StatusCode"])
-          end
-        rescue Excon::Error
-          logger.error "could not wait successfully for container #{container}, url: #{url}"
-          raise
-        end
+    def start_build_container(container)
+      url = client.url('containers',container,'start')
+      client.post(
+        headers: {
+          'Content-Type' => 'application/json'
+        },
+        path: url,
+        expects: [204],
+        body: JSON.generate({})
+      )
+    rescue Excon::Error
+      logger.error "could not start container #{container}, url: #{url}"
+      raise
+    end
 
-        yield container
-      ensure
-        unless keep?
-          client.destroy(container)
-        end
+    def attach_to_build_container_and_stream_logs(container)
+      url = client.url('containers',container,'attach?stderr=1&stdout=1&stream=1&logs=1')
+      client.post(
+        path: url,
+        body: '',
+        expects: [200],
+        middlewares: [
+          StreamParser.new(out,err),
+          Excon::Middleware::Expects,
+          Excon::Middleware::Instrumentor,
+          Excon::Middleware::Mock
+        ]
+      )
+    rescue Excon::Error
+      logger.error "could not attach to container #{container}, url: #{url}"
+      raise
+    end
+
+    def wait_for_build_container_to_shut_down(container)
+      res = client.post(
+        path: client.url('containers',container,'wait'),
+        expects: [200],
+        body: ''
+      )
+      json = JSON.parse(res.body)
+      if json["StatusCode"] != 0
+        raise BuildFailed.new("Build script failed with non zero exit code", json)
       end
+    rescue Excon::Error
+      logger.error "could not wait successfully for container #{container}, url: #{url}"
+      raise
     end
 
     def input_package(container)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-fry
 version: !ruby/object:Gem::Version
-  version: 0.7.2.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Maxime Lagresle
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-09 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon