easy_manager 0.9.2 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11feb80943534098ca933a620ea7face972816314e4292336b34ea432ff0f5b4
-  data.tar.gz: de1c828f3d43fc9581c9e99045a11741bb77567c1f341b89ac268cfda7544888
+  metadata.gz: ab9a57597bbf2084e8677c0744935cfc798c99c63cc07b4503568963f11c3d55
+  data.tar.gz: ba92b5d4810baa0bbb84348e52d8a55dd098c28f03771092d5c9c8df6a479f22
 SHA512:
-  metadata.gz: 00cd84e57894fee52e4ea070f27db99f3ca3c9f1c8c9df46adf50e5e4c1ccd0f8384b87686d3968cb76d739483559b2528c937cdd542c8e5e1cd6d5c7d7cf909
-  data.tar.gz: b06fc5f300eccce23a5a3fbbddf25dfc0bfc23b3c76307cd04d6ea4d07afd8c842097d2fb79e3920e4b123aae7b4ad1ba15dcd189f215b6742d5a1b8ac66c934
+  metadata.gz: dd711601f7aa4bba050f61fc1be56fd48d838892a4f15bfbf15c82c4488bb2b09fbcc5e40a5f26f5b7b00b3baa19fcff47e8992ee0fdc9efc7451ed9bc4bfc87
+  data.tar.gz: 8cd4d60852f38458df9f0379e8e2a1a5b217de125f7848ce0e4b1e79263bda328b0f588e5cb7a0882357ca4bca5741c5e084b18336870292490d92fd090884da

data/lib/easymanager/scaleway/ips.rb

@@ -18,11 +18,16 @@ class EasyManager
         Utilities.parse_json(response.body)
       end
 
-      def self.delete(scw, ip_id)
-        Typhoeus.delete(
+      def self.delete(scw, ip_id, tries = 0)
+        resp = Typhoeus.delete(
           File.join(scw.api_url, "/instance/v1/zones/#{scw.zone}/ips/#{ip_id}"),
           headers: scw.headers
         )
+        return resp if resp&.code == 204
+
+        sleep(rand(10..60))
+        tries += 1
+        delete(scw, ip_id, tries) unless tries >= 3
       end
     end
   end

data/lib/easymanager/scaleway/main.rb

@@ -35,9 +35,16 @@ class EasyManager
     end
 
     def delete_by_id(id)
+      response = nil
       servers = list
 
-      servers.each { |server| delete(server) if server['id'] == id }
+      servers.each do |server|
+        next unless server['id'] == id
+
+        response = delete(server)
+      end
+
+      response
     end
 
     def status(srv)
@@ -48,7 +55,7 @@ class EasyManager
       Servers.ready?(self, srv, ssh, srv_ready_cmds)
     end
 
-    def wait_until_ready!(srv, ssh, timeout = 300)
+    def wait_until_ready!(srv, ssh, timeout = 600)
       ready = false
       start = Time.now
       loop do
@@ -67,7 +74,7 @@ class EasyManager
       check_cloud_init_cmd = "test -f '/var/log/cloud-init.log' && echo true"
       cloud_init_ready_cmd = 'tail -1 /var/log/cloud-init-output.log'
 
-      [check_cloud_init_cmd, cloud_init_ready_cmd, 'hostname']
+      [check_cloud_init_cmd, cloud_init_ready_cmd]
     end
   end
 end

data/lib/easymanager/scaleway/servers.rb

@@ -29,11 +29,11 @@ class EasyManager
         return unless srv_up?(scw, srv)
 
         cmd_values = SSH.cmd_exec(ssh, srv, cmds)
-        if cmd_values[cmds[0]].empty?
-          cmd_values['hostname'] == srv['hostname']
-        else
-          cmd_values[cmds[1]].include?('The system is finally up')
-        end
+        return unless cmd_values
+        return if cmd_values[cmds[0]].empty?
+
+        cmd_values[cmds[1]].include?('The system is finally up') ||
+          cmd_values[cmds[1]].match?(/Cloud-init v.*finished\sat.*Up.*seconds/)
       end
 
       def self.status(scw, srv_id)
@@ -87,13 +87,18 @@ class EasyManager
         )
       end
 
-      def self.action(scw, srv_id, action)
+      def self.action(scw, srv_id, action, tries = 0)
         data = { action: action }
-        Typhoeus.post(
+        resp = Typhoeus.post(
           File.join(scw.api_url, "/instance/v1/zones/#{scw.zone}/servers/#{srv_id}/action"),
           headers: scw.headers,
           body: data.to_json
         )
+        return resp if resp&.code == 202
+
+        sleep(rand(10..60))
+        tries += 1
+        action(scw, srv_id, action, tries) unless tries >= 3
       end
 
       def self.srv_data(scw, srv_type, image, name_pattern)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_manager
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.4
 platform: ruby
 authors:
 - Joshua MARTINELLE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf