profitbricks-sdk-ruby 3.0.2 → 4.0.0

data/lib/profitbricks.rb

@@ -22,4 +22,10 @@ module ProfitBricks
   require 'profitbricks/location'
   require 'profitbricks/request'
   require 'profitbricks/wait_for'
+  require 'profitbricks/contract'
+  require 'profitbricks/group'
+  require 'profitbricks/user'
+  require 'profitbricks/share'
+  require 'profitbricks/resource'
+  require 'profitbricks/usermanagement'
 end

data/lib/profitbricks/contract.rb

@@ -0,0 +1,29 @@
+module ProfitBricks
+  # Contract Resource class
+  class Contract < ProfitBricks::Model
+
+    class << self
+      # Retrieve a contract.
+      def get(options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/contracts",
+          expects: 200,
+          query: options
+        )
+        instantiate_objects(response)
+      end
+
+      # Retrieve a contract by contract number.
+      def get_by_contract_id(contract_id)
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/contracts",
+          headers: { 'PB-Contract-Number' => "#{contract_id}" },
+          expects: 200
+        )
+        instantiate_objects(response)
+      end
+    end
+  end
+end

data/lib/profitbricks/datacenter.rb

@@ -84,10 +84,32 @@ module ProfitBricks
 
     class << self
       def create(options = {})
+        entities = {}
+
+        # Retrieve servers collection if present and generate appropriate JSON.
+        if options.key?(:servers)
+          entities[:servers] = collect_entities(options.delete(:servers))
+        end
+
+        # Retrieve volumes collection if present and generate appropriate JSON.
+        if options.key?(:volumes)
+          entities[:volumes] = collect_entities(options.delete(:volumes))
+        end
+
+        # Retrieve volumes collection if present and generate appropriate JSON.
+        if options.key?(:loadbalancers)
+          entities[:loadbalancers] = collect_entities(options.delete(:loadbalancers))
+        end
+
+        # Retrieve volumes collection if present and generate appropriate JSON.
+        if options.key?(:lans)
+          entities[:lans] = collect_entities(options.delete(:lans))
+        end
+
         response = ProfitBricks.request(
           method: :post,
           path: '/datacenters',
-          body: { properties: options }.to_json,
+          body: { properties: options, entities: entities }.to_json,
           expects: 202
         )
         instantiate_objects(response)
@@ -111,5 +133,25 @@ module ProfitBricks
         instantiate_objects(response)
       end
     end
+
+    private
+
+    def self.collect_entities(entities)
+      if entities.is_a?(Array) && entities.length > 0
+        items = []
+        entities.each do |entity|
+          if entity.key?(:volumes)
+            subentities = collect_entities(entity.delete(:volumes))
+            items << {
+              properties: entity,
+              entities: { volumes: subentities }
+            }
+          else
+            items << { properties: entity }
+          end
+        end
+        { items: items }
+      end
+    end
   end
 end

data/lib/profitbricks/errors.rb

@@ -2,5 +2,6 @@ module ProfitBricks
   class Errors
     class Error < StandardError; end
     class OperationFailure < StandardError; end
+    class Unauthorized < StandardError; end
   end
 end

data/lib/profitbricks/group.rb

@@ -0,0 +1,76 @@
+module ProfitBricks
+  # Group class
+  class Group < ProfitBricks::Model
+    # Delete the group.
+    def delete
+      response = ProfitBricks.request(
+        method: :delete,
+        path: "/um/groups/#{id}",
+        expects: 202
+      )
+      self.requestId = response[:requestId]
+      self
+    end
+
+    # Update the group.
+    def update(options = {})
+      response = ProfitBricks.request(
+        method: :put,
+        path: "/um/groups/#{id}",
+        expects: 202,
+        body: { properties: options }.to_json
+      )
+      if response
+        self.requestId = response['requestId']
+        @properties = @properties.merge(response['properties'])
+      end
+      self
+    end
+
+    # Add an user to the group
+    def add_user(user_id)
+      ProfitBricks::User.add_to_group(id, user_id)
+    end
+
+    # Remove an user from the group
+    def remove_user(user_id)
+      ProfitBricks::User.remove_from_group(id, user_id)
+    end
+
+    class << self
+      # Create a new group.
+      def create(options = {})
+        response = ProfitBricks.request(
+          method: :post,
+          path: '/um/groups/',
+          expects: 202,
+          body: { properties: options }.to_json
+        )
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+
+      # List all groups.
+      def list(options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: '/um/groups/',
+          expects: 200,
+          query: options
+        )
+        instantiate_objects(response)
+      end
+
+      # Retrieve a group.
+      def get(group_id,options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/um/groups/#{group_id}",
+          expects: 200,
+          query: options
+        )
+        instantiate_objects(response)
+      end
+  end
+end
+end

