Merge pull request #266 from benjaminapetersen/trello/api-groups/services/bindService

Update bindService to use getPreferredVersion

dist/origin-web-common-services.js

@@ -1159,7 +1159,8 @@ angular.module("openshiftCommonServices")
     // The secret key this service uses for the parameters JSON blob when binding.
     var PARAMETERS_SECRET_KEY = 'parameters';
 
-    var bindingResource = APIService.getPreferredVersion('servicebindings');
+    var serviceBindingsVersion = APIService.getPreferredVersion('servicebindings');
+    var secretsVersion = APIService.getPreferredVersion('secrets');
 
     var getServiceClassForInstance = function(serviceInstance, serviceClasses) {
       if (!serviceClasses) {
@@ -1345,7 +1346,7 @@ angular.module("openshiftCommonServices")
     };
 
     return {
-      bindingResource: bindingResource,
+      bindingResource: serviceBindingsVersion,
       getServiceClassForInstance: getServiceClassForInstance,
       makeParametersSecret: makeParametersSecret,
       generateSecretName: generateSecretName,
@@ -1365,7 +1366,7 @@ angular.module("openshiftCommonServices")
           namespace: serviceInstance.metadata.namespace
         };
 
-        var promise = DataService.create(bindingResource, null, newBinding, context);
+        var promise = DataService.create(serviceBindingsVersion, null, newBinding, context);
         if (!parametersSecretName) {
           return promise;
         }
@@ -1373,7 +1374,7 @@ angular.module("openshiftCommonServices")
         // Create the secret as well if the binding has parameters.
         return promise.then(function(binding) {
           var parametersSecret = makeParametersSecret(parametersSecretName, parameters, binding);
-          return DataService.create("secrets", null, parametersSecret, context).then(function() {
+          return DataService.create(secretsVersion, null, parametersSecret, context).then(function() {
             return binding;
           });
         });

dist/origin-web-common.js

@@ -3208,7 +3208,8 @@ angular.module("openshiftCommonServices")
     // The secret key this service uses for the parameters JSON blob when binding.
     var PARAMETERS_SECRET_KEY = 'parameters';
 
-    var bindingResource = APIService.getPreferredVersion('servicebindings');
+    var serviceBindingsVersion = APIService.getPreferredVersion('servicebindings');
+    var secretsVersion = APIService.getPreferredVersion('secrets');
 
     var getServiceClassForInstance = function(serviceInstance, serviceClasses) {
       if (!serviceClasses) {
@@ -3394,7 +3395,7 @@ angular.module("openshiftCommonServices")
     };
 
     return {
-      bindingResource: bindingResource,
+      bindingResource: serviceBindingsVersion,
       getServiceClassForInstance: getServiceClassForInstance,
       makeParametersSecret: makeParametersSecret,
       generateSecretName: generateSecretName,
@@ -3414,7 +3415,7 @@ angular.module("openshiftCommonServices")
           namespace: serviceInstance.metadata.namespace
         };
 
-        var promise = DataService.create(bindingResource, null, newBinding, context);
+        var promise = DataService.create(serviceBindingsVersion, null, newBinding, context);
         if (!parametersSecretName) {
           return promise;
         }
@@ -3422,7 +3423,7 @@ angular.module("openshiftCommonServices")
         // Create the secret as well if the binding has parameters.
         return promise.then(function(binding) {
           var parametersSecret = makeParametersSecret(parametersSecretName, parameters, binding);
-          return DataService.create("secrets", null, parametersSecret, context).then(function() {
+          return DataService.create(secretsVersion, null, parametersSecret, context).then(function() {
             return binding;
           });
         });

dist/origin-web-common.min.js

@@ -1449,7 +1449,7 @@ return data;
 }
 };
 }), angular.module("openshiftCommonServices").service("BindingService", [ "$filter", "$q", "APIService", "AuthService", "DataService", "DNS1123_SUBDOMAIN_VALIDATION", function($filter, $q, APIService, AuthService, DataService, DNS1123_SUBDOMAIN_VALIDATION) {
-var PARAMETERS_SECRET_KEY = "parameters", bindingResource = APIService.getPreferredVersion("servicebindings"), getServiceClassForInstance = function(serviceInstance, serviceClasses) {
+var PARAMETERS_SECRET_KEY = "parameters", serviceBindingsVersion = APIService.getPreferredVersion("servicebindings"), secretsVersion = APIService.getPreferredVersion("secrets"), getServiceClassForInstance = function(serviceInstance, serviceClasses) {
 if (!serviceClasses) return null;
 var serviceClassName = _.get(serviceInstance, "spec.clusterServiceClassRef.name");
 return serviceClassName ? serviceClasses[serviceClassName] :null;
@@ -1536,7 +1536,7 @@ return _.get(serviceClasses, [ serviceClassName, "spec", "externalMetadata", "di
 return _.sortBy(serviceInstances, [ getServiceClassDisplayName, "metadata.name" ]);
 };
 return {
-bindingResource:bindingResource,
+bindingResource:serviceBindingsVersion,
 getServiceClassForInstance:getServiceClassForInstance,
 makeParametersSecret:makeParametersSecret,
 generateSecretName:generateSecretName,
@@ -1545,10 +1545,10 @@ var parametersSecretName;
 _.isEmpty(parameters) || (parametersSecretName = generateSecretName(serviceInstance.metadata.name + "-bind-parameters-"));
 var newBinding = makeBinding(serviceInstance, application, parametersSecretName), context = {
 namespace:serviceInstance.metadata.namespace
-}, promise = DataService.create(bindingResource, null, newBinding, context);
+}, promise = DataService.create(serviceBindingsVersion, null, newBinding, context);
 return parametersSecretName ? promise.then(function(binding) {
 var parametersSecret = makeParametersSecret(parametersSecretName, parameters, binding);
-return DataService.create("secrets", null, parametersSecret, context).then(function() {
+return DataService.create(secretsVersion, null, parametersSecret, context).then(function() {
 return binding;
 });
 }) :promise;

src/services/bindService.js

@@ -11,7 +11,8 @@ angular.module("openshiftCommonServices")
     // The secret key this service uses for the parameters JSON blob when binding.
     var PARAMETERS_SECRET_KEY = 'parameters';
 
-    var bindingResource = APIService.getPreferredVersion('servicebindings');
+    var serviceBindingsVersion = APIService.getPreferredVersion('servicebindings');
+    var secretsVersion = APIService.getPreferredVersion('secrets');
 
     var getServiceClassForInstance = function(serviceInstance, serviceClasses) {
       if (!serviceClasses) {
@@ -197,7 +198,7 @@ angular.module("openshiftCommonServices")
     };
 
     return {
-      bindingResource: bindingResource,
+      bindingResource: serviceBindingsVersion,
       getServiceClassForInstance: getServiceClassForInstance,
       makeParametersSecret: makeParametersSecret,
       generateSecretName: generateSecretName,
@@ -217,7 +218,7 @@ angular.module("openshiftCommonServices")
           namespace: serviceInstance.metadata.namespace
         };
 
-        var promise = DataService.create(bindingResource, null, newBinding, context);
+        var promise = DataService.create(serviceBindingsVersion, null, newBinding, context);
         if (!parametersSecretName) {
           return promise;
         }
@@ -225,7 +226,7 @@ angular.module("openshiftCommonServices")
         // Create the secret as well if the binding has parameters.
         return promise.then(function(binding) {
           var parametersSecret = makeParametersSecret(parametersSecretName, parameters, binding);
-          return DataService.create("secrets", null, parametersSecret, context).then(function() {
+          return DataService.create(secretsVersion, null, parametersSecret, context).then(function() {
             return binding;
           });
         });