Added terraform catalog forms and summary page

Author: GilbertCherrie

app/controllers/catalog_controller.rb

@@ -237,7 +237,7 @@ def atomic_form_field_changed
     build_automate_tree(:automate_catalog) if automate_tree_needed?
     if params[:st_prov_type] # build request screen for selected item type
       @_params[:org_controller] = "service_template"
-      if ansible_playbook?
+      if ansible_playbook_type? || terraform_template_type?
         @record = ServiceTemplate.new
         # waiting for back-end PR to be merged to implement this
         # if false
@@ -285,7 +285,10 @@ def atomic_form_field_changed
 
     render :update do |page|
       page << javascript_prologue
-      if @edit[:new][:st_prov_type] == "generic_ansible_playbook"
+      if @edit[:new][:st_prov_type] == "generic_terraform_template"
+        page.replace("form_div", :partial => "tt_react_form")
+        page << javascript_hide("form_buttons_div")
+      elsif @edit[:new][:st_prov_type] == "generic_ansible_playbook"
         page.replace("form_div", :partial => "st_angular_form")
         page << javascript_hide("form_buttons_div")
       else
@@ -370,6 +373,7 @@ def explorer
     end
     template_locals = {:locals => {:controller => "catalog"}}
     template_locals[:locals].merge!(fetch_playbook_details) if need_ansible_locals?
+    template_locals[:locals].merge!(fetch_terraform_template_details) if need_terraform_locals?
     template_locals[:locals].merge!(fetch_ct_details) if need_container_template_locals?
     template_locals[:locals].merge!(fetch_ovf_template_details) if need_ovf_template_locals?
 
@@ -890,7 +894,7 @@ def resource_action_entry_point(resource_action)
   def build_tenants_tree
     tenants = @record ? @record.additional_tenants : Tenant.where(:id => @edit[:new][:tenant_ids])
     catalog_bundle = @edit.present? && @edit[:key] && @edit[:key].starts_with?('st_edit') # Get the info if adding/editing Catalog Item or Bundle; not important if only displaying
-    TreeBuilderTenants.new('tenants_tree', @sb, true, :additional_tenants => tenants, :selectable => @edit.present?, :ansible_playbook => ansible_playbook_type?, :catalog_bundle => catalog_bundle)
+    TreeBuilderTenants.new('tenants_tree', @sb, true, :additional_tenants => tenants, :selectable => @edit.present?, :show_tenant_tree => ansible_playbook_type? || terraform_template_type?, :catalog_bundle => catalog_bundle)
   end
 
   def svc_catalog_provision_finish_submit_endpoint
@@ -905,15 +909,25 @@ def ansible_playbook_type?
                 elsif @edit
                   @edit[:new][:st_prov_type]
                 end
+    if prov_type == 'generic_ansible_playbook'
+      @current_region = MiqRegion.my_region.region
+    end
     prov_type == 'generic_ansible_playbook'
   end
 
-  def ansible_playbook?
-    ansible_playbook = ansible_playbook_type?
-    @current_region = MiqRegion.my_region.region if ansible_playbook
-    ansible_playbook
+  def terraform_template_type?
+    prov_type = if params[:st_prov_type]
+                  params[:st_prov_type]
+                elsif @record
+                  @record.prov_type
+                elsif @edit
+                  @edit[:new][:st_prov_type]
+                end
+    if prov_type == 'generic_terraform_template'
+      @current_region = MiqRegion.my_region.region
+    end
+    prov_type == 'generic_terraform_template'
   end
-  helper_method :ansible_playbook?
 
   # Get all the available Catalogs
   def available_catalogs
@@ -1904,7 +1918,7 @@ def get_node_info_handle_leaf_node(id)
         @no_wf_msg = _("Request is missing for selected item")
       end
     end
-    unless @record.prov_type == "generic_ansible_playbook"
+    unless @record.prov_type == "generic_ansible_playbook" || @record.prov_type == "generic_terraform_template"
       @sb[:dialog_label]       = _("No Dialog")
       @sb[:fqname]             = nil
       @sb[:reconfigure_fqname] = nil
@@ -2173,11 +2187,11 @@ def fetch_playbook_details
     playbook_details[:provisioning][:network_credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedAnsible::AutomationManager::NetworkCredential, provision[:network_credential_id]) if provision[:network_credential_id]
     playbook_details[:provisioning][:cloud_credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedAnsible::AutomationManager::CloudCredential, provision[:cloud_credential_id]) if provision[:cloud_credential_id]
     playbook_details[:provisioning][:vault_credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedAnsible::AutomationManager::VaultCredential, provision[:vault_credential_id]) if provision[:vault_credential_id]
-    fetch_dialog(playbook_details, provision[:dialog_id], :provisioning)
     playbook_details[:provisioning][:execution_ttl] = provision[:execution_ttl]
     playbook_details[:provisioning][:verbosity] = provision[:verbosity]
     playbook_details[:provisioning][:log_output] = provision[:log_output]
     playbook_details[:provisioning][:become_enabled] = provision[:become_enabled] == true ? _('Yes') : _('No')
+    fetch_dialog(playbook_details, provision[:dialog_id], :provisioning)
 
     if @record.config_info[:retirement]
       retirement = @record.config_info[:retirement]
@@ -2199,6 +2213,38 @@ def fetch_playbook_details
     playbook_details
   end
 
+  def fetch_terraform_template_details
+    terraform_template_details = {}
+    provision = @record.config_info[:provision]
+    terraform_template_details[:provisioning] = {}
+    terraform_template_details[:provisioning][:repository] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::ConfigurationScriptSource, provision[:repository_id])
+    terraform_template_details[:provisioning][:template] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::ConfigurationScriptPayload, provision[:configuration_script_payload_id])
+    terraform_template_details[:provisioning][:credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::Credential, provision[:credential_id])
+    terraform_template_details[:provisioning][:network_credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::NetworkCredential, provision[:network_credential_id]) if provision[:network_credential_id]
+    terraform_template_details[:provisioning][:execution_ttl] = provision[:execution_ttl]
+    terraform_template_details[:provisioning][:verbosity] = provision[:verbosity]
+    terraform_template_details[:provisioning][:log_output] = provision[:log_output]
+    terraform_template_details[:provisioning][:become_enabled] = provision[:become_enabled] == true ? _('Yes') : _('No')
+    fetch_dialog(terraform_template_details, provision[:dialog_id], :provisioning)
+
+    # if @record.config_info[:retirement]
+    #   retirement = @record.config_info[:retirement]
+    #   terraform_template_details[:retirement] = {}
+    #   terraform_template_details[:retirement][:remove_resources] = retirement[:remove_resources]
+    #   if retirement[:repository_id]
+    #     terraform_template_details[:retirement][:repository] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::ConfigurationScriptSource, retirement[:repository_id])
+    #     terraform_template_details[:retirement][:template] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::ConfigurationScriptPayload, retirement[:configuration_script_payload_id])
+    #     terraform_template_details[:retirement][:credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::Credential, retirement[:credential_id])
+    #     terraform_template_details[:retirement][:network_credential] = fetch_name_from_object(ManageIQ::Providers::EmbeddedTerraform::AutomationManager::NetworkCredential, retirement[:network_credential_id]) if retirement[:network_credential_id]
+    #   end
+    #   terraform_template_details[:retirement][:execution_ttl] = retirement[:execution_ttl]
+    #   terraform_template_details[:retirement][:verbosity] = retirement[:verbosity]
+    #   terraform_template_details[:retirement][:log_output] = retirement[:log_output]
+    #   terraform_template_details[:retirement][:become_enabled] = retirement[:become_enabled] == true ? _('Yes') : _('No')
+    # end
+    terraform_template_details
+  end
+
   def fetch_dialog(playbook_details, dialog_id, key)
     return nil if dialog_id.nil?
 
@@ -2303,8 +2349,10 @@ def replace_right_cell(options = {})
     content = if @tagging
                 action_url = x_active_tree == :ot_tree ? "ot_tags_edit" : "st_tags_edit"
                 r[:partial => "layouts/x_tagging", :locals => {:action_url => action_url}]
+              elsif action && %w[at_st_new st_new].include?(action) && terraform_template_type?
+                r[:partial => "tt_react_form"]
               elsif action && %w[at_st_new st_new].include?(action)
-                r[:partial => ansible_playbook? ? "st_angular_form" : "st_form"]
+                r[:partial => ansible_playbook_type? ? "st_angular_form" : "st_form"]
               elsif action && %w[ownership].include?(action)
                 r[:partial => @refresh_partial]
               elsif action && %w[st_catalog_new st_catalog_edit].include?(action)
