Merge 58830044-user-provide-newrelic-service to master

Glyn Normington · Glyn Normington · commit 69a528282e98 · 2013-10-24T10:48:14.000+01:00
[Completes #58830044]
diff --git a/lib/java_buildpack/util/service_utils.rb b/lib/java_buildpack/util/service_utils.rb
@@ -29,19 +29,33 @@ class ServiceUtils
     def self.find_service(services, filter)
       service = nil
 
-      types = services.keys.select { |key| key =~ filter }
-      fail "Exactly one service type matching '#{filter.source}' can be bound.  Found #{types.length}." if types.length > 1
+      matching_services = services.select { |key, service_instances| key =~ filter || service_instances_match(service_instances, filter) }
+      fail "Exactly one service type matching '#{filter.source}' can be bound.  Found #{matching_services.length}." if matching_services.length > 1
 
-      if types.length > 0
-        instances = services[types[0]]
+      unless matching_services.empty?
+        instances = matching_services.values[0]
         fail "Exactly one service instance matching '#{filter.source}' can be bound.  Found #{instances.length}." if instances.length != 1
-
         service = instances[0]
       end
 
       service
     end
 
+    private
+
+    def self.service_instances_match(service_instances, filter)
+      service_instances.any? do |service_instance|
+        match = service_instance['name'] =~ filter || service_instance['label'] =~ filter
+
+        unless match
+          tags = service_instance['tags']
+          match = tags.any? { |tag| match = tag =~ filter } unless tags.nil?
+        end
+
+        match
+      end
+    end
+
   end
 
 end
diff --git a/spec/java_buildpack/util/service_utils_spec.rb b/spec/java_buildpack/util/service_utils_spec.rb
@@ -23,13 +23,45 @@ module JavaBuildpack::Util
 
     let(:vcap_services) do
       {
-        'newrelic-n/a' => [
-          { 'name' => 'new-relic' }
-        ],
-        'elephantsql-n/a' => [
-          { 'name' => 'db1' },
-          { 'name' => 'db2' }
-        ]
+          'newrelic-n/a' => [
+              { 'name' => 'new-relic' }
+          ],
+          'elephantsql-n/a' => [
+              { 'name' => 'db1' },
+              { 'name' => 'db2' }
+          ]
+      }
+    end
+
+    let(:vcap_services_with_name) do
+      {
+          'name-n/a' => [
+              { 'name' => 'xnewrelicx' }
+          ]
+      }
+    end
+
+    let(:vcap_services_with_label) do
+      {
+          'name-n/a' => [
+              { 'label' => 'xnewrelicx' }
+          ]
+      }
+    end
+
+    let(:vcap_services_with_tags) do
+      {
+          'name-n/a' => [
+              { 'tags' => %w(y xnewrelicx z) }
+          ]
+      }
+    end
+
+    let(:vcap_services_with_plan) do
+      {
+          'name-n/a' => [
+              { 'plan' => 'xnewrelicx' }
+          ]
       }
     end
 
@@ -49,6 +81,22 @@ module JavaBuildpack::Util
       expect(ServiceUtils.find_service(vcap_services, /newrelic/)).to eq(vcap_services['newrelic-n/a'][0])
     end
 
+    it 'should return the contents of the service if name matched' do
+      expect(ServiceUtils.find_service(vcap_services_with_name, /newrelic/)).to eq(vcap_services_with_name['name-n/a'][0])
+    end
+
+    it 'should return the contents of the service if label matched' do
+      expect(ServiceUtils.find_service(vcap_services_with_label, /newrelic/)).to eq(vcap_services_with_label['name-n/a'][0])
+    end
+
+    it 'should return the contents of the service if a tag matched' do
+      expect(ServiceUtils.find_service(vcap_services_with_tags, /newrelic/)).to eq(vcap_services_with_tags['name-n/a'][0])
+    end
+
+    it 'should return nil if plan would have matched' do
+      expect(ServiceUtils.find_service(vcap_services_with_plan, /newrelic/)).to be_nil
+    end
+
   end
 
 end
