morpheus-cli 5.4.4.2 → 5.4.5

data/lib/morpheus/cli/commands/clusters.rb

@@ -373,8 +373,15 @@ class Morpheus::Cli::Clusters
       opts.on( '--resource-name NAME', "Resource Name" ) do |val|
         options[:resourceName] = val.to_s
       end
-      opts.on('--tags LIST', String, "Tags") do |val|
-        options[:tags] = val
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.add_hidden_option('--metadata')
+      opts.on('--labels LIST', String, "Tags") do |val|
+        options[:labels] = val
       end
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
@@ -510,13 +517,13 @@ class Morpheus::Cli::Clusters
         description = options[:description] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false, 'description' => 'Resource Description.'}],options[:options],@api_client,{})['description']
         cluster_payload['description'] = description if description
 
-        tags = options[:tags]
+        labels = options[:labels]
 
-        if !tags && !options[:no_prompt]
-          tags = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tags', 'type' => 'text', 'fieldLabel' => 'Resource Labels', 'required' => false, 'description' => 'Resource Tags.'}],options[:options],@api_client,{})['tags']
+        if !labels && !options[:no_prompt]
+          labels = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'type' => 'text', 'fieldLabel' => 'Resource Labels', 'required' => false, 'description' => 'Resource Labels.'}],options[:options],@api_client,{})['labels']
         end
 
-        server_payload['tags'] = tags if tags
+        server_payload['labels'] = labels if labels
 
         # Cloud / Zone
         cloud_id = nil
@@ -595,7 +602,7 @@ class Morpheus::Cli::Clusters
 
         # Multi-disk / prompt for volumes
         if provision_type['hasVolumes']
-          volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
+          volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options, @api_client, api_params)
           if !volumes.empty?
             server_payload['volumes'] = volumes
           end
@@ -605,7 +612,13 @@ class Morpheus::Cli::Clusters
         option_type_list =
           ((controller_type.nil? ? [] : controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) +
           layout['optionTypes'] +
-          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue []))
+          (cluster_type['optionTypes'].reject { |type| 
+            !type['enabled'] || !type['creatable'] || type['fieldComponent']
+          } rescue []))
+
+        # remove metadata option_type , prompt manually for that field 'tags' instead of 'metadata'
+        metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
+        option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
 
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
@@ -633,10 +646,23 @@ class Morpheus::Cli::Clusters
         # Server options
         server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
+        # Metadata Tags
+        if metadata_option_type
+          if options[:metadata]
+            metadata = parse_metadata(options[:metadata])
+            server_payload['tags'] = metadata if !metadata.empty?
+          else
+            metadata = prompt_metadata(options)
+            server_payload['tags'] = metadata if !metadata.empty?
+          end
+        end
+
         # Worker count
         if !['manual', 'external'].include?(provision_type['code'])
           default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
-          server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker-cluster', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+          nodeCount = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker-cluster', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+          server_payload['config']['nodeCount'] = nodeCount
+          server_payload['nodeCount'] = nodeCount
         end
 
         # Create User
@@ -1092,6 +1118,16 @@ class Morpheus::Cli::Clusters
       opts.on("--description [TEXT]", String, "Description") do |val|
         options[:description] = val.to_s
       end
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.on('--metadata LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.add_hidden_option('--metadata')
+      opts.on('--labels LIST', String, "Tags") do |val|
+        options[:labels] = val
+      end
       add_server_options(opts, options)
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Add worker to a cluster.\n" +
@@ -1153,6 +1189,14 @@ class Morpheus::Cli::Clusters
         # Description
         server_payload['description'] = options[:description] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'description' => 'Worker Description'}], options[:options], @api_client)['description']
 
+        # Labels
+        labels = options[:labels]
+        if !labels && !options[:no_prompt]
+          labels = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'type' => 'text', 'fieldLabel' => 'Resource Labels', 'required' => false, 'description' => 'Resource Labels.'}],options[:options],@api_client,{})['labels']
+        end
+
+        server_payload['labels'] = labels if labels
+
         # Cloud
         available_clouds = options_interface.options_for_source('clouds', {groupId: cluster['site']['id'], clusterId: cluster['id'], ownerOnly: true})['data']
         cloud_id = nil
@@ -1192,7 +1236,7 @@ class Morpheus::Cli::Clusters
         end
 
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options.merge({'defaultAddFirstDataVolume': true}), @api_client, {zoneId: cloud['id'], siteId: group['id']})
+        volumes = options[:volumes] || prompt_volumes(service_plan, provision_type, options, @api_client, {zoneId: cloud['id'], siteId: group['id']})
 
         if !volumes.empty?
           server_payload['volumes'] = volumes
@@ -1218,8 +1262,24 @@ class Morpheus::Cli::Clusters
           (type['fieldContext'] == 'instance.networkDomain' && type['fieldName'] == 'id')
         } rescue [])
 
+        # remove metadata option_type , prompt manually for that field 'tags' instead of 'metadata'
+        #metadata_option_type = option_type_list.find {|type| type['fieldName'] == 'metadata' }
+        metadata_option_type = cluster_type['optionTypes'].find {|type| type['fieldName'] == 'metadata' }
+        option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
+
         server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id']}))
 
+        # Metadata Tags
+        if metadata_option_type
+          if options[:metadata]
+            metadata = parse_metadata(options[:metadata])
+            server_payload['tags'] = metadata if !metadata.empty?
+          else
+            metadata = prompt_metadata(options)
+            server_payload['tags'] = metadata if !metadata.empty?
+          end
+        end
+
         # Create User
         if !options[:createUser].nil?
           server_payload['config']['createUser'] = options[:createUser]

data/lib/morpheus/cli/commands/dashboard_command.rb

@@ -135,7 +135,7 @@ This includes instance and backup counts, favorite instances, monitoring and rec
       print as_pretty_table([json_response], monitoring_column_definitions.upcase_keys!, options)
 
       
-      if json_response['logStats']
+      if json_response['logStats'] && json_response['logStats']['data']
         # todo: should come from monitoring.startMs-endMs
         log_period_display = "7 Days"
         print_h2 "Logs (#{log_period_display})", options

data/lib/morpheus/cli/commands/execution_request_command.rb

@@ -83,12 +83,13 @@ class Morpheus::Cli::ExecutionRequestCommand
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
           options[:refresh_interval] = default_refresh_interval
         end
-        if execution_request['exitCode'] || ['complete','failed','expired'].include?(execution_request['status'])
+        if !(execution_request['status'] == 'pending' || execution_request['status'] == 'new')
           # it is finished
         else
           print cyan
-          print "Execution request has not yet finished. Refreshing every #{options[:refresh_interval]} seconds"
-          while execution_request['exitCode'].nil? do
+          refresh_display_seconds = options[:refresh_interval] % 1.0 == 0 ? options[:refresh_interval].to_i : options[:refresh_interval]
+          print "Execution request has not yet finished. Refreshing every #{refresh_display_seconds} seconds"
+          while execution_request['status'] == 'pending' || execution_request['status'] == 'new' do
             sleep(options[:refresh_interval])
             print cyan,".",reset
             json_response = @execution_request_interface.get(execution_request_id, params)
@@ -114,9 +115,13 @@ class Morpheus::Cli::ExecutionRequestCommand
         #"Created By" => lambda {|it| it['createdById'] },
         #"Subdomain" => lambda {|it| it['subdomain'] },
       }
+      description_cols.delete("Server ID") if execution_request['serverId'].nil?
+      description_cols.delete("Instance ID") if execution_request['instanceId'].nil?
+      description_cols.delete("Container ID") if execution_request['containerId'].nil?
+      description_cols.delete("Exit Code") if execution_request['exitCode'].nil?
       print_description_list(description_cols, execution_request)      
 
-      if execution_request['stdErr'] && execution_request['stdErr'] != "stdin: is not a tty\n"
+      if execution_request['stdErr'].to_s.strip != '' && execution_request['stdErr'] != "stdin: is not a tty\n"
         print_h2 "Error"
         puts execution_request['stdErr'].to_s.strip
       end

data/lib/morpheus/cli/commands/file_copy_request_command.rb

@@ -80,7 +80,8 @@ class Morpheus::Cli::FileCopyRequestCommand
           # it is finished
         else
           print cyan
-          print "File copy request has not yet finished. Refreshing every #{options[:refresh_interval]} seconds"
+          refresh_display_seconds = options[:refresh_interval] % 1.0 == 0 ? options[:refresh_interval].to_i : options[:refresh_interval]
+          print "File copy request has not yet finished. Refreshing every #{refresh_display_seconds} seconds"
           while !['complete','failed','expired'].include?(file_copy_request['status']) do
             sleep(options[:refresh_interval])
             print cyan,".",reset

data/lib/morpheus/cli/commands/instances.rb

@@ -8,6 +8,7 @@ class Morpheus::Cli::Instances
   include Morpheus::Cli::DeploymentsHelper
   include Morpheus::Cli::ProcessesHelper
   include Morpheus::Cli::LogsHelper
+  include Morpheus::Cli::ExecutionRequestHelper
 
   set_command_name :instances
   set_command_description "View and manage instances."
@@ -24,12 +25,15 @@ class Morpheus::Cli::Instances
                        :wiki, :update_wiki,
                        {:exec => :execution_request},
                        :deploys,
-                       :refresh, :apply
+                       :refresh, :prepare_apply, :plan, :apply, :state
   #register_subcommands :firewall_disable, :firewall_enable
   # register_subcommands {:'lb-update' => :load_balancer_update}
   alias_subcommand :details, :get
   set_default_subcommand :list
 
+  # hide these for now
+  set_subcommands_hidden :prepare_apply
+
   def initialize()
     #@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
@@ -4549,19 +4553,22 @@ EOT
     end
   end
 
-  def apply(args)
+  def prepare_apply(args)
     params, payload, options = {}, {}, {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance] [options]")
       build_standard_update_options(opts, options, [:auto_confirm])
       opts.footer = <<-EOT
-Apply an instance.
+Prepare to apply an instance.
 [instance] is required. This is the name or id of an instance.
+Displays the current configuration data used by the apply command.
 This is only supported by certain types of instances such as terraform.
 EOT
     end
     optparse.parse!(args)
-    verify_args!(args:args, optparse:optparse, count:1)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
+    end
     connect(options)
 
     begin
@@ -4577,10 +4584,131 @@ EOT
         payload.deep_merge!(parse_passed_options(options))
         # raise_command_error "Specify at least one option to update.\n#{optparse}" if payload.empty?
       end
-      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to apply this instance: #{instance['name']}?")
-        return 9, "aborted command"
-      end
       @instances_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.prepare_apply(instance["id"], params)
+        return
+      end
+      json_response = @instances_interface.prepare_apply(instance["id"], params)
+      render_result = render_with_format(json_response, options)
+      return 0 if render_result
+      # print_green_success "Prepared to apply instance: #{instance['name']}"
+      print_h1 "Prepared Instance: #{instance['name']}"
+      instance_config = json_response['data'] 
+      # instance_config = json_response if instance_config.nil?
+      puts as_yaml(instance_config, options)
+      #return get([app['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      print "\n", reset
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def apply(args)
+    default_refresh_interval = 15
+    params, payload, options = {}, {}, {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [options]")
+      opts.on( '-p', '--parameter NAME=VALUE', "Template parameter name and value" ) do |val|
+        k, v = val.split("=")
+        options[:options]['templateParameter'] ||= {}
+        options[:options]['templateParameter'][k] = v
+      end
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is complete. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh" ) do
+        options[:no_refresh] = true
+      end
+      opts.on(nil, '--no-validate', "Do not validate planned changes before apply" ) do
+        options[:no_validate] = true
+      end
+      opts.on(nil, '--validate-only', "Only validate planned changes, do not execute the apply command." ) do
+        options[:validate_only] = true
+      end
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Apply an instance.
+[instance] is required. This is the name or id of an instance.
+This is only supported by certain types of instances such as terraform.
+By default this executes two requests to validate and then apply the changes.
+The first request corresponds to the terraform plan command only.
+Use --no-validate to skip this step apply changes in one step.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+
+    instance = find_instance_by_name_or_id(args[0])
+    return 1 if instance.nil?
+    # construct request
+    params.merge!(parse_query_options(options))
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!(parse_passed_options(options))
+    else
+      payload.deep_merge!(parse_passed_options(options))
+      # attempt to load prepare-apply to get templateParameter values and prompt for them
+      # ok, actually use options/layoutParameters to get the list of parameters
+      begin
+        prepare_apply_json_response = @instances_interface.prepare_apply(instance["id"])
+        config = prepare_apply_json_response['data']
+        variable_map = config['templateParameter']
+        api_params = {layoutId: instance['layout']['id'], instanceId: instance['id'], zoneId: instance['cloud']['id'], siteId: instance['group']['id']}
+        layout_parameters = @options_interface.options_for_source('layoutParameters',api_params)['data']
+
+        if layout_parameters && !layout_parameters.empty?
+          variable_option_types = []
+          i = 0
+          layout_parameters.each do |layout_parameter|
+            var_label = layout_parameter['displayName'] || layout_parameter['name']
+            var_name = layout_parameter['name']
+            var_value = variable_map ? variable_map[var_name] : layout_parameter['defaultValue']
+            if var_value.nil? && layout_parameter['defaultValue']
+              var_value = layout_parameter['defaultValue']
+            end
+            var_type = (layout_parameter['passwordType'] || layout_parameter['sensitive']) ? 'password' : 'text'
+            option_type = {'fieldContext' => 'templateParameter', 'fieldName' => var_name, 'fieldLabel' => var_label, 'type' => var_type, 'required' => true, 'defaultValue' => (var_value.to_s.empty? ? nil : var_value.to_s), 'displayOrder' => (i+1) }
+            variable_option_types << option_type
+            i+=1
+          end
+          blueprint_type_display = format_blueprint_type(instance['layout']['provisionTypeCode'])
+          if blueprint_type_display == "terraform"
+            blueprint_type_display = "Terraform"
+          end
+          print_h2 "#{blueprint_type_display} Variables"
+          v_prompt = Morpheus::Cli::OptionTypes.prompt(variable_option_types, options[:options], @api_client)
+          v_prompt.deep_compact!
+          payload.deep_merge!(v_prompt)
+        end
+      rescue RestClient::Exception => ex
+        # if e.response && e.response.code == 404
+        Morpheus::Logging::DarkPrinter.puts "Unable to load config for instance apply, skipping parameter prompting" if Morpheus::Logging.debug?
+        # print_rest_exception(ex, options)
+        # end
+      end
+    end
+
+    @instances_interface.setopts(options)
+    if options[:validate_only]
+      # validate only
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.validate_apply(instance["id"], params, payload)
+        return
+      end
+      json_response = @instances_interface.validate_apply(instance["id"], params, payload)
+      print_green_success "Validating instance #{instance['name']}"
+      execution_id = json_response['executionId']
+      if !options[:no_refresh]
+        #Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_id, "--refresh", options[:refresh_interval].to_s]+ (options[:remote] ? ["-r",options[:remote]] : []))
+        validate_execution_request = wait_for_execution_request(execution_id, options)
+      end
+    elsif options[:no_validate]
+      # skip validate, apply only
       if options[:dry_run]
         print_dry_run @instances_interface.dry.apply(instance["id"], params, payload)
         return
@@ -4588,17 +4716,172 @@ EOT
       json_response = @instances_interface.apply(instance["id"], params, payload)
       render_response(json_response, options) do
         print_green_success "Applying instance #{instance['name']}"
-        # return _get(instance['id'], options)
+        execution_id = json_response['executionId']        
+        if !options[:no_refresh]
+          #Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_id, "--refresh", options[:refresh_interval].to_s]+ (options[:remote] ? ["-r",options[:remote]] : []))
+          apply_execution_request = wait_for_execution_request(execution_id, options)
+        end
+      end
+    else
+      # validate and then apply
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.validate_apply(instance["id"], params, payload)
+        print_dry_run @instances_interface.dry.apply(instance["id"], params, payload)
+        return
+      end
+      json_response = @instances_interface.validate_apply(instance["id"], params, payload)
+      print_green_success "Validating instance #{instance['name']}"
+      execution_id = json_response['executionId']
+      validate_execution_request = wait_for_execution_request(execution_id, options)
+      if validate_execution_request['status'] != 'complete'
+        print_red_alert "Validation failed. Changes will not be applied."
+        return 1, "Validation failed. Changes will not be applied."
+      else
+        unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to apply these changes?")
+          return 9, "aborted command"
+        end
+        json_response = @instances_interface.apply(instance["id"], params, payload)
+        render_response(json_response, options) do
+          print_green_success "Applying instance #{instance['name']}"
+          execution_id = json_response['executionId']        
+          if !options[:no_refresh]
+            #Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_id, "--refresh", options[:refresh_interval].to_s]+ (options[:remote] ? ["-r",options[:remote]] : []))
+            apply_execution_request = wait_for_execution_request(execution_id, options)
+          end
+        end
       end
-      return 0, nil
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
-  # todo: print state summary
-  def state_summary(args)
+  def state(args)
+    params, payload, options = {}, {}, {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [options]")
+      opts.on('--data', "Display State Data") do
+        options[:include_state_data] = true
+      end
+      opts.on('--specs', "Display Spec Templates") do
+        options[:include_spec_templates] = true
+      end
+      opts.on('--plan', "Display Plan Data") do
+        options[:include_plan_data] = true
+      end
+      opts.on('--input', "Display Input") do
+        options[:include_input] = true
+      end
+      opts.on('--output', "Display Output") do
+        options[:include_output] = true
+      end
+      opts.on('-a','--all', "Display All Details") do
+        options[:include_state_data] = true
+        options[:include_spec_templates] = true
+        options[:include_plan_data] = true
+        options[:include_input] = true
+        options[:include_output] = true
+        options[:details] = true
+      end
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+View state of an instance.
+[instance] is required. This is the name or id of an instance.
+This is only supported by certain types of apps such as terraform.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    instance = find_instance_by_name_or_id(args[0])
+      return 1 if instance.nil?
+    # construct request
+    params.merge!(parse_query_options(options))
+    @instances_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @instances_interface.dry.state(instance["id"], params)
+      return
+    end
+    json_response = @instances_interface.state(instance["id"], params)
+    render_result = render_with_format(json_response, options)
+    return 0 if render_result
+    print_h1 "Instance State: #{instance['name']}", options
+    # print_h2 "Workloads", options
+    if json_response['workloads'] && !json_response['workloads'].empty?
+      workload_columns = {
+        "Name" => lambda {|it| it['subRefName'].to_s.empty? ? "#{it['refName']}" : "#{it['refName']} - #{it['subRefName']}" },
+        "Last Check" => lambda {|it| format_local_dt(it['stateDate']) },
+        "Status" => lambda {|it| format_ok_status(it['status'] || 'ok') },
+        "Drift Status" => lambda {|it| it['iacDrift'] ? "Drift" : "No Drift" }
+      }
+      print as_pretty_table(json_response['workloads'], workload_columns.upcase_keys!, options)
+    else
+      print cyan,"No workloads found.",reset,"\n"
+    end
+    if options[:include_state_data]
+      print_h2 "State Data", options
+      puts json_response['stateData']
+    end
+    if options[:include_spec_templates]
+      print_h2 "Spec Templates", options
+      spec_templates_columns = {
+        "Resource Spec" => lambda {|it| it['name'] || (it['template'] ? it['template']['name'] : nil) },
+        "Attached to Source Template" => lambda {|it| format_boolean(!it['isolated']) },
+        "Source Spec Template" => lambda {|it| (it['template'] ? it['template']['name'] : nil) || it['name'] }
+      }
+      print as_pretty_table(json_response['specs'], spec_templates_columns.upcase_keys!, options)
+      # print "\n", reset
+    end
+    if options[:include_plan_data]
+      # print_h2 "Plan Data", options
+      if instance['type'] == 'terraform' || instance['layout']['provisionTypeCode'] == 'terraform'
+        print_h2 "Terraform Plan", options
+      else
+        print_h2 "Plan Data", options
+      end
+      puts json_response['planData']
+      # print "\n", reset
+    end
+    if options[:include_input]
+      # print_h2 "Input"
+      if json_response['input'] && json_response['input']['variables']
+        print_h2 "VARIABLES", options
+        input_variable_columns = {
+          "Name" => lambda {|it| it['name'] },
+          "Value" => lambda {|it| it['value'] }
+        }
+        print as_pretty_table(json_response['input']['variables'], input_variable_columns.upcase_keys!, options)
+      end
+      if json_response['input'] && json_response['input']['providers']
+        print_h2 "PROVIDERS", options
+        input_provider_columns = {
+          "Name" => lambda {|it| it['name'] }
+        }
+        print as_pretty_table(json_response['input']['providers'], input_provider_columns.upcase_keys!, options)
+      end
+      if json_response['input'] && json_response['input']['data']
+        print_h2 "DATA", options
+        input_data_columns = {
+          "Type" => lambda {|it| it['type'] },
+          "Key" => lambda {|it| it['key'] },
+          "Name" => lambda {|it| it['name'] }
+        }
+        print as_pretty_table(json_response['input']['data'], input_data_columns.upcase_keys!, options)
+      end
+      # print "\n", reset
+    end
+    if options[:include_output]
+      # print_h2 "Output", options
+      if json_response['output'] && json_response['output']['outputs']
+        print_h2 "OUTPUTS", options
+        input_variable_columns = {
+          "Name" => lambda {|it| it['name'] },
+          "Value" => lambda {|it| it['value'] }
+        }
+        print as_pretty_table(json_response['output']['outputs'], input_variable_columns.upcase_keys!, options)
+      end
+      # print "\n", reset
+    end
+    print "\n", reset
+    return 0
   end
 
 private

data/lib/morpheus/cli/commands/library_layouts_command.rb

@@ -187,6 +187,7 @@ EOT
           ""
         end
       },
+      "Tfvar Secret" => lambda {|it| it['tfvarSecret'] },
       # "Category" => lambda {|it| it['category'].to_s.capitalize },
       # # "Logo" => lambda {|it| it['logo'].to_s },
       # "Visiblity" => lambda {|it| it['visibility'].to_s.capitalize },
@@ -200,6 +201,7 @@ EOT
       # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
     }
+    description_cols.delete("Tfvar Secret") if !(layout['provisionType'] && layout['provisionType']['code'] == 'terraform')
     print_description_list(description_cols, layout)
 
     
@@ -338,6 +340,9 @@ EOT
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--tfvar-secret VALUE', String, "Tfvar Secret name, eg. 'tfvars/dev-key'") do |val|
+        params['tfvarSecret'] = val == 'null' ? nil : val
+      end
       add_perms_options(opts, options, layout_permission_excludes)
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
@@ -453,6 +458,13 @@ EOT
           return 1
         end
         
+        # TFVAR SECRET
+        if !params['tfvarSecret']
+          if provision_type && provision_type['code'] == 'terraform'
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tfvarSecret', 'type' => 'select', 'optionSource' => 'tfvarSecrets', 'fieldLabel' => 'Tfvar Secret', 'required' => false}], options[:options], @api_client)
+            params['tfvarSecret'] = v_prompt['tfvarSecret'] if v_prompt['tfvarSecret']
+          end
+        end
 
         payload = {'instanceTypeLayout' => params}
         
@@ -544,6 +556,9 @@ EOT
           params['specTemplates'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('--tfvar-secret VALUE', String, "Tfvar Secret name, eg. 'tfvars/dev-key'") do |val|
+        params['tfvarSecret'] = val == 'null' ? nil : val
+      end
       add_perms_options(opts, options, layout_permission_excludes)
       build_standard_update_options(opts, options)
             opts.footer = <<-EOT

data/lib/morpheus/cli/commands/provisioning_licenses_command.rb

@@ -489,7 +489,7 @@ class Morpheus::Cli::ProvisioningLicensesCommand
       {'fieldName' => 'licenseVersion', 'fieldLabel' => 'Version', 'type' => 'text', 'displayOrder' => 6},
       {'fieldName' => 'copies', 'fieldLabel' => 'Copies', 'type' => 'number', 'required' => true, 'defaultValue' => 1, 'displayOrder' => 7},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldName' => 'virtualImages', 'fieldLabel' => 'Virtual Images', 'type' => 'multiSelect', 'optionSource' => lambda { 
+      {'fieldName' => 'virtualImages', 'fieldLabel' => 'Virtual Images', 'type' => 'multiSelect', 'optionSource' => lambda { |api_client, api_params| 
         # @options_interface.options_for_source("virtualImages", {})['data']
         get_virtual_images_dropdown()
       }, 'displayOrder' => 9},