easy_manager 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9a57597bbf2084e8677c0744935cfc798c99c63cc07b4503568963f11c3d55
-  data.tar.gz: ba92b5d4810baa0bbb84348e52d8a55dd098c28f03771092d5c9c8df6a479f22
+  metadata.gz: 2f4d3fe63e75058880a12dbb337a1ba5ad42fc3c9fdd560f6f88bb9c1bce42e9
+  data.tar.gz: 50993b21c01f7ab2e27f9d643dc7c4e22bf06874883e7a53e6f4ea874d379869
 SHA512:
-  metadata.gz: dd711601f7aa4bba050f61fc1be56fd48d838892a4f15bfbf15c82c4488bb2b09fbcc5e40a5f26f5b7b00b3baa19fcff47e8992ee0fdc9efc7451ed9bc4bfc87
-  data.tar.gz: 8cd4d60852f38458df9f0379e8e2a1a5b217de125f7848ce0e4b1e79263bda328b0f588e5cb7a0882357ca4bca5741c5e084b18336870292490d92fd090884da
+  metadata.gz: 48c105b80b325399b5fd5782bb554cf428a325be64849b2d92ae43add2b86b550ca9a4fce65b10020f37049d3a1b8023e9b9e15d083c509d7e30df8558afca99
+  data.tar.gz: 9b8c8d3d358849e6910fe4769ab50ea4e3293dcf9228dcee4367f9c1afdbea85a2f158974bac6fb3dcad36e703087587b6040e2311a97a690ed876cd5efd78fd

data/lib/easymanager/scaleway/ips.rb

@@ -18,16 +18,11 @@ class EasyManager
         Utilities.parse_json(response.body)
       end
 
-      def self.delete(scw, ip_id, tries = 0)
-        resp = Typhoeus.delete(
+      def self.delete(scw, ip_id)
+        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)

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,31 +87,29 @@ class EasyManager
         )
       end
 
-      def self.action(scw, srv_id, action, tries = 0)
+      def self.action(scw, srv_id, action)
         data = { action: action }
-        resp = Typhoeus.post(
+        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.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Joshua MARTINELLE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf