fog-proxmox 0.13.0 → 0.14.0

data/lib/fog/{identity/proxmox → proxmox/identity}/models/user.rb

@@ -17,6 +17,8 @@
 
 # frozen_string_literal: true
 
+require 'fog/proxmox/attributes'
+
 module Fog
   module Proxmox
     class Identity
@@ -32,9 +34,18 @@ module Fog
         attribute :enable
         attribute :groups
         attribute :keys
+        attribute :tokens
+
+        def initialize(new_attributes = {})
+          prepare_service_value(new_attributes)
+          Fog::Proxmox::Attributes.set_attr_and_sym('userid', attributes, new_attributes)
+          requires :userid
+          initialize_tokens
+          super(new_attributes)
+        end
 
         def save(options = {})
-          service.create_user(attributes.merge(options))
+          service.create_user((attributes.reject { |attribute| [:tokens].include? attribute }).merge(options))
           reload
         end
 
@@ -46,7 +57,7 @@ module Fog
 
         def update
           requires :userid
-          service.update_user(userid, attributes.reject { |attribute| [:userid].include? attribute })
+          service.update_user(userid, attributes.reject { |attribute| [:userid, :tokens].include? attribute })
           reload
         end
 
@@ -54,6 +65,18 @@ module Fog
           requires :userid, :password
           service.change_password(userid, password)
         end
+
+        def permissions(path = nil)
+          requires :userid
+          attributes[:permissions] = service.list_user_permissions(userid, path)
+        end
+
+        private
+
+        def initialize_tokens
+          attributes[:tokens] = Fog::Proxmox::Identity::Tokens.new(service: service, userid: userid)
+        end
+
       end
     end
   end

data/lib/fog/{identity/proxmox → proxmox/identity}/models/users.rb

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
 
-require 'fog/identity/proxmox/models/user'
+require 'fog/proxmox/identity/models/user'
 
 module Fog
   module Proxmox

data/lib/fog/proxmox/identity/requests/create_token.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Real create_token request
+      class Real
+        def create_token(userid, tokenid, options)
+          request(
+            expects: [200],
+            method: 'POST',
+            path: "access/users/#{URI.encode_www_form_component(userid)}/token/#{tokenid}",
+            body: URI.encode_www_form(options)
+          )
+        end
+      end
+
+      # class Mock create_token request
+      class Mock
+      end
+    end
+  end
+end

data/lib/fog/proxmox/identity/requests/delete_token.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+# frozen_string_literal: true
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Real delete_token request
+      class Real
+        def delete_token(userid, tokenid)
+          request(
+            expects: [200],
+            method: 'DELETE',
+            path: "access/users/#{URI.encode_www_form_component(userid)}/token/#{tokenid}"
+          )
+        end
+      end
+
+      # class Mock delete_token request
+      class Mock
+      end
+    end
+  end
+end

data/lib/fog/proxmox/identity/requests/get_token_info.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+# frozen_string_literal: true
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Real get_token_info request
+      class Real
+        def get_token_info(userid, tokenid)
+          request(
+            expects: [200],
+            method: 'GET',
+            path: "access/users/#{URI.encode_www_form_component(userid)}/token/#{tokenid}"
+          )
+        end
+      end
+
+      # class Mock get_token_info request
+      class Mock
+        def get_token_info(realm); end
+      end
+    end
+  end
+end

data/lib/fog/proxmox/identity/requests/list_tokens.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+# frozen_string_literal: true
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Real list_tokens request
+      class Real
+        def list_tokens(userid)
+          request(
+            expects: [200],
+            method: 'GET',
+            path: "access/users/#{URI.encode_www_form_component(userid)}/token"
+          )
+        end
+      end
+
+      # class Mock list_tokens request
+      class Mock
+        def list_tokens; end
+      end
+    end
+  end
+end

data/lib/fog/proxmox/identity/requests/list_user_permissions.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+# frozen_string_literal: true
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Real list_user_permissions request
+      class Real
+        def list_user_permissions(userid, path)
+          options = { userid: userid }
+          options.store(:path, path) if path
+            request(
+            expects: [200],
+            method: 'GET',
+            path: 'access/permissions',
+            query: URI.encode_www_form(options)
+          )
+        end
+      end
+
+      # class Mock list_user_permissions request
+      class Mock
+        def list_user_permissions; end
+      end
+    end
+  end
+end

data/lib/fog/proxmox/identity/requests/update_token.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+# Copyright 2018 Tristan Robert
+
+# This file is part of Fog::Proxmox.
+
+# Fog::Proxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# Fog::Proxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with Fog::Proxmox. If not, see <http://www.gnu.org/licenses/>.
+
+# frozen_string_literal: true
+
+module Fog
+  module Proxmox
+    class Identity
+      # class Real update_token request
+      class Real
+        def update_token(userid, tokenid, attributes)
+          request(
+            expects: [200],
+            method: 'PUT',
+            path: "access/users/#{URI.encode_www_form_component(userid)}/token/#{tokenid}",
+            body: URI.encode_www_form(attributes)
+          )
+        end
+      end
+
+      # class Mock update_token request
+      class Mock
+      end
+    end
+  end
+end

data/lib/fog/{network/proxmox.rb → proxmox/network.rb}

@@ -21,16 +21,16 @@ module Fog
   module Proxmox
     # Proxmox network service
     class Network < Fog::Service
-      requires :pve_url
-      recognizes :pve_ticket, :pve_path, :pve_ticket_expires, :pve_csrftoken, :persistent, :current_user, :pve_username, :pve_password
+      requires :proxmox_url, :proxmox_auth_method
+      recognizes :proxmox_token, :proxmox_tokenid, :proxmox_userid, :persistent, :proxmox_username, :proxmox_password
 
-      model_path 'fog/network/proxmox/models'
+      model_path 'fog/proxmox/network/models'
       model :node
       collection :nodes
       model :network
       collection :networks
 
-      request_path 'fog/network/proxmox/requests'
+      request_path 'fog/proxmox/network/requests'
 
       # Manage nodes cluster
       request :list_nodes
@@ -49,8 +49,14 @@ module Fog
         attr_reader :config
 
         def initialize(options = {})
-          @pve_uri = URI.parse(options[:pve_url])
-          @pve_path = @pve_uri.path
+          @proxmox_uri = URI.parse(options[:proxmox_url])
+          @proxmox_auth_method = options[:proxmox_auth_method]
+          @proxmox_tokenid = options[:proxmox_tokenid]
+          @proxmox_userid = options[:proxmox_userid]
+          @proxmox_username = options[:proxmox_username]
+          @proxmox_password = options[:proxmox_password]
+          @proxmox_token = options[:proxmox_token]
+          @proxmox_path = @proxmox_uri.path
           @config = options
         end
       end
@@ -58,20 +64,21 @@ module Fog
       # Real class
       class Real
         include Fog::Proxmox::Core
-        def initialize(options = {})
-          initialize_identity(options)
-          @connection_options = options[:connection_options] || {}
-          @path_prefix = URI.parse(options[:pve_url]).path
-          authenticate
-          @persistent = options[:persistent] || false
-          url = "#{@scheme}://#{@host}:#{@port}"
-          @connection = Fog::Core::Connection.new(url, @persistent, @connection_options.merge(path_prefix: @path_prefix))
+
+        def self.not_found_class
+          Fog::Proxmox::Network::NotFound
         end
 
         def config
           self
         end
 
+        def config_service?
+          true
+        end
+
+        private
+
         def configure(source)
           source.instance_variables.each do |v|
             instance_variable_set(v, source.instance_variable_get(v))