morpheus-cli 4.2.7 → 4.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126814172818496eedcb013dedfd88920675f1646b924b1304aa89986b4883d7
-  data.tar.gz: 936e0252a66ee0cd7ad99c691b87ed4e3a608ffd38810fccf4673c79dc53b47f
+  metadata.gz: 39ea88743d6ad4977058a608249545bffa88dfdd0bec6c80b23cd73d904cbf3d
+  data.tar.gz: 5b775dd9bdb4652c381c8166721560b5b49d9f5f4a64055bd51ef80189072ca6
 SHA512:
-  metadata.gz: 72ee705d6fa646418aa223fe6ba2ab2558850a8a949ab8d821018878c3288c486bde5175c2ce8d360db8587f5db9a1bd0e760af900216ec9fb82b407270648f2
-  data.tar.gz: 6bb390e9947db29cf1e5ead6ea4c1de0ff4f78b11268247616354d677d42b838edf9e87ffc976f75423576b98509bb98462630ce48020300cb3e749a6b4f5f01
+  metadata.gz: 00cbddb0b701321221a396758a1a344028c9e02608dfe5a1e8ea8ddc834a02c52b9ddb76b99b9a226f933763c5cefee9c22a07198262f6f57216edb2eb1f844f
+  data.tar.gz: bd44a4e080bdac78a9c6aae481f61c749041527332ccf09881e72ba63c8359bfb7658d05e9204ac957d8453314893bca24fb63d232007e1ab406bc23071854bf

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.7
+RUN gem install morpheus-cli -v 4.2.8
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -423,6 +423,13 @@ module Morpheus::Cli::ProvisioningHelper
       arbitrary_options.delete('environment')
       arbitrary_options.delete('instanceContext')
       arbitrary_options.delete('tags')
+      # these are used by prompt_network_interfaces
+      arbitrary_options.delete('networkInterface')
+      (2..10).each {|i| arbitrary_options.delete('networkInterface' + i.to_s) }
+      # these are used by prompt_volumes
+      arbitrary_options.delete('rootVolume')
+      arbitrary_options.delete('dataVolume')
+      (2..10).each {|i| arbitrary_options.delete('dataVolume' + i.to_s) }
       arbitrary_options.delete('lockedFields')
       # arbitrary_options.delete('ports')
       payload.deep_merge!(arbitrary_options)

data/lib/morpheus/cli/users.rb

@@ -223,25 +223,49 @@ class Morpheus::Cli::Users
       }
       print_description_list(description_cols, user)
 
-      available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
-      available_field_options.each do |field, label|
-        if !(field == 'sites' && is_tenant_account) && options["include_#{field}_access".to_sym]
-          access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
-          access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+      # backward compatibility
+      if user['access'].nil? && options[:include_features_access]
+        user_feature_permissions_json = @users_interface.feature_permissions(account_id, user['id'])
+        user_feature_permissions = user_feature_permissions_json['permissions'] || user_feature_permissions_json['featurePermissions']
 
-          print_h2 "#{label} Access", options
+        if user_feature_permissions
+          print_h2 "Feature Permissions", options
           print cyan
-
-          if access.count > 0
-            access.each {|it| it['access'] = get_access_string(it['access'])}
-
-            if ['features', 'instance_types'].include?(field)
-              print as_pretty_table(access, [:name, :code, :access], options)
-            else
-              print as_pretty_table(access, [:name, :access], options)
+          if user_feature_permissions.is_a?(Array)
+            rows = user_feature_permissions.collect do |it|
+              {name: it['name'], code: it['code'], access: get_access_string(it['access']) }
             end
+            print as_pretty_table(rows, [:name, :code, :access], options)
           else
-            println yellow,"No #{label} Access Found.",reset
+            rows = user_feature_permissions.collect do |code, access|
+              {code: code, access: get_access_string(access) }
+            end
+            print as_pretty_table(rows, [:code, :access], options)
+          end
+        else
+          puts yellow,"No permissions found.",reset
+        end
+      else
+        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
+        available_field_options.each do |field, label|
+          if !(field == 'sites' && is_tenant_account) && options["include_#{field}_access".to_sym]
+            access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
+            access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+
+            print_h2 "#{label} Access", options
+            print cyan
+
+            if access.count > 0
+              access.each {|it| it['access'] = get_access_string(it['access'])}
+
+              if ['features', 'instance_types'].include?(field)
+                print as_pretty_table(access, [:name, :code, :access], options)
+              else
+                print as_pretty_table(access, [:name, :access], options)
+              end
+            else
+              println yellow,"No #{label} Access Found.",reset
+            end
           end
         end
       end
