morpheus-cli 3.6.8 → 3.6.9

data/lib/morpheus/api/app_templates_interface.rb

@@ -15,35 +15,24 @@ class Morpheus::AppTemplatesInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def list(options={})
+  def list(params={})
     url = "#{@base_url}/api/app-templates"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
-  def create(options)
+  def create(payload)
     url = "#{@base_url}/api/app-templates"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def update(id, options)
+  def update(id, payload)
     url = "#{@base_url}/api/app-templates/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def save_image(id, options)
-    url = "#{@base_url}/api/app-templates/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
-  end
-
-
   # multipart image upload
   def save_image(id, image_file, params={})
     url = "#{@base_url}/api/app-templates/#{id}/image"
@@ -54,10 +43,9 @@ class Morpheus::AppTemplatesInterface < Morpheus::APIClient
     execute(method: :post, url: url, headers: headers, payload: payload)
   end
 
-  def duplicate(id, options)
+  def duplicate(id, payload)
     url = "#{@base_url}/api/app-templates/#{id}/duplicate"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
@@ -67,19 +55,10 @@ class Morpheus::AppTemplatesInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
-  def list_tiers(options={})
+  def list_tiers(params={})
     url = "#{@base_url}/api/app-templates/tiers"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
-  # unused, prefer /options/instanceTypes
-  # def list_types(options={})
-  #   url = "#{@base_url}/api/app-templates/types"
-  #   headers = { params: {}, authorization: "Bearer #{@access_token}" }
-  #   headers[:params].merge!(options)
-  #   execute(method: :get, url: url, headers: headers)
-  # end
-
 end

data/lib/morpheus/api/apps_interface.rb

@@ -9,66 +9,60 @@ class Morpheus::AppsInterface < Morpheus::APIClient
   end
 
 
-  def get(options=nil)
+  def get(params={})
     url = "#{@base_url}/api/apps"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    if options.is_a?(Hash)
-      headers[:params].merge!(options)
-    elsif options.is_a?(Numeric)
-      url = "#{@base_url}/api/apps/#{options}"
-    elsif options.is_a?(String)
-      headers[:params]['name'] = options
+    if params.is_a?(Hash)
+      headers[:params].merge!(params)
+    elsif params.is_a?(Numeric)
+      url = "#{@base_url}/api/apps/#{params}"
+    elsif params.is_a?(String)
+      headers[:params]['name'] = params
     end
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-  def validate(options)
+  def validate(payload)
     # url = "#{@base_url}/api/apps/validate-instance"
     url = "#{@base_url}/api/apps/validate"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def validate_instance(options)
+  def validate_instance(payload)
     # url = "#{@base_url}/api/apps/validate-instance"
     url = "#{@base_url}/api/apps/validate-instance"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def create(options)
+  def create(payload)
     url = "#{@base_url}/api/apps"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def update(app_id, options)
+  def update(app_id, payload)
     url = "#{@base_url}/api/apps/#{app_id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def add_instance(app_id, options)
+  def add_instance(app_id, payload)
     url = "#{@base_url}/api/apps/#{app_id}/add-instance"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def remove_instance(app_id, options)
+  def remove_instance(app_id, payload)
     url = "#{@base_url}/api/apps/#{app_id}/remove-instance"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
@@ -123,10 +117,9 @@ class Morpheus::AppsInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def apply_security_groups(id, options)
+  def apply_security_groups(id, payload)
     url = "#{@base_url}/api/apps/#{id}/security-groups"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end

data/lib/morpheus/api/archive_buckets_interface.rb

@@ -41,7 +41,7 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/archives/buckets/#{URI.escape(id.to_s)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
@@ -89,7 +89,7 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
     url = "#{@base_url}/api/archives/buckets/#{URI.escape(bucket_id.to_s)}" + ".zip"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
-    # execute(opts, false)
+    # execute(opts, {parse_json:false})
     if Dir.exists?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end

data/lib/morpheus/api/archive_files_interface.rb

