cf 4.2.9.rc2 → 4.2.9.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658bb15baee12d49dedab15c3e842db99f8bdc81
-  data.tar.gz: 7c6bc93e7f5c8c381abc3cfee2736a53ea603f5f
+  metadata.gz: c55cc0d0ff989f6e5afc8b9404527c74f0390644
+  data.tar.gz: 6f896df4b514a8e2827aed83b7687b670233078a
 SHA512:
-  metadata.gz: 7b99f6e8a7dcdb928ab74a390cb8011ce4b16ad58b215720e549c45c6d410297109d8ac250ece4828ebbcda73728bf7b3cd0240f65bc23ef0aac7869e03f179c
-  data.tar.gz: b9d1b5a8a9425fb8c7936fe51f5ce477a9f2ec100059b28217812f071a2e379abf21dc5138beea43183e77801b782ee72ffbc2d85106274355a3ea539a12bdf3
+  metadata.gz: ac80ed0d9c5a7eef372b9f6e25dfcae8920fff2612582331ac83726ab586dcec5269bd48e872dd4bfe686b6f9584940c88df936703063ff9e2d00ffe92f3640f
+  data.tar.gz: 9f040edd92bfc646f5897b418aa365fc6037ad549ad82ebd9068226bfe09cef3db7e78e87131ce4ab2cf941a64a12a6edbf1ae94be6d47459253fd48e6d3ea92

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

@@ -74,7 +74,7 @@ module CF::Service
 
         service_instance.credentials = ask_credentials # input[:credentials]
       else
-        service_instance = client.service_instance
+        service_instance = client.managed_service_instance
         service_instance.name = input[:name, offering]
         finalize
 
@@ -106,7 +106,7 @@ module CF::Service
 
     def ask_credentials
       credentials = {}
-      line("What credentials parameters should applications use to connect to this service instance? (e.g. key: uri, value: mysql://username:password@hostname:port/name)")
+      line("What credential parameters should applications use to connect to this service instance? (e.g. hostname, port, password)")
 
       while keys = ask("Keys").split(/\s*,\s*/).map(&:strip)
         if bad_key = keys.detect { |key| key !~ /^[-\w]+$/ }

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), "user-provided", "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/version.rb

@@ -1,3 +1,3 @@
 module CF
-  VERSION = "4.2.9.rc2".freeze
+  VERSION = "4.2.9.rc3".freeze
 end

data/lib/tasks/gem_release.rake

@@ -10,7 +10,7 @@ namespace :gem do
     sh! "git add lib/cf/version.rb"
 
     print_with_purpose "Bumping to version #{gem_version}"
-    generate_release_notes(old_version)
+    #generate_release_notes(old_version)
     sh!("git commit -m 'Bumping to version #{gem_version}.'")
     sh!("git push")
     sh!("gem release --tag")
@@ -20,7 +20,7 @@ namespace :gem do
   def generate_release_notes(old_version)
     print_with_purpose "Generating release notes..."
     file_name = "release_#{gem_version}"
-    #sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
+    sh!("anchorman notes --name=#{file_name} --from=v#{old_version}")
     sh!("git add release_notes")
   end
 

data/spec/cf/cli/app/delete_spec.rb

@@ -52,8 +52,8 @@ module CF
       end
 
       context "when there are apps" do
-        let(:service_1) { build(:service_instance, :name => "service-instance-name-1") }
-        let(:service_2) { build(:service_instance, :name => "service-instance-name-2") }
+        let(:service_1) { build(:managed_service_instance, :name => "service-instance-name-1") }
+        let(:service_2) { build(:managed_service_instance, :name => "service-instance-name-2") }
 
         let(:service_binding_1) { build(:service_binding, :service_instance => service_1) }
         let(:service_binding_2) { build(:service_binding, :service_instance => service_2) }

data/spec/cf/cli/app/push/create_spec.rb

@@ -7,7 +7,7 @@ module CF
       let(:given) { {} }
       let(:global) { {:color => false, :quiet => true} }
 
-      let(:service_instances) { Array.new(5) { build(:service_instance) } }
+      let(:service_instances) { Array.new(5) { build(:managed_service_instance) } }
       let(:lucid64) { build(:stack, :name => "lucid64") }
       let(:client) { build(:client) }
 

data/spec/cf/cli/service/create_spec.rb

@@ -73,8 +73,8 @@ module CF
           } }
 
           it "creates the specified service" do
-            CFoundry::V2::ServiceInstance.any_instance.should_receive(:service_plan=).with(service_plan)
-            CFoundry::V2::ServiceInstance.any_instance.should_receive(:create!)
+            CFoundry::V2::ManagedServiceInstance.any_instance.should_receive(:service_plan=).with(service_plan)
+            CFoundry::V2::ManagedServiceInstance.any_instance.should_receive(:create!)
             capture_output { command }
           end
         end
@@ -89,8 +89,8 @@ module CF
           let(:services) { [selected_service] }
 
           it "uses case insensitive match" do
-            CFoundry::V2::ServiceInstance.any_instance.should_receive(:service_plan=).with(service_plan)
-            CFoundry::V2::ServiceInstance.any_instance.should_receive(:create!)
+            CFoundry::V2::ManagedServiceInstance.any_instance.should_receive(:service_plan=).with(service_plan)
+            CFoundry::V2::ManagedServiceInstance.any_instance.should_receive(:create!)
             capture_output { command }
           end
         end
@@ -107,7 +107,7 @@ module CF
             should_ask("What kind?", hash_including(choices: include(has_label("user-provided")))) { user_provided_service }
             should_ask("Name?", anything) { "user-provided-service-name-1" }
 
-            should_print("What credentials parameters should applications use to connect to this service instance? (e.g. key: uri, value: mysql://username:password@hostname:port/name)")
+            should_print("What credential parameters should applications use to connect to this service instance? (e.g. hostname, port, password)")
             should_ask("Keys") { "host, port, user name" }
             should_print("'user name' is not a valid key")
             should_ask("Keys") { "host, port" }

data/spec/cf/cli/service/rename_spec.rb

@@ -51,7 +51,7 @@ describe CF::Service::Rename do
   end
 
   context "when there are services" do
-    let(:services) { Array.new(2) { build(:service_instance) } }
+    let(:services) { Array.new(2) { build(:managed_service_instance) } }
     let(:renamed_service) { services.first }
 
     context "when the defaults are used" do

data/spec/cf/cli/service/service_instance_helper_spec.rb

@@ -0,0 +1,155 @@
+require "spec_helper"
+
+describe ServiceInstanceHelper do
+  describe ".new" do
+    let(:provided_instance) { build(:user_provided_service_instance) }
+    let(:managed_instance) { build(:managed_service_instance) }
+
+    it "returns a ManagedSerivceInstanceHelper when the argument is a ManagedServiceInstance" do
+      expect(ServiceInstanceHelper.new(managed_instance)).to be_a ManagedServiceInstanceHelper
+    end
+
+    it "returns a ManagedSerivceInstanceHelper when the argument is a ManagedServiceInstance" do
+      expect(ServiceInstanceHelper.new(provided_instance)).to be_a UserProvidedServiceInstanceHelper
+    end
+  end
+end
+
+describe UserProvidedServiceInstanceHelper do
+  let(:bindings) { [] }
+  let(:instance) { build(:user_provided_service_instance, service_bindings: bindings) }
+  subject(:helper) { UserProvidedServiceInstanceHelper.new(instance) }
+  describe "matches" do
+    it "returns true when 'user-provided' is the given label" do
+      expect(helper.matches(service: "user-provided")).to eq true
+    end
+
+    it "returns false when 'user-provided' is not the given label" do
+      expect(helper.matches(service: "a-different-label")).to eq false
+    end
+
+    it "returns true when a label is not given" do
+      expect(helper.matches).to eq true
+    end
+  end
+
+  its(:service_label) { should eq("user-provided") }
+  its(:service_provider) { should eq("n/a") }
+  its(:version) { should eq("n/a") }
+  its(:plan_name) { should eq("n/a") }
+  its(:name) { should eq instance.name }
+  its(:service_bindings) { should eq instance.service_bindings }
+end
+
+describe ManagedServiceInstanceHelper do
+  let(:label) { "some-label" }
+  let(:provider) { "some-provider" }
+  let(:version) { "some-version" }
+  let(:plan_name) { "some-plan-name" }
+
+  let(:service) { build(:service, label: label, provider: provider, version: version) }
+  let(:plan) { build(:service_plan, service: service, name: plan_name) }
+  let(:bindings) { [] }
+  let(:instance) { build(:managed_service_instance, service_plan: plan, service_bindings: bindings) }
+  subject(:helper) { ManagedServiceInstanceHelper.new(instance) }
+
+  describe "matches" do
+    it "returns true when no condition is specified" do
+      expect(helper.matches).to eq(true)
+    end
+
+    context "filtering based on service" do
+      it "returns true if the service label matches given service" do
+        expect(helper.matches(service: label)).to eq(true)
+      end
+
+      it "returns false if the service label does not match given service" do
+        expect(helper.matches(service: "a-different-label")).to eq(false)
+      end
+    end
+
+    context "filtering based on service plan" do
+      it "returns true if the plan name matches given plan" do
+        expect(helper.matches(plan: plan_name)).to eq(true)
+      end
+
+      it "returns true if the plan name does not match given plan" do
+        expect(helper.matches(plan: "some-other-plan-name")).to eq(false)
+      end
+
+      it "is case insensitive" do
+        expect(helper.matches(plan: plan_name.upcase)).to eq(true)
+      end
+    end
+
+    context "filtering based on provider" do
+      it "returns true if the provider name matches given provider" do
+        expect(helper.matches(provider: provider)).to eq(true)
+      end
+
+      it "returns true if the provider does not match given provider" do
+        expect(helper.matches(provider: "a-different-provider")).to eq(false)
+      end
+    end
+
+    context "filtering based on version" do
+      it "returns true if the version matches given version" do
+        expect(helper.matches(version: version)).to eq(true)
+      end
+
+      it "returns true if the version does not match given version" do
+        expect(helper.matches(version: "a-different-version")).to eq(false)
+      end
+    end
+
+    context "multiple filters" do
+      it "returns true if the service instance matches all four parameters" do
+        expect(helper.matches(service: label, plan: plan_name,
+                              provider: provider, version: version)).to eq true
+      end
+
+      it "return false if any of the parameters does not match the attribute of the service instance" do
+        expect(helper.matches(service: label, plan: plan_name,
+                              provider: provider, version: "a-different-version")).to eq false
+      end
+    end
+
+    context "with patterns for args" do
+      it "returns true when service label matches the given glob" do
+        expect(helper.matches(service: label.gsub(/.$/, "*"))).to eq(true)
+      end
+
+      it "returns false when the service label doesn not match the given glob" do
+        expect(helper.matches(service: label + "_*")).to eq(false)
+      end
+    end
+  end
+
+  describe "service_label" do
+
+    it "returns the label of instance's service offering" do
+      expect(helper.service_label).to eq label
+    end
+  end
+
+  describe "service_provider" do
+    it "returns the provider of the instance's service offering" do
+      expect(helper.service_provider).to eq provider
+    end
+  end
+
+  describe "version" do
+    it "returns the version of the instance's service offering" do
+      expect(helper.version).to eq version
+    end
+  end
+
+  describe "plan_name" do
+    it "returns the name of the instance's service plan" do
+      expect(helper.plan_name).to eq plan_name
+    end
+  end
+
+  its(:name) { should eq instance.name }
+  its(:service_bindings) { should eq instance.service_bindings }
+end

data/spec/cf/cli/service/services_spec.rb

@@ -42,7 +42,7 @@ module CF
 
         let(:service_plan) { build(:service_plan, :service => build(:service, :version => "service_version", :provider => "provider")) }
         let(:service_binding) { build(:service_binding, :app => app) }
-        let(:service1) { build(:service_instance, :service_plan => service_plan, :service_bindings => [service_binding]) }
+        let(:service1) { build(:managed_service_instance, :service_plan => service_plan, :service_bindings => [service_binding]) }
 
         let(:service_instances) { [service1] }
         let(:current_space) { build(:space, :name => "the space") }
@@ -81,7 +81,7 @@ module CF
 
           context "when one of the services does not have a service plan" do
             let(:service_instances) { [service1, service2]}
-            let(:service2) { build(:service_instance, :service_plan => nil, :service_bindings => [service_binding]) }
+            let(:service2) { build(:user_provided_service_instance, :service_bindings => [service_binding]) }
 
             it 'still produces a table of service' do
               subject
@@ -102,9 +102,9 @@ module CF
 
               expect(output).to match /service-instance-.+?\s+  # name
         user-provided\s+                                # service
-        none\s+                                         # provider
-        none\s+                                         # version
-        none\s+                                         # plan
+        n\/a\s+                                         # provider
+        n\/a\s+                                         # version
+        n\/a\s+                                         # plan
         app-name-\d+\s+                                 # bound apps
         /x
             end

data/spec/cf/cli/space/space_spec.rb

@@ -29,7 +29,7 @@ module CF
 
         let(:apps) { Array.new(2) { build(:app) } }
         let(:domains) { Array.new(2) { build(:domain) } }
-        let(:services) { Array.new(2) { build(:service_instance) } }
+        let(:services) { Array.new(2) { build(:managed_service_instance) } }
         let(:space) { build(:space, :name => "some_space_name", :apps => apps, :service_instances => services, :domains => domains, :organization => organization ) }
         let(:spaces) { [space] }
         let(:organization) { build(:organization, :name => "Spacey Org") }

data/spec/cf/cli/space/spaces_spec.rb

@@ -5,9 +5,9 @@ module CF
     describe Spaces do
       let(:full) { false }
       let(:app) { build(:app) }
-      let!(:space_1) { build(:space, :name => "bb_second", :apps => [app], :service_instances => [build(:service_instance)]) }
-      let!(:space_2) { build(:space, :name => "aa_first", :apps => [app], :service_instances => [build(:service_instance)], :domains => [build(:domain)]) }
-      let!(:space_3) { build(:space, :name => "cc_last", :apps => [app], :service_instances => [build(:service_instance)], :domains => [build(:domain)]) }
+      let!(:space_1) { build(:space, :name => "bb_second", :apps => [app], :service_instances => [build(:managed_service_instance)]) }
+      let!(:space_2) { build(:space, :name => "aa_first", :apps => [app], :service_instances => [build(:managed_service_instance)], :domains => [build(:domain)]) }
+      let!(:space_3) { build(:space, :name => "cc_last", :apps => [app], :service_instances => [build(:managed_service_instance)], :domains => [build(:domain)]) }
       let(:spaces) { [space_1, space_2, space_3] }
       let(:organization) { build(:organization, :spaces => spaces, :name => "foo") }
       let(:client) do

data/spec/factories/cfoundry/v2/{service_instances_factory.rb → managed_service_instances_factory.rb}

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :service_instance, :class => CFoundry::V2::ServiceInstance do
+  factory :managed_service_instance, :class => CFoundry::V2::ManagedServiceInstance do
     sequence(:guid) { |n| "service-instance-guid-#{n}" }
     sequence(:name) { |n| "service-instance-name-#{n}" }
 
@@ -9,4 +9,4 @@ FactoryGirl.define do
 
     initialize_with { new(guid, client) }
   end
-end
+end

data/spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :user_provided_service_instance, :class => CFoundry::V2::UserProvidedServiceInstance do
+    sequence(:guid) { |n| "user-provided-service-instance-guid-#{n}" }
+    sequence(:name) { |n| "user-provided-service-instance-name-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/features/services_spec.rb

@@ -15,7 +15,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
         create_service_instance("dummy-dev", service2, plan: "small")
 
         BlueShell::Runner.run("#{cf_bin} services") do |runner|
-          expect(runner).to say /#{service1}\s+user-provided\s+none\s+none\s+none\s+.*/
+          expect(runner).to say /#{service1}\s+user-provided\s+n\/a\s+n\/a\s+n\/a\s+.*/
         end
       end
 
@@ -51,8 +51,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
             expect(runner).to say "Name?"
             runner.send_keys service_name
 
-            expect(runner).to say "What credentials parameters should applications use to connect to this service instance? (e.g. key: uri, value: mysql://username:password@hostname:port/name)
-Keys"
+            expect(runner).to say "What credential parameters should applications use to connect to this service instance? (e.g. hostname, port, password)\nKeys"
             runner.send_keys "hostname"
             expect(runner).to say "hostname"
             runner.send_keys "myserviceinstance.com"

data/spec/integration/push_flow_spec.rb

@@ -9,6 +9,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
     let(:app) { "hello-sinatra-#{run_id}" }
     let(:subdomain) { "hello-sinatra-subdomain-#{run_id}" }
     let(:service_name) { "dummy-service-#{run_id}" }
+    let(:user_provided_name) { "user-provided-#{run_id}"}
 
     before do
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
@@ -85,7 +86,27 @@ if ENV["CF_V2_RUN_INTEGRATION"]
           expect(runner).not_to say "Which plan?>"
           runner.send_up_arrow
           expect(runner).not_to say "Which plan?>"
-          runner.send_return
+          runner.send_keys "y"
+
+          # create a user-provided service here
+          expect(runner).to say "What kind?>"
+          runner.send_keys "user-provided"
+
+          expect(runner).to say "Name?>"
+          runner.send_keys user_provided_name
+
+          expect(runner).not_to say "Which plan?>"
+          expect(runner).to say "What credential parameters should applications use to connect to this service instance? (e.g. hostname, port, password)\nKeys>"
+          runner.send_keys "uri"
+
+          expect(runner).to say "uri>"
+          runner.send_keys "mysql://u:p@example.com:port/db"
+
+          expect(runner).to say /Creating service #{user_provided_name}.*OK/
+          expect(runner).to say /Binding .+ to .+ OK/
+
+          expect(runner).to say "Create another service?> n"
+          runner.send_keys "n"
 
           if runner.expect "Bind other services to application?> n", 15
             runner.send_return

data/spec/manifests/manifests_spec.rb

@@ -65,7 +65,7 @@ describe CFManifests do
             :service_binding,
             :service_instance =>
               build(
-                :service_instance,
+                :managed_service_instance,
                 :name => "service-1",
                 :service_plan =>
                   build(
@@ -140,7 +140,7 @@ describe CFManifests do
         {:services => {"service-1" => {:label => "mysql", :plan => "100"}}}
       end
 
-      let(:service_1) { build(:service_instance, :name => "service-1") }
+      let(:service_1) { build(:managed_service_instance, :name => "service-1") }
       let(:plan_100) { build :service_plan, :name => "100" }
 
       let(:mysql) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf
 version: !ruby/object:Gem::Version
-  version: 4.2.9.rc2
+  version: 4.2.9.rc3
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.4.rc1
+        version: 4.0.4.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.4.rc1
+        version: 4.0.4.rc2
 - !ruby/object:Gem::Dependency
   name: interact
   requirement: !ruby/object:Gem::Requirement
@@ -335,6 +335,7 @@ files:
 - lib/cf/cli/service/delete.rb
 - lib/cf/cli/service/rename.rb
 - lib/cf/cli/service/service.rb
+- lib/cf/cli/service/service_instance_helper.rb
 - lib/cf/cli/service/services.rb
 - lib/cf/cli/service/unbind.rb
 - lib/cf/cli/space/base.rb
@@ -486,6 +487,7 @@ files:
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/help_spec.rb
 - spec/cf/cli/service/rename_spec.rb
+- spec/cf/cli/service/service_instance_helper_spec.rb
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
@@ -512,15 +514,16 @@ files:
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
 - spec/factories/cfoundry/v2/domains_factory.rb
+- spec/factories/cfoundry/v2/managed_service_instances_factory.rb
 - spec/factories/cfoundry/v2/organizations_factory.rb
 - spec/factories/cfoundry/v2/quota_definitions.rb
 - spec/factories/cfoundry/v2/routes_factory.rb
 - spec/factories/cfoundry/v2/service_bindings_factory.rb
-- spec/factories/cfoundry/v2/service_instances_factory.rb
 - spec/factories/cfoundry/v2/service_plans_factory.rb
 - spec/factories/cfoundry/v2/services_factory.rb
 - spec/factories/cfoundry/v2/spaces_factory.rb
 - spec/factories/cfoundry/v2/stacks_factory.rb
+- spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb
 - spec/factories/cfoundry/v2/users_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb
@@ -666,6 +669,7 @@ test_files:
 - spec/cf/cli/service/delete_spec.rb
 - spec/cf/cli/service/help_spec.rb
 - spec/cf/cli/service/rename_spec.rb
+- spec/cf/cli/service/service_instance_helper_spec.rb
 - spec/cf/cli/service/service_spec.rb
 - spec/cf/cli/service/services_spec.rb
 - spec/cf/cli/service/unbind_spec.rb
@@ -692,15 +696,16 @@ test_files:
 - spec/factories/cfoundry/v2/apps_factory.rb
 - spec/factories/cfoundry/v2/clients_factory.rb
 - spec/factories/cfoundry/v2/domains_factory.rb
+- spec/factories/cfoundry/v2/managed_service_instances_factory.rb
 - spec/factories/cfoundry/v2/organizations_factory.rb
 - spec/factories/cfoundry/v2/quota_definitions.rb
 - spec/factories/cfoundry/v2/routes_factory.rb
 - spec/factories/cfoundry/v2/service_bindings_factory.rb
-- spec/factories/cfoundry/v2/service_instances_factory.rb
 - spec/factories/cfoundry/v2/service_plans_factory.rb
 - spec/factories/cfoundry/v2/services_factory.rb
 - spec/factories/cfoundry/v2/spaces_factory.rb
 - spec/factories/cfoundry/v2/stacks_factory.rb
+- spec/factories/cfoundry/v2/user_provided_service_instances_factory.rb
 - spec/factories/cfoundry/v2/users_factory.rb
 - spec/features/account_lifecycle_spec.rb
 - spec/features/create_user_spec.rb