knife-ionoscloud 5.1.2 → 6.0.0

data/lib/chef/knife/ionoscloud_server_create.rb

@@ -25,8 +25,7 @@ class Chef
       option :cpu_family,
               short: '-f CPU_FAMILY',
               long: '--cpu-family CPU_FAMILY',
-              description: 'The family of the CPU (INTEL_XEON or AMD_OPTERON)',
-              default: 'INTEL_SKYLAKE'
+              description: 'The family of the CPU (INTEL_XEON or AMD_OPTERON)'
 
       option :ram,
               short: '-r RAM',
@@ -36,8 +35,7 @@ class Chef
       option :availability_zone,
               short: '-a AVAILABILITY_ZONE',
               long: '--availability-zone AVAILABILITY_ZONE',
-              description: 'The availability zone of the server',
-              default: 'AUTO'
+              description: 'The availability zone of the server'
 
       option :boot_volume,
               long: '--boot-volume VOLUME_ID',
@@ -66,9 +64,9 @@ class Chef
 
         print "#{ui.color('Creating server...', :magenta)}"
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        servers_api = Ionoscloud::ServersApi.new(api_client)
 
-        server, _, headers = server_api.datacenters_servers_post_with_http_info(
+        server, _, headers = servers_api.datacenters_servers_post_with_http_info(
           config[:datacenter_id],
           Ionoscloud::Server.new(
             properties: Ionoscloud::ServerProperties.new(
@@ -86,7 +84,7 @@ class Chef
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        print_server(server_api.datacenters_servers_find_by_id(config[:datacenter_id], server.id))
+        print_server(servers_api.datacenters_servers_find_by_id(config[:datacenter_id], server.id))
       end
     end
   end

data/lib/chef/knife/ionoscloud_server_delete.rb

@@ -28,7 +28,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         @name_args.each do |server_id|
           begin
@@ -38,7 +38,9 @@ class Chef
             ui.error("Server ID #{server_id} not found. Skipping.")
             next
           end
+
           print_server(server)
+          puts "\n"
 
           begin
             confirm('Do you really want to delete this server')

data/lib/chef/knife/ionoscloud_server_get.rb

@@ -29,12 +29,14 @@ class Chef
       def run
         $stdout.sync = true
         handle_extra_config
-        validate_required_params(@required_options, config)
-
-        print_server(Ionoscloud::ServerApi.new(api_client).datacenters_servers_find_by_id(
-                       config[:datacenter_id],
-          config[:server_id],
-        ))
+        validate_required_params(@required_options, config)\
+
+        print_server(
+          Ionoscloud::ServersApi.new(api_client).datacenters_servers_find_by_id(
+            config[:datacenter_id],
+            config[:server_id],
+          ),
+        )
       end
     end
   end

data/lib/chef/knife/ionoscloud_server_list.rb

@@ -12,6 +12,11 @@ class Chef
               long: '--datacenter-id DATACENTER_ID',
               description: 'The ID of the datacenter containing the server'
 
+      option :upgrade_needed,
+              short: '-u',
+              long: '--upgrade-needed',
+              description: 'It can be used to filter which servers can be upgraded'
+
       attr_reader :description, :required_options
 
       def initialize(args = [])
@@ -29,30 +34,36 @@ class Chef
         server_list = [
           ui.color('ID', :bold),
           ui.color('Name', :bold),
+          ui.color('Type', :bold),
+          ui.color('Template', :bold),
           ui.color('Cores', :bold),
           ui.color('CPU Family', :bold),
           ui.color('RAM', :bold),
-          ui.color('Availability Zone', :bold),
           ui.color('VM State', :bold),
           ui.color('Boot Volume', :bold),
           ui.color('Boot CDROM', :bold),
         ]
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
+
+        opts = { depth: 1 }
+
+        opts[:upgrade_needed] = config[:upgrade_needed] if config[:upgrade_needed]
 
-        server_api.datacenters_servers_get(config[:datacenter_id], { depth: 1 }).items.each do |server|
+        server_api.datacenters_servers_get(config[:datacenter_id], opts).items.each do |server|
           server_list << server.id
           server_list << server.properties.name
+          server_list << server.properties.type
+          server_list << server.properties.template_uuid
           server_list << server.properties.cores.to_s
           server_list << server.properties.cpu_family
           server_list << server.properties.ram.to_s
-          server_list << server.properties.availability_zone
           server_list << server.properties.vm_state
           server_list << (server.properties.boot_volume.nil? ? '' : server.properties.boot_volume.id)
           server_list << (server.properties.boot_cdrom.nil? ? '' : server.properties.boot_cdrom.id)
         end
 
-        puts ui.list(server_list, :uneven_columns_across, 9)
+        puts ui.list(server_list, :uneven_columns_across, 10)
       end
     end
   end

data/lib/chef/knife/ionoscloud_server_reboot.rb

@@ -28,7 +28,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         @name_args.each do |server_id|
           begin

data/lib/chef/knife/ionoscloud_server_resume.rb

@@ -0,0 +1,44 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudServerResume < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud server resume SERVER_ID [SERVER_ID] (options)'
+
+      option :datacenter_id,
+              short: '-D DATACENTER_ID',
+              long: '--datacenter-id DATACENTER_ID',
+              description: 'ID of the data center'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'This will resume a suspended server. The operation can only be applied to suspended Cube servers. No billing event will be generated.'
+        @required_options = [:datacenter_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        server_api = Ionoscloud::ServersApi.new(api_client)
+
+        @name_args.each do |server_id|
+          begin
+            _, _, headers = server_api.datacenters_servers_resume_post_with_http_info(config[:datacenter_id], server_id)
+          rescue Ionoscloud::ApiError => err
+            raise err unless err.code == 404
+            ui.error("Server ID #{server_id} not found. Skipping.")
+            next
+          end
+          ui.info("Server #{server_id} is resuming. Request ID: #{get_request_id headers}")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_server_start.rb

@@ -26,7 +26,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         @name_args.each do |server_id|
           begin

data/lib/chef/knife/ionoscloud_server_stop.rb

@@ -27,7 +27,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         @name_args.each do |server_id|
           begin

data/lib/chef/knife/ionoscloud_server_suspend.rb

@@ -0,0 +1,45 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudServerSuspend < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud server suspend SERVER_ID [SERVER_ID] (options)'
+
+      option :datacenter_id,
+              short: '-D DATACENTER_ID',
+              long: '--datacenter-id DATACENTER_ID',
+              description: 'ID of the data center'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'This will suspend a server. The operation can only be applied to Cube servers. '\
+        'Note: The virtual machine will not be deleted, and the consumed resources will continue to be billed.'
+        @required_options = [:datacenter_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        server_api = Ionoscloud::ServersApi.new(api_client)
+
+        @name_args.each do |server_id|
+          begin
+            _, _, headers = server_api.datacenters_servers_suspend_post_with_http_info(config[:datacenter_id], server_id)
+          rescue Ionoscloud::ApiError => err
+            raise err unless err.code == 404
+            ui.error("Server ID #{server_id} not found. Skipping.")
+            next
+          end
+          ui.warn("Server #{server_id} is being suspended. Request ID: #{get_request_id headers}")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_server_token.rb

@@ -0,0 +1,43 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudServerToken < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud server token (options)'
+
+      option :datacenter_id,
+              short: '-D DATACENTER_ID',
+              long: '--datacenter-id DATACENTER_ID',
+              description: 'The ID of the Datacenter.'
+
+      option :server_id,
+              short: '-S SERVER_ID',
+              long: '--server-id SERVER_ID',
+              description: 'The ID of the Server.'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Returns the server json web token to be used for login operations (ex: accessing the server console).'
+        @required_options = [:datacenter_id, :server_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        begin
+          puts Ionoscloud::ServersApi.new(api_client).datacenters_servers_token_get(config[:datacenter_id], config[:server_id]).token
+        rescue Ionoscloud::ApiError => err
+          raise err unless err.code == 404
+          ui.error("Server ID #{config[:server_id]} not found.")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_server_update.rb

@@ -65,7 +65,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         if @updatable_fields.map { |el| config[el] }.any?
           print "#{ui.color('Updating Server...', :magenta)}"

data/lib/chef/knife/ionoscloud_server_upgrade.rb

@@ -0,0 +1,45 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudServerUpgrade < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud server upgrade (options)'
+
+      option :datacenter_id,
+              short: '-D DATACENTER_ID',
+              long: '--datacenter-id DATACENTER_ID',
+              description: 'The ID of the Datacenter.'
+
+      option :server_id,
+              short: '-S SERVER_ID',
+              long: '--server-id SERVER_ID',
+              description: 'The ID of the Server.'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        "This will upgrade the version of the server, if needed. To verify if there is an upgrade available for a server, "\
+        "call '/datacenters/{datacenterId}/servers?upgradeNeeded=true'."
+        @required_options = [:datacenter_id, :server_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        begin
+          _, _, headers = Ionoscloud::ServersApi.new(api_client).datacenters_servers_upgrade_post(config[:datacenter_id], config[:server_id])
+          ui.info("Server #{config[:server_id]} is being upgraded. Request ID: #{get_request_id headers}")
+        rescue Ionoscloud::ApiError => err
+          raise err unless err.code == 404
+          ui.error("Server ID #{config[:server_id]} not found.")
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_share_create.rb

@@ -18,6 +18,7 @@ class Chef
               description: 'The ID of the resource.'
 
       option :edit_privilege,
+              short: '-e',
               long: '--edit',
               description: 'The group has permission to edit privileges on this resource.'
 

data/lib/chef/knife/ionoscloud_share_delete.rb

@@ -5,7 +5,7 @@ class Chef
     class IonoscloudShareDelete < Knife
       include Knife::IonoscloudBase
 
-      banner 'knife ionoscloud server delete RESOURCE_ID [RESOURCE_ID] (options)'
+      banner 'knife ionoscloud server delete SHARE_ID [SHARE_ID] (options)'
 
       option :group_id,
               short: '-G GROUP_ID',
@@ -38,6 +38,7 @@ class Chef
           end
 
           print_share(share)
+          puts "\n"
 
           begin
             confirm('Do you really want to delete this Resource Share')

data/lib/chef/knife/ionoscloud_snapshot_create.rb

@@ -52,7 +52,7 @@ class Chef
 
         print "#{ui.color('Creating Snapshot...', :magenta)}"
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
         snapshot, _, headers  = volume_api.datacenters_volumes_create_snapshot_post_with_http_info(
           config[:datacenter_id],
@@ -68,7 +68,7 @@ class Chef
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        print_snapshot(Ionoscloud::SnapshotApi.new(api_client).snapshots_find_by_id(snapshot.id))
+        print_snapshot(Ionoscloud::SnapshotsApi.new(api_client).snapshots_find_by_id(snapshot.id))
       end
     end
   end

data/lib/chef/knife/ionoscloud_snapshot_delete.rb

@@ -21,7 +21,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        snapshot_api = Ionoscloud::SnapshotApi.new(api_client)
+        snapshot_api = Ionoscloud::SnapshotsApi.new(api_client)
 
         @name_args.each do |snapshot_id|
           begin

data/lib/chef/knife/ionoscloud_snapshot_get.rb

@@ -25,7 +25,7 @@ class Chef
         $stdout.sync = true
         handle_extra_config
         validate_required_params(@required_options, config)
-        print_snapshot(Ionoscloud::SnapshotApi.new(api_client).snapshots_find_by_id(config[:snapshot_id]))
+        print_snapshot(Ionoscloud::SnapshotsApi.new(api_client).snapshots_find_by_id(config[:snapshot_id]))
       end
     end
   end

data/lib/chef/knife/ionoscloud_snapshot_list.rb

@@ -29,7 +29,7 @@ class Chef
           ui.color('Size', :bold)
         ]
 
-        snapshot_api = Ionoscloud::SnapshotApi.new(api_client)
+        snapshot_api = Ionoscloud::SnapshotsApi.new(api_client)
 
         snapshot_api.snapshots_get({ depth: 1 }).items.each do |snapshot|
           snapshot_list << snapshot.id

data/lib/chef/knife/ionoscloud_snapshot_restore.rb

@@ -39,7 +39,7 @@ class Chef
 
         print "#{ui.color('Restoring Snapshot...', :magenta)}"
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
         _, _, headers  = volume_api.datacenters_volumes_restore_snapshot_post_with_http_info(
           config[:datacenter_id],
@@ -50,20 +50,9 @@ class Chef
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
-        volume = volume_api.datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id])
-
-        puts "\n"
-        puts "#{ui.color('ID', :cyan)}: #{volume.id}"
-        puts "#{ui.color('Name', :cyan)}: #{volume.properties.name}"
-        puts "#{ui.color('Size', :cyan)}: #{volume.properties.size}"
-        puts "#{ui.color('Bus', :cyan)}: #{volume.properties.bus}"
-        puts "#{ui.color('Image', :cyan)}: #{volume.properties.image}"
-        puts "#{ui.color('Type', :cyan)}: #{volume.properties.type}"
-        puts "#{ui.color('Licence Type', :cyan)}: #{volume.properties.licence_type}"
-        puts "#{ui.color('Zone', :cyan)}: #{volume.properties.availability_zone}"
-        puts 'done'
+        print_volume(volume_api.datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id]))
       end
     end
   end

data/lib/chef/knife/ionoscloud_snapshot_update.rb

@@ -88,7 +88,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::SnapshotApi.new(api_client)
+        server_api = Ionoscloud::SnapshotsApi.new(api_client)
 
         if @updatable_fields.map { |el| config[el] }.any?
           print "#{ui.color('Updating Snapshot...', :magenta)}"

data/lib/chef/knife/ionoscloud_template_list.rb

@@ -0,0 +1,47 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudTemplateList < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud template list'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Retrieve a list of available templates. Templates can be used on specific server types only (CUBE at the moment)'
+        @required_options = [:ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        template_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Cores', :bold),
+          ui.color('RAM', :bold),
+          ui.color('Storage Size', :bold),
+        ]
+        templates_api = Ionoscloud::TemplatesApi.new(api_client)
+
+        templates_api.templates_get({ depth: 1 }).items.sort do |a, b|
+          a.properties.cores != b.properties.cores ? a.properties.cores <=> b.properties.cores : a.properties.ram <=> b.properties.ram
+        end.each do |template|
+          template_list << template.id
+          template_list << template.properties.name
+          template_list << Integer(template.properties.cores)
+          template_list << Integer(template.properties.ram)
+          template_list << Integer(template.properties.storage_size)
+        end
+
+        puts ui.list(template_list, :uneven_columns_across, 5)
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_user_create.rb

@@ -18,6 +18,7 @@ class Chef
               description: 'Lastname of the user.'
 
       option :email,
+              short: '-e EMAIL',
               long: '--email EMAIL',
               description: 'An e-mail address for the user.'
 
@@ -32,16 +33,8 @@ class Chef
               description: 'Assigns the user have administrative rights.'
 
       option :force_sec_auth,
-              long: '--force-sec-auth',
-              description: 'Indicates if secure (two-factor) authentication should be forced for the user.'
-
-      option :sec_auth_active,
               long: '--sec-auth',
-              description: 'Indicates if secure authentication is active for the user or not.'
-
-      option :active,
-              long: '--active',
-              description: 'Indicates if the user is active.'
+              description: 'Indicates if secure (two-factor) authentication should be forced for the user.'
 
       attr_reader :description, :required_options
 
@@ -63,20 +56,16 @@ class Chef
 
         user_management_api = Ionoscloud::UserManagementApi.new(api_client)
 
-        user, _, headers  = user_management_api.um_users_post_with_http_info(
-          Ionoscloud::UserPost.new(
-            properties: Ionoscloud::UserPropertiesPost.new(
-              firstname: config[:firstname],
-              lastname: config[:lastname],
-              email: config[:email],
-              password: config[:password],
-              administrator: config[:administrator],
-              force_sec_auth: config[:force_sec_auth],
-              sec_auth_active: config[:sec_auth_active],
-              active: config[:active],
-            ),
-          ),
-        )
+        user, _, headers  = user_management_api.um_users_post_with_http_info({
+          properties: {
+            firstname: config[:firstname],
+            lastname: config[:lastname],
+            email: config[:email],
+            password: config[:password],
+            administrator: config[:administrator],
+            forceSecAuth: config[:force_sec_auth],
+          }.compact,
+        })
 
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }

data/lib/chef/knife/ionoscloud_user_delete.rb

@@ -35,6 +35,7 @@ class Chef
           end
 
           print_user(user)
+          puts "\n"
 
           begin
             confirm('Do you really want to delete this User')

data/lib/chef/knife/ionoscloud_user_ssourl.rb

@@ -27,7 +27,7 @@ class Chef
         validate_required_params(@required_options, config)
 
         begin
-          puts Ionoscloud::UserManagementApi.new(api_client).um_users_s3ssourl_get(config[:user_id]).sso_url
+          puts Ionoscloud::UserS3KeysApi.new(api_client).um_users_s3ssourl_get(config[:user_id]).sso_url
         rescue Ionoscloud::ApiError => err
           raise err unless err.code == 404
           ui.error("User ID #{config[:user_id]} not found.")

data/lib/chef/knife/ionoscloud_volume_attach.rb

@@ -31,7 +31,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         @name_args.each do |volume_id|
           begin