@@ -2321,6 +2369,7 @@ def replace_right_cell(options = {})
                 else
                   template_locals = {:controller => "catalog"}
                   template_locals.merge!(fetch_playbook_details) if need_ansible_locals?
+                  template_locals.merge!(fetch_terraform_template_details) if need_terraform_locals?
                   template_locals.merge!(fetch_ct_details) if need_container_template_locals?
                   template_locals.merge!(fetch_ovf_template_details) if need_ovf_template_locals?
                   r[:partial => "catalog/#{x_active_tree}_show", :locals => template_locals]
@@ -2344,7 +2393,7 @@ def replace_right_cell(options = {})
         presenter.hide(:toolbar).show(:paging_div)
         # incase it was hidden for summary screen, and incase there were no records on show_list
         presenter.remove_paging
-        if (action == 'at_st_new' && ansible_playbook?) || %w[st_catalog_new st_catalog_edit copy_catalog].include?(action)
+        if (action == 'at_st_new' && (ansible_playbook_type? || terraform_template_type?)) || %w[st_catalog_new st_catalog_edit copy_catalog].include?(action)
           presenter.hide(:form_buttons_div)
         else
           presenter.show(:form_buttons_div)
@@ -2407,6 +2456,12 @@ def need_ansible_locals?
       @record.prov_type == "generic_ansible_playbook"
   end
 
+  def need_terraform_locals?
+    x_active_tree == :sandt_tree &&
+      TreeBuilder.get_model_for_prefix(@nodetype) == "ServiceTemplate" &&
+      @record.prov_type == "generic_terraform_template"
+  end
+
   def need_container_template_locals?
     x_active_tree == :sandt_tree &&
       TreeBuilder.get_model_for_prefix(@nodetype) == "ServiceTemplate" &&

app/helpers/catalog_helper.rb

@@ -95,15 +95,15 @@ def catalog_tab_content(key_name, &block)
 
   def catalog_basic_information(record, sb_params, tenants_tree)
     prov_types = catalog_provision_types
-    prov_data = [prov_types[:template], prov_types[:ovf]].include?(record.prov_type) && catalog_provision?(record, :playbook) ? provisioning : nil
+    prov_data = [prov_types[:template], prov_types[:ovf]].include?(record.prov_type) && (catalog_provision?(record, :playbook) || catalog_provision?(record, :terraform_template)) ? provisioning : nil
     data = {:title => _('Basic Information'), :mode => "miq_catalog_basic_information"}
     rows = []
     rows.push(row_data(_('Name'), record.name))
     rows.push(row_data(_('Description'), record.description))
     rows.push(row_data(_('Display in Catalog'), {:input => "checkbox", :name => "display", :checked => record.display, :disabled => true, :label => ''}))
     rows.push(row_data(_('Catalog'), record.service_template_catalog ? record.service_template_catalog.name : _('Unassigned')))
     rows.push(row_data(_('Zone'), record.zone ? record.zone.name : '')) unless record.composite?
-    rows.push(row_data(_('Dialog'), sb_params[:dialog_label])) unless catalog_provision?(record, :playbook)
+    rows.push(row_data(_('Dialog'), sb_params[:dialog_label])) unless catalog_provision?(record, :playbook) || catalog_provision?(record, :terraform_template)
     rows.push(row_data(_("Price / Month (in %{currency})") % {:currency => record.currency.code}, record.price)) if record.currency
     rows.push(row_data(_('Item Type'), _(ServiceTemplate.all_catalog_item_types[record.prov_type]))) if record.prov_type
     rows.push(row_data(_('Subtype'), _(ServiceTemplate::GENERIC_ITEM_SUBTYPES[record[:generic_subtype]]) || _("Custom"))) if catalog_provision?(record, :generic)
@@ -118,7 +118,7 @@ def catalog_basic_information(record, sb_params, tenants_tree)
       rows.push(row_data(_('Container Template'), provision_data(prov_data, :template_name)))
     end
 
-    unless catalog_provision?(record, :playbook)
+    unless catalog_provision?(record, :playbook) || catalog_provision?(record, :terraform_template)
       entry_points = [[_("Provisioning"), :fqname]]
       unless record.prov_type.try(:start_with?, "generic_")
         entry_points.push([_("Reconfigure"), :reconfigure_fqname], [_("Retirement"), :retire_fqname])
@@ -184,21 +184,31 @@ def catalog_resources(record)
     miq_structured_list(data)
   end
 
-  def catalog_generic_ansible_playbook_info(type, record, info)
+  def catalog_generic_template_info(type, record, info)
     list_type = type == :provision ? 'provisioning' : 'retirement'
     data = {:title => "#{list_type.camelize} %s" % _('Info'), :mode => "miq_catalog_playbook_info"}
     rows = []
     rows.push(row_data(_('Repository'), info[:repository]))
-    rows.push(row_data(_('Playbook'), info[:playbook]))
-    rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
-    rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
-    rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
-    rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
-    rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
-    rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))
-    rows.push(row_data(_('Logging Output'), ViewHelper::LOG_OUTPUT_LEVELS[info[:log_output]]))
-    rows.push(row_data(_('Escalate Privilege'), info[:become_enabled]))
-    rows.push(row_data(_('Verbosity'), _(ViewHelper::VERBOSITY_LEVELS[info[:verbosity]])))
+    if record.type == 'ServiceTemplateAnsiblePlaybook'
+      rows.push(row_data(_('Playbook'), info[:playbook]))
+      rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
+      rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
+      rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
+      rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
+      rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
+      rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))
+      rows.push(row_data(_('Logging Output'), ViewHelper::LOG_OUTPUT_LEVELS[info[:log_output]]))
+      rows.push(row_data(_('Escalate Privilege'), info[:become_enabled]))
+      rows.push(row_data(_('Verbosity'), _(ViewHelper::VERBOSITY_LEVELS[info[:verbosity]])))
+    else
+      rows.push(row_data(_('Template'), info[:template]))
+      rows.push(row_data(_('Credential'), info[:credential]))
+      rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
+      rows.push(row_data(_('Logging Output'), ViewHelper::LOG_OUTPUT_LEVELS[info[:log_output]]))
+      rows.push(row_data(_('Escalate Privilege'), info[:become_enabled]))
+      rows.push(row_data(_('Verbosity'), _(ViewHelper::VERBOSITY_LEVELS[info[:verbosity]])))
+      data[:rows] = rows
+    end
     data[:rows] = rows
     miq_structured_list(data)
   end
@@ -238,12 +248,13 @@ def catalog_dialog(provisioning)
   end
 
   def catalog_provision_types
-    {:generic       => "generic",
-     :orchestration => "generic_orchestration",
-     :ovf           => "generic_ovf_template",
-     :playbook      => "generic_ansible_playbook",
-     :tower         => "generic_ansible_tower",
-     :template      => "generic_container_template"}.freeze
+    {:generic            => "generic",
+     :orchestration      => "generic_orchestration",
+     :ovf                => "generic_ovf_template",
+     :playbook           => "generic_ansible_playbook",
+     :terraform_template => "generic_terraform_template",
+     :tower              => "generic_ansible_tower",
+     :template           => "generic_container_template"}.freeze
   end
 
   private
@@ -257,8 +268,8 @@ def catalog_tab_conditions(record)
       :detail     => record.display && !record.prov_type.try(:start_with?, "generic_"),
       :resource   => record.composite?,
       :request    => !record.prov_type || (record.prov_type && need_prov_dialogs?(record.prov_type)),
-      :provision  => record.prov_type == catalog_provision_types[:playbook],
-      :retirement => record.config_info.fetch_path(:retirement)
+      :provision  => record.prov_type == catalog_provision_types[:playbook] || record.prov_type == catalog_provision_types[:terraform_template],
+      :retirement => record.prov_type == catalog_provision_types[:terraform_template] ? nil : record.config_info.fetch_path(:retirement)
     }
   end
 

app/javascript/components/ansible-playbook-edit-catalog-form/index.jsx

@@ -213,7 +213,7 @@ AnsiblePlayBookEditCatalogForm.propTypes = {
     tenantTree: PropTypes.shape({
       additional_tenants: PropTypes.arrayOf(PropTypes.any).isRequired,
       selectable: PropTypes.bool.isRequired,
-      ansible_playbook: PropTypes.bool.isRequired,
+      show_tenant_tree: PropTypes.bool.isRequired,
       catalog_bundle: PropTypes.bool.isRequired,
       locals_for_render: PropTypes.shape({
         tree_id: PropTypes.string.isRequired,