data/lib/profitbricks/image.rb

@@ -1,12 +1,11 @@
 module ProfitBricks
   # Image class
   class Image < ProfitBricks::Model
-
     # Delete the image.
     def delete
       ProfitBricks.request(
         method: :delete,
-        path: "/images/#{self.id}",
+        path: "/images/#{id}",
         expects: 202
       )
     end
@@ -15,7 +14,7 @@ module ProfitBricks
     def update(options = {})
       response = ProfitBricks.request(
         method: :patch,
-        path: "/images/#{self.id}",
+        path: "/images/#{id}",
         expects: 202,
         body: options.to_json
       )
@@ -27,13 +26,14 @@ module ProfitBricks
     end
 
     class << self
-
       # List all images.
-      def list
+      def list(options = {})
+
         response = ProfitBricks.request(
           method: :get,
-          path: '/images',
-          expects: 200
+          path: '/images/',
+          expects: 200,
+          query: options
         )
         instantiate_objects(response)
       end

data/lib/profitbricks/lan.rb

@@ -28,25 +28,20 @@ module ProfitBricks
       self
     end
 
-    # List LAN members.
-    def list_members
-      response = ProfitBricks.request(
-        method: :get,
-        path: "/datacenters/#{self.datacenterId}/lans/#{self.id}/nics",
-        expects: 200,
-      )
-      self.class.instantiate_objects(response)
-    end
-
     class << self
 
       # Create a new LAN.
       def create(datacenter_id, options = {})
+        entities = {}
+        # Retrieve nics collection if present and generate appropriate JSON.
+        if options.key?('nics')
+          entities[:nics] =collect_entities(options.delete('nics'))
+        end
         response = ProfitBricks.request(
           method: :post,
           path: "/datacenters/#{datacenter_id}/lans",
           expects: 202,
-          body: { properties: options }.to_json
+          body: { properties: options, entities: entities }.to_json
         )
         add_parent_identities(response)
         instantiate_objects(response)
@@ -74,5 +69,17 @@ module ProfitBricks
         instantiate_objects(response)
       end
     end
+
+    private
+
+    def self.collect_entities(entities)
+      items = []
+      if entities.is_a?(Array) && entities.length > 0
+        entities.each do |entity|
+          items << { id: entity }
+        end
+        {items: items}
+      end
+    end
   end
 end

data/lib/profitbricks/model.rb

@@ -27,8 +27,14 @@ module ProfitBricks
 
     def reload
       # Remove URL host and prefix path from href.
+      # Example: server
       path = URI(self.href).path
+      # => /cloudapi/v3/datacenters/UUID/servers/UUID
       path.sub!(ProfitBricks::Config.path_prefix, '')
+      # => //datacenters/UUID/servers/UUID
+      # => raises Excon::Error::NotFound
+      path.sub!(/\/{2,}/, '/')
+      # => /datacenters/UUID/servers/UUID
       
       response = ProfitBricks.request(
         method: :get,

data/lib/profitbricks/profitbricks.rb

@@ -9,21 +9,20 @@ module ProfitBricks
     ProfitBricks::Config.debug = false
     ProfitBricks::Config.protocol = 'https'
     ProfitBricks::Config.port = '443'
-    ProfitBricks::Config.path_prefix = 'cloudapi/v3'
+    ProfitBricks::Config.path_prefix = 'cloudapi/v4'
     yield ProfitBricks::Config
 
     if ProfitBricks::Config.host
       url = construct_url
     else
-      url = ProfitBricks::Config.url || 'https://api.profitbricks.com/cloudapi/v3'
+      url = ProfitBricks::Config.url || 'https://api.profitbricks.com/cloudapi/v4'
     end
 
     params = {
       user: ProfitBricks::Config.username,
       password: ProfitBricks::Config.password,
       debug: ProfitBricks::Config.debug,
-      omit_default_port: true,
-      query: { depth: ProfitBricks::Config.depth }
+      omit_default_port: true
     }
 
     @client = Excon.new(url, params)
@@ -49,6 +48,7 @@ module ProfitBricks
   def self.request(params)
     begin
       params = add_headers(params)
+      ProfitBricks.client.params[:query] = append_query(params)
       response = ProfitBricks.client.request(prepend_path_prefix(params))
     rescue Excon::Errors::Unauthorized => error
       raise error, parse_json(error.response.body)['messages']
@@ -56,6 +56,8 @@ module ProfitBricks
       raise error, parse_json(error.response.body)['messages']
     rescue Excon::Errors::InternalServerError => error
       raise error, parse_json(error.response.body)['messages']
+    rescue Excon::Error::Forbidden => error
+      raise error, parse_json(error.response.body)['messages']
     end
     add_request_id(response)
   end
@@ -91,10 +93,10 @@ module ProfitBricks
     params[:headers] ||= {}
     params[:headers].merge!(ProfitBricks::Config.headers) if ProfitBricks::Config.headers
 
-    if params[:headers]["User-Agent"]
-      params[:headers]["User-Agent"] = "profitbricks-ruby-sdk/#{ProfitBricks::VERSION} " + params[:headers]["User-Agent"]
+    if params[:headers]['User-Agent']
+      params[:headers]['User-Agent'] = "profitbricks-ruby-sdk/#{ProfitBricks::VERSION} " + params[:headers]['User-Agent']
     else
-      params[:headers]["User-Agent"] = "profitbricks-ruby-sdk/#{ProfitBricks::VERSION}"
+      params[:headers]['User-Agent'] = "profitbricks-ruby-sdk/#{ProfitBricks::VERSION}"
     end
 
     unless params[:headers].key?('Content-Type')
@@ -116,6 +118,11 @@ module ProfitBricks
     params
   end
 
+  def self.append_query(params)
+    params[:query] ||= {}
+    params[:query].merge!(depth: ProfitBricks::Config.depth) if !params[:query][:depth]
+  end
+
   def self.construct_url
     "#{ProfitBricks::Config.protocol}://" \
     "#{ProfitBricks::Config.host}:" \

data/lib/profitbricks/resource.rb

@@ -0,0 +1,42 @@
+module ProfitBricks
+  # Resource class
+  class Resource < ProfitBricks::Model
+    class << self
+      # List all resources.
+      def list(options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: '/um/resources',
+          expects: 200,
+          query: options
+        )
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+
+      def list_by_type(resource_type, options = {})      
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/um/resources/#{resource_type}",
+          expects: 200,
+          query: options
+        )
+
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+
+      # Retrieve a resource
+      def get(resource_type, resource_id, options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/um/resources/#{resource_type}/#{resource_id}",
+          expects: 200,
+          query: options
+        )
+
+        instantiate_objects(response)
+      end
+    end
+  end
+end

data/lib/profitbricks/share.rb

@@ -0,0 +1,66 @@
+module ProfitBricks
+  # Share class
+  class Share < ProfitBricks::Model
+
+    class << self
+      # Delete the share.
+      def delete(group_id,resource_id)
+        response = ProfitBricks.request(
+          method: :delete,
+          path: "/um/groups/#{group_id}/shares/#{resource_id}",
+          expects: 202
+        )
+        return true
+      end
+
+      # Update the share.
+      def update(group_id,resource_id ,options = {})
+        response = ProfitBricks.request(
+          method: :put,
+          path: "/um/groups/#{group_id}/shares/#{resource_id}",
+          expects: 200,
+          body: { properties: options }.to_json
+        )
+
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+
+      # Create a new share.
+      def create(group_id, options = {})
+        response = ProfitBricks.request(
+          method: :post,
+          path: "/um/groups/#{group_id}/shares/#{options[:resource_id]}",
+          expects: 202,
+          body: { properties: options}.to_json
+        )
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+
+      # List all shares under a group.
+      def list(group_id, options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/um/groups/#{group_id}/shares",
+          expects: 200,
+          query: options
+        )
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+
+      # Retrieve a share under a group.
+      def get(group_id, share_id, options = {})
+        response = ProfitBricks.request(
+          method: :get,
+          path: "/um/groups/#{group_id}/shares/#{share_id}",
+          expects: 200,
+          query: options
+        )
+        add_parent_identities(response)
+        instantiate_objects(response)
+      end
+    end
+  end
+end