Merge pull request #524 from spadgett/external-service-property-names

Adopt renamed service external name properties
openshift · Oct 25, 2017 · ea758f9 · ea758f9
2 parents 5157527 + 8aed1d9
commit ea758f9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/bower.json b/bower.json
@@ -40,7 +40,7 @@
     "patternfly": ">=3.29.3 <4.0.0",
     "jquery": "~3.2.1",
     "lodash": "~4.17.4",
-    "origin-web-common": "~0.0.66",
+    "origin-web-common": "~0.0.70",
     "angular-schema-form-bootstrap": "^0.2.0"
   },
   "devDependencies": {

diff --git a/dist/origin-web-catalogs.js b/dist/origin-web-catalogs.js
@@ -1623,7 +1623,7 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
                 e.ctrl.noProjectsCantCreate = !0;
             });
         }, e.prototype.createService = function() {
-            var e = this, t = this.getParameters(), r = i.isEmpty(t) ? null : this.BindingService.generateSecretName(this.getExternalClusterServiceClassName() + "-parameters"), n = this.makeServiceInstance(r), a = {
+            var e = this, t = this.getParameters(), r = i.isEmpty(t) ? null : this.BindingService.generateSecretName(this.getClusterServiceClassExternalName() + "-parameters"), n = this.makeServiceInstance(r), a = {
                 group: "servicecatalog.k8s.io",
                 resource: "serviceinstances"
             }, s = {
@@ -1677,19 +1677,19 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
             return i.omitBy(this.ctrl.parameterData, function(e) {
                 return "" === e;
             });
-        }, e.prototype.getExternalClusterServiceClassName = function() {
+        }, e.prototype.getClusterServiceClassExternalName = function() {
             return i.get(this, "ctrl.serviceClass.resource.spec.externalName");
         }, e.prototype.makeServiceInstance = function(e) {
-            var t = this.getExternalClusterServiceClassName(), r = {
+            var t = this.getClusterServiceClassExternalName(), r = {
                 kind: "ServiceInstance",
                 apiVersion: "servicecatalog.k8s.io/v1beta1",
                 metadata: {
                     namespace: this.ctrl.selectedProject.metadata.name,
                     generateName: t + "-"
                 },
                 spec: {
-                    externalClusterServiceClassName: t,
-                    externalClusterServicePlanName: this.ctrl.selectedPlan.spec.externalName
+                    clusterServiceClassExternalName: t,
+                    clusterServicePlanExternalName: this.ctrl.selectedPlan.spec.externalName
                 }
             };
             return e && (r.spec.parametersFrom = [ {
@@ -2133,8 +2133,8 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
                 var e = d.getParameters(d.ctrl.parameterData), t = i.get(d.ctrl.serviceInstance, "spec.parameters"), r = i.map(t, function(e, t) {
                     return [ t ];
                 }), a = i.pick(e, r), s = i.omit(e, r), o = n.copy(d.ctrl.serviceInstance);
-                i.get(o, "spec.externalClusterServicePlanName") !== i.get(d.ctrl.selectedPlan, "spec.externalName") && (i.set(o, "spec.clusterServicePlanRef", void 0), 
-                i.set(o, "spec.externalClusterServicePlanName", i.get(d.ctrl.selectedPlan, "spec.externalName"))), 
+                i.get(o, "spec.clusterServicePlanExternalName") !== i.get(d.ctrl.selectedPlan, "spec.externalName") && (i.unset(o, "spec.clusterServicePlanRef"), 
+                i.set(o, "spec.clusterServicePlanExternalName", i.get(d.ctrl.selectedPlan, "spec.externalName"))), 
                 n.equals(a, t) || i.set(o, "spec.parameters", a);
                 var c = {};
                 if (i.each(d.secrets, function(t) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "bootstrap": "^3.3.6",
     "font-awesome": "~4.7.0",
     "jquery": "3.2.1",
-    "origin-web-common": "0.0.67",
+    "origin-web-common": "~0.0.70",
     "paper-css": "^0.1.2",
     "patternfly": "^3.29.3",
     "urijs": "1.18.0"

diff --git a/src/components/order-service/order-service.controller.ts b/src/components/order-service/order-service.controller.ts
@@ -287,7 +287,7 @@ export class OrderServiceController implements angular.IController {
 
   public createService() {
     let parameters = this.getParameters();
-    let secretName: string = _.isEmpty(parameters) ? null : this.BindingService.generateSecretName(this.getExternalClusterServiceClassName() + '-parameters');
+    let secretName: string = _.isEmpty(parameters) ? null : this.BindingService.generateSecretName(this.getClusterServiceClassExternalName() + '-parameters');
     let serviceInstance = this.makeServiceInstance(secretName);
     let resource = {
       group: 'servicecatalog.k8s.io',
@@ -432,22 +432,22 @@ export class OrderServiceController implements angular.IController {
     });
   }
 
-  private getExternalClusterServiceClassName(): string {
+  private getClusterServiceClassExternalName(): string {
     return _.get(this, 'ctrl.serviceClass.resource.spec.externalName') as string;
   };
 
   private makeServiceInstance(secretName: string) {
-    let externalClusterServiceClassName = this.getExternalClusterServiceClassName();
+    let clusterServiceClassExternalName = this.getClusterServiceClassExternalName();
     let serviceInstance: any = {
       kind: 'ServiceInstance',
       apiVersion: 'servicecatalog.k8s.io/v1beta1',
       metadata: {
         namespace: this.ctrl.selectedProject.metadata.name,
-        generateName: externalClusterServiceClassName + '-'
+        generateName: clusterServiceClassExternalName + '-'
        },
        spec: {
-         externalClusterServiceClassName: externalClusterServiceClassName,
-         externalClusterServicePlanName: this.ctrl.selectedPlan.spec.externalName
+         clusterServiceClassExternalName: clusterServiceClassExternalName,
+         clusterServicePlanExternalName: this.ctrl.selectedPlan.spec.externalName
        }
     };
 

diff --git a/src/components/update-service/update-service.controller.ts b/src/components/update-service/update-service.controller.ts
@@ -224,9 +224,9 @@ export class UpdateServiceController implements angular.IController {
     var newParameters: any = _.omit(parameterData, originalKeys);
     var updateInstance: any = angular.copy(this.ctrl.serviceInstance);
 
-    if (_.get(updateInstance, 'spec.externalClusterServicePlanName') !== _.get(this.ctrl.selectedPlan, 'spec.externalName')) {
-      _.set(updateInstance, 'spec.clusterServicePlanRef', undefined);
-      _.set(updateInstance, 'spec.externalClusterServicePlanName', _.get(this.ctrl.selectedPlan, 'spec.externalName'));
+    if (_.get(updateInstance, 'spec.clusterServicePlanExternalName') !== _.get(this.ctrl.selectedPlan, 'spec.externalName')) {
+      _.unset(updateInstance, 'spec.clusterServicePlanRef');
+      _.set(updateInstance, 'spec.clusterServicePlanExternalName', _.get(this.ctrl.selectedPlan, 'spec.externalName'));
     }
 
     if (!angular.equals(updateParameters, originalParameters)) {