@@ -21,7 +21,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     url = "#{@base_url}/api/archives/download" + "/#{full_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
-    execute(opts, false)
+    execute(opts, {parse_json: false})
   end
 
   def download_file_by_path_chunked(full_file_path, outfile, params={})
@@ -29,7 +29,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     url = "#{@base_url}/api/archives/download" + "/#{full_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
-    # execute(opts, false)
+    # execute(opts, {parse_json: false})
     if Dir.exists?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
@@ -59,7 +59,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     url = "#{@base_url}/public-archives/download" + "/#{full_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
-    # execute(opts, false)
+    # execute(opts, {parse_json: false})
     if Dir.exists?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
@@ -90,7 +90,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     params['s'] = link_key
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
-    # execute(opts, false)
+    # execute(opts, {parse_json: false})
     if Dir.exists?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
@@ -144,7 +144,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
   def destroy_file_link(file_id, link_id, params={})
     url = "#{@base_url}/api/archives/files/#{file_id}/links/#{link_id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
@@ -175,7 +175,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/archives/files/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/auth_interface.rb

@@ -14,7 +14,20 @@ class Morpheus::AuthInterface < Morpheus::APIClient
     url = "#{@base_url}/oauth/token"
     params = {grant_type: 'password', scope:'write', client_id: 'morph-cli', username: username}
     payload = {password: password}
-    opts = {method: :post, url: url, headers:{ params: params}, payload: payload, timeout: 10}
+    opts = {method: :post, url: url, headers:{ params: params}, payload: payload, timeout: 5}
+    response = execute(opts)
+    return response if @dry_run
+    @access_token = response['access_token']
+    return response
+  end
+
+  # this regenerates the access_token and refresh_token
+  def use_refresh_token(refresh_token)
+    @access_token = nil
+    url = "#{@base_url}/oauth/token"
+    params = {grant_type: 'refresh_token', scope:'write', client_id: 'morph-cli'}
+    payload = {refresh_token: refresh_token}
+    opts = {method: :post, url: url, headers:{ params: params}, payload: payload}
     response = execute(opts)
     return response if @dry_run
     @access_token = response['access_token']

data/lib/morpheus/api/blueprints_interface.rb

@@ -15,31 +15,27 @@ class Morpheus::BlueprintsInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def list(options={})
+  def list(params={})
     url = "#{@base_url}/api/blueprints"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
-  def create(options)
+  def create(payload)
     url = "#{@base_url}/api/blueprints"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def update(id, options)
+  def update(id, payload)
     url = "#{@base_url}/api/blueprints/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def update_permissions(id, options)
+  def update_permissions(id, payload)
     url = "#{@base_url}/api/blueprints/#{id}/update-permissions"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
@@ -53,10 +49,9 @@ class Morpheus::BlueprintsInterface < Morpheus::APIClient
     execute(method: :post, url: url, headers: headers, payload: payload)
   end
 
-  def duplicate(id, options)
+  def duplicate(id, payload)
     url = "#{@base_url}/api/blueprints/#{id}/duplicate"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
@@ -66,17 +61,15 @@ class Morpheus::BlueprintsInterface < Morpheus::APIClient
     execute(method: :delete, url: url, headers: headers)
   end
 
-  def list_tiers(options={})
+  def list_tiers(payload={})
     url = "#{@base_url}/api/blueprints/tiers"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
     execute(method: :get, url: url, headers: headers)
   end
 
-  def list_types(options={})
+  def list_types(params={})
     url = "#{@base_url}/api/blueprints/types"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 

data/lib/morpheus/api/cloud_datastores_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::CloudDatastoresInterface < Morpheus::APIClient
   def destroy(cloud_id, id, params={})
     url = "#{@base_url}/api/zones/#{cloud_id}/data-stores/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/cloud_policies_interface.rb

@@ -40,7 +40,7 @@ class Morpheus::CloudPoliciesInterface < Morpheus::APIClient
   def destroy(cloud_id, id, params={})
     url = "#{@base_url}/api/zones/#{cloud_id}/policies/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 

data/lib/morpheus/api/clouds_interface.rb

@@ -11,37 +11,35 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
   def cloud_types()
     url = "#{@base_url}/api/zone-types"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, timeout: 30, headers: headers}
+    opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-  def get(options=nil)
+  def get(params=nil)
     url = "#{@base_url}/api/zones"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
 
-    if options.is_a?(Hash)
-      headers[:params].merge!(options)
-    elsif options.is_a?(Numeric)
-      url = "#{@base_url}/api/zones/#{options}"
-    elsif options.is_a?(String)
-      headers[:params]['name'] = options
+    if params.is_a?(Hash)
+      headers[:params].merge!(params)
+    elsif params.is_a?(Numeric)
+      url = "#{@base_url}/api/zones/#{params}"
+    elsif params.is_a?(String)
+      headers[:params]['name'] = params
     end
-    opts = {method: :get, url: url, timeout: 30, headers: headers}
+    opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-  def create(options)
+  def create(payload)
     url = "#{@base_url}/api/zones"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    opts = {method: :post, url: url, timeout: 30, headers: headers, payload: payload.to_json}
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
-  def update(id, options)
+  def update(id, payload)
     url = "#{@base_url}/api/zones/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
@@ -49,36 +47,35 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
   def destroy(id, params={})
     url = "#{@base_url}/api/zones/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
   def firewall_disable(id)
     url = "#{@base_url}/api/zones/#{id}/security-groups/disable"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, timeout: 30, headers: headers}
+    opts = {method: :put, url: url, headers: headers}
     execute(opts)
   end
 
   def firewall_enable(id)
     url = "#{@base_url}/api/zones/#{id}/security-groups/enable"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, timeout: 30, headers: headers}
+    opts = {method: :put, url: url, headers: headers}
     execute(opts)
   end
 
   def security_groups(id)
     url = "#{@base_url}/api/zones/#{id}/security-groups"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :get, url: url, timeout: 30, headers: headers}
+    opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-  def apply_security_groups(id, options)
+  def apply_security_groups(id, payload)
     url = "#{@base_url}/api/zones/#{id}/security-groups"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
-    opts = {method: :post, url: url, timeout: 30, headers: headers, payload: payload.to_json}
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 end

data/lib/morpheus/api/cypher_interface.rb

@@ -9,47 +9,38 @@ class Morpheus::CypherInterface < Morpheus::APIClient
     @expires_at = expires_at
   end
 
-  def get(id, params={})
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/cypher/#{id}"
+  def get(item_key, params={})
+    raise "#{self.class}.get() passed a blank item_key!" if item_key.to_s == ''
+    url = "#{@base_url}/api/cypher/v1/#{item_key}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    execute({method: :get, url: url, headers: headers})
   end
 
-  def list(params={})
-    url = "#{@base_url}/api/cypher"
+  # list url is the same as get but uses $itemKey/?list=true
+  # method: 'LIST' would be neat though
+  def list(item_key=nil, params={})
+    url = item_key ? "#{@base_url}/api/cypher/v1/#{item_key}" : "#{@base_url}/api/cypher/v1"
+    params.merge!({list:'true'})
     headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    execute({method: :get, url: url, headers: headers})
   end
 
-  def create(payload)
-    url = "#{@base_url}/api/cypher"
+  def create(item_key, payload)
+    url = "#{@base_url}/api/cypher/v1/#{item_key}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
+    execute({method: :post, url: url, headers: headers, payload: payload.to_json})
   end
 
-  def update(id, payload)
-    url = "#{@base_url}/api/cypher/#{id}"
+  def update(item_key, payload)
+    url = "#{@base_url}/api/cypher/v1/#{item_key}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
+    execute({method: :put, url: url, headers: headers, payload: payload.to_json})
   end
 
-  def destroy(id, params={})
-    url = "#{@base_url}/api/cypher/#{id}"
+  def destroy(item_key, params={})
+    url = "#{@base_url}/api/cypher/v1/#{item_key}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
-    execute(opts)
-  end
-
-  def decrypt(id, params={})
-    url = "#{@base_url}/api/cypher/#{id}/decrypt"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    execute({method: :delete, url: url, headers: headers})
   end
 
 end