Fix: Fixes host edit to show correct vm_attributes which were used while creating host. Also normalizes volume attributes as volumes_attributes to be consistent.

Author: Manisha15

app/lib/foreman_opentofu/concerns/base_template_scope_extensions.rb

@@ -94,15 +94,11 @@ def backend_block
       end
 
       def build_disks
-        disks = @cr_attrs['volumes'].presence || @cr_attrs['volumes_attributes'].presence || @compute_resource.default_volumes
-        return '' if disks.blank?
-        disks = [disks] if disks.is_a?(Hash)
-        disks.each_with_index.map do |disk, index|
+        disk_render_source.each_with_index.filter_map do |disk, index|
           # drop removed disks; tofu will drop them automatically, if they are no longer defined
-          next if disk['_delete'].to_i == 1
+          next if disk.respond_to?(:[]) && disk['_delete'].to_i == 1
 
-          data = @compute_resource.render_disk(disk, self, index)
-          render_provider_data(data)
+          rendered_disk(index, disk)
         end.join("\n")
       end
 
@@ -115,6 +111,20 @@ def build_nics
 
       private
 
+      def disk_render_source
+        disks = @cr_attrs['volumes'].presence || @cr_attrs['volumes_attributes'].presence || @compute_resource.default_volumes
+        disks = [disks] if disks.is_a?(Hash)
+        disks = [] if disks.blank?
+        disks.empty? ? [nil] : disks
+      end
+
+      def rendered_disk(index, disk)
+        data = @compute_resource.render_disk(disk, self, index)
+        return if data.blank?
+
+        render_provider_data(data)
+      end
+
       def nics_from_cr_attrs
         nics = @cr_attrs['interfaces'].presence || @cr_attrs['interfaces_attributes'].presence || @compute_resource.default_interfaces
         normalize_interfaces(nics).map do |nic|
@@ -126,7 +136,9 @@ def nics_from_cr_attrs
       end
 
       def render_provider_data(data)
-        if data.is_a?(Hash) && data[:resource].present?
+        if data.is_a?(String)
+          data
+        elsif data.is_a?(Hash) && data[:resource].present?
           resource = data[:resource]
           block_to_hcl(['resource', resource[:type], resource[:name]], resource[:content], depth: 0)
         elsif data.is_a?(Hash) && data.size == 1 && data.values.first.is_a?(Hash)

app/models/concerns/foreman_opentofu/vm_command_collection_normalization.rb

@@ -3,6 +3,8 @@ module VMCommandCollectionNormalization
     private
 
     def normalize_vm_args_collections!(args)
+      args[:image_id] = args[:image] if args.key?(:image)
+      normalize_vm_boolean_args!(args)
       [:volumes, :interfaces].each do |collection|
         raw = args.delete(:"#{collection}_attributes") || args[collection]
         next if raw.nil?
@@ -11,6 +13,21 @@ def normalize_vm_args_collections!(args)
       end
     end
 
+    def normalize_vm_boolean_args!(args)
+      vm_boolean_keys.each do |key|
+        next unless args.key?(key)
+        args[key] = Foreman::Cast.to_bool(args[key])
+      end
+    end
+
+    def vm_boolean_keys
+      return [] unless respond_to?(:tofu_provider) && tofu_provider.respond_to?(:attributes)
+
+      tofu_provider.attributes('vm')
+                   .select { |attr| attr['type'] == 'bool' }
+                   .map { |attr| attr['name'].to_sym }
+    end
+
     def normalize_collection_input(collection, value)
       return nested_attributes_for(collection, value) if value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
 

app/models/foreman_opentofu/compute_vm.rb

@@ -61,8 +61,14 @@ def wait_for(&block)
       instance_eval(&block)
     end
 
-    def volumes
-      attribute_value('volumes') || []
+    def volumes_attributes
+      vols_attrs = attribute_value('volumes_attributes')
+      return vols_attrs if vols_attrs.is_a?(Hash)
+
+      list = vols_attrs.presence || attribute_value('volumes')
+      return {} if list.blank?
+
+      Array(list).each_with_index.to_h { |vol, idx| [idx.to_s, vol] }
     end
 
     private

app/models/foreman_opentofu/opentofu_vm_commands.rb

@@ -51,13 +51,14 @@ def stop_vm(name)
     end
 
     def save_vm(uuid, attrs)
+      old_attrs = vm_compute_attributes_for(uuid).to_h.deep_stringify_keys
       tf_state = TfState.find_by(uuid: uuid)
       raise StandardError, "VM with UUID #{uuid} does not exist" unless tf_state
       vm_command_errors('update vm') do
-        attrs = attrs.empty? ? {} : attrs.first
-        attrs = attrs.to_h.symbolize_keys
-        normalize_vm_args_collections!(attrs)
-        data = client({ 'name' => tf_state.name }.merge(attrs)).run_create
+        new_attrs = attrs.to_h.deep_stringify_keys
+        merged_attrs = attrs.empty? ? {} : old_attrs.merge(new_attrs).deep_symbolize_keys
+        normalize_vm_args_collections!(merged_attrs)
+        data = client({ 'name' => tf_state.name }.merge(merged_attrs)).run_create
         ComputeVM.new(self, data)
       end
     end

app/models/foreman_opentofu/tofu.rb

@@ -120,5 +120,22 @@ def available_resource(resource_name, options = {})
     def available_resource_ui_select(resource_name, options = {})
       available_resource(resource_name, options)&.map { |obj| [obj['name'], obj['id']] }
     end
+
+    private
+
+    def set_vm_volumes_attributes(vm, vm_attrs)
+      volumes = if vm.respond_to?(:volumes_attributes)
+                  vm.volumes_attributes.values
+                else
+                  []
+                end
+      vm_attrs[:volumes_attributes] = Hash[
+        volumes.each_with_index.map do |volume, idx|
+          attrs = volume.respond_to?(:attributes) ? volume.attributes : volume
+          [idx.to_s, attrs]
+        end
+      ]
+      vm_attrs
+    end
   end
 end

app/views/foreman_opentofu/compute_resources_vms/_indexed_networks_fields.html.erb

@@ -1,6 +1,7 @@
 <% if compute_resource.is_a?(ForemanOpentofu::Tofu) %>
+  <% association_attributes = "#{compute_resource.interfaces_attrs_name}_attributes" %>
   <div class="<%= compute_resource.interfaces_attrs_name %>_fields_template form_template" style="display: none;">
-    <%= fields_for "#{f.object_name}[#{compute_resource.interfaces_attrs_name}][new_#{compute_resource.interfaces_attrs_name}]", compute_resource.new_interface do |i| %>
+    <%= fields_for "#{f.object_name}[#{association_attributes}][new_#{compute_resource.interfaces_attrs_name}]", compute_resource.new_interface do |i| %>
       <%= render :partial => provider_partial(compute_resource, 'network'),
                  :locals => { :f => i, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },
                  :layout => 'compute_resources_vms/form/deletable_layout' %>

app/views/foreman_opentofu/compute_resources_vms/_indexed_volumes_fields.html.erb

@@ -1,6 +1,6 @@
 <% if compute_resource.is_a?(ForemanOpentofu::Tofu) %>
   <div class="volumes_fields_template form_template" style="display: none;">
-    <%= fields_for "#{f.object_name}[volumes][new_volumes]", volume do |i| %>
+    <%= fields_for "#{f.object_name}[volumes_attributes][new_volumes]", volume do |i| %>
       <%= render :partial => provider_partial(compute_resource, 'volume'),
                  :locals => { :f => i, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :remove_title => _('remove storage volume') },
                  :layout => "compute_resources_vms/form/#{item_layout}_layout" %>

app/views/foreman_opentofu/compute_resources_vms/form/tofu/_interfaces_fields.html.erb

@@ -1,10 +1,11 @@
 <%
   association = compute_resource.interfaces_attrs_name
+  association_attributes = "#{association}_attributes"
   interfaces = Array.wrap(f.object.public_send(association))
   interfaces = [compute_resource.new_interface].compact if interfaces.empty?
 %>
 <% interfaces.each_with_index do |interface_obj, idx| %>
-  <%= fields_for "#{f.object_name}[#{association}][#{idx}]", interface_obj do |i| %>
+  <%= fields_for "#{f.object_name}[#{association_attributes}][#{idx}]", interface_obj do |i| %>
     <%= render :partial => provider_partial(compute_resource, 'network'),
                :locals => { :f => i, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove network interface'), :selected_cluster => selected_cluster },
                :layout => "compute_resources_vms/form/#{item_layout}_layout" %>

app/views/foreman_opentofu/compute_resources_vms/form/tofu/_volumes_fields.html.erb

@@ -1,8 +1,16 @@
 <%
-  volumes = Array.wrap(f.object.volumes)
+  volumes = f.object.volumes_attributes
+  volumes =
+    if volumes.is_a?(Hash)
+      volumes.sort_by { |key, _| key.to_s.sub('new_', '').to_i }
+    else
+      Array.wrap(volumes).each_with_index.map { |value, idx| [idx.to_s, value] }
+    end
 %>
-<% volumes.each_with_index do |volume_obj, idx| %>
-  <%= fields_for "#{f.object_name}[volumes][#{idx}]", volume_obj do |i| %>
+<% volumes.each do |volume_key, volume_obj| %>
+  <% volume_obj = compute_resource.new_volume(volume_obj.to_h) if volume_obj.is_a?(Hash) %>
+  <%= fields_for "#{f.object_name}[volumes_attributes][#{volume_key}]", volume_obj do |i| %>
+    <%= i.hidden_field :id if volume_obj.respond_to?(:id) && volume_obj.id.present? %>
     <%= render :partial => provider_partial(compute_resource, 'volume'),
                :locals => { :f => i, :compute_resource => compute_resource, :new_host => new_host, :new_vm => new_vm, :remove_title => _('remove storage volume') },
                :layout => "compute_resources_vms/form/#{item_layout}_layout" %>

app/views/templates/provisioning/hetzner_provision_host.erb

@@ -25,9 +25,11 @@ resource "hcloud_server" "node1" {
   <%= vm_attributes(['name', 'image']) %>
 
   <%- if @cr_attrs['image_id'].present? %>
-  image = <%= @cr_attrs['image_id'] %>
-  <%- if @user_data_filename.present? %>
+    image = <%= @cr_attrs['image_id'] %>
+  <%- if @user_data_filename.present?%>
     user_data = "${file("<%= @user_data_filename %>")}"
+  elsif @cr_attrs['user_data'].present? %>
+    user_data = <%= @cr_attrs['user_data'] %>
   <%- end %>
   <%- end %>
 
@@ -39,6 +41,10 @@ resource "hcloud_server" "node1" {
   }
 }
 
+locals {
+  disks = <%= to_hcl(@cr_attrs['volumes_attributes'] || {}, snippet: false) %>
+}
+
 <%= build_disks %>
 
 output "vm_attrs" {
@@ -47,6 +53,15 @@ output "vm_attrs" {
       vm_ip_address = hcloud_server.node1.ipv4_address
       vm_ip6_address = hcloud_server.node1.ipv6_address
       vm = hcloud_server.node1
+      volumes_attributes = try({
+        for v in values(hcloud_volume.volumes) : tostring(v.id) => {
+          id = v.id
+          name = v.name
+          size = v.size
+          automount = try(v.automount, null)
+          format = try(v.format, null)
+        }
+      }, {})
 }
 }