@@ -287,38 +311,74 @@ class Morpheus::Cli::Users
 
       json_response = @users_interface.permissions(account_id, user['id'])
 
-      if options[:json]
-        puts as_json(json_response, options, 'access')
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, 'access')
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['access'], options)
-        return 0
-      end
+      # backward compatibility
+      if !json_response['permissions'].nil?
+        if options[:json]
+          puts as_json(json_response, options, 'permissions')
+          return 0
+        elsif options[:yaml]
+          puts as_yaml(json_response, options, 'permissions')
+          return 0
+        elsif options[:csv]
+          puts records_as_csv(json_response['permissions'], options)
+          return 0
+        else
+          user_feature_permissions = nil
+          # permissions (Array) has replaced featurePermissions (map)
+          user_feature_permissions = json_response['permissions'] || json_response['featurePermissions']
+          print_h1 "User Permissions: #{user['username']}", options
+          if user_feature_permissions
+            print cyan
+            if user_feature_permissions.is_a?(Array)
+              rows = user_feature_permissions.collect do |it|
+                {name: it['name'], code: it['code'], access: get_access_string(it['access']) }
+              end
+              print as_pretty_table(rows, [:name, :code, :access], options)
+            else
+              rows = user_feature_permissions.collect do |code, access|
+                {code: code, access: get_access_string(access) }
+              end
+              print as_pretty_table(rows, [:code, :access], options)
+            end
+
+          else
+            print yellow,"No permissions found.",reset,"\n"
+          end
+        end
+      else
+        if options[:json]
+          puts as_json(json_response, options, 'access')
+          return 0
+        elsif options[:yaml]
+          puts as_yaml(json_response, options, 'access')
+          return 0
+        elsif options[:csv]
+          puts records_as_csv(json_response['access'], options)
+          return 0
+        end
 
-      print_h1 "User Permissions: #{user['username']}", options
+        print_h1 "User Permissions: #{user['username']}", options
 
-      available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
-      available_field_options.each do |field, label|
-        if !(field == 'sites' && is_tenant_account)
-          access = json_response['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
-          access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
+        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint'}
+        available_field_options.each do |field, label|
+          if !(field == 'sites' && is_tenant_account)
+            access = json_response['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
+            access = access.reject {|it| it['access'] == 'none'} if !options[:display_none_access]
 
-          print_h2 "#{label} Access", options
-          print cyan
+            print_h2 "#{label} Access", options
+            print cyan
 
-          if access.count > 0
-            access.each {|it| it['access'] = get_access_string(it['access'])}
+            if access.count > 0
+              access.each {|it| it['access'] = get_access_string(it['access'])}
 
-            if ['features', 'instance_types'].include?(field)
-              print as_pretty_table(access, [:name, :code, :access], options)
+              if ['features', 'instance_types'].include?(field)
+                print as_pretty_table(access, [:name, :code, :access], options)
+              else
+                print as_pretty_table(access, [:name, :access], options)
+              end
             else
-              print as_pretty_table(access, [:name, :access], options)
+              println yellow,"No #{label} Access Found.",reset
             end
-          else
-            println yellow,"No #{label} Access Found.",reset
           end
         end
       end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.7"
+    VERSION = "4.2.8"
   end
 end

data/lib/morpheus/cli/workflows.rb

@@ -29,15 +29,24 @@ class Morpheus::Cli::Workflows
 
 
   def list(args)
+    params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on("-t", "--type TYPE", "Type of workflow. i.e. provision or operation. Default is provision.") do |val|
+        workflow_type = val.to_s.downcase
+        if workflow_type.include?('provision')
+          workflow_type = 'provision'
+        elsif workflow_type.include?('operation')
+          workflow_type = 'operation'
+        end
+        params['type'] = workflow_type
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
     begin
-      params = {}
       params.merge!(parse_list_options(options))
       @task_sets_interface.setopts(options)
       if options[:dry_run]
@@ -61,6 +70,9 @@ class Morpheus::Cli::Workflows
         title = "Morpheus Workflows"
         subtitles = []
         subtitles += parse_list_subtitles(options)
+        if params['type']
+          subtitles << "Type: #{params['type']}"
+        end
         print_h1 title, subtitles
         if task_sets.empty?
           print cyan,"No workflows found.",reset,"\n"

metadata

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