nex_client 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c927e21aeea01504d624b3ccf9b33a73e206d7
-  data.tar.gz: 57a595c1175ff1e51ac26444802266d6a02a57f7
+  metadata.gz: 98eeac822300b75e82e9d06c1f0f28f43b388442
+  data.tar.gz: 5083a27ba0b31ec42f42459be7135c453ebc737e
 SHA512:
-  metadata.gz: b6b1cc1026c4ee4e250084584724db87156fbe321f88da0808d1eccc1055f939b1ba6001e0f5c1e2159f773d881831e9c4373afc87e678dcfcb31c1a1eb62a63
-  data.tar.gz: 53820cb2245d5a5613e65ed6d901dd84d802f37660dbaf119707cee58d5360467e5082e34f9dcef6b784447ba3b3c55c95a8dc8a19b93f70ee1d6e0ae8d323cf
+  metadata.gz: ef9341d6e6d4e1b43ffbf2feb83843ee961997636e2d2568ce3bd24ac92b9c22c35bb004866f4f0d9139d952b91d7648869e760ff78510911f423667ad919425
+  data.tar.gz: b19f819f976eeabdd559b2fcea4efde5acc5877161d969cf3582dbb603b7a77583fd968747508572e107edbcbf3f0caa3949a0d15bf529a9de7c36ab084a04da

data/lib/nex_client/cli.rb

@@ -52,7 +52,7 @@ module NexClient
       end
 
       command :'addons:logs' do |c|
-        c.syntax = 'nex-cli addons:logs APP_NAME [options]'
+        c.syntax = 'nex-cli addons:logs ADDON_NAME [options]'
         c.summary = 'Gather addon logs'
         c.description = 'Gather container logs for a given addon'
         c.example 'gather logs for myaddon', 'nex-cli addons:logs myaddon'
@@ -63,6 +63,16 @@ module NexClient
         end
       end
 
+      command :'addons:ssh' do |c|
+        c.syntax = 'nex-cli addons:ssh ADDON_NAME [options]'
+        c.summary = 'SSH to an addon container [platform admin]'
+        c.description = 'Initiate an SSH session to a given addon container'
+        c.example 'ssh to addon myaddon', 'nex-cli addons:ssh myaddon'
+        c.action do |args, options|
+          NexClient::Commands::Addons.ssh(args,options)
+        end
+      end
+
       command :apps do |c|
         c.syntax = 'nex-cli apps [options]'
         c.summary = 'Manage apps'
@@ -163,6 +173,16 @@ module NexClient
         end
       end
 
+      command :'apps:ssh' do |c|
+        c.syntax = 'nex-cli apps:ssh APP_NAME [options]'
+        c.summary = 'SSH to an app container [platform admin]'
+        c.description = 'Initiate an SSH session to a given app container'
+        c.example 'ssh to app myapp', 'nex-cli apps:ssh myapp'
+        c.action do |args, options|
+          NexClient::Commands::Apps.ssh(args,options)
+        end
+      end
+
       command :'apps:transfer' do |c|
         c.syntax = 'nex-cli apps:transfer APP_NAME OWNER_HANDLE [options]'
         c.summary = 'Transfer app ownership'
@@ -224,7 +244,7 @@ module NexClient
       end
 
       command :'cubes:restart' do |c|
-        c.syntax = 'nex-cli cubes:restart CUBE_NAME'
+        c.syntax = 'nex-cli cubes:restart CUBE_ID'
         c.summary = 'Restart a cube'
         c.description = 'Restart a cube'
         c.example 'restart cube xyz', 'nex-cli cubes:restart xyz'
@@ -234,7 +254,7 @@ module NexClient
       end
 
       command :'cubes:start' do |c|
-        c.syntax = 'nex-cli cubes:start CUBE_NAME'
+        c.syntax = 'nex-cli cubes:start CUBE_ID'
         c.summary = 'Start a cube'
         c.description = 'Start a cube'
         c.example 'start cube xyz', 'nex-cli cubes:start xyz'
@@ -244,7 +264,7 @@ module NexClient
       end
 
       command :'cubes:stop' do |c|
-        c.syntax = 'nex-cli cubes:stop CUBE_NAME'
+        c.syntax = 'nex-cli cubes:stop CUBE_ID'
         c.summary = 'Stop a cube'
         c.description = 'Stop a cube'
         c.example 'stop cube xyz', 'nex-cli cubes:stop xyz'
@@ -253,6 +273,16 @@ module NexClient
         end
       end
 
+      command :'cubes:ssh' do |c|
+        c.syntax = 'nex-cli cubes:ssh APP_NAME [options]'
+        c.summary = 'SSH to a specific container [platform admin]'
+        c.description = 'Initiate an SSH session to a given container'
+        c.example 'ssh to cube some-uuid', 'nex-cli cubes:ssh some-uuid'
+        c.action do |args, options|
+          NexClient::Commands::CubeInstances.ssh(args,options)
+        end
+      end
+
       command :cube_templates do |c|
         c.syntax = 'nex-cli cube_templates [options]'
         c.summary = 'Manage cube_templates [platform admin][legacy]'

data/lib/nex_client/commands/addons.rb

@@ -24,7 +24,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_addons(list)
         end
@@ -45,6 +45,21 @@ module NexClient
         self.display_logs(logs.log_ret)
       end
 
+      # SSH to the addon
+      def self.ssh(args,opts)
+        name = args.first
+        e = NexClient::Addon.find(name: name).first
+
+        # Display error
+        unless e
+          error("Error! Could not find addon: #{name}")
+          return false
+        end
+
+        # Perform command
+        perform_ssh_cmd(e.ssh_cmd_template)
+      end
+
       def self.create(args,opts)
         svc_name,app_name = args
         app = NexClient::App.find(name: app_name).first

data/lib/nex_client/commands/apps.rb

@@ -31,7 +31,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_apps(list)
         end
@@ -75,6 +75,21 @@ module NexClient
         self.display_logs(logs.log_ret)
       end
 
+      # SSH to the app
+      def self.ssh(args,opts)
+        name = args.first
+        e = NexClient::App.find(name: name).first
+
+        # Display error
+        unless e
+          error("Error! Could not find app: #{name}")
+          return false
+        end
+
+        # Perform command
+        perform_ssh_cmd(e.ssh_cmd_template)
+      end
+
       def self.create(args,opts)
         image_info = args.first.split(':')
         attrs = { image: image_info[0], image_tag: image_info[1] }

data/lib/nex_client/commands/cube_instances.rb

@@ -28,19 +28,19 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_cubes(list)
         end
       end
 
       def self.trigger_action(action,args,opts)
-        name = args.first
-        e = NexClient::CubeInstance.find(name: name).first
+        id = args.first
+        e = NexClient::CubeInstance.find(uuid: id).first
 
         # Display error
         unless e
-          error("Error! Could not find cube: #{name}")
+          error("Error! Could not find cube: #{id}")
           return false
         end
 
@@ -53,7 +53,22 @@ module NexClient
           return false
         end
 
-        success("Initiated #{action} for cube #{name}...")
+        success("Initiated #{action} for cube #{id}...")
+      end
+
+      # SSH to the addon
+      def self.ssh(args,opts)
+        id = args.first
+        e = NexClient::CubeInstance.find(uuid: id).first
+
+        # Display error
+        unless e
+          error("Error! Could not find cube: #{id}")
+          return false
+        end
+
+        # Perform command
+        perform_ssh_cmd(e.ssh_cmd_template)
       end
 
       def self.display_cubes(list)
@@ -70,7 +85,7 @@ module NexClient
         dns = self.format_dns(record)
         cluster = self.format_cluster(record)
         [
-          record.id,
+          record.uuid,
           record.status,
           record.region,
           record.ssl_enabled,

data/lib/nex_client/commands/cube_templates.rb

@@ -19,7 +19,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_templates(list)
         end

data/lib/nex_client/commands/domains.rb

@@ -17,7 +17,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_domains(list)
         end

data/lib/nex_client/commands/helpers.rb

@@ -30,6 +30,36 @@ module NexClient
         end
         puts "\n"
       end
+
+      # Perform an SSH command based on a template
+      # Fetch current user key and username
+      def perform_ssh_cmd(ssh_cmd_template)
+        # Fetch user
+        me = NexClient::Me.find.first
+        if me.api_only
+          error("Error! Cannot SSH with an api-only user")
+          return false
+        end
+
+        # Get SSH details
+        username = me.handle
+        pv_key = me.private_key
+
+        # Create SSH Key
+        pv_key_file = Tempfile.new('nex.sshkey')
+        pv_key_file.write(pv_key)
+        pv_key_file.close
+
+        # Format command
+        ssh_cmd = ssh_cmd_template.gsub("{{certfile}}",pv_key_file.path).gsub("{{username}}",username)
+
+        # Launch SSH session
+        begin
+          system(ssh_cmd)
+        ensure
+          pv_key_file.unlink # delete tmp file
+        end
+      end
     end
   end
 end

data/lib/nex_client/commands/organizations.rb

@@ -14,7 +14,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_organizations(list)
         end

data/lib/nex_client/commands/racks.rb

@@ -37,7 +37,7 @@ module NexClient
 
           # Loop through results
           while (list.pages.links||{})['next']
-            ask("Press enter for next page")
+            return true if ask("Press enter for next page ('q' to quit)") =~ /q/
             list = list.pages.next
             self.display_compute_racks(list)
           end
@@ -49,7 +49,7 @@ module NexClient
 
           # Loop through results
           while (list.pages.links||{})['next']
-            ask("Press enter for next page")
+            return true if ask("Press enter for next page ('q' to quit)") =~ /q/
             list = list.pages.next
             self.display_storage_racks(list)
           end
@@ -61,7 +61,7 @@ module NexClient
 
           # Loop through results
           while (list.pages.links||{})['next']
-            ask("Press enter for next page")
+            return true if ask("Press enter for next page ('q' to quit)") =~ /q/
             list = list.pages.next
             self.display_routing_racks(list)
           end
@@ -73,7 +73,7 @@ module NexClient
 
           # Loop through results
           while (list.pages.links||{})['next']
-            ask("Press enter for next page")
+            return true if ask("Press enter for next page ('q' to quit)") =~ /q/
             list = list.pages.next
             self.display_gateway_racks(list)
           end
@@ -100,31 +100,8 @@ module NexClient
           return false
         end
 
-        # Fetch user
-        me = NexClient::Me.find.first
-        if me.api_only
-          error("Error! Cannot SSH with an api-only user")
-          return false
-        end
-
-        # Get SSH details
-        username = me.handle
-        pv_key = me.private_key
-
-        # Create SSH Key
-        pv_key_file = Tempfile.new('nex.sshkey')
-        pv_key_file.write(pv_key)
-        pv_key_file.close
-
-        # Format command
-        ssh_cmd = rack.ssh_cmd_template.gsub("{{certfile}}",pv_key_file.path).gsub("{{username}}",username)
-
-        # Launch SSH session
-        begin
-          system(ssh_cmd)
-        ensure
-          pv_key_file.unlink # delete tmp file
-        end
+        # Perform command
+        perform_ssh_cmd(rack.ssh_cmd_template)
       end
 
       def self.display_compute_racks(list)

data/lib/nex_client/commands/ssl_certificates.rb

@@ -17,7 +17,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_certs(list)
         end

data/lib/nex_client/commands/users.rb

@@ -21,7 +21,7 @@ module NexClient
 
         # Loop through results
         while (list.pages.links||{})['next']
-          ask("Press enter for next page")
+          return true if ask("Press enter for next page ('q' to quit)") =~ /q/
           list = list.pages.next
           self.display_users(list)
         end

data/lib/nex_client/version.rb

@@ -1,3 +1,3 @@
 module NexClient
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nex_client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client