morpheus-cli 5.5.1 → 5.5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9a8ef29c8d96c51593c8c762e94e34409426fb787ce3944396af9fc1e71279
-  data.tar.gz: 9a89c3ce4161499a9cf9df9ec30d48f0f8e9f4faf04746a19f966c1dc6cda7fd
+  metadata.gz: c60f08b038db5460dc2fbcb4ca3626f8784164f89ff477cd9b4ef0b32073a16e
+  data.tar.gz: 1b2a47809e7826fec9893d7b9899ee96e536c6661f4de7eedc4f467756dde5e5
 SHA512:
-  metadata.gz: 2d4ef36713c80b4ce6c9037b5ac971f8abdcd65ad4ff732a7e1c9ab89e46ca7199fa4ce7f4bcb5cbe67e79236f9b90ee7b894d1d62ea5809c6da4c7b54e7ca7b
-  data.tar.gz: fc6fca36a81248ad7f44c8dd7aabb03fe60d7b9aaafd03311385a7b86a101a1cfb180dacf1a33d7306a5e5cf204d70ffb7e61ca02cef3c5180ff52df89d8fe65
+  metadata.gz: 89fcdd4815408d056d3fd6adb79bcc82f7d26eaf6fdc9d6d640289d554cdab0f7c4eeeef55f130299a67b599a1e2746263d55eab209165e91e11e68d1e5cb8f8
+  data.tar.gz: 7fa16441f2d3612f1af1f86f8cb3c86363abd2f36f49f8da47550b6b2901a60227acc8407ab93e9a71e9d147431e0513905b9d63153378294a7bd57e0127b656

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -836,6 +836,14 @@ class Morpheus::APIClient
     Morpheus::BackupJobsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def backup_services
+    Morpheus::BackupServicesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def backup_service_types
+    Morpheus::BackupServiceTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def catalog_item_types
     Morpheus::CatalogItemTypesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/backup_service_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::BackupServiceTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/backup-service-types"
+  end
+
+end

data/lib/morpheus/api/backup_services_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::BackupServicesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/backup-services"
+  end
+
+end

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

@@ -0,0 +1,44 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::BackupServices
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+
+  set_command_description "View and manage backup services."
+  set_command_name :'backup-services'
+  register_subcommands :list, :get, :add, :update, :remove
+  register_interfaces :backup_services, :backup_service_types
+  set_rest_has_type true
+
+  protected
+
+  def load_option_types_for_backup_service(record_type, parent_record)
+    [
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => 'on', 'displayOrder' => 2},
+      {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Public', 'value' => 'public'}, {'name' => 'Private', 'value' => 'private'}], 'defaultValue' => 'public', 'displayOrder' => 1000}
+    ] + record_type['optionTypes']
+  end
+
+  def backup_service_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Status" => 'status',
+      "Visibility" => 'visibility'
+    }
+  end
+
+  def backup_service_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Enabled" => 'enabled',
+      "Api URL" => 'serviceUrl',
+      "Host" => 'host',
+      "Port" => 'port',
+      "Credential" => lambda {|it| it['credential']['type'] == 'local' ? 'local' : it['credential']['name']},
+      "Visibility" => 'visibility'
+    }
+  end
+end

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

@@ -985,9 +985,15 @@ class Morpheus::Cli::Clouds
     # Details (zoneType.optionTypes)
 
     if cloud_type && cloud_type['optionTypes']
+      if !cloud_type['optionTypes'].find {|opt| opt['type'] == 'credential'}
+        tmp_option_types << {'fieldName' => 'type', 'fieldLabel' => 'Credentials', 'type' => 'credential', 'optionSource' => 'credentials', 'required' => true, 'defaultValue' => 'local', 'config' => {'credentialTypes' => ['username-password']}, 'displayOrder' => 7}
+        cloud_type['optionTypes'].select {|opt| ['username', 'password', 'serviceUsername', 'servicePassword'].include?(opt['fieldName'])}.each {|opt| opt['localCredential'] = true}
+      end
       # adjust displayOrder to put these at the end
       #tmp_option_types = tmp_option_types + cloud_type['optionTypes']
       cloud_type['optionTypes'].each do |opt|
+        # temp fix for typo
+        opt['optionSource'] = 'credentials' if opt['optionSource'] == 'credentials,'
         tmp_option_types << opt.merge({'displayOrder' => opt['displayOrder'].to_i + 100})
       end
     end

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

