lds-cf-plugin 0.2.3 → 0.3.0

data/lib/lds-cf-plugin/custom_service.rb

@@ -1,5 +1,5 @@
 require "cf/cli"
-require "yajl"
+require "json"
 
 module LdsCfPlugin
   class CustomService < CF::CLI
@@ -8,7 +8,7 @@ module LdsCfPlugin
     end
 
     desc "Create a custom service"
-    group :lds
+    group :lds, :services
     input :name, :desc => "Name for your service", :argument => :optional
     input :credentials, :desc => "The service credentials JSON string to be passed to the application", :argument => :optional
     input :plan, :desc => "Service plan",
@@ -49,7 +49,7 @@ module LdsCfPlugin
         credentials = ask("Service credentials JSON string")
       end
 
-      creds = Yajl::Parser.new.parse(credentials)
+      creds = JSON.parse(credentials)
 
       # Register custom service with gateway
 
@@ -59,7 +59,7 @@ module LdsCfPlugin
         :credentials => creds
       }
       options = {
-          :payload => Yajl::Encoder.encode(payload)
+          :payload => JSON.generate(payload)
       }
       request, response = rest_client.request("POST", "/register", options)
       if response[:status].to_i != 200

data/lib/lds-cf-plugin/oracle_service.rb

@@ -1,5 +1,5 @@
 require "cf/cli"
-require "yajl"
+require "json"
 
 module LdsCfPlugin
   class CustomService < CF::CLI
@@ -8,7 +8,7 @@ module LdsCfPlugin
     end
 
     desc "Create an Oracle service"
-    group :lds
+    group :lds, :services
     input :name, :desc => "Name for your service", :argument => :optional
     input :service, :desc => "The Oracle database to connect to", :argument => :optional
     input :schema, :desc => "The schema (user) to use", :argument => :optional
@@ -71,11 +71,11 @@ module LdsCfPlugin
           :password => password
       }
       options = {
-          :payload => Yajl::Encoder.encode(payload)
+          :payload => JSON.generate(payload)
       }
       request, response = rest_client.request("POST", "/register", options)
       if response[:status].to_i != 200
-        fail "Error registering Oracle service with gateway.  See details below:\n#{response[:body]}"
+        fail "Error registering Oracle service with gateway:\n#{response[:body]}"
       end
 
 

data/lib/lds-cf-plugin/plugin.rb

@@ -1,9 +1,11 @@
 require "mothership/help"
 
 Mothership::Help.groups(
-    [:lds, "LDS Specific"]
+    [:lds, "LDS Specific",
+    [:services, "Services"],
+    [:diagnostics, "Diagnostics"]]
 )
 
 require "lds-cf-plugin/custom_service"
 require "lds-cf-plugin/oracle_service"
-
+require "lds-cf-plugin/tunnel"

data/lib/lds-cf-plugin/tunnel/tunnelclient.rb

@@ -0,0 +1,102 @@
+require 'eventmachine'
+require 'interact/pretty'
+
+module TunnelClient
+
+  PROTOCOL_VERSION = '1'.freeze
+
+  FRAME_HEADER_LENGTH = 5
+
+  extend Interact::Pretty
+
+  def self.tunnel(token, tunnel_server_host, tunnel_server_port, app, instance_id, port = 'debug', local_host = '127.0.0.1', local_port = 1847, use_tls = true)
+    EventMachine::start_server(local_host, local_port, TunnelListener, token, tunnel_server_host, tunnel_server_port, app.guid, instance_id, port, use_tls)
+  end
+
+  class TunnelListener < EventMachine::Connection
+
+    attr_reader :token
+    attr_reader :app_guid
+    attr_reader :instance_id
+    attr_reader :port
+    attr_reader :use_tls
+
+    def initialize(token, tunnel_server_host, tunnel_server_port, app_guid, instance_id, port, use_tls)
+      @token, @app_guid, @instance_id, @port, @use_tls = token, app_guid, instance_id, port, use_tls
+
+      @tunnel_server_host = tunnel_server_host
+      @tunnel_server_port = tunnel_server_port
+    end
+
+    def post_init
+      puts 'Opening new connection to server...'
+      pause
+      @connection = EventMachine.connect(@tunnel_server_host, @tunnel_server_port, TunnelConnection, self)
+    end
+
+    def unbind
+      puts "Connection closed"
+      @connection.close_connection_after_writing
+    end
+
+  end
+
+  class TunnelConnection < EventMachine::Connection
+
+    def initialize(listener)
+      @listener = listener
+    end
+
+    def post_init
+      puts "Connection opened"
+      if @listener.use_tls
+        start_tls
+      else
+        send_initialization
+      end
+    end
+
+    def ssl_handshake_completed
+      send_initialization
+    end
+
+    def receive_data(data)
+      (@buf ||= '') << data
+
+      while @buf.bytesize >= FRAME_HEADER_LENGTH
+        frame_type, frame_length = @buf.unpack("A1N")
+        if @buf.bytesize >= FRAME_HEADER_LENGTH + frame_length
+          @buf.slice!(0,FRAME_HEADER_LENGTH)
+          frame_body = @buf.slice!(0,frame_length)
+          case frame_type
+            when 'E', 'e'
+              # Error
+              close_connection
+              raise frame_body
+            when 'R', 'r'
+              @listener.resume
+              proxy_incoming_to @listener
+              @listener.proxy_incoming_to self
+            else
+              close_connection
+              raise "Received invalid frame type '#{frame_type}' from Tunnel Server"
+          end
+        end
+      end
+    end
+
+    def unbind
+      @listener.close_connection_after_writing
+    end
+
+    private
+
+    def send_initialization
+      frame_body = "#{PROTOCOL_VERSION} #{@listener.token} #{@listener.app_guid} #{@listener.instance_id} #{@listener.port}"
+      frame = ['I', frame_body.bytesize, frame_body]
+      send_data frame.pack("A1NA*")
+    end
+
+  end
+
+end

data/lib/lds-cf-plugin/tunnel.rb

@@ -0,0 +1,192 @@
+require "cf/cli"
+require "cf/constants"
+require 'eventmachine'
+require "lds-cf-plugin/tunnel/tunnelclient"
+require "open-uri"
+require "uri"
+
+module LdsCfPlugin
+
+  JMXMP_JAR_NAME = "jmxremote_optional-repackaged-4.0.jar".freeze
+  JMXMP_JAR_FILE = File.expand_path("#{CF::CONFIG_DIR}/jmxremote_optional-repackaged-4.0.jar").freeze
+  JMXMP_JAR_URL = "http://search.maven.org/remotecontent?filepath=org/glassfish/main/external/jmxremote_optional-repackaged/4.0/#{JMXMP_JAR_NAME}".freeze
+
+  class Tunnel < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Open tunnel to application's debug port"
+    group :lds, :diagnostics
+    input :app, :desc => "Application to debug", :argument => :optional,
+          :from_given => by_name(:app)
+    input :instance, :desc => "Application instance", :argument => :optional
+    input :host, :desc => "The local host to bind to for tunneling connections",
+          :default => "127.0.0.1", :aliases => "--host"
+    input :port, :desc => "The local port to listen on for tunneling connections",
+          :default => 1847, :aliases => "--port"
+    input :tunnel_server, :desc => "The server to connect to for tunneling to the application",
+          :aliases => "--server"
+    input :tunnel_server_port, :desc => "The port to connect to on the tunnel server",
+          :aliases => "--server-port", :default => 2014
+    input :use_tls, :desc => "Indicates if TLS should be used", :default => true
+    def tunnel_debug
+      app = input[:app]
+      instances = get_instances(app)
+
+      filter_debug_instances(app, instances)
+
+      unless instances.size > 0
+        if ask("Restart application #{c(app.name, :name)} in debug mode?", :default => true)
+          invoke :restart, :app => app, :debug_mode => ""
+
+          instances = get_instances(app)
+          filter_debug_instances(app, instances)
+        else
+          fail "Unable to debug #{c(app.name, :name)} because it is not running in debug mode."
+        end
+      end
+
+      fail "Debugger information for #{c(app.name, :name)} still not available." unless instances.size > 0
+
+      tunnel(app, instances, "debug")
+    end
+
+    def filter_debug_instances(app, instances)
+      instances.keep_if do |instance|
+        debugger = instance.debugger
+        puts "#{c('Debugger information for instance', :error)} ##{c(instance.id, :number)} #{c('of', :error)} #{c(app.name, :name)} #{c('not available', :error)}" unless debugger
+        debugger
+      end
+    end
+
+    desc "Open tunnel to application's console port"
+    group :lds, :diagnostics
+    input :app, :desc => "Application to connect the console to", :argument => :optional,
+          :from_given => by_name(:app)
+    input :instance, :desc => "Application instance", :argument => :optional
+    input :host, :desc => "The local host to bind to for tunneling connections",
+          :default => "127.0.0.1", :aliases => "--host"
+    input :port, :desc => "The local port to listen on for tunneling connections",
+          :default => 1830, :aliases => "--port"
+    input :tunnel_server, :desc => "The server to connect to for tunneling to the application",
+          :aliases => "--server"
+    input :tunnel_server_port, :desc => "The port to connect to on the tunnel server",
+          :aliases => "--server-port", :default => 2014
+    input :use_tls, :desc => "Indicates if TLS should be used", :default => true
+    def tunnel_console(&post_tunnel)
+      app = input[:app]
+      instances = get_instances(app)
+
+      instances.keep_if do |instance|
+        console = instance.console
+        puts "#{c('Console information for instance', :error)} ##{c(instance.id, :number)} #{c('of', :error)} #{c(app.name, :name)} #{c(' not available', :error)}" unless console
+        console
+      end
+
+      fail "Console information for #{c(app.name, :name)} not available." unless instances.size > 0
+
+      tunnel(app, instances, "console", &post_tunnel)
+    end
+
+    desc "Launch VisualVM and connect to each instance of application"
+    group :lds, :diagnostics
+    input :app, :desc => "Application VisualVM will connect to", :argument => :optional,
+          :from_given => by_name(:app)
+    input :instance, :desc => "Application instance", :argument => :optional
+    input :host, :desc => "The local host to bind to for tunneling connections",
+          :default => "127.0.0.1", :aliases => "--host"
+    input :port, :desc => "The local port to listen on for tunneling connections",
+          :default => 1830, :aliases => "--port"
+    input :tunnel_server, :desc => "The server to connect to for tunneling to the application",
+          :aliases => "--server"
+    input :tunnel_server_port, :desc => "The port to connect to on the tunnel server",
+          :aliases => "--server-port", :default => 2014
+    input :use_tls, :desc => "Indicates if TLS should be used", :default => true
+    input :jvisualvm, :desc => "The location of the jvisualvm executable to be used", :aliases => "--jvisualvm"
+    def visualvm
+      if !File::exist?(JMXMP_JAR_FILE)
+        with_progress("Downloading JMXMP extension") do
+          File.open(JMXMP_JAR_FILE, "wb") do |saved_file|
+            open(JMXMP_JAR_URL, 'rb') do |read_file|
+              saved_file.write(read_file.read)
+            end
+          end
+        end
+      end
+      tunnel_console do |instances|
+        visualvm = input[:jvisualvm] ? input[:jvisualvm] : "jvisualvm"
+        EventMachine::defer do
+          if system("#{visualvm} -cp:a #{JMXMP_JAR_FILE}") == nil
+            fail("Unable to run '#{visualvm}'. Is it in your PATH?")
+          end
+        end
+
+        EventMachine::defer do
+          # Give jvisualvm time to start up
+          sleep(5)
+          host = input[:host]
+          port = input[:port]
+
+          instances.each do |instance|
+            jmxurl = "service:jmx:jmxmp://#{host}:#{port}"
+            puts "Adding instance #{c('#' + instance.id, :instance)} to VisualVM (#{c(jmxurl, :instance)})"
+            system("#{visualvm} --openjmx #{jmxurl}")
+            port = port + 1
+          end
+        end
+      end
+    end
+
+    def tunnel(app, instances, mode, &post_tunnel)
+      server = input[:tunnel_server] ? input[:tunnel_server] : URI(client.target).host
+      server_port = input[:tunnel_server_port]
+
+      host = input[:host]
+      port = input[:port]
+
+      line
+
+      EventMachine.error_handler do |e|
+        EventMachine.stop_event_loop
+
+        log_error(e)
+      end
+
+      EventMachine.run do
+        instances.each do |instance|
+          TunnelClient::tunnel(client.token.auth_header, server, server_port, app, instance.id, mode, host, port, input[:use_tls])
+          puts "Listening on #{c(host + ':' + port.to_s, :number)} for #{c(mode, :warning)} connections to forward to #{c(app.name, :name)} instance #{c('#' + instance.id, :instance)}."
+          port = port + 1
+        end
+        yield instances if post_tunnel
+      end
+    end
+
+    private
+
+    def ask_app
+      ask "Which application?", :choices => client.apps,
+          :display => proc(&:name)
+    end
+
+    def get_instances(app)
+      instances = with_progress ("Getting instances for #{c(app.name, :name)}") do
+        app.instances
+      end
+
+      fail "No instances of #{c(app.name, :name)} are running." if instances.length == 0
+
+      instances.sort! { |a, b| a.id.to_i <=> b.id.to_i }
+
+      if input[:instance]
+        instance = input[:instance].to_i
+        instances = [ instances[instance] ]
+      end
+
+      instances
+    end
+
+  end
+
+end

data/lib/lds-cf-plugin/version.rb

@@ -1,3 +1,3 @@
 module LdsCfPlugin
-  VERSION = "0.2.3".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,69 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lds-cf-plugin
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Mike Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cfoundry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: 
-email: 
+email:
 - heathma@ldschurch.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/lds-cf-plugin/custom_service.rb
 - lib/lds-cf-plugin/oracle_service.rb
+- lib/lds-cf-plugin/tunnel.rb
 - lib/lds-cf-plugin/version.rb
 - lib/lds-cf-plugin/plugin.rb
-homepage: http://cloudfoundry.com/
+- lib/lds-cf-plugin/tunnel/tunnelclient.rb
+homepage: http://ui.app.lds.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cloud Foundry commands for LDS PaaS.
 test_files: []
-