nex_client 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15ebf0a5c81f16a7120e2b3c916c72b1ce6ed859
-  data.tar.gz: 1163c034dec77183d99efddb20d2d40d2c2941dc
+  metadata.gz: 3bea397684b919daf609e59cba8da6003c876186
+  data.tar.gz: 4eb230395b5f7a8b0fe41f5f4d9f9f45adc8d8bc
 SHA512:
-  metadata.gz: b1125e3402abca995c63030136e73779489f09c71ccb1bd7f9409a9938c1fbe0f979b8bdde12b23fb30d87f0dbcc1da942ddc84822b6d8e24543e86bd240726a
-  data.tar.gz: 41e4b4c6b438b2870a2eb7ad1ab0876afb63d5437ff6c74c9aefc1e249347fec49f3c8eb20b827a5b5cb245e3a5adf483145d53fcfe153c16a1d42e06283709d
+  metadata.gz: 16aa93de97a9261ae2fa9e6ba2ebe15fc0f3194c14685258d1d98e3cc1616a665ce80ed31fe7199fc94d01c1a27d15fa68ae523b6229a41c935d2f0b03d87bca
+  data.tar.gz: 2f7cfccadd6e26606426eed05f8c55ee32c3703d6358660b97013044afe7b871cec293fe6ecc5f988ac7b440288b33bbdf7e34f4260158802ec96054315b9688

data/lib/nex_client/cli.rb

@@ -37,6 +37,7 @@ module NexClient
         c.example 'create mysql addon for myapp', 'nex-cli addons:create mysql myapp'
         c.example 'create redis addon for myapp', 'nex-cli addons:create redis myapp'
         c.option '--size SIZE', Integer, 'specify container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory.'
+        c.option '--http-log-drain DRAIN_URL', String, 'specify the URL of a remote log drain'
         c.action do |args, options|
           NexClient::Commands::Addons.create(args,options)
         end
@@ -64,6 +65,16 @@ module NexClient
         end
       end
 
+      command :'addons:info' do |c|
+        c.syntax = 'nex-cli addons:info ADDON_NAME [options]'
+        c.summary = 'Show information about an addon'
+        c.description = 'Show all details about an addon'
+        c.example 'show details about myaddon', 'nex-cli addons:info myaddon'
+        c.action do |args, options|
+          NexClient::Commands::Addons.info(args,options)
+        end
+      end
+
       command :'addons:logs' do |c|
         c.syntax = 'nex-cli addons:logs ADDON_NAME [options]'
         c.summary = 'Gather addon logs'
@@ -98,6 +109,18 @@ module NexClient
         end
       end
 
+      command :'addons:update' do |c|
+        c.syntax = 'nex-cli addons:update ADDON_NAME [options]'
+        c.summary = 'Update addon settings'
+        c.description = 'Update addon settings'
+        c.example 'change container size to 4', 'nex-cli addons:update myaddon --size 4'
+        c.option '--size SIZE', Integer, 'change container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory. [restart required]'
+        c.option '--http-log-drain DRAIN_URL', String, 'specify the URL of a remote log drain. [restart required]'
+        c.action do |args, options|
+          NexClient::Commands::Addons.update(args,options)
+        end
+      end
+
       command :apps do |c|
         c.syntax = 'nex-cli apps [options]'
         c.summary = 'Manage apps'
@@ -130,6 +153,7 @@ module NexClient
         c.option '--no-ssl', 'disable SSL support (enabled by default)'
         c.option '--size SIZE', Integer, 'specify container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory.'
         c.option '--storage', 'enable persistent storage (/!\ only one node allowed)'
+        c.option '--http-log-drain DRAIN_URL', String, 'specify the URL of a remote log drain'
         c.option '--owner ORGANIZATION_HANDLE', 'specify an organisation as owner (organization admin only)'
         c.option '--desc DESCRIPTION', String, 'description for this application (140 characters max)'
         c.option '--tags TAG_LIST', Array, 'comma separated list of tags describing this app'
@@ -242,7 +266,8 @@ module NexClient
         c.summary = 'Update apps settings'
         c.description = 'Update application settings'
         c.example 'change container size to 4', 'nex-cli apps:update myapp --size 4'
-        c.option '--size SIZE', Integer, 'change container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory.'
+        c.option '--size SIZE', Integer, 'change container size (default: 2, min: 1, max: 20). Container will have N shares of CPU and N*128M of memory. [restart required]'
+        c.option '--http-log-drain DRAIN_URL', String, 'specify the URL of a remote log drain. [restart required]'
         c.option '--desc DESCRIPTION', String, 'update the application description'
         c.option '--tags TAG_LIST', String, 'comma separated list of tags to use to describe the app'
         c.action do |args, options|
@@ -268,6 +293,44 @@ module NexClient
         end
       end
 
+      command :certs do |c|
+        c.syntax = 'nex-cli certs [APP_OR_ORG_NAME] [options]'
+        c.summary = 'Manage certs'
+        c.description = 'List ssl certificates'
+        c.example 'list all certs', 'nex-cli certs'
+        c.example 'list all certs under app myapp', 'nex-cli certs myapp'
+        c.example 'list all certs under organization myorg', 'nex-cli certs myorg'
+        c.example 'list all certs matching example.com', 'nex-cli certs --domain example.com'
+        c.option '--domain', 'list all certs matching the provided cname'
+        c.action do |args, options|
+          NexClient::Commands::SslCertificates.list(args,options)
+        end
+      end
+
+      command :'certs:create' do |c|
+        c.syntax = 'nex-cli certs:create CNAME APP_OR_ORG_NAME'
+        c.summary = 'Create ssl certificates'
+        c.description = 'Create certs for your apps'
+        c.example 'create some.example.com certificate for myapp', 'nex-cli certs:create some.example.com myapp'
+        c.example 'create *.example.com certificate for myorg', 'nex-cli certs:create *.example.com myorg'
+        c.option '--cert CERT_PATH', String, 'path to pem certificate'
+        c.option '--bundle BUNDLE_PATH', String, 'path to certificate bundle'
+        c.option '--privkey KEY_PATH', String, 'path to certificate private key'
+        c.action do |args, options|
+          NexClient::Commands::SslCertificates.create(args,options)
+        end
+      end
+
+      command :'certs:delete' do |c|
+        c.syntax = 'nex-cli certs:delete CNAME'
+        c.summary = 'Delete certs'
+        c.description = 'Permanently delete a ssl certificate'
+        c.example 'delete certificate for some.example.com', 'nex-cli certs:delete some.example.com'
+        c.action do |args, options|
+          NexClient::Commands::SslCertificates.destroy(args,options)
+        end
+      end
+
       command :cubes do |c|
         c.syntax = 'nex-cli cubes [options]'
         c.summary = 'Manage cubes [platform admin]'
@@ -418,41 +481,6 @@ module NexClient
         end
       end
 
-      command :certs do |c|
-        c.syntax = 'nex-cli certs [APP_NAME] [options]'
-        c.summary = 'Manage certs'
-        c.description = 'List ssl certificates'
-        c.example 'list all certs', 'nex-cli certs'
-        c.example 'list all certs matching example.com', 'nex-cli certs --domain example.com'
-        c.option '--domain', 'list all certs matching the provided cname'
-        c.action do |args, options|
-          NexClient::Commands::SslCertificates.list(args,options)
-        end
-      end
-
-      command :'certs:create' do |c|
-        c.syntax = 'nex-cli certs:create CNAME APP_NAME'
-        c.summary = 'Create ssl certificates'
-        c.description = 'Create certs for your apps'
-        c.example 'create some.example.com certificate for myapp', 'nex-cli certs:create some.example.com myapp'
-        c.option '--cert CERT_PATH', String, 'path to pem certificate'
-        c.option '--bundle BUNDLE_PATH', String, 'path to certificate bundle'
-        c.option '--privkey KEY_PATH', String, 'path to certificate private key'
-        c.action do |args, options|
-          NexClient::Commands::SslCertificates.create(args,options)
-        end
-      end
-
-      command :'certs:delete' do |c|
-        c.syntax = 'nex-cli certs:delete CNAME'
-        c.summary = 'Delete certs'
-        c.description = 'Permanently delete a ssl certificate'
-        c.example 'delete certificate for some.example.com', 'nex-cli certs:delete some.example.com'
-        c.action do |args, options|
-          NexClient::Commands::SslCertificates.destroy(args,options)
-        end
-      end
-
       command :users do |c|
         c.syntax = 'nex-cli users [options]'
         c.summary = 'List users'

data/lib/nex_client/commands/addons.rb

@@ -8,6 +8,12 @@ module NexClient
       ADDONS_TITLE = "Addons".colorize(:red)
       ADDONS_HEADERS = ['name','status','service','size','nodes','app'].map(&:upcase)
 
+      VARS_TITLE = "Environment Variables".colorize(:blue)
+      VARS_HEADERS = ['key','value'].map(&:upcase)
+
+      OPTS_TITLE = "Options".colorize(:blue)
+      OPTS_HEADERS = ['key','value'].map(&:upcase)
+
       def self.list(args,opts)
         filters = {}
         filters[:status] = opts.status || ['active','restarting']
@@ -31,6 +37,32 @@ module NexClient
         end
       end
 
+      def self.info(args,opts)
+        name = args.first
+        e = NexClient::Addon.includes(:app).find(name: name).first
+
+        # Display error
+        unless e
+          error("Error! Could not find addon: #{name}")
+          return false
+        end
+
+        # Display app id
+        self.display_id(e)
+
+        # Display addon details
+        self.display_addons(e)
+
+        # Display all vars
+        self.display_vars(e.all_vars)
+
+        # Display options
+        self.display_options(e.opts)
+
+        # Display App
+        Apps.display_apps(e.app)
+      end
+
       def self.logs(args,opts)
         name = args.first
         e = NexClient::Addon.find(name: name).first
@@ -76,6 +108,12 @@ module NexClient
         attrs[:service] = svc_name
         attrs[:container_size] = opts.size if opts.size.present?
 
+        # Option: HTTP Log Drain
+        if opts.http_log_drain.present?
+          attrs[:opts] ||= {}
+          attrs[:opts][:http_log_drain] = opts.http_log_drain
+        end
+
         addon = NexClient::Addon.new(attrs)
         addon.relationships.attributes = { app: { data: { type: 'apps', id: app.id } } }
         addon.save
@@ -90,6 +128,33 @@ module NexClient
         self.display_addons(NexClient::Addon.includes(:app).find(addon.id).first)
       end
 
+      def self.update(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
+
+        # Attributes
+        attrs = {}
+        attrs[:container_size] = opts.size if opts.size.present?
+
+        # Option: HTTP Log Drain
+        if opts.http_log_drain.present?
+          attrs[:opts] ||= (e.opts || {}).dup
+          attrs[:opts]['http_log_drain'] = opts.http_log_drain
+        end
+
+        # Update
+        e.update_attributes(attrs)
+
+        # Display app
+        self.display_addons(NexClient::Addon.includes(:app).find(e.id).first)
+      end
+
       def self.destroy(args,opts)
         name = args.first
         e = NexClient::Addon.find(name: name).first
@@ -150,6 +215,34 @@ module NexClient
         puts "\n"
       end
 
+      def self.display_id(e)
+        table = Terminal::Table.new do |t|
+          t.add_row(['ADDON ID',e.id])
+        end
+        puts table
+        puts "\n"
+      end
+
+      def self.display_vars(list)
+        table = Terminal::Table.new title: VARS_TITLE, headings: VARS_HEADERS do |t|
+          [list].flatten.compact.each do |e|
+            e.sort_by { |k, v| k }.each { |k,v| t.add_row([k,v]) }
+          end
+        end
+        puts table
+        puts "\n"
+      end
+
+      def self.display_options(list)
+        table = Terminal::Table.new title: OPTS_TITLE, headings: OPTS_HEADERS do |t|
+          [list].flatten.compact.each do |e|
+            e.each { |k,v| t.add_row([k,v]) }
+          end
+        end
+        puts table
+        puts "\n"
+      end
+
       def self.format_record(record)
         app = self.format_app(record)
         node_count = self.format_node_count(record)

data/lib/nex_client/commands/apps.rb

@@ -13,6 +13,9 @@ module NexClient
       VARS_TITLE = "Environment Variables".colorize(:blue)
       VARS_HEADERS = ['key','value'].map(&:upcase)
 
+      OPTS_TITLE = "Options".colorize(:blue)
+      OPTS_HEADERS = ['key','value'].map(&:upcase)
+
       SCM_TITLE = "Source Control Management".colorize(:yellow)
       SCM_HEADERS = ['provider','repo','branch','last commit'].map(&:upcase)
 
@@ -42,7 +45,7 @@ module NexClient
 
       def self.info(args,opts)
         name = args.first
-        e = NexClient::App.includes(:addons,:owner).find(name: name).first
+        e = NexClient::App.includes(:addons,:owner,:domains,:ssl_certificates).find(name: name).first
 
         # Display error
         unless e
@@ -59,9 +62,18 @@ module NexClient
         # Display all vars
         self.display_vars(e.all_vars)
 
-        # Display all vars
+        # Display options
+        self.display_options(e.opts)
+
+        # Display Source Control Management
         self.display_scm(e.scm)
 
+        # Display custom domains
+        Domains.display_domains(e.domains)
+
+        # Display SSL certificates
+        SslCertificates.display_certs(e.ssl_certificates)
+
         # Display all addons
         Addons.display_addons(e.addons.select { |a| a.status == 'active'})
       end
@@ -107,6 +119,12 @@ module NexClient
         attrs[:description] = opts.desc if opts.desc.present?
         attrs[:tag_list] = opts.tags if opts.tags.present?
 
+        # Option: HTTP Log Drain
+        if opts.http_log_drain.present?
+          attrs[:opts] ||= {}
+          attrs[:opts]['http_log_drain'] = opts.http_log_drain
+        end
+
         # Env variables via command line
         if opts.env.present?
           attrs[:vars] ||= {}
@@ -166,6 +184,12 @@ module NexClient
         attrs[:description] = opts.desc if opts.desc.present?
         attrs[:tag_list] = opts.tags if opts.tags.present?
 
+        # Option: HTTP Log Drain
+        if opts.http_log_drain.present?
+          attrs[:opts] ||= (e.opts || {}).dup
+          attrs[:opts]['http_log_drain'] = opts.http_log_drain
+        end
+
         # Update
         e.update_attributes(attrs)
 
@@ -370,6 +394,16 @@ module NexClient
 
       def self.display_vars(list)
         table = Terminal::Table.new title: VARS_TITLE, headings: VARS_HEADERS do |t|
+          [list].flatten.compact.each do |e|
+            e.sort_by { |k, v| k }.each { |k,v| t.add_row([k,v]) }
+          end
+        end
+        puts table
+        puts "\n"
+      end
+
+      def self.display_options(list)
+        table = Terminal::Table.new title: OPTS_TITLE, headings: OPTS_HEADERS do |t|
           [list].flatten.compact.each do |e|
             e.each { |k,v| t.add_row([k,v]) }
           end

data/lib/nex_client/commands/domains.rb

@@ -5,7 +5,7 @@ module NexClient
       extend Helpers
 
       DOMAINS_TITLE = "Domains".colorize(:magenta)
-      DOMAINS_HEADERS = ['id','cname','origin'].map(&:upcase)
+      DOMAINS_HEADERS = ['id','cname','ssl?','origin'].map(&:upcase)
 
       def self.list(args,opts)
         filters = {}
@@ -27,7 +27,7 @@ module NexClient
         domain_name,app_name = args
         app = NexClient::App.find(name: app_name).first
         app ||= NexClient::CubeInstance.find(name: app_name).first
-
+        
         # Display error
         unless app
           error("Error! Could not find app: #{app_name}")
@@ -84,6 +84,7 @@ module NexClient
         [
           record.id,
           record.cname,
+          record.ssl_available,
           origin
         ]
       end

data/lib/nex_client/commands/ssl_certificates.rb

@@ -24,13 +24,14 @@ module NexClient
       end
 
       def self.create(args,opts)
-        cert_name,app_name = args
-        app = NexClient::App.find(name: app_name).first
-        app ||= NexClient::CubeInstance.find(name: app_name).first
+        cert_name,origin_name = args
+        origin = NexClient::App.find(name: origin_name).first
+        origin ||= NexClient::CubeInstance.find(name: origin_name).first
+        origin ||= NexClient::Organization.find(handle: origin_name).first
 
         # Display error
-        unless app
-          error("Error! Could not find app: #{app_name}")
+        unless origin
+          error("Error! Could not find origin: #{origin_name}")
           return false
         end
 
@@ -45,7 +46,7 @@ module NexClient
           cert_bundle: bundle,
           private_key: privkey
         )
-        cert.relationships.attributes = { origin: { data: { type: app.type, id: app.id } } }
+        cert.relationships.attributes = { origin: { data: { type: origin.type, id: origin.id } } }
         cert.save
 
         # Display errors if any
@@ -99,8 +100,9 @@ module NexClient
       end
 
       def self.format_origin(record)
-        return "-" unless record.origin
-        record.origin.name
+        return '-' unless o = record.origin
+        name = o.respond_to?(:handle) ? o.handle : o.name
+        "#{o.type[0..2]}:#{name}"
       end
     end
   end

data/lib/nex_client/domain.rb

@@ -3,5 +3,6 @@ module NexClient
   class Domain < BaseResource
     property :created_at, type: :time
     property :updated_at, type: :time
+    property :ssl_available, type: :boolean
   end
 end

data/lib/nex_client/version.rb

@@ -1,3 +1,3 @@
 module NexClient
-  VERSION ||= '0.12.0'
+  VERSION ||= '0.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nex_client
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client