morpheus-cli 5.4.4.2 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 035407b70b8d466e8167c8c82dcc564c1b1ec3890411efc1f0cada46f29b5fb7
-  data.tar.gz: 1af6373e32fd55e17031919e958987c3928f3cc9dd1537bdd03fa245f5d41c63
+  metadata.gz: ca02ec5cffb310afe4458568f745332e8f81f1d03a525ad1a9d9d1a3ecd08313
+  data.tar.gz: 323d4e3627c67fbd676bb34eb0b6f62b0eecff6180285af93599aba21f0a9781
 SHA512:
-  metadata.gz: 5635c593c0a181fab9635275458448336b593f87462e53586b5caf6d255710d3fcb2e749772b6a03ff68e3362a73c7e764e4df408dd3b8b7cd7a5bc0082e3e85
-  data.tar.gz: 10eb5b76228b348d8734c48014687a91adb2fece61d63905bdea17699b3d0a2751e3d509f12fe77e78871cf954c3bfe22443d48feb43d8af8da698d77a037f24
+  metadata.gz: bc72cdba318abc74aef8dec7ab8602ad7ec7196101950dfc0b29b8fe8c4298c2de5b41265a386457c38fa0ac9e46082cb86d04d7cfbc75652a1824d5a036cec1
+  data.tar.gz: f546fe9ed24fcc380d8aa1f2fc6d05a1cfb7186dcee48e66c340c51951b69e3b04408db5400ddcb23c9c596ccb14867571f1e21b6ceeb3e253c720d0525c21b0

data/Dockerfile

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

data/lib/morpheus/api/apps_interface.rb

@@ -57,20 +57,34 @@ class Morpheus::AppsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def apply(app_id, params, payload)
-    url = "#{@base_url}/api/apps/#{app_id}/apply"
+  def prepare_apply(app_id, params={})
+    url = "#{@base_url}/api/apps/#{app_id}/prepare-apply"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def validate_apply(app_id, params, payload)
+    url = "#{@base_url}/api/apps/#{app_id}/validate-apply"
     headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def prepare_apply(app_id, params, payload)
-    url = "#{@base_url}/api/apps/#{app_id}/prepare-apply"
+  def apply(app_id, params, payload)
+    url = "#{@base_url}/api/apps/#{app_id}/apply"
     headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
+  def state(id, params={})
+    url = "#{@base_url}/api/apps/#{id}/state"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def add_instance(app_id, payload)
     url = "#{@base_url}/api/apps/#{app_id}/add-instance"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/instances_interface.rb

@@ -379,6 +379,20 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def prepare_apply(id, params={})
+    url = "#{@base_url}/api/instances/#{id}/prepare-apply"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def validate_apply(id, params, payload)
+    url = "#{@base_url}/api/instances/#{id}/validate-apply"
+    headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def apply(id, params, payload)
     url = "#{@base_url}/api/instances/#{id}/apply"
     headers = {:params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -386,8 +400,8 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def state_summary(id, params={})
-    url = "#{@base_url}/api/instances/#{id}/state-summary"
+  def state(id, params={})
+    url = "#{@base_url}/api/instances/#{id}/state"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/prices_interface.rb

@@ -62,4 +62,10 @@ class Morpheus::PricesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
+
+  def list_currencies(params={})
+    url = "#{base_path}/currencies"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
 end

data/lib/morpheus/cli/cli_command.rb

@@ -253,7 +253,7 @@ module Morpheus
 
       # list is GET that supports phrase,max,offset,sort,direction
       def build_standard_list_options(opts, options, includes=[], excludes=[])
-        build_standard_get_options(opts, options, [:list] + includes, excludes=[])
+        build_standard_get_options(opts, options, [:list] + includes, excludes)
       end
 
       def build_standard_add_options(opts, options, includes=[], excludes=[])
@@ -1569,7 +1569,7 @@ module Morpheus
         #Morpheus::Logging::DarkPrinter.puts "find_all(#{args.join(', ')})" if Morpheus::Logging.debug?
         type, *request_args = args
         type = type.to_s.singularize.underscore
-        list_key = respond_to?("#{type}_list_key", true) ? send("#{type}_list_key") : type.camelcase.pluralize
+        list_key = respond_to?("#{type}_list_key", true) ? send("#{type}_list_key") : get_list_key(type)
         json_response = find_all_json(*args)
         if !json_response.key?(list_key)
           # maybe just use the first key like this:
@@ -1600,7 +1600,7 @@ module Morpheus
         #Morpheus::Logging::DarkPrinter.puts "find_record(#{args.join(', ')})" if Morpheus::Logging.debug?
         type, *request_args = args
         type = type.to_s.singularize.underscore
-        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : type.camelcase.singularize
+        object_key = respond_to?("#{type}_object_key", true) ? send("#{type}_object_key") : get_object_key(type)
         json_response = find_record_json(*args)
         if !json_response.key?(object_key)
           # maybe just use the first key like this:
@@ -1645,6 +1645,19 @@ module Morpheus
         return interface
       end
 
+      def get_list_key(type)
+        return get_object_key(type).pluralize
+      end
+
+      def get_object_key(type)
+        key = type.camelcase.singularize
+        # add aliases here as needed
+        if key == "cloud"
+          key = "zone"
+        end
+        return key
+      end
+
       module ClassMethods
 
         def prog_name