Merge pull request #224 from jeff-phillips-18/bind

Export makeParametersSecret and generateSecretName

dist/origin-web-common-services.js

@@ -1147,17 +1147,17 @@ angular.module("openshiftCommonServices")
       return generateName(secretNamePrefix, generateNameLength);
     };
 
-    var makeParametersSecret = function(secretName, parameters, binding) {
+    var makeParametersSecret = function(secretName, parameters, owner) {
       var secret = {
         apiVersion: 'v1',
         kind: 'Secret',
         metadata: {
           name: secretName,
           ownerReferences: [{
-            apiVersion: binding.apiVersion,
-            kind: binding.kind,
-            name: binding.metadata.name,
-            uid: binding.metadata.uid,
+            apiVersion: owner.apiVersion,
+            kind: owner.kind,
+            name: owner.metadata.name,
+            uid: owner.metadata.uid,
             controller: false,
             // TODO: Change to true when garbage collection works with service
             // catalog resources. Setting to true now results in a 403 Forbidden
@@ -1314,6 +1314,8 @@ angular.module("openshiftCommonServices")
     return {
       bindingResource: bindingResource,
       getServiceClassForInstance: getServiceClassForInstance,
+      makeParametersSecret: makeParametersSecret,
+      generateSecretName: generateSecretName,
 
       // Create a binding for `serviceInstance`. If an `application` API object
       // is specified, also create a pod preset for that application using its

dist/origin-web-common.js

@@ -3164,17 +3164,17 @@ angular.module("openshiftCommonServices")
       return generateName(secretNamePrefix, generateNameLength);
     };
 
-    var makeParametersSecret = function(secretName, parameters, binding) {
+    var makeParametersSecret = function(secretName, parameters, owner) {
       var secret = {
         apiVersion: 'v1',
         kind: 'Secret',
         metadata: {
           name: secretName,
           ownerReferences: [{
-            apiVersion: binding.apiVersion,
-            kind: binding.kind,
-            name: binding.metadata.name,
-            uid: binding.metadata.uid,
+            apiVersion: owner.apiVersion,
+            kind: owner.kind,
+            name: owner.metadata.name,
+            uid: owner.metadata.uid,
             controller: false,
             // TODO: Change to true when garbage collection works with service
             // catalog resources. Setting to true now results in a 403 Forbidden
@@ -3331,6 +3331,8 @@ angular.module("openshiftCommonServices")
     return {
       bindingResource: bindingResource,
       getServiceClassForInstance: getServiceClassForInstance,
+      makeParametersSecret: makeParametersSecret,
+      generateSecretName: generateSecretName,
 
       // Create a binding for `serviceInstance`. If an `application` API object
       // is specified, also create a pod preset for that application using its

dist/origin-web-common.min.js

@@ -1398,17 +1398,17 @@ length:DNS1123_SUBDOMAIN_VALIDATION.maxlength - generateNameLength - 1,
 omission:""
 });
 return generateName(secretNamePrefix, generateNameLength);
-}, makeParametersSecret = function(secretName, parameters, binding) {
+}, makeParametersSecret = function(secretName, parameters, owner) {
 var secret = {
 apiVersion:"v1",
 kind:"Secret",
 metadata:{
 name:secretName,
 ownerReferences:[ {
-apiVersion:binding.apiVersion,
-kind:binding.kind,
-name:binding.metadata.name,
-uid:binding.metadata.uid,
+apiVersion:owner.apiVersion,
+kind:owner.kind,
+name:owner.metadata.name,
+uid:owner.metadata.uid,
 controller:!1,
 blockOwnerDeletion:!1
 } ]
@@ -1478,6 +1478,8 @@ return _.get(item, "metadata.name", "");
 return {
 bindingResource:bindingResource,
 getServiceClassForInstance:getServiceClassForInstance,
+makeParametersSecret:makeParametersSecret,
+generateSecretName:generateSecretName,
 bindService:function(serviceInstance, application, serviceClass, parameters) {
 var parametersSecretName;
 _.isEmpty(parameters) || (parametersSecretName = generateSecretName(serviceInstance.metadata.name + "-bind-parameters-"));

src/services/bindService.js

@@ -39,17 +39,17 @@ angular.module("openshiftCommonServices")
       return generateName(secretNamePrefix, generateNameLength);
     };
 
-    var makeParametersSecret = function(secretName, parameters, binding) {
+    var makeParametersSecret = function(secretName, parameters, owner) {
       var secret = {
         apiVersion: 'v1',
         kind: 'Secret',
         metadata: {
           name: secretName,
           ownerReferences: [{
-            apiVersion: binding.apiVersion,
-            kind: binding.kind,
-            name: binding.metadata.name,
-            uid: binding.metadata.uid,
+            apiVersion: owner.apiVersion,
+            kind: owner.kind,
+            name: owner.metadata.name,
+            uid: owner.metadata.uid,
             controller: false,
             // TODO: Change to true when garbage collection works with service
             // catalog resources. Setting to true now results in a 403 Forbidden
@@ -206,6 +206,8 @@ angular.module("openshiftCommonServices")
     return {
       bindingResource: bindingResource,
       getServiceClassForInstance: getServiceClassForInstance,
+      makeParametersSecret: makeParametersSecret,
+      generateSecretName: generateSecretName,
 
       // Create a binding for `serviceInstance`. If an `application` API object
       // is specified, also create a pod preset for that application using its