morpheus-cli 3.6.32 → 3.6.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24803cc6c01bc67cf8ba06e90df80f379738febf629612dab84a29da085f81f
-  data.tar.gz: 596305e77aa0b2686b89861e161ff1db294cb7f7e7943167882db00becd7d15a
+  metadata.gz: d794a4ae333246f0e3207b26be0374cddc7a524be9ab4351798c19acb33dd065
+  data.tar.gz: db7694d619ace42e93872b63212d019555e790232ed173196b276d42c8ebb9bf
 SHA512:
-  metadata.gz: ecfb02f85f8b2893051114407bacf6a78d11ecf3b16eeb01671d5b966e9f87fd60126ad00c763eac27c4d62a8f2e9ecf22c13b33d02c1e77da18abc86d7256bf
-  data.tar.gz: 92579b647b4b14b2841250dafdb8712157e5117ece943f54fa9ad24644513b593053555d4cc457a045bc60813ff3568561c686b947661610f73229dee93579d5
+  metadata.gz: 5cdd00e0cd5ed3810ae3aa1620deae76b8c6f5a48b622a50095f6849e19ee71ff41f2c116556cc122eb2682055b390280fa3301c04f4859bd16f4b03e866f29d
+  data.tar.gz: 8ad4f8f73d76d164089a33cd64811efa3ddcac72d79c339cb7a1629a6371440fbf1882774309bae2a21a37fac5704d08a9b6af6086142d269e8d100e89b31be9

data/lib/morpheus/cli/credentials.rb

@@ -270,8 +270,8 @@ module Morpheus
         username = wallet['username']
 
         begin
-          auth_interface.setopts(options)
           auth_interface = Morpheus::AuthInterface.new(@appliance_url)
+          auth_interface.setopts(options)
           if options[:dry_run]
             print_dry_run auth_interface.dry.use_refresh_token(wallet['refresh_token'])
             return nil

data/lib/morpheus/cli/environments_command.rb

@@ -167,7 +167,7 @@ class Morpheus::Cli::EnvironmentsCommand
       else
         display_name = json_response['environment']  ? json_response['environment']['name'] : ''
         print_green_success "Environment #{display_name} added"
-        get([json_response['environment']['id']])
+        get([json_response['environment']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -230,7 +230,7 @@ class Morpheus::Cli::EnvironmentsCommand
       else
         display_name = json_response['environment'] ? json_response['environment']['name'] : ''
         print_green_success "Environment #{display_name} updated"
-        get([json_response['environment']['id']])
+        get([json_response['environment']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -312,7 +312,7 @@ class Morpheus::Cli::EnvironmentsCommand
       else
         display_name = json_response['environment'] ? json_response['environment']['name'] : ''
         print_green_success "Environment #{display_name} updated"
-        get([json_response['environment']['id']])
+        get([json_response['environment']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e

data/lib/morpheus/cli/instances.rb

@@ -427,8 +427,7 @@ class Morpheus::Cli::Instances
         instance_id = json_response["instance"]["id"]
         instance_name = json_response["instance"]["name"]
         print_green_success "Provisioning instance [#{instance_id}] #{instance_name}"
-        get([instance_id])
-        #list([])
+        get([instance_id] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -538,7 +537,7 @@ class Morpheus::Cli::Instances
       else
         print_green_success "Updated instance #{instance['name']}"
         #list([])
-        get([instance['id']])
+        get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -615,7 +614,7 @@ class Morpheus::Cli::Instances
       else
         print_green_success "Updated notes for instance #{instance['name']}"
         #list([])
-        get([instance['id']])
+        get([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -692,7 +691,7 @@ class Morpheus::Cli::Instances
       print reset,"\n"
 
       if open_wiki_link
-        return view_wiki([args[0]])
+        return view_wiki([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
 
       return 0
@@ -814,7 +813,8 @@ class Morpheus::Cli::Instances
         puts as_json(json_response, options)
       else
         print_green_success "Updated wiki page for instance #{instance['name']}"
-        wiki([instance['id']])
+
+        wiki([instance['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -1695,7 +1695,7 @@ class Morpheus::Cli::Instances
         return
       end
       if !options[:quiet]
-        envs([args[0]])
+        envs([args[0]] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -1728,7 +1728,7 @@ class Morpheus::Cli::Instances
         return
       end
       if !options[:quiet]
-        envs([args[0]])
+        envs([args[0]] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -2540,7 +2540,7 @@ class Morpheus::Cli::Instances
         return
       elsif !options[:quiet]
         print_green_success "Removing instance #{instance['name']}"
-        #list([])
+        #list([] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -2572,7 +2572,7 @@ class Morpheus::Cli::Instances
         print as_json(json_response, options), "\n"
         return
       elsif !options[:quiet]
-        security_groups([args[0]])
+        security_groups([args[0]] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -2604,7 +2604,7 @@ class Morpheus::Cli::Instances
         print as_json(json_response, options), "\n"
         return
       elsif !options[:quiet]
-        security_groups([args[0]])
+        security_groups([args[0]] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -2698,7 +2698,7 @@ class Morpheus::Cli::Instances
         return
       end
       if !options[:quiet]
-        security_groups([args[0]])
+        security_groups([args[0]] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
     rescue RestClient::Exception => e
       print_rest_exception(e, options)

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

@@ -313,7 +313,7 @@ module Morpheus::Cli::ProvisioningHelper
       options[:options]['environment'] = options[:options]['instanceContext']
     end
     v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'required' => false, 'selectOptions' => get_available_environments()}], options[:options])
-    payload['instance']['instanceContext'] = v_prompt['instanceContext'] if !v_prompt['instanceContext'].empty?
+    payload['instance']['instanceContext'] = v_prompt['environment'] if !v_prompt['environment'].empty?
 
     # Tags
     v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'tags', 'fieldLabel' => 'Tags', 'type' => 'text', 'required' => false}], options[:options])

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.32"
+    VERSION = "3.6.33"
   end
 end

data/lib/morpheus/cli/wiki_command.rb

@@ -58,7 +58,7 @@ class Morpheus::Cli::WikiCommand
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if pages.empty?
-          print yellow,"No wiki pages found.",reset
+          print yellow,"No wiki pages found.",reset,"\n"
         else
           columns = [
             {"ID" => lambda {|page| page['id'] } },
@@ -120,19 +120,23 @@ class Morpheus::Cli::WikiCommand
       unless options[:quiet]
         print_h1 "Wiki Page Details"
         print cyan
-
-        print_description_list({
+        wiki_columns = {
           "ID" => 'id',
           "Name" => 'name',
           "Category" => 'category',
-          "Ref Type" => 'refType',
-          "Ref ID" => 'refId',
+          # "Ref Type" => 'refType',
+          # "Ref ID" => 'refId',
+          "Reference" => lambda {|it| it['refType'] ? "#{it['refType']} (#{it['refId']})" : '' },
           #"Owner" => lambda {|it| it['account'] ? it['account']['name'] : '' },
           "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
           "Created By" => lambda {|it| it['createdBy'] ? it['createdBy']['username'] : '' },
           "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
           "Updated By" => lambda {|it| it['updatedBy'] ? it['updatedBy']['username'] : '' }
-        }, page)
+        }
+        if page['refType'].nil?
+          wiki_columns.delete("Reference")
+        end
+        print_description_list(wiki_columns, page)
         print reset,"\n"
 
         print_h2 "Page Content"
@@ -141,7 +145,7 @@ class Morpheus::Cli::WikiCommand
       end
       print reset,"\n"
       if open_wiki_link
-        return view([page['id']])
+        return view([page['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -239,7 +243,7 @@ class Morpheus::Cli::WikiCommand
       else
         display_name = json_response['page']  ? json_response['page']['name'] : ''
         print_green_success "Wiki page #{display_name} added"
-        get([json_response['page']['id']])
+        get([json_response['page']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -304,7 +308,7 @@ class Morpheus::Cli::WikiCommand
       else
         display_name = json_response['page'] ? json_response['page']['name'] : ''
         print_green_success "Wiki page #{display_name} updated"
-        get([json_response['page']['id']])
+        get([json_response['page']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -344,7 +348,7 @@ class Morpheus::Cli::WikiCommand
         print "\n"
       else
         print_green_success "Wiki page #{page['name']} removed"
-        # list([])
+        # list([] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.6.32
+  version: 3.6.33
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler