cf-copilot 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651ed652ed54626994734f86ee06512083462f86
-  data.tar.gz: 9e2a059983f0e0a3947697eaa670bbfc4f2c3c58
+  metadata.gz: 111090a607e297c9032abbd2850d1df993fd6efe
+  data.tar.gz: 279e31f4249998ce9a0b83b275fdcc4032c2687b
 SHA512:
-  metadata.gz: 4e01bf34405aa7271c2c2901faede410c9b9f148b86f007fc0f7f391c3cba00cd92b2f46bf15b2f5494bcf72a989a2248edf0f349f01f40387f7a7f1d0d6260e
-  data.tar.gz: 8c9306ca2ce3922603d30b0632ddfa4078ff9c584b4dbb9776f455927bab928c4d1dde9cf685f6524a36c53f70ee936bfc83ed78abd0ebcc1a670bb181054ad0
+  metadata.gz: a406ca97277e260a4b6358996edcfb9c6ee6f4feb977eb50956f93dd1088677abd008d302edb7fe72d29abd29b8bd8600fe87574cef9aeffc588f02adb45a4b8
+  data.tar.gz: a1830e80cbc245ad54661dd2d85968365012b9e18706f9363d784d808b1cb6c1cd6f10aa9b7c6737415b8611d219a74ab1e100f9acabf9df5deb65874150cb3a

data/bin/build_and_install_copilot_gem

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+pushd "${COPILOT_ROOT}/sdk/ruby"
+  gem build ./cf-copilot.gemspec && gem install cf-copilot
+popd

data/bin/build_and_run_docker

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+docker build -t protobuf-ruby-dependencies .
+docker run -v "${COPILOT_ROOT}:/tmp/copilot" -it protobuf-ruby-dependencies /bin/bash
+cd /tmp/copilot

data/bin/generate_protos

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euo pipefail
+
+echo "Generating services and messages for cf-copilot..."
+
+pushd "${COPILOT_ROOT}/api/protos"
+  protoc --ruby_out="${COPILOT_ROOT}/sdk/ruby/lib/copilot/protos" \
+  --grpc_out="${COPILOT_ROOT}/sdk/ruby/lib/copilot/protos" \
+  --plugin="protoc-gen-grpc=$(which grpc_tools_ruby_protoc_plugin)" \
+  ./cloud_controller.proto
+popd

data/bin/test

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euo pipefail
+
+pushd "${COPILOT_ROOT}/cmd"
+  go install ./copilot-server
+popd
+
+pushd "${COPILOT_ROOT}/sdk/ruby"
+  bundle install
+  bundle exec rspec
+popd

data/lib/cf-copilot.rb

@@ -6,6 +6,7 @@ require 'copilot/protos/cloud_controller_services_pb'
 module Cloudfoundry
   module Copilot
     class Client
+      class PilotError < StandardError; end
 
       attr_reader :host, :port
 
@@ -28,23 +29,31 @@ module Cloudfoundry
         route = Api::Route.new(guid: guid, host: host)
         request = Api::UpsertRouteRequest.new(route: route)
         service.upsert_route(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       def delete_route(guid:)
         request = Api::DeleteRouteRequest.new(guid: guid)
         service.delete_route(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       def map_route(capi_process_guid:, route_guid:)
         route_mapping = Api::RouteMapping.new(capi_process_guid: capi_process_guid, route_guid: route_guid)
         request = Api::MapRouteRequest.new(route_mapping: route_mapping)
         service.map_route(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       def unmap_route(capi_process_guid:, route_guid:)
         route_mapping = Api::RouteMapping.new(capi_process_guid: capi_process_guid, route_guid: route_guid)
         request = Api::UnmapRouteRequest.new(route_mapping: route_mapping)
         service.unmap_route(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       def upsert_capi_diego_process_association(capi_process_guid:, diego_process_guids:)
@@ -55,6 +64,8 @@ module Cloudfoundry
           })
 
         service.upsert_capi_diego_process_association(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       def delete_capi_diego_process_association(capi_process_guid:)
@@ -62,6 +73,8 @@ module Cloudfoundry
           capi_process_guid: capi_process_guid
         )
         service.delete_capi_diego_process_association(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       def bulk_sync(routes:, route_mappings:, capi_diego_process_associations:)
@@ -71,6 +84,8 @@ module Cloudfoundry
           capi_diego_process_associations: capi_diego_process_associations
         )
         service.bulk_sync(request)
+      rescue GRPC::BadStatus => e
+        raise Cloudfoundry::Copilot::Client::PilotError, "#{e.details} - #{e.metadata}"
       end
 
       private

data/lib/copilot/version.rb

@@ -1,5 +1,5 @@
 module Cloudfoundry
   module Copilot
-    VERSION = "0.0.3"
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf-copilot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Cloud Foundry Routing Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - cf-routing@pivotal.io
@@ -76,6 +90,10 @@ files:
 - LICENSE
 - NOTICE
 - README.md
+- bin/build_and_install_copilot_gem
+- bin/build_and_run_docker
+- bin/generate_protos
+- bin/test
 - lib/cf-copilot.rb
 - lib/copilot/protos/cloud_controller_pb.rb
 - lib/copilot/protos/cloud_controller_services_pb.rb