cf 5.0.0.rc1 → 5.0.0.rc3

data/lib/admin/plugin.rb

@@ -2,3 +2,4 @@ require "admin/curl"
 require "admin/guid"
 require "admin/set_quota"
 require "admin/service_auth_token"
+require "admin/service_broker/add"

data/lib/admin/service_broker/add.rb

@@ -0,0 +1,46 @@
+require "cf/cli"
+
+module CFAdmin::ServiceBroker
+  class Add < CF::CLI
+    def precondition
+      check_target
+    end
+
+    desc "Add a Service Broker."
+    group :admin
+    input :name, :argument => :optional,
+      :desc => "broker name"
+    input :url,
+      :desc => "broker url"
+    input :token,
+      :desc => "broker token"
+
+    def add_service_broker
+      broker = client.service_broker
+
+      broker.name = input[:name]
+      finalize
+      broker.broker_url = input[:url]
+      finalize
+      broker.token = input[:token]
+      finalize
+
+      with_progress("") do
+        broker.create!
+      end
+    end
+
+    private
+    def ask_name
+      ask("name")
+    end
+
+    def ask_url
+      ask("url")
+    end
+
+    def ask_token
+      ask("token")
+    end
+  end
+end

data/lib/cf/cli.rb

@@ -414,10 +414,8 @@ EOS
 
       fail "V1 targets are no longer supported." if info[:version] == 1
 
-      @@client = CFoundry::V2::Client.new(target, token)
+      @@client = build_client(target, token)
 
-      @@client.http_proxy = input[:http_proxy] || ENV['HTTP_PROXY'] || ENV['http_proxy']
-      @@client.https_proxy = input[:https_proxy] || ENV['HTTPS_PROXY'] || ENV['https_proxy']
       @@client.trace = input[:trace]
 
       uri = URI.parse(target)
@@ -435,6 +433,13 @@ EOS
     rescue CFoundry::InvalidTarget
     end
 
+    def build_client(target, token = nil)
+      client = CFoundry::V2::Client.new(target, token)
+      client.http_proxy = input[:http_proxy] || ENV['HTTP_PROXY'] || ENV['http_proxy']
+      client.https_proxy = input[:https_proxy] || ENV['HTTPS_PROXY'] || ENV['https_proxy']
+      client
+    end
+
     def fail_unknown(display, name)
       fail("Unknown #{display} '#{name}'.")
     end

data/lib/cf/cli/service/create.rb

@@ -1,6 +1,16 @@
 require "cf/cli/service/base"
 
 module CF::Service
+  USER_PROVIDED_OFFERING = "user-provided" # I'd rather move this to CFoundry
+
+  class UPDummy
+    def label
+      "user-provided"
+    end
+
+    attr_reader :version, :provider
+  end
+
   class Create < Base
     offerings_from_label = proc { |label, offerings|
       offerings.select { |s| s.label == label }
@@ -46,6 +56,8 @@ module CF::Service
       end
       finalize
 
+      offerings << UPDummy.new
+
       selected_offerings = offerings.any? ? Array(input[:offering, offerings.sort_by(&:label)]) : []
       finalize
 
@@ -55,48 +67,84 @@ module CF::Service
 
       offering = selected_offerings.first
 
-      service = client.service_instance
-      service.name = input[:name, offering]
-      finalize
-      plan = input[:plan, offering.service_plans]
-      finalize
-      service.service_plan = if plan.is_a?(String)
-                               offering.service_plans.find { |p| p.name.casecmp(plan) == 0 }
-                             else
-                               plan
-                             end
-      service.space = client.current_space
-
-      with_progress("Creating service #{c(service.name, :name)}") do
-        service.create!
+      if offering.label == CF::Service::USER_PROVIDED_OFFERING
+        service_instance = client.user_provided_service_instance
+        service_instance.name = input[:name, offering]
+        finalize
+
+        # at this point there's no way input[:credentials] can work interactively...
+        service_instance.credentials = input[:credentials, nil] || ask_credentials
+      else
+        service_instance = client.managed_service_instance
+        service_instance.name = input[:name, offering]
+        finalize
+
+        plan = input[:plan, offering.service_plans]
+        finalize
+        service_instance.service_plan = if plan.is_a?(String)
+                                          offering.service_plans.find { |p| p.name.casecmp(plan) == 0 }
+                                        else
+                                          plan
+                                        end
+      end
+
+      service_instance.space = client.current_space
+
+      with_progress("Creating service #{c(service_instance.name, :name)}") do
+        service_instance.create!
       end
 
       app = input[:app]
       finalize
 
       if app
-        invoke :bind_service, :service => service, :app => app
+        invoke :bind_service, :service => service_instance, :app => app
       end
-      service
+      service_instance
     end
 
     private
 
+    def ask_credentials
+      credentials = {}
+
+      while keys = ask("What credential parameters should applications use to connect to this service instance?\n(e.g. hostname, port, password)").split(/\s*,\s*/).map(&:strip)
+        if bad_key = keys.detect { |key| key !~ /^[-\w]+$/ }
+          line("'#{bad_key}' is not a valid key")
+        else
+          break
+        end
+      end
+      finalize
+      keys.each do |key|
+        value = ask(key)
+        finalize
+        credentials[key] = value
+      end
+
+      credentials
+    end
+
     def ask_offering(offerings)
       [ask("What kind?", :choices => offerings.sort_by(&:label),
-        :display => proc { |s|
+        :display => proc do |s|
           str = "#{c(s.label, :name)} #{s.version}"
           if s.provider != "core"
             str << ", via #{s.provider}"
           end
           str
-        },
+        end,
         :complete => proc { |s| "#{s.label} #{s.version}" })]
     end
 
     def ask_name(offering)
-      random = sprintf("%x", rand(1000000))
-      ask "Name?", :default => "#{offering.label}-#{random}"
+      default = nil
+      unless offering == CF::Service::USER_PROVIDED_OFFERING
+        random = sprintf("%x", rand(1000000))
+        default = "#{offering.label}-#{random}"
+      end
+
+      ask "Name?", :default => default
     end
 
     def ask_plan(plans)

data/lib/cf/cli/service/delete.rb

@@ -4,7 +4,7 @@ module CF::Service
   class Delete < Base
     desc "Delete a service"
     group :services, :manage
-    input :service, :desc => "Service to bind", :argument => :optional,
+    input :service, :desc => "Service to delete", :argument => :optional,
           :from_given => by_name(:service_instance, :service)
     input :unbind, :desc => "Unbind from applications before deleting?",
           :type => :boolean, :default => proc { force? || interact }

data/lib/cf/cli/service/service_instance_helper.rb

@@ -0,0 +1,99 @@
+class ServiceInstanceHelper
+  def self.new(instance)
+    "#{instance.class.name.demodulize}Helper".constantize.new(instance)
+  end
+end
+
+class UserProvidedServiceInstanceHelper
+  def initialize(instance)
+    @instance = instance
+  end
+
+  def service_label
+    "user-provided"
+  end
+
+  def service_provider
+    "n/a"
+  end
+
+  def version
+    "n/a"
+  end
+
+  def plan_name
+    "n/a"
+  end
+
+  def matches(opts = {})
+    label = opts[:service]
+    if label
+      return label == service_label
+    end
+
+    true
+  end
+
+  def name
+    @instance.name
+  end
+
+  def service_bindings
+    @instance.service_bindings
+  end
+end
+
+class ManagedServiceInstanceHelper
+  def initialize(service_instance)
+    @instance = service_instance
+  end
+
+  def service_label
+    @instance.service_plan.service.label
+  end
+
+  def service_provider
+    @instance.service_plan.service.provider
+  end
+
+  def version
+    @instance.service_plan.service.version
+  end
+
+  def plan_name
+    @instance.service_plan.name
+  end
+
+  def service_bindings
+    @instance.service_bindings
+  end
+
+  def name
+    @instance.name
+  end
+
+  def matches(opts = {})
+    service = opts[:service]
+    plan = opts[:plan]
+    provider = opts[:provider]
+    version = opts[:version]
+
+    if service
+      return false unless File.fnmatch(service, service_label)
+    end
+
+    if plan
+      return false unless File.fnmatch(plan.upcase, plan_name.upcase)
+    end
+
+    if provider
+      return false unless File.fnmatch(provider, service_provider)
+    end
+
+    if version
+      return false unless File.fnmatch(version, self.version)
+    end
+
+    true
+  end
+end

data/lib/cf/cli/service/services.rb

@@ -71,19 +71,16 @@ module CF::Service
     def show_services_table
       table(
         ["name", "service", "provider", "version", "plan", "bound apps"],
-        @services.collect { |i|
-          apps     = name_list(i.service_bindings.collect(&:app))
-          plan = i.service_plan
-
-          unless plan
-            [ c(i.name, :name), "none", "none", "none", "none", apps]
-          else
-            service = plan.service
-            label    = service.label
-            version  = service.version
-            provider = service.provider
-            [ c(i.name, :name), label, provider, version, plan.name, apps]
-          end
+        @services.collect { |instance|
+          presenter = ServiceInstanceHelper.new(instance)
+          apps     = name_list(presenter.service_bindings.collect(&:app))
+
+          label = presenter.service_label
+          provider = presenter.service_provider
+          version = presenter.version
+          plan_name = presenter.plan_name
+
+          [ c(presenter.name, :name), label, provider, version, plan_name, apps]
         })
 
     end
@@ -105,25 +102,8 @@ module CF::Service
         return false unless File.fnmatch(name, i.name)
       end
 
-      plan = i.service_plan
-
-      if service = options[:service]
-        return false unless File.fnmatch(service, plan.service.label)
-      end
-
-      if plan = options[:plan]
-        return false unless File.fnmatch(plan.upcase, plan.name.upcase)
-      end
-
-      if provider = options[:provider]
-        return false unless File.fnmatch(provider, plan.service.provider)
-      end
-
-      if version = options[:version]
-        return false unless File.fnmatch(version, plan.service.version)
-      end
-
-      true
+      helper = ServiceInstanceHelper.new(i)
+      return helper.matches(options)
     end
   end
 end

data/lib/cf/cli/start/target.rb

@@ -21,7 +21,7 @@ module CF::Start
         target = sane_target_url(input[:url])
         with_progress("Setting target to #{c(target, :name)}") do
           begin
-            CFoundry::Client.get(target) # check that it's valid before setting
+            build_client(target).info # check that it's valid before setting
           rescue CFoundry::TargetRefused
             fail "Target refused connection."
           rescue CFoundry::InvalidTarget

data/lib/cf/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "5.0.0.rc1".freeze
+  VERSION = "5.0.0.rc3".freeze
 end

data/lib/manifests/manifests.rb

@@ -1,5 +1,6 @@
 require "yaml"
 require "set"
+require "cf/cli/service/create"
 
 require "manifests/loader"
 
@@ -182,16 +183,23 @@ module CFManifests
     unless services.empty?
       meta["services"] = {}
 
-      services.each do |i|
-        p = i.service_plan
-        s = p.service
-
-        meta["services"][i.name] = {
-          "label" => s.label,
-          "provider" => s.provider,
-          "version" => s.version,
-          "plan" => p.name
-        }
+      services.each do |service_instance|
+        if service_instance.is_a?(CFoundry::V2::UserProvidedServiceInstance)
+          meta["services"][service_instance.name] = {
+            "label" => "user-provided",
+            "credentials" => service_instance.credentials.stringify_keys,
+          }
+        else
+          service_plan = service_instance.service_plan
+          service = service_plan.service
+
+          meta["services"][service_instance.name] = {
+            "label" => service.label,
+            "provider" => service.provider,
+            "version" => service.version,
+            "plan" => service_plan.name
+          }
+        end
       end
     end
 
@@ -292,25 +300,33 @@ module CFManifests
       if instance = client.service_instance_by_name(name)
         to_bind << instance
       else
-        offering = offerings.find { |o|
-          o.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
-            (!svc[:version] || o.version == svc[:version]) &&
-            (o.provider == (svc[:provider] || "core"))
-        }
+        if svc[:label] == "user-provided"
+          invoke :create_service,
+            name: name,
+            offering: CF::Service::UPDummy.new,
+            app: app,
+            credentials: svc[:credentials]
+        else
+          offering = offerings.find { |o|
+            o.label == (svc[:label] || svc[:type] || svc[:vendor]) &&
+              (!svc[:version] || o.version == svc[:version]) &&
+              (o.provider == (svc[:provider] || "core"))
+          }
 
-        fail "Unknown service offering: #{svc.inspect}." unless offering
+          fail "Unknown service offering: #{svc.inspect}." unless offering
 
-        plan = offering.service_plans.find { |p|
-          p.name == (svc[:plan] || "D100")
-        }
+          plan = offering.service_plans.find { |p|
+            p.name == (svc[:plan] || "D100")
+          }
 
-        fail "Unknown service plan: #{svc[:plan]}." unless plan
+          fail "Unknown service plan: #{svc[:plan]}." unless plan
 
-        invoke :create_service,
-          :name => name,
-          :offering => offering,
-          :plan => plan,
-          :app => app
+          invoke :create_service,
+            :name => name,
+            :offering => offering,
+            :plan => plan,
+            :app => app
+        end
       end
     end