morpheus-cli 5.3.0.3 → 5.3.2.1

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.3.0.3"
+    VERSION = "5.3.2.1"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -20,7 +20,7 @@ class Morpheus::Cli::VirtualImages
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @virtual_images_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).virtual_images
+    @virtual_images_interface = @api_client.virtual_images
   end
 
   def handle(args)

data/lib/morpheus/cli/whoami.rb

@@ -319,21 +319,6 @@ EOT
           set_whoami_cache(appliance_name, user_id, result)
         end
       end
-      # if result.nil?
-      #   # appliance needs to be passed in here...heh
-      #   appliance = ::Morpheus::Cli::Remote.load_remote(appliance_name)
-      #   if appliance.nil?
-      #     raise "Remote not found for name '#{appliance_name}'"
-      #   end
-      #   wallet = ::Morpheus::Cli::Credentials.new(appliance[:name], appliance[:url]).load_saved_credentials()
-      #   if wallet.nil? || wallet['access_token'].nil?
-      #     raise "Access token not found for remote '#{appliance_name}'"
-      #   end
-      #   access_token = wallet['access_token']
-      #   whoami_interface = Morpheus::WhoamiInterface.new({url: appliance[:url], access_token: wallet['access_token']})
-      #   whoami_response = whoami_interface.get()
-      #   result = whoami_response
-      # end
       return result
     end
 

data/lib/morpheus/cli/wiki_command.rb

@@ -16,7 +16,7 @@ class Morpheus::Cli::WikiCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @wiki_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).wiki
+    @wiki_interface = @api_client.wiki
   end
 
   def handle(args)

data/lib/morpheus/ext/string.rb

@@ -0,0 +1,41 @@
+class String
+  
+  def pluralize
+    value = self
+    if value == ""
+      value
+    elsif value[-1].chr == "y"
+      value[0..-2] + "ies"
+    elsif value[-1].chr == "s"
+      if value[-2..-1] == "es"
+        value
+      else
+        value + "es"
+      end
+    else
+      value + "s"
+    end
+  end
+
+  def singularize
+    value = self
+    if value == ""
+      value
+    elsif value.size > 3 && value[-3..-1] == "ies"
+      value[0..-4] + "y"
+    elsif value.size > 2 && value[-3..-1] == "ses"
+      value[0..-3]
+    elsif value[-1] == "s"
+      value[0..-2]
+    end
+  end
+
+  def dasherize
+    self.gsub(" ", "-").gsub("_", "-")
+  end
+
+  def underscoreize
+    self.gsub(" ", "_").gsub("-", "_")
+  end
+
+end

data/lib/morpheus/formatters.rb

@@ -472,3 +472,7 @@ def format_name_values(obj)
     ""
   end
 end
+
+def a_or_an(v)
+  v.to_s =~ /^[aeiou]/i ? "an" : "a"
+end

data/lib/morpheus/rest_client.rb

@@ -44,8 +44,22 @@ module Morpheus
         end
         query_string = params
         if query_string.respond_to?(:map)
+          if options[:grails_params] != false
+            query_string = grails_params(query_string)
+          end
           query_string = URI.encode_www_form(query_string)
         end
+        # grails expects dot notation in body params
+        if opts[:method] == :post || opts[:method] == :put
+          if opts[:headers]['Content-Type'].nil? || opts[:headers]['Content-Type'] == 'application/x-www-form-urlencoded' || opts[:headers]['Content-Type'] == 'multipart/form-data'
+            if opts[:payload].respond_to?(:map)
+              if opts[:grails_params] != false
+                # puts "grailsifying it!"
+                opts[:payload] = grails_params(opts[:payload])
+              end
+            end
+          end
+        end
         if query_string && !query_string.empty?
           opts[:url] = "#{opts[:url]}?#{query_string}"
         end
@@ -69,6 +83,22 @@ module Morpheus
         @@ssl_verification_enabled = verify
       end
 
+      def grails_params(data, context=nil)
+        params = {}
+        data.each do |k,v|
+          if v.is_a?(Hash)
+            params.merge!(grails_params(v, context ? "#{context}.#{k.to_s}" : k))
+          else
+            if context
+              params["#{context}.#{k.to_s}"] = v
+            else
+              params[k] = v
+            end
+          end
+        end
+        return params
+      end
+
     end
   end
 end

data/lib/morpheus/terminal.rb

@@ -19,17 +19,25 @@ module Morpheus
   #
   # ==== Example Usage
   #
-  #    morph = Morpheus::Terminal.new
-  #    exit_code, err = morph.execute("instances list -m 10")
+  #    require 'morpheus/terminal'
+  #
+  #    # Write output to STDOUT is the default behavior
+  #
+  #    terminal = Morpheus::Terminal.new
+  #    exit_code, err = terminal.execute("instances list -m 10")
   #    assert exit_code == 0
   #    assert err == nil
   #
-  #    morph = Morpheus::Terminal.new(STDIN, File.new("/tmp/morph.log", "w+"))
-  #    morph.execute("hosts get 23")
+  #    # Write command output to a file instead
+  #    terminal = Morpheus::Terminal.new(stdout: File.new("morpheus-terminal.log", "w+"))
+  #    terminal.execute("version")
+  #    terminal.execute("instances list")
+  #    terminal.execute("apps list")
   #
-  #    morph = Morpheus::Terminal.new(STDIN, File.new("/tmp/host23.json", "w"))
-  #    morph.execute("hosts get 23 --json")
-  #    puts File.read("/tmp/host23.json")
+  #    # Overwrite file with output of a command
+  #    terminal = Morpheus::Terminal.new(stdout: File.new("instance23.json", "w"))
+  #    terminal.execute("instances get 23 --json")
+  #    puts "Instance 23 Details: ", File.read("instance23.json")
   #
   class Terminal
     include Morpheus::Benchmarking::HasBenchmarking

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.3.0.3
+  version: 5.3.2.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,8 @@ files:
 - lib/morpheus/api/blueprints_interface.rb
 - lib/morpheus/api/budgets_interface.rb
 - lib/morpheus/api/catalog_item_types_interface.rb
+- lib/morpheus/api/certificate_types_interface.rb
+- lib/morpheus/api/certificates_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
 - lib/morpheus/api/cloud_folders_interface.rb
 - lib/morpheus/api/cloud_policies_interface.rb
@@ -218,6 +220,7 @@ files:
 - lib/morpheus/api/image_builder_preseed_scripts_interface.rb
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
+- lib/morpheus/api/integration_types_interface.rb
 - lib/morpheus/api/integrations_interface.rb
 - lib/morpheus/api/invoice_line_items_interface.rb
 - lib/morpheus/api/invoices_interface.rb
@@ -233,6 +236,9 @@ files:
 - lib/morpheus/api/library_spec_template_types_interface.rb
 - lib/morpheus/api/library_spec_templates_interface.rb
 - lib/morpheus/api/license_interface.rb
+- lib/morpheus/api/load_balancer_pools_interface.rb
+- lib/morpheus/api/load_balancer_types_interface.rb
+- lib/morpheus/api/load_balancer_virtual_servers_interface.rb
 - lib/morpheus/api/load_balancers_interface.rb
 - lib/morpheus/api/log_settings_interface.rb
 - lib/morpheus/api/logs_interface.rb
@@ -271,10 +277,13 @@ files:
 - lib/morpheus/api/provisioning_license_types_interface.rb
 - lib/morpheus/api/provisioning_licenses_interface.rb
 - lib/morpheus/api/provisioning_settings_interface.rb
+- lib/morpheus/api/read_interface.rb
 - lib/morpheus/api/reports_interface.rb
 - lib/morpheus/api/rest_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/search_interface.rb
+- lib/morpheus/api/secondary_read_interface.rb
+- lib/morpheus/api/secondary_rest_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
 - lib/morpheus/api/security_groups_interface.rb
 - lib/morpheus/api/server_types_interface.rb
@@ -292,6 +301,11 @@ files:
 - lib/morpheus/api/user_settings_interface.rb
 - lib/morpheus/api/user_sources_interface.rb
 - lib/morpheus/api/users_interface.rb
+- lib/morpheus/api/vdi_allocations_interface.rb
+- lib/morpheus/api/vdi_apps_interface.rb
+- lib/morpheus/api/vdi_gateways_interface.rb
+- lib/morpheus/api/vdi_interface.rb
+- lib/morpheus/api/vdi_pools_interface.rb
 - lib/morpheus/api/virtual_images_interface.rb
 - lib/morpheus/api/whitelabel_settings_interface.rb
 - lib/morpheus/api/whoami_interface.rb
@@ -312,6 +326,7 @@ files:
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/budgets_command.rb
 - lib/morpheus/cli/catalog_item_types_command.rb
+- lib/morpheus/cli/certificates_command.rb
 - lib/morpheus/cli/change_password_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -382,6 +397,7 @@ files:
 - lib/morpheus/cli/library_spec_templates_command.rb
 - lib/morpheus/cli/library_upgrades_command.rb
 - lib/morpheus/cli/license.rb
+- lib/morpheus/cli/load_balancer_types.rb
 - lib/morpheus/cli/load_balancers.rb
 - lib/morpheus/cli/log_settings_command.rb
 - lib/morpheus/cli/login.rb
@@ -392,6 +408,7 @@ files:
 - lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
+- lib/morpheus/cli/mixins/load_balancers_helper.rb
 - lib/morpheus/cli/mixins/logs_helper.rb
 - lib/morpheus/cli/mixins/monitoring_helper.rb
 - lib/morpheus/cli/mixins/operations_helper.rb
@@ -400,6 +417,8 @@ files:
 - lib/morpheus/cli/mixins/processes_helper.rb
 - lib/morpheus/cli/mixins/provisioning_helper.rb
 - lib/morpheus/cli/mixins/remote_helper.rb
+- lib/morpheus/cli/mixins/rest_command.rb
+- lib/morpheus/cli/mixins/vdi_helper.rb
 - lib/morpheus/cli/mixins/whoami_helper.rb
 - lib/morpheus/cli/monitoring_alerts_command.rb
 - lib/morpheus/cli/monitoring_apps_command.rb
@@ -448,6 +467,11 @@ files:
 - lib/morpheus/cli/user_settings_command.rb
 - lib/morpheus/cli/user_sources_command.rb
 - lib/morpheus/cli/users.rb
+- lib/morpheus/cli/vdi_allocations_command.rb
+- lib/morpheus/cli/vdi_apps_command.rb
+- lib/morpheus/cli/vdi_command.rb
+- lib/morpheus/cli/vdi_gateways_command.rb
+- lib/morpheus/cli/vdi_pools_command.rb
 - lib/morpheus/cli/version.rb
 - lib/morpheus/cli/virtual_images.rb
 - lib/morpheus/cli/whitelabel_settings_command.rb
@@ -457,6 +481,7 @@ files:
 - lib/morpheus/ext/hash.rb
 - lib/morpheus/ext/nil_class.rb
 - lib/morpheus/ext/rest_client.rb
+- lib/morpheus/ext/string.rb
 - lib/morpheus/formatters.rb
 - lib/morpheus/logging.rb
 - lib/morpheus/morpkg.rb