Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt renamed service external name properies #2347

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/controllers/overview.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ function OverviewController($scope,
};

// Updated on viewBy changes to include the app label when appropriate.
var filterFields = ['metadata.name', 'spec.externalClusterServiceClassName'];
var filterFields = ['metadata.name', 'spec.clusterServiceClassExternalName'];
var filterByName = function(items) {
return KeywordService.filterForKeywords(items, filterFields, state.filterKeywords);
};
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"angular-moment": "1.0.0",
"angular-utf8-base64": "0.0.5",
"file-saver": "1.3.3",
"origin-web-common": "0.0.69",
"origin-web-catalog": "0.0.59"
"origin-web-common": "0.0.70",
"origin-web-catalog": "0.0.60"
},
"devDependencies": {
"angular-mocks": "1.5.11",
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ R.deploymentConfigsNoPipeline = _.sortBy(e, "metadata.name"), R.pipelineViewHasO
R.disableFilter = "pipeline" === R.viewBy && _.isEmpty(R.pipelineBuildConfigs);
}, se = function(e) {
return v.getLabelSelector().select(e);
}, ce = [ "metadata.name", "spec.externalClusterServiceClassName" ], le = function(e) {
}, ce = [ "metadata.name", "spec.clusterServiceClassExternalName" ], le = function(e) {
return g.filterForKeywords(e, ce, W.filterKeywords);
}, ue = function(e) {
switch (R.filterBy) {
Expand Down
16 changes: 8 additions & 8 deletions dist/scripts/vendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -73580,7 +73580,7 @@ return t || _.get(e, "spec.externalName");
}).filter("serviceInstanceDisplayName", [ "serviceClassDisplayNameFilter", function(e) {
return function(t, n) {
if (n) return e(n);
var i = _.get(t, "spec.externalClusterServiceClassName");
var i = _.get(t, "spec.clusterServiceClassExternalName");
return i || _.get(t, "metadata.name");
};
} ]).filter("serviceInstanceStatus", [ "isServiceInstanceReadyFilter", function(e) {
Expand Down Expand Up @@ -74165,7 +74165,7 @@ return d(e, t[i], n[r]);
sortServiceInstances: function(e, t) {
return e || t ? _.sortBy(e, function(e) {
var n = _.get(e, "spec.clusterServiceClassRef.name");
return _.get(t, [ n, "spec", "externalMetadata", "displayName" ]) || e.spec.externalClusterServiceClassName;
return _.get(t, [ n, "spec", "externalMetadata", "displayName" ]) || e.spec.clusterServiceClassExternalName;
}, function(e) {
return _.get(e, "metadata.name", "");
}) : null;
Expand Down Expand Up @@ -78840,7 +78840,7 @@ t !== n && (e.updateBindParametersStepVisibility(), e.ctrl.nextTitle = e.bindPar
e.ctrl.noProjectsCantCreate = !0;
});
}, e.prototype.createService = function() {
var e = this, t = this.getParameters(), n = r.isEmpty(t) ? null : this.BindingService.generateSecretName(this.getExternalClusterServiceClassName() + "-parameters"), i = this.makeServiceInstance(n), o = {
var e = this, t = this.getParameters(), n = r.isEmpty(t) ? null : this.BindingService.generateSecretName(this.getClusterServiceClassExternalName() + "-parameters"), i = this.makeServiceInstance(n), o = {
group: "servicecatalog.k8s.io",
resource: "serviceinstances"
}, a = {
Expand Down Expand Up @@ -78887,19 +78887,19 @@ this.ctrl.parameterSchema = r.get(e, "spec.instanceCreateParameterSchema"), this
return r.omitBy(this.ctrl.parameterData, function(e) {
return "" === e;
});
}, e.prototype.getExternalClusterServiceClassName = function() {
}, e.prototype.getClusterServiceClassExternalName = function() {
return r.get(this, "ctrl.serviceClass.resource.spec.externalName");
}, e.prototype.makeServiceInstance = function(e) {
var t = this.getExternalClusterServiceClassName(), n = {
var t = this.getClusterServiceClassExternalName(), n = {
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 && (n.spec.parametersFrom = [ {
Expand Down Expand Up @@ -79295,7 +79295,7 @@ u.ctrl.orderComplete = !1, u.ctrl.error = null;
var e = u.getParameters(u.ctrl.parameterData), t = r.get(u.ctrl.serviceInstance, "spec.parameters"), n = r.map(t, function(e, t) {
return [ t ];
}), o = r.pick(e, n), a = r.omit(e, n), s = i.copy(u.ctrl.serviceInstance);
r.get(s, "spec.externalClusterServicePlanName") !== r.get(u.ctrl.selectedPlan, "spec.externalName") && (r.set(s, "spec.clusterServicePlanRef", void 0), r.set(s, "spec.externalClusterServicePlanName", r.get(u.ctrl.selectedPlan, "spec.externalName"))), i.equals(o, t) || r.set(s, "spec.parameters", o);
r.get(s, "spec.clusterServicePlanExternalName") !== r.get(u.ctrl.selectedPlan, "spec.externalName") && (r.unset(s, "spec.clusterServicePlanRef"), r.set(s, "spec.clusterServicePlanExternalName", r.get(u.ctrl.selectedPlan, "spec.externalName"))), i.equals(o, t) || r.set(s, "spec.parameters", o);
var l = {};
if (r.each(u.secrets, function(t) {
var n = JSON.parse(u.SecretsService.decodeSecretData(t.data).parameters), o = r.map(n, function(e, t) {
Expand Down
1 change: 1 addition & 0 deletions dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.