@@ -879,10 +879,10 @@ EOT
   def add_deployment_version_option_types
     [
       {'fieldName' => 'userVersion', 'fieldLabel' => 'Version', 'type' => 'text', 'required' => true, 'displayOrder' => 1, 'description' => 'This is the deployment version identifier (userVersion)'},
-      {'fieldName' => 'deployType', 'fieldLabel' => 'Deploy Type', 'type' => 'select', 'optionSource' => 'deployTypes', 'required' => true, 'displayOrder' => 1, 'description' => 'This is the deployment version identifier (userVersion)', 'defaultValue' => 'file', 'code' => 'deployment.deployType'},
-      {'fieldName' => 'fetchUrl', 'fieldLabel' => 'Fetch URL', 'type' => 'select', 'optionSource' => 'deployTypes', 'required' => true, 'displayOrder' => 1, 'description' => 'The URL to fetch the deployment file(s) from.', 'dependsOnCode' => 'deployment.deployType:fetch'},
-      {'fieldName' => 'gitUrl', 'fieldLabel' => 'Git URL', 'type' => 'string', 'required' => true, 'displayOrder' => 1, 'description' => 'The URL to fetch the deployment file(s) from.', 'dependsOnCode' => 'deployment.deployType:git'},
-      {'fieldName' => 'gitRef', 'fieldLabel' => 'Git Ref', 'type' => 'string', 'displayOrder' => 1, 'description' => 'The Git Reference to use, this the branch or tag name, defaults to master.', 'dependsOnCode' => 'deployment.deployType:git'}
+      {'fieldName' => 'deployType', 'fieldLabel' => 'Deploy Type', 'type' => 'select', 'optionSource' => 'deployTypes', 'required' => true, 'displayOrder' => 2, 'description' => 'This is the deployment version identifier (userVersion)', 'defaultValue' => 'file', 'code' => 'deployment.deployType'},
+      {'fieldName' => 'fetchUrl', 'fieldLabel' => 'Fetch URL', 'type' => 'string', 'required' => true, 'displayOrder' => 3, 'description' => 'The URL to fetch the deployment file(s) from.', 'dependsOnCode' => 'deployment.deployType:fetch'},
+      {'fieldName' => 'gitUrl', 'fieldLabel' => 'Git URL', 'type' => 'string', 'required' => true, 'displayOrder' => 4, 'description' => 'The URL to fetch the deployment file(s) from.', 'dependsOnCode' => 'deployment.deployType:git'},
+      {'fieldName' => 'gitRef', 'fieldLabel' => 'Git Ref', 'type' => 'string', 'displayOrder' => 5, 'description' => 'The Git Reference to use, this the branch or tag name, defaults to master.', 'dependsOnCode' => 'deployment.deployType:git'}
     ]
   end
 

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

@@ -130,7 +130,8 @@ module Morpheus::Cli::InfrastructureHelper
   end
 
   def cloud_type_for_name(name)
-    return get_available_cloud_types(true, {'name' => name}).find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
+    types = get_available_cloud_types(true, {'name' => name})
+    return types.find { |z| z['code'].downcase == name.downcase} || types.find { |z| z['name'].downcase == name.downcase}
   end
 
 

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

@@ -159,6 +159,17 @@ module Morpheus::Cli::RestCommand
 
     alias :set_rest_perms_config :rest_perms_config=
 
+    # rest_option_context_map specifies context mapping during option prompt. default is domain => ''
+    def rest_option_context_map
+      @option_context_map || {'domain' => ''}
+    end
+
+    def rest_option_context_map=(v)
+      @option_context_map = v
+    end
+
+    alias :set_rest_option_context_map :rest_option_context_map=
+
     # rest_has_type indicates a resource has a type. default is false
     def rest_has_type
       @rest_has_type == true
@@ -344,6 +355,10 @@ module Morpheus::Cli::RestCommand
     self.class.rest_perms_config
   end
 
+  def rest_option_context_map
+    self.class.rest_option_context_map
+  end
+
   # returns the default rest interface, allows using rest_interface_name = "your"
   # or override this method to return @your_interface if needed
   def rest_interface
@@ -582,7 +597,8 @@ EOT
   def add(args)
     record_type = nil
     record_type_id = nil
-    options = {}
+    options = {:options => {:context_map => rest_option_context_map}}
+    #respond_to?("#{rest_key}_option_context_map", true) ? send("#{rest_key}_option_context_map") : {'domain' => ''}}}
     option_types = respond_to?("add_#{rest_key}_option_types", true) ? send("add_#{rest_key}_option_types") : []
     advanced_option_types = respond_to?("add_#{rest_key}_advanced_option_types", true) ? send("add_#{rest_key}_advanced_option_types") : []
     type_option_type = option_types.find {|it| it['fieldName'] == 'type'} 

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "5.5.1"
+    VERSION = "5.5.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.1.3
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-19 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,8 @@ files:
 - lib/morpheus/api/audit_interface.rb
 - lib/morpheus/api/auth_interface.rb
 - lib/morpheus/api/backup_jobs_interface.rb
+- lib/morpheus/api/backup_service_types_interface.rb
+- lib/morpheus/api/backup_services_interface.rb
 - lib/morpheus/api/backup_settings_interface.rb
 - lib/morpheus/api/backups_interface.rb
 - lib/morpheus/api/billing_interface.rb
@@ -342,6 +344,7 @@ files:
 - lib/morpheus/cli/commands/archives_command.rb
 - lib/morpheus/cli/commands/audit.rb
 - lib/morpheus/cli/commands/backup_jobs_command.rb
+- lib/morpheus/cli/commands/backup_services_command.rb
 - lib/morpheus/cli/commands/backup_settings_command.rb
 - lib/morpheus/cli/commands/backups_command.rb
 - lib/morpheus/cli/commands/benchmark_command.rb