cf 5.0.0.rc1 → 5.0.0.rc3

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/delete_orphaned_service_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV["CF_V2_RUN_INTEGRATION"]
+  describe "A user deleting an app bound to a user-provided service" do
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-#{run_id}" }
+    let(:user_provided_name) { "user-provided-#{run_id}"}
+
+    before do
+      FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
+      WebMock.allow_net_connect!
+      login
+    end
+
+    after do
+      `#{cf_bin} unbind-service -f --no-script #{user_provided_name} #{app}`
+      `#{cf_bin} delete-service -f --no-script #{user_provided_name}`
+
+      `#{cf_bin} delete #{app} -f --routes --no-script`
+      logout
+    end
+
+    it "can delete the user-provided service when given --delete-orphaned" do
+      Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+        FileUtils.rm("manifest.yml", force: true)
+        File.open("manifest.yml", "w") do |f|
+          f.write(<<-MANIFEST)
+---
+applications:
+- name: #{app}
+  memory: 256M
+  instances: 1
+  host: ~
+  domain: none
+  path: .
+  services:
+    #{user_provided_name}:
+      label: user-provided
+      credentials:
+        username: abc123
+          MANIFEST
+        end
+
+        BlueShell::Runner.run("#{cf_bin} push --no-start") do |runner|
+          expect(runner).to say "Using manifest file manifest.yml"
+          expect(runner).to say "Creating #{app}... OK"
+
+          expect(runner).to say /Creating service #{user_provided_name}.*OK/
+          expect(runner).to say /Binding #{user_provided_name} to #{app}... OK/
+
+          expect(runner).to say "Uploading #{app}... OK"
+        end
+      end
+
+      BlueShell::Runner.run("#{cf_bin} delete #{app} --delete-orphaned --force") do |runner|
+        expect(runner).to say "Deleting #{app}... OK"
+        expect(runner).to say "Deleting #{user_provided_name}... OK"
+      end
+    end
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
+end

data/spec/features/manifests_spec.rb

@@ -0,0 +1,86 @@
+require "spec_helper"
+require "webmock/rspec"
+
+if ENV["CF_V2_RUN_INTEGRATION"]
+  describe "A user pushing a new sinatra app" do
+
+    let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
+    let(:app) { "hello-sinatra-#{run_id}" }
+    let(:subdomain) { "hello-sinatra-subdomain-#{run_id}" }
+    let(:user_provided_name) { "user-provided-#{run_id}"}
+
+    before do
+      FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
+      WebMock.allow_net_connect!
+      login
+    end
+
+    after do
+      `#{cf_bin} unbind-service -f --no-script #{user_provided_name} #{app}`
+      `#{cf_bin} delete-service -f --no-script #{user_provided_name}`
+
+      `#{cf_bin} delete #{app} -f --routes --no-script`
+      logout
+    end
+
+    context "with user-provided service" do
+      it "reads the manifest when pushing" do
+        Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+          FileUtils.rm("manifest.yml", force: true)
+          File.open("manifest.yml", "w") do |f|
+            f.write(<<-MANIFEST)
+---
+applications:
+- name: #{app}
+  memory: 256M
+  instances: 1
+  host: #{subdomain}
+  domain: a1-app.cf-app.com
+  path: .
+  services:
+    #{user_provided_name}:
+      label: user-provided
+      credentials:
+        username: abc123
+        password: sunshine
+        hostname: oracle.enterprise.com
+        port: 1234
+        name: myoracledb2
+            MANIFEST
+          end
+
+          BlueShell::Runner.run("#{cf_bin} push") do |runner|
+            expect(runner).to say "Using manifest file manifest.yml"
+            expect(runner).to say "Creating #{app}... OK"
+
+            expect(runner).to say(/Creating route #{subdomain}\..*\.\.\. OK/)
+            expect(runner).to say(/Binding #{subdomain}\..* to #{app}\.\.\. OK/)
+
+            expect(runner).to say /Creating service #{user_provided_name}.*OK/
+            expect(runner).to say /Binding #{user_provided_name} to #{app}... OK/
+
+            expect(runner).to say "Uploading #{app}... OK", 180
+            expect(runner).to say "Preparing to start #{app}... OK", 180
+            expect(runner).to say "Checking status of app '#{app}'...", 180
+            expect(runner).to say "1 of 1 instances running"
+            expect(runner).to say "Push successful! App '#{app}' available at http://#{subdomain}.a1-app.cf-app.com", 30
+          end
+        end
+
+        BlueShell::Runner.run("#{cf_bin} services") do |runner|
+          expect(runner).to say /name\s+service\s+provider\s+version\s+plan\s+bound apps/
+          expect(runner).to say /#{user_provided_name}\s+ # name
+            user-provided\s+                        # service
+            n\/a\s+                              # provider
+            n\/a\s+                             # version
+            n\/a\s+                             # plan
+            #{app}                              # bound apps
+          /x
+        end
+      end
+    end
+
+  end
+else
+  $stderr.puts 'Skipping v2 integration specs; please provide necessary environment variables'
+end

data/spec/features/org_spec.rb

@@ -24,13 +24,13 @@ if ENV["CF_V2_RUN_INTEGRATION"]
     end
 
     it "can create and recursively delete an org" do
-      BlueShell::Runner.run("cf create-org #{new_org_name}") do |runner|
+      BlueShell::Runner.run("#{cf_bin} create-org #{new_org_name}") do |runner|
         runner.should say "Creating organization #{new_org_name}... OK"
         runner.should say "Switching to organization #{new_org_name}... OK"
         runner.should say "There are no spaces. You may want to create one with create-space."
       end
 
-      BlueShell::Runner.run("cf create-space new-space") do |runner|
+      BlueShell::Runner.run("#{cf_bin} create-space new-space") do |runner|
         runner.should say "Creating space new-space... OK"
       end
 
@@ -39,11 +39,11 @@ if ENV["CF_V2_RUN_INTEGRATION"]
       #  runner.should say "If you want to delete the organization along with all dependent objects, rerun the command with the '--recursive' flag."
       #end
 
-      BlueShell::Runner.run("cf delete-org #{new_org_name} --force --recursive") do |runner|
+      BlueShell::Runner.run("#{cf_bin} delete-org #{new_org_name} --force --recursive") do |runner|
         runner.should say("Deleting organization #{new_org_name}... OK")
       end
 
-      BlueShell::Runner.run("cf orgs") do |runner|
+      BlueShell::Runner.run("#{cf_bin} orgs") do |runner|
         runner.should_not say("#{new_org_name}")
       end
     end

data/spec/{integration → features}/push_flow_spec.rb

@@ -3,12 +3,11 @@ require "webmock/rspec"
 
 if ENV["CF_V2_RUN_INTEGRATION"]
   describe "A user pushing a new sinatra app", :ruby19 => true do
-    include CF::Interactive
-
     let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
     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)
@@ -20,6 +19,10 @@ if ENV["CF_V2_RUN_INTEGRATION"]
     after do
       `#{cf_bin} unbind-service -f --no-script #{service_name} #{app}`
       `#{cf_bin} delete-service -f --no-script #{service_name}`
+
+      `#{cf_bin} unbind-service -f --no-script #{user_provided_name} #{app}`
+      `#{cf_bin} delete-service -f --no-script #{user_provided_name}`
+
       `#{cf_bin} delete #{app} -f --routes --no-script`
       logout
       Interact::Progress::Dots.stop!
@@ -31,6 +34,7 @@ if ENV["CF_V2_RUN_INTEGRATION"]
       end
 
       Dir.chdir("#{SPEC_ROOT}/assets/hello-sinatra") do
+        FileUtils.rm("manifest.yml", force: true)
         BlueShell::Runner.run("#{cf_bin} push") do |runner|
           expect(runner).to say "Name>"
           runner.send_keys app
@@ -85,7 +89,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?\n(e.g. hostname, port, password)>"
+          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/features/services_spec.rb

@@ -6,6 +6,25 @@ if ENV['CF_V2_RUN_INTEGRATION']
       login
     end
 
+    describe "listing services" do
+      let(:service1) { "some-provided-instance-#{Time.now.to_i}" }
+      let(:service2) { "cf-managed-instance-#{Time.now.to_i}" }
+
+      it "shows all service instances in the space" do
+        create_service_instance("user-provided", service1, credentials: { hostname: "myservice.com"} )
+        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+n\/a\s+n\/a\s+n\/a\s+.*/
+        end
+      end
+
+      after do
+        delete_service(service1)
+        delete_service(service2)
+      end
+    end
+
     describe "creating a service" do
       describe "when the user leaves the line blank for a plan" do
         it "re-prompts for the plan" do
@@ -20,6 +39,83 @@ if ENV['CF_V2_RUN_INTEGRATION']
           end
         end
       end
+
+      describe "when the service is a user-provided instance" do
+        let(:service_name) { "my-private-db-#{Random.rand(1000) + 1000}"}
+
+        it "can create a service instance" do
+          BlueShell::Runner.run("#{cf_bin} create-service") do |runner|
+            expect(runner).to say "What kind?"
+            runner.send_keys "user-provided"
+
+            expect(runner).to say "Name?"
+            runner.send_keys service_name
+
+            expect(runner).to say "What credential parameters should applications use to connect to this service instance?\n(e.g. hostname, port, password)"
+            runner.send_keys "hostname"
+            expect(runner).to say "hostname"
+            runner.send_keys "myserviceinstance.com"
+
+            expect(runner).to say /Creating service #{service_name}.+ OK/
+          end
+        end
+
+        after do
+          delete_service(service_name)
+        end
+      end
+    end
+
+    describe "binding to a service" do
+      let(:app_folder) { "env" }
+      let(:app_name) { "services_env_test_app-#{Time.now.to_i}" }
+
+      let(:service_name) { "some-provided-instance-#{Time.now.to_i}" }
+
+      it "can bind and unbind user-provided services to apps" do
+        push_app(app_folder, app_name, start_command: "'bundle exec ruby env_test.rb -p $PORT'", timeout: 90)
+        create_service_instance("user-provided", service_name, credentials: { hostname: "myservice.com"} )
+
+        BlueShell::Runner.run("#{cf_bin} bind-service") do |runner|
+          expect(runner).to say "Which application?>"
+          runner.send_keys app_name
+
+          expect(runner).to say "Which service?>"
+          runner.send_keys service_name
+
+          expect(runner).to say "Binding #{service_name} to #{app_name}... OK"
+        end
+
+        BlueShell::Runner.run("#{cf_bin} unbind-service") do |runner|
+          expect(runner).to say "Which application?"
+          runner.send_keys app_name
+
+          expect(runner).to say "Which service?>"
+          runner.send_keys service_name
+
+          expect(runner).to say "Unbinding #{service_name} from #{app_name}... OK"
+        end
+      end
+
+      after do
+        delete_app(app_name)
+      end
+    end
+
+    def delete_service(service_name)
+      BlueShell::Runner.run("#{cf_bin} delete-service --service #{service_name} --force") do |runner|
+        expect(runner).to say "Deleting #{service_name}... OK"
+      end
+    end
+
+    def delete_app(app_name, routes=true)
+      delete_cmd = "#{cf_bin} delete #{app_name}"
+      delete_cmd + " --routes" if routes
+      BlueShell::Runner.run(delete_cmd) do |runner|
+        expect(runner).to say "Really delete #{app_name}?"
+        runner.send_keys "y"
+        expect(runner).to say "Deleting #{app_name}... OK"
+      end
     end
   end
 end

data/spec/integration/service_broker_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe "Service Broker Management", components: [:nats, :uaa, :ccng] do
+  let(:username) { 'admin' }
+  let(:password) { 'the_admin_pw' }
+  let(:target) { 'http://127.0.0.1:8181' }
+
+  before do
+    create_user_in_ccng
+    logout
+  end
+
+  after do
+    logout
+  end
+
+  it "allows an admin user to add a service broker" do
+    BlueShell::Runner.run("#{cf_bin} target #{target}") do |runner|
+      runner.wait_for_exit
+
+      expect(runner).to be_successful
+    end
+
+    BlueShell::Runner.run("#{cf_bin} login #{username} --password #{password}") do |runner|
+      expect(runner).to say "Authenticating... OK"
+    end
+
+    BlueShell::Runner.run("#{cf_bin} add-service-broker --name cf-mysql --url http://cf-mysql.cfapp.io --token cfmysqlsecret") do |runner|
+      expect(runner).to say "... OK"
+    end
+  end
+  
+  def create_user_in_ccng
+    ccng_post "/v2/users", {
+      guid: user_guid
+    }
+  end
+
+  def user_guid
+    uaa_port = component!(:uaa).port
+    token_issuer = CF::UAA::TokenIssuer.new("http://localhost:#{uaa_port}", 'cf')
+    auth_header = token_issuer.owner_password_grant(username, password).auth_header
+    response = Typhoeus::Request.new(
+      "http://localhost:#{uaa_port}/Users?filter=userName+eq+'#{username}'",
+      headers: {'Authorization' => auth_header}
+    ).run
+    JSON.parse(response.body).fetch("resources").first.fetch('id')
+  end
+end