morpheus-cli 3.3.1.2 → 3.3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e733c8e17b5f716f3ddbc77cfd4f4a4edcd4829
-  data.tar.gz: a84c8fe72b59941c634cb7fb9cd65d50f09baf77
+  metadata.gz: 6dca5394d3b291c04ad94c20fd9070c3edf671c1
+  data.tar.gz: 0ff1d952e7bb43abab664b76070fa6e3caf0040b
 SHA512:
-  metadata.gz: 4ef7d578657dceaf7d2eb8ab41386af3d344e8df567f41d05034c8d44a7fef43271e3d7f95f691c2fe461098b17e6b63713df97cdd95f33783e35d564c542000
-  data.tar.gz: 16b13439ac6db6a6ea4267a8e09dbd53c2d10f6e3ce78e7c2b5a7a767a067aab06ed005cdffb67077ad78ac9c015848a40ce46378bb694a0baacfa9e4c693ad2
+  metadata.gz: 180055da960a32d3f91d62c0e14d3b2f17bff1d62583bed8996e1c293f032813e4a8cce9b31b61516ab633cbc4bbc727b75eeb3acaf8cc3761f156113984b648
+  data.tar.gz: 81f35079f2e9bb2996326aa3cc2b6a054985618202c9dfd50730f556ade6a5111994c596614f4a5061d74aceeba021bff4f5ee5bf591fd30f6920cd59e73bef0

data/lib/morpheus/cli/apps.rb

@@ -92,6 +92,7 @@ class Morpheus::Cli::Apps
   end
 
   def add(args)
+    template_id = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
@@ -157,8 +158,23 @@ class Morpheus::Cli::Apps
         payload = {}
         params = Morpheus::Cli::OptionTypes.prompt(add_app_option_types, options[:options], @api_client, options[:params])
         params = params.deep_compact! # remove nulls and blank strings
-        if params['template']
-          params['id'] = params.delete('template')
+        template_id = params.delete('template')
+        if template_id.to_s.empty? || template_id == 'existing'
+          # new API parameter
+          payload['templateId'] = 'existing'
+          # API versions before 3.3.1 expect both of these instead of templateId
+          payload['id'] = 'existing'
+          payload['templateName'] = 'Existing Instances'
+        else
+          found_app_template = get_available_app_templates.find {|it| it['id'].to_s == template_id.to_s }
+          if found_app_template.nil?
+            print_red_alert "App Template not found by id #{template_id}"
+            return 1
+          end
+          payload['templateId'] = found_app_template['id']
+          # API versions before 3.3.1 expect both of these instead of templateId
+          payload['id'] = found_app_template['id']
+          payload['templateName'] = found_app_template['name']
         end
         group = find_group_by_name_or_id_for_provisioning(params.delete('group'))
         return if group.nil?
@@ -166,17 +182,6 @@ class Morpheus::Cli::Apps
         payload['group'] = {id: group['id'], name: group['name']}
       end
 
-      # allow creating a blank app by default
-      # sux having go merge this into user passed config/configFile
-      # but it's better than making them know to enter it.
-      if !payload['id']
-        payload['id'] = 'existing'
-        payload['templateName'] = 'Existing Instances'
-      else
-        # maybe validate template id
-        # app_template = find_app_template_by_id(payload['id'])
-      end
-
       if options[:dry_run]
         print_dry_run @apps_interface.dry.create(payload)
         return

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.3.1.2"
+    VERSION = "3.3.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.3.1.2
+  version: 3.3.1.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler