morpheus-cli 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc76035aa0ef2357f45015b8a206bc573ac04920
-  data.tar.gz: 29937e60b69e809b83d4caa7f6011dff58b3d8a1
+  metadata.gz: 434f161f0f0e7b31eb27d2930d1944e3bf7df388
+  data.tar.gz: 1362db4a4894832d043898ced414b6e60c99a344
 SHA512:
-  metadata.gz: f71800dfb8fcf0890fb498726547bb692f02ee08baeb3f808653a81c73b14899a3eca97c8dc4d4276bbeb36f95876984890029e43793a39f867e53afc68f97eb
-  data.tar.gz: 1dc86e5c4dcf6ea494adb37d8e80b7dfafaa9c4b43f0d9bc0da22e6b5f525108b59940d88d25528aa5b8c2a879b66d439e355a93145b01fb8db5fcd6cdf5183d
+  metadata.gz: d701a012d0e66263f2d5b29c8426ecf24f627f9628cf167aecd54a30bc4ecfc6de1ee8249c012e21b93f439408d5dac4a23178d04627fd5a933cccbce7ad9ca2
+  data.tar.gz: 1415d32475a94b966ff1c1dd11d3cd79fd72d1fb37394d92dff020c85052a16b0073145058d3203817cb7ba8c1c18256b2b5a5b0e84c0fda2d99bca445e500a6

data/lib/morpheus/cli/instances.rb

@@ -165,15 +165,16 @@ class Morpheus::Cli::Instances
 		layout_id = layout_prompt['layout']
 		plan_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'servicePlan', 'type' => 'select', 'fieldLabel' => 'Plan', 'optionSource' => 'instanceServicePlans', 'required' => true, 'description' => 'Choose the appropriately sized plan for this instance'}],options[:options],@api_client,{groupId: groupId, zoneId: cloud, instanceTypeId: instance_type['id'], layoutId: layout_id, version: version_prompt['version']})
 		payload[:servicePlan] = plan_prompt['servicePlan']
+
 		layout = instance_type['instanceTypeLayouts'].find{ |lt| lt['id'].to_i == layout_id.to_i}
 		instance_type['instanceTypeLayouts'].sort! { |x,y| y['sortOrder'] <=> x['sortOrder'] }
 		
 		payload[:instance][:layout] = {id: layout['id']}
 
 		type_payload = {}
-		if !layout['optionTypes'].nil? && layout['optionTypes'].empty?
+		if !layout['optionTypes'].nil? && !layout['optionTypes'].empty?
 			type_payload = Morpheus::Cli::OptionTypes.prompt(layout['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
-		elsif !instance_type['optionTypes'].nil? && instance_type['optionTypes'].empty?
+		elsif !instance_type['optionTypes'].nil? && !instance_type['optionTypes'].empty?
 			type_payload = Morpheus::Cli::OptionTypes.prompt(instance_type['optionTypes'],options[:options],@api_client,{groupId: groupId, cloudId: cloud, zoneId: cloud, instanceTypeId: instance_type['id'], version: version_prompt['version']})
 		end
 		if !type_payload['config'].nil?
@@ -339,11 +340,11 @@ class Morpheus::Cli::Instances
 			print "\n" ,cyan, bold, "#{instance['name']} (#{instance['instanceType']['name']})\n","==================", "\n\n", reset, cyan
 			envs = env_results['envs'] || {}
 			if env_results['readOnlyEnvs']
-				envs += env_results['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") ? "********" : v, :export => true}}
+				envs += env_results['readOnlyEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value'], :export => true}}
 			end
 			tp envs, :name, :value, :export
 			print "\n" ,cyan, bold, "Imported Envs\n","==================", "\n\n", reset, cyan
-			 imported_envs = env_results['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") ? "********" : v}}
+			 imported_envs = env_results['importedEnvs'].map { |k,v| {:name => k, :value => k.downcase.include?("password") || v['masked'] ? "********" : v['value']}}
 			 tp imported_envs
 			print reset, "\n"
 			
@@ -359,8 +360,11 @@ class Morpheus::Cli::Instances
 		optparse = OptionParser.new do|opts|
 			opts.banner = "Usage: morpheus instances setenv INSTANCE NAME VALUE [-e]"
 			opts.on( '-e', "Exportable" ) do |exportable|
-					options[:export] = exportable
-				end
+				options[:export] = exportable
+			end
+			opts.on( '-M', "Masked" ) do |masked|
+				options[:masked] = masked
+			end
 			Morpheus::Cli::CliCommand.genericOptions(opts,options)
 		end
 		if args.count < 3
@@ -371,7 +375,7 @@ class Morpheus::Cli::Instances
 		connect(options)
 		begin
 			instance = find_instance_by_name(args[0])
-			evar = {name: args[1], value: args[2], export: options[:export]}
+			evar = {name: args[1], value: args[2], export: options[:export], masked: options[:masked]}
 			params = {}
 			@instances_interface.create_env(instance['id'], [evar])
 			envs([args[0]])

data/lib/morpheus/cli/option_types.rb

@@ -133,7 +133,7 @@ module Morpheus
           if option_type['optionSource']
             source_options = load_source_options(option_type['optionSource'],api_client,api_params)
           end
-          if !source_options['data'].nil? && !source_options['data'].count == 1 && option_type['skipSingleOption'] == true
+          if !source_options.nil? && !source_options.count == 1 && option_type['skipSingleOption'] == true
             value_found = true
             value = source_option['value']
           end

data/lib/morpheus/cli/version.rb

@@ -1,5 +1,5 @@
 module Morpheus
   module Cli
-    VERSION = "0.9.3"
+    VERSION = "0.9.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - David Estes