cf-copilot 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c80431d4b64e781a4d9584982ebb539886ad282
-  data.tar.gz: 225d49a0f05050accfae05b4df68d45e8d6b951e
+  metadata.gz: 269865176708a705ed2d0f3b2a2ad84461cf7a57
+  data.tar.gz: f17028b7c22a936bfc89ae230fca77d0397b7d87
 SHA512:
-  metadata.gz: 487a0fe583e56791ff00b68fce3e457fc0178690b689db5cbbb993c631c33cd9dc1ea3a9b270f5f85f21cb14f32eea45fda31252357c093724647ec94bbdf2dc
-  data.tar.gz: aca51603f1c4921a84151d547c901dcf051bb2e8a7f092830ad24dcdbc12f668036fa16d0af88c991503ec095e5a30906ceef119745de2b7440c66b0dcbf0273
+  metadata.gz: 00de273ffd184a13efd6605537d325a737127117fd39ca1243182e284e3f93b2eba058825fc9436953c52c9bc884d26041e09b42ba045a9d721c433db1b5c7ec
+  data.tar.gz: 4f89fef2d39c84a72eb66bc150655bb354250dc3a2a2d0de69829c01fc64d06208cca35a09c3a7dd44859c861b6b7ab1e4f39baed9422a77b88b9240bb5815eb

data/README.md

@@ -12,16 +12,17 @@ pushd sdk/ruby
 popd
 ```
 
-### Run all of the associated ruby specs
+
+### How to build and install the `cf-copilot` ruby gem
 ```
 pushd sdk/ruby
-  bin/test
+  bin/build-and-install-copilot-gem
 popd
 ```
 
-### How to build and install the `cf-copilot` ruby gem
+### How to run tests
 ```
 pushd sdk/ruby
-  bin/build-and-install-copilot-gem
+  bin/run-tests-in-docker
 popd
 ```

data/bin/run-tests-in-docker

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# echo "Run  to run the tests!"
+
+docker run -v ~/workspace/istio-release/src/code.cloudfoundry.org/copilot/:/go/src/code.cloudfoundry.org/copilot -it cloudfoundry/cf-routing-pipeline /bin/bash -c "ln -s /go/src/code.cloudfoundry.org/copilot/sdk/ruby/bin/test tests; ./tests; /bin/bash"

data/bin/test

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-set -euo pipefail
+export GOPATH=${PWD}/go
+export PATH=$PATH:$GOPATH/bin
+go get github.com/onsi/ginkgo/ginkgo
+go get github.com/golang/dep/cmd/dep
+cd go/src/code.cloudfoundry.org/copilot
+go install ./cmd/copilot-server
+cd sdk/ruby
+bundle install
+bundle exec rspec
 
-pushd "${COPILOT_ROOT}/cmd"
-  go install ./copilot-server
-popd
-
-pushd "${COPILOT_ROOT}/sdk/ruby"
-  bundle install
-  bundle exec rspec
-popd
+echo "Rerun ./tests as much as you need."

data/lib/cf-copilot.rb

@@ -27,8 +27,11 @@ module Cloudfoundry
         service.health(request)
       end
 
-      def upsert_route(guid:, host:, path: '', internal: false)
-        route = Api::Route.new(guid: guid, host: host, path: path, internal: internal)
+      def upsert_route(guid:, host:, path: '', internal: false, vip: nil)
+        if internal && vip.nil?
+          raise Cloudfoundry::Copilot::Client::PilotError, "vip required for internal routes"
+        end
+        route = Api::Route.new(guid: guid, host: host, path: path, internal: internal, vip: vip)
         request = Api::UpsertRouteRequest.new(route: route)
         service.upsert_route(request)
       rescue GRPC::BadStatus => e

data/lib/copilot/protos/cloud_controller_pb.rb

@@ -28,6 +28,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :host, :string, 2
     optional :path, :string, 3
     optional :internal, :bool, 4
+    optional :vip, :string, 5
   end
   add_message "api.UpsertRouteRequest" do
     optional :route, :message, 1, "api.Route"
@@ -42,7 +43,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "api.RouteMapping" do
     optional :capi_process_guid, :string, 1
     optional :route_guid, :string, 2
-    optional :route_weight, :int32, 3
+    optional :route_weight, :uint32, 3
     optional :app_port, :int32, 4
   end
   add_message "api.MapRouteRequest" do

data/lib/copilot/version.rb

@@ -1,5 +1,5 @@
 module Cloudfoundry
   module Copilot
-    VERSION = '0.0.12'.freeze
+    VERSION = '0.0.13'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf-copilot
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Cloud Foundry Routing Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -94,6 +94,7 @@ files:
 - bin/dockerized-rebuild-proto
 - bin/generate-protos
 - bin/push-gem
+- bin/run-tests-in-docker
 - bin/test
 - lib/cf-copilot.rb
 - lib/copilot/protos/cloud_controller_pb.rb