easy_manager 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb1e50bc8e3aa5d0b6387b1464774ceab853e72e476bbfdde0235da92cb5fa5
-  data.tar.gz: 559ec2811c9aed00b58e32e020635e8d0eb65e9843fd44168c5ecb16e66cc7b2
+  metadata.gz: 3c69241067a306ea8a4121569bb19963b9531cc8ba7a44ba01be9c742220a8f1
+  data.tar.gz: d14b0fc7bb8d684acfa7c836765ad86bcc562b69507262a2161a6312e40afbea
 SHA512:
-  metadata.gz: ddded25e7989bf1e70dd6d13571f3e7d2ff7cbb998683d62c11c90102b8d781e3803b977f8c6b7b86342923602d10514bc8896b227506fa36820e59e054155c0
-  data.tar.gz: bd1a66cfc21f9f3e6b541345114204fa00a335d46942d7b715df2c20101ed0e2654b0f94ba77739ac6e59a776611a13538112a2925d28fc6b6f997e0a3c1aee7
+  metadata.gz: 55e47bd71a06f13344ead528da9276e682739af5eb2269f72a368072113c87a394609dc47bbb0f73fd93c96fca01ae6fdd7d42a696cdd03652315174abaa3166
+  data.tar.gz: 811d7c1e4033c69ac3738796ed984a630cb9f31f28eee2b30c1364438a9ebed309bf8b8901c4a4c13afdc5ce6a8eec313ef562aa5c39701118db80d2226bc21f

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

@@ -25,9 +25,10 @@ class EasyManager
       srv_type = options[:srv_type] || 'DEV1-S'
       image = options[:image] || 'ubuntu-jammy'
       name_pattern = options[:name_pattern] || 'scw-easymanager-__RANDOM__'
+      tags = options[:tags] || []
       cloud_init = options[:cloud_init] || false
 
-      Servers.create(self, srv_type, image, name_pattern, cloud_init)
+      Servers.create(self, srv_type, image, name_pattern, tags, cloud_init)
     end
 
     def delete(srv)
@@ -55,7 +56,7 @@ class EasyManager
       Servers.ready?(self, srv, ssh, srv_ready_cmds)
     end
 
-    def wait_until_ready!(srv, ssh, timeout = 360)
+    def wait_until_ready!(srv, ssh, timeout = 600)
       ready = false
       start = Time.now
       loop do

data/lib/easymanager/scaleway/servers.rb

@@ -49,8 +49,8 @@ class EasyManager
         json_body['server']['state']
       end
 
-      def self.create(scw, srv_type, image, name_pattern, cloud_init)
-        data = srv_data(scw, srv_type, image, name_pattern)
+      def self.create(scw, srv_type, image, name_pattern, tags, cloud_init)
+        data = srv_data(scw, srv_type, image, name_pattern, tags)
         return if data.nil?
 
         response = Typhoeus.post(File.join(scw.api_url, "/instance/v1/zones/#{scw.zone}/servers/"),
@@ -87,26 +87,34 @@ 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)
+      def self.srv_data(scw, srv_type, image, name_pattern, tags)
         srv_infos = Config.srv_infos(srv_type)
         image_id = Config.image_id(image)
         new_ip = Ips.reserve(scw)
         return if image_id.nil? || srv_infos.nil? || new_ip.nil?
 
         {
-          name: name_pattern.gsub('__RANDOM__', Utilities.random_string), commercial_type: srv_type,
-          public_ip: new_ip['ip']['id'], project: scw.project,
+          name: name_pattern.gsub('__RANDOM__', Utilities.random_string),
+          commercial_type: srv_type,
+          public_ip: new_ip['ip']['id'],
+          project: scw.project,
           image: image_id,
-          volumes: { '0' => { size: srv_infos[:volume], volume_type: srv_infos[:volume_type] } }
+          volumes: { '0' => { size: srv_infos[:volume], volume_type: srv_infos[:volume_type] } },
+          tags: tags
         }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_manager
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - Joshua MARTINELLE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf