knife-ionoscloud 5.1.0 → 5.1.1

data/lib/chef/knife/ionoscloud_nodepool_delete.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)

data/lib/chef/knife/ionoscloud_nodepool_list.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         nodepool_list = [

data/lib/chef/knife/ionoscloud_pcc_create.rb

@@ -32,6 +32,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating private cross connect...', :magenta)}"

data/lib/chef/knife/ionoscloud_pcc_delete.rb

@@ -18,6 +18,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         pcc_api = Ionoscloud::PrivateCrossConnectApi.new(api_client)

data/lib/chef/knife/ionoscloud_pcc_list.rb

@@ -18,6 +18,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         pcc_list = [

data/lib/chef/knife/ionoscloud_request_list.rb

@@ -42,6 +42,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         request_list = [

data/lib/chef/knife/ionoscloud_request_status.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         begin

data/lib/chef/knife/ionoscloud_request_wait.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Waiting for request...', :magenta)}"

data/lib/chef/knife/ionoscloud_resource_list.rb

@@ -45,6 +45,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         user_management_api = Ionoscloud::UserManagementApi.new(api_client)

data/lib/chef/knife/ionoscloud_s3key_create.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating S3key...', :magenta)}"

data/lib/chef/knife/ionoscloud_s3key_delete.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         user_management_api = Ionoscloud::UserManagementApi.new(api_client)

data/lib/chef/knife/ionoscloud_s3key_list.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         s3key_list = [

data/lib/chef/knife/ionoscloud_server_create.rb

@@ -61,6 +61,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating server...', :magenta)}"

data/lib/chef/knife/ionoscloud_server_delete.rb

@@ -25,6 +25,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_api = Ionoscloud::ServerApi.new(api_client)
@@ -44,8 +45,8 @@ class Chef
           msg_pair('CPU Family', server.properties.cpu_family)
           msg_pair('Ram', server.properties.ram)
           msg_pair('Availability Zone', server.properties.availability_zone)
-          msg_pair('Boot Volume', server.properties.boot_volume.id)
-          msg_pair('Boot CDROM', server.properties.boot_cdrom.id)
+          msg_pair('Boot Volume', (server.properties.boot_volume.nil? ? '' : server.properties.boot_volume.id))
+          msg_pair('Boot CDROM', (server.properties.boot_cdrom.nil? ? '' : server.properties.boot_cdrom.id))
 
           begin
             confirm('Do you really want to delete this server')

data/lib/chef/knife/ionoscloud_server_list.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_list = [

data/lib/chef/knife/ionoscloud_server_reboot.rb

@@ -25,6 +25,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_api = Ionoscloud::ServerApi.new(api_client)

data/lib/chef/knife/ionoscloud_server_start.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_api = Ionoscloud::ServerApi.new(api_client)

data/lib/chef/knife/ionoscloud_server_stop.rb

@@ -24,6 +24,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_api = Ionoscloud::ServerApi.new(api_client)

data/lib/chef/knife/ionoscloud_share_create.rb

@@ -40,6 +40,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Sharing Resource...', :magenta)}"

data/lib/chef/knife/ionoscloud_share_delete.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         user_management_api = Ionoscloud::UserManagementApi.new(api_client)

data/lib/chef/knife/ionoscloud_share_list.rb

@@ -24,6 +24,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         share_list = [

data/lib/chef/knife/ionoscloud_snapshot_create.rb

@@ -47,6 +47,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating Snapshot...', :magenta)}"

data/lib/chef/knife/ionoscloud_snapshot_delete.rb

@@ -18,6 +18,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         snapshot_api = Ionoscloud::SnapshotApi.new(api_client)

data/lib/chef/knife/ionoscloud_snapshot_list.rb

@@ -18,6 +18,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         snapshot_list = [

data/lib/chef/knife/ionoscloud_snapshot_restore.rb

@@ -34,6 +34,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Restoring Snapshot...', :magenta)}"

data/lib/chef/knife/ionoscloud_user_create.rb

@@ -49,6 +49,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating user...', :magenta)}"

data/lib/chef/knife/ionoscloud_user_delete.rb

@@ -20,6 +20,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         user_management_api = Ionoscloud::UserManagementApi.new(api_client)

data/lib/chef/knife/ionoscloud_user_list.rb

@@ -25,6 +25,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         user_list = [

data/lib/chef/knife/ionoscloud_user_ssourl.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         begin

data/lib/chef/knife/ionoscloud_volume_attach.rb

@@ -28,6 +28,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_api = Ionoscloud::ServerApi.new(api_client)

data/lib/chef/knife/ionoscloud_volume_create.rb

@@ -59,8 +59,21 @@ class Chef
       option :availability_zone,
               short: '-Z AVAILABILITY_ZONE',
               long: '--availability-zone AVAILABILITY_ZONE',
-              description: 'The volume availability zone of the server',
-              required: false
+              description: 'The volume availability zone of the server'
+
+      option :backupunit_id,
+              short: '-B BACKUPUNIT_ID',
+              long: '--backupunit BACKUPUNIT_ID',
+              description: 'The uuid of the Backup Unit that user has access to. The property is immutable and is only allowed '\
+              'to be set on a new volume creation. It is mandatory to provide either \'public image\' or \'imageAlias\' in '\
+              'conjunction with this property.'
+
+      option :user_data,
+              short: '-u USER_DATA',
+              long: '--user-data USER_DATA',
+              description: 'The cloud-init configuration for the volume as base64 encoded string. The property is '\
+              'immutable and is only allowed to be set on a new volume creation. It is mandatory to provide either \'public image\' '\
+              'or \'imageAlias\' that has cloud-init compatibility in conjunction with this property.'
 
       attr_reader :description, :required_options
 
@@ -74,21 +87,10 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
-        if !config[:image] && !config[:image_alias]
-          ui.error('Either \'--image\' or \'--image-alias\' parameter must be provided')
-          exit(1)
-        end
-
-        if !config[:ssh_keys] && !config[:image_password]
-          ui.error('Either \'--image-password\' or \'--ssh-keys\' parameter must be provided')
-          exit(1)
-        end
-
-        if config[:ssh_keys]
-          config[:ssh_keys] = config[:ssh_keys].split(',')
-        end
+        config[:ssh_keys] = config[:ssh_keys].split(',') if config[:ssh_keys] && config[:ssh_keys].instance_of?(String)
 
         print "#{ui.color('Creating volume...', :magenta)}"
 
@@ -108,6 +110,8 @@ class Chef
               sshKeys: config[:sshKeys],
               imagePassword: config[:image_password],
               availabilityZone: config[:availability_zone],
+              backupunit_id: config[:backupunit_id],
+              user_data: config[:user_data],
             }.compact
           },
         )

data/lib/chef/knife/ionoscloud_volume_delete.rb

@@ -24,6 +24,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         volume_api = Ionoscloud::VolumeApi.new(api_client)

data/lib/chef/knife/ionoscloud_volume_detach.rb

@@ -31,6 +31,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         server_api = Ionoscloud::ServerApi.new(api_client)

data/lib/chef/knife/ionoscloud_volume_list.rb

@@ -29,6 +29,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         volume_list = [

data/lib/knife-ionoscloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ionoscloud
-    VERSION = '5.1.0'
+    VERSION = '5.1.1'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/chef/knife/ionoscloud_k8s_delete_spec.rb

@@ -86,7 +86,7 @@ describe Chef::Knife::IonoscloudK8sDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call KubernetesApi.k8s_delete when the cluster is not active' do
+    it 'should not call KubernetesApi.k8s_delete when the cluster is not one of ["ACTIVE", "TERMINATED"]' do
       k8s_cluster = k8s_cluster_mock(
         {
           state: 'DEPLOYING',
@@ -103,7 +103,10 @@ describe Chef::Knife::IonoscloudK8sDelete do
       subject_config.each { |key, value| subject.config[key] = value }
       subject.name_args = [k8s_cluster.id]
 
-      expect(subject.ui).to receive(:error).with("K8s Cluster ID #{k8s_cluster.id} is not active. Skipping.")
+      expect(subject.ui).to receive(:error).with(
+        "K8s Cluster #{k8s_cluster.id} state must be one of ['ACTIVE', 'TERMINATED'], "\
+        "actual state is '#{k8s_cluster.metadata.state}'. Skipping."
+      )
 
       expect(subject.api_client).not_to receive(:wait_for)
       mock_call_api(

data/spec/chef/knife/ionoscloud_nodepool_create_spec.rb

@@ -33,6 +33,7 @@ describe Chef::Knife::IonoscloudNodepoolCreate do
         min_node_count: nodepool.properties.auto_scaling.min_node_count,
         max_node_count: nodepool.properties.auto_scaling.max_node_count,
         lans: nodepool.properties.lans.map { |lan| lan.id }.join(','),
+        public_ips: nodepool.properties.public_ips.join(','),
       }
 
       subject_config.each { |key, value| subject.config[key] = value }
@@ -42,7 +43,6 @@ describe Chef::Knife::IonoscloudNodepoolCreate do
 
       expected_body = nodepool.properties.to_hash
       expected_body[:lans].map! { |lan| lan.delete(:properties); lan[:id] = Integer(lan[:id]); lan }
-      expected_body.delete(:publicIps)
       expected_body.delete(:availableUpgradeVersions)
 
       expect(subject).to receive(:puts).with("ID: #{nodepool.id}")

data/spec/chef/knife/ionoscloud_volume_create_spec.rb

@@ -70,58 +70,6 @@ describe Chef::Knife::IonoscloudVolumeCreate do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call anything when neither image not image-alias is provided' do
-      volume = volume_mock
-      subject_config = {
-        ionoscloud_username: 'email',
-        ionoscloud_password: 'password',
-        cluster_id: 'cluster_id',
-        datacenter_id: 'datacenter_id',
-        name: volume.properties.name,
-        size: volume.properties.size,
-        type: volume.properties.type,
-        bus: volume.properties.bus,
-        availability_zone: volume.properties.availability_zone,
-        image_password: 'K3tTj8G14a3EgKyNeeiY',
-      }
-
-      subject_config.each { |key, value| subject.config[key] = value }
-      expect(subject.ui).to receive(:error).with('Either \'--image\' or \'--image-alias\' parameter must be provided')
-
-      expect(subject.api_client).not_to receive(:wait_for)
-      expect(subject.api_client).not_to receive(:call_api)
-
-      expect { subject.run }.to raise_error(SystemExit) do |error|
-        expect(error.status).to eq(1)
-      end
-    end
-
-    it 'should not call anything when neither image not image-alias is provided' do
-      volume = volume_mock
-      subject_config = {
-        ionoscloud_username: 'email',
-        ionoscloud_password: 'password',
-        cluster_id: 'cluster_id',
-        datacenter_id: 'datacenter_id',
-        name: volume.properties.name,
-        size: volume.properties.size,
-        type: volume.properties.type,
-        bus: volume.properties.bus,
-        availability_zone: volume.properties.availability_zone,
-        image_alias: 'debian:latest',
-      }
-
-      subject_config.each { |key, value| subject.config[key] = value }
-      expect(subject.ui).to receive(:error).with('Either \'--image-password\' or \'--ssh-keys\' parameter must be provided')
-
-      expect(subject.api_client).not_to receive(:wait_for)
-      expect(subject.api_client).not_to receive(:call_api)
-
-      expect { subject.run }.to raise_error(SystemExit) do |error|
-        expect(error.status).to eq(1)
-      end
-    end
-
     it 'should not make any call if any required option is missing' do
       required_options = subject.instance_variable_get(:@required_options)