Merge pull request #164 from cdcabrera/service-instances-bindings

Updates for Service Instance & Bindings

Author: spadgett

dist/origin-web-common-services.js

@@ -1137,6 +1137,10 @@ angular.module("openshiftCommonServices")
     };
 
     var getBindingsForResource = function(bindings, apiObject) {
+      if (_.get(apiObject, 'kind') === 'Instance') {
+        return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
+      }
+
       var podPresetSelectors = getPodPresetSelectorsForBindings(bindings);
 
       // Create a selector for the potential binding target to check if the

dist/origin-web-common.js

@@ -3006,6 +3006,10 @@ angular.module("openshiftCommonServices")
     };
 
     var getBindingsForResource = function(bindings, apiObject) {
+      if (_.get(apiObject, 'kind') === 'Instance') {
+        return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
+      }
+
       var podPresetSelectors = getPodPresetSelectorsForBindings(bindings);
 
       // Create a selector for the potential binding target to check if the

dist/origin-web-common.min.js

@@ -1202,6 +1202,7 @@ var podPresetSelector = _.get(binding, "spec.alphaPodPresetTemplate.selector");
 podPresetSelector && (podPresetSelectors[binding.metadata.name] = new LabelSelector(podPresetSelector));
 }), podPresetSelectors;
 }, getBindingsForResource = function(bindings, apiObject) {
+if ("Instance" === _.get(apiObject, "kind")) return _.filter(bindings, [ "spec.instanceRef.name", _.get(apiObject, "metadata.name") ]);
 var podPresetSelectors = getPodPresetSelectorsForBindings(bindings), applicationSelector = new LabelSelector(_.get(apiObject, "spec.selector")), resourceBindings = [];
 return _.each(podPresetSelectors, function(podPresetSelector, bindingName) {
 podPresetSelector.covers(applicationSelector) && resourceBindings.push(bindings[bindingName]);

src/services/bindService.js

@@ -113,6 +113,10 @@ angular.module("openshiftCommonServices")
     };
 
     var getBindingsForResource = function(bindings, apiObject) {
+      if (_.get(apiObject, 'kind') === 'Instance') {
+        return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
+      }
+
       var podPresetSelectors = getPodPresetSelectorsForBindings(bindings);
 
       // Create a selector for the potential binding target to check if the