Skip to content

Commit e16f127

Browse files
spadgettspadgett
authored
Merge pull request #444 from spadgett/remove-requester-username-param
Remove special handling of requester-username parameter
2 parents 2133dc5 + 8c271f8 commit e16f127

File tree

2 files changed

+42
-86
lines changed

2 files changed

+42
-86
lines changed

Diff for: ‎dist/origin-web-catalogs.js

+40-48
Original file line numberDiff line numberDiff line change
@@ -1348,67 +1348,66 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
13481348
"use strict";
13491349
t.__esModule = !0;
13501350
var n = r(1), i = r(0), a = function() {
1351-
function e(e, t, r, n, a, s, o, c, l, d) {
1352-
var p = this;
1351+
function e(e, t, r, n, a, s, o, c, l) {
1352+
var d = this;
13531353
this.ctrl = this, this.watches = [], this.clearValidityWatcher = function() {
1354-
p.validityWatcher && (p.validityWatcher(), p.validityWatcher = void 0), p.ctrl.reviewStep.allowed = !1;
1354+
d.validityWatcher && (d.validityWatcher(), d.validityWatcher = void 0), d.ctrl.reviewStep.allowed = !1;
13551355
}, this.showInfo = function() {
1356-
p.clearValidityWatcher(), p.ctrl.configPageShown = !1, p.ctrl.nextTitle = "Next >";
1356+
d.clearValidityWatcher(), d.ctrl.configPageShown = !1, d.ctrl.nextTitle = "Next >";
13571357
}, this.showPlan = function() {
1358-
p.clearValidityWatcher(), p.ctrl.configPageShown = !1, p.ctrl.nextTitle = "Next >";
1358+
d.clearValidityWatcher(), d.ctrl.configPageShown = !1, d.ctrl.nextTitle = "Next >";
13591359
}, this.showConfig = function() {
1360-
p.clearValidityWatcher(), p.ctrl.configPageShown = !0, p.reviewStep.allowed = p.bindStep.hidden && p.configStep.valid,
1361-
p.updateBindability(), p.validityWatcher = p.$scope.$watch("$ctrl.forms.orderConfigureForm.$valid", function(e, t) {
1362-
p.configStep.valid = e, p.bindStep.allowed = p.configStep.valid, p.reviewStep.allowed = p.bindStep.hidden && p.configStep.valid;
1360+
d.clearValidityWatcher(), d.ctrl.configPageShown = !0, d.reviewStep.allowed = d.bindStep.hidden && d.configStep.valid,
1361+
d.updateBindability(), d.validityWatcher = d.$scope.$watch("$ctrl.forms.orderConfigureForm.$valid", function(e, t) {
1362+
d.configStep.valid = e, d.bindStep.allowed = d.configStep.valid, d.reviewStep.allowed = d.bindStep.hidden && d.configStep.valid;
13631363
});
13641364
}, this.showBind = function() {
1365-
p.clearValidityWatcher(), p.ctrl.configPageShown = !1, p.ctrl.nextTitle = p.bindParametersStep.hidden ? "Create" : "Next >",
1366-
p.reviewStep.allowed = p.bindParametersStep.hidden && p.bindStep.valid, p.isNewProject() ? p.ctrl.projectDisplayName = p.ctrl.selectedProject.metadata.annotations["new-display-name"] || p.ctrl.selectedProject.metadata.name : p.ctrl.projectDisplayName = p.$filter("displayName")(p.ctrl.selectedProject),
1367-
p.validityWatcher = p.$scope.$watch("$ctrl.forms.bindForm.$valid", function(e, t) {
1368-
p.bindStep.valid = e, p.bindParametersStep.allowed = e, p.reviewStep.allowed = p.bindParametersStep.hidden && p.bindStep.valid;
1365+
d.clearValidityWatcher(), d.ctrl.configPageShown = !1, d.ctrl.nextTitle = d.bindParametersStep.hidden ? "Create" : "Next >",
1366+
d.reviewStep.allowed = d.bindParametersStep.hidden && d.bindStep.valid, d.isNewProject() ? d.ctrl.projectDisplayName = d.ctrl.selectedProject.metadata.annotations["new-display-name"] || d.ctrl.selectedProject.metadata.name : d.ctrl.projectDisplayName = d.$filter("displayName")(d.ctrl.selectedProject),
1367+
d.validityWatcher = d.$scope.$watch("$ctrl.forms.bindForm.$valid", function(e, t) {
1368+
d.bindStep.valid = e, d.bindParametersStep.allowed = e, d.reviewStep.allowed = d.bindParametersStep.hidden && d.bindStep.valid;
13691369
});
13701370
}, this.showBindParameters = function() {
1371-
p.clearValidityWatcher(), p.ctrl.nextTitle = "Create", p.validityWatcher = p.$scope.$watch("$ctrl.forms.bindParametersForm.$valid", function(e, t) {
1372-
p.bindParametersStep.valid = e, p.reviewStep.allowed = p.bindParametersStep.valid;
1371+
d.clearValidityWatcher(), d.ctrl.nextTitle = "Create", d.validityWatcher = d.$scope.$watch("$ctrl.forms.bindParametersForm.$valid", function(e, t) {
1372+
d.bindParametersStep.valid = e, d.reviewStep.allowed = d.bindParametersStep.valid;
13731373
});
13741374
}, this.showResults = function() {
1375-
p.clearValidityWatcher(), p.ctrl.configPageShown = !1, p.ctrl.nextTitle = "Close",
1376-
p.ctrl.wizardDone = !0, p.provisionService();
1375+
d.clearValidityWatcher(), d.ctrl.configPageShown = !1, d.ctrl.nextTitle = "Close",
1376+
d.ctrl.wizardDone = !0, d.provisionService();
13771377
}, this.provisionService = function() {
1378-
if (p.ctrl.inProgress = !0, p.ctrl.orderComplete = !1, p.ctrl.error = !1, p.isNewProject()) {
1379-
var e = p.ctrl.selectedProject.metadata.name, t = p.ctrl.selectedProject.metadata.annotations["new-display-name"], r = p.$filter("description")(p.ctrl.selectedProject);
1380-
p.ProjectsService.create(e, t, r).then(function(e) {
1381-
p.ctrl.selectedProject = e, p.ctrl.projectDisplayName = p.$filter("displayName")(e),
1382-
p.createService();
1378+
if (d.ctrl.inProgress = !0, d.ctrl.orderComplete = !1, d.ctrl.error = !1, d.isNewProject()) {
1379+
var e = d.ctrl.selectedProject.metadata.name, t = d.ctrl.selectedProject.metadata.annotations["new-display-name"], r = d.$filter("description")(d.ctrl.selectedProject);
1380+
d.ProjectsService.create(e, t, r).then(function(e) {
1381+
d.ctrl.selectedProject = e, d.ctrl.projectDisplayName = d.$filter("displayName")(e),
1382+
d.createService();
13831383
}, function(e) {
1384-
p.ctrl.error = e.data;
1384+
d.ctrl.error = e.data;
13851385
});
1386-
} else p.ctrl.projectDisplayName = p.$filter("displayName")(p.ctrl.selectedProject),
1387-
p.createService();
1386+
} else d.ctrl.projectDisplayName = d.$filter("displayName")(d.ctrl.selectedProject),
1387+
d.createService();
13881388
}, this.onProjectUpdate = function() {
1389-
if (p.isNewProject()) p.ctrl.applications = [], p.ctrl.updating = !1, p.updateBindability(); else if (p.ctrl.showPodPresets) {
1390-
p.ctrl.updating = !0, p.ctrl.bindType = "none", p.ctrl.serviceToBind = p.ctrl.serviceClass;
1389+
if (d.isNewProject()) d.ctrl.applications = [], d.ctrl.updating = !1, d.updateBindability(); else if (d.ctrl.showPodPresets) {
1390+
d.ctrl.updating = !0, d.ctrl.bindType = "none", d.ctrl.serviceToBind = d.ctrl.serviceClass;
13911391
var e = {
1392-
namespace: i.get(p.ctrl.selectedProject, "metadata.name")
1392+
namespace: i.get(d.ctrl.selectedProject, "metadata.name")
13931393
};
1394-
p.ApplicationsService.getApplications(e).then(function(e) {
1395-
p.ctrl.applications = e, p.ctrl.updating = !1, p.updateBindability();
1394+
d.ApplicationsService.getApplications(e).then(function(e) {
1395+
d.ctrl.applications = e, d.ctrl.updating = !1, d.updateBindability();
13961396
});
13971397
}
13981398
}, this.watchResults = function(e, t, r) {
1399-
p.watches.push(p.DataService.watchObject(e, t.metadata.name, r, function(e, t) {
1399+
d.watches.push(d.DataService.watchObject(e, t.metadata.name, r, function(e, t) {
14001400
var r = i.get(e, "status.conditions"), n = i.find(r, {
14011401
type: "Ready"
14021402
});
1403-
p.ctrl.orderComplete = n && "True" === n.status, p.ctrl.error = i.find(r, {
1403+
d.ctrl.orderComplete = n && "True" === n.status, d.ctrl.error = i.find(r, {
14041404
type: "Failed",
14051405
status: "True"
14061406
});
14071407
}));
1408-
}, this.$scope = e, this.$filter = t, this.ApplicationsService = r, this.AuthService = n,
1409-
this.ProjectsService = a, this.DataService = s, this.BindingService = o, this.Logger = c,
1410-
this.sendRequesterUsername = !1, this.ctrl.showPodPresets = i.get(l, [ "ENABLE_TECH_PREVIEW_FEATURE", "pod_presets" ], !1),
1411-
this.DNS1123_SUBDOMAIN_VALIDATION = d;
1408+
}, this.$scope = e, this.$filter = t, this.ApplicationsService = r, this.ProjectsService = n,
1409+
this.DataService = a, this.BindingService = s, this.Logger = o, this.ctrl.showPodPresets = i.get(c, [ "ENABLE_TECH_PREVIEW_FEATURE", "pod_presets" ], !1),
1410+
this.DNS1123_SUBDOMAIN_VALIDATION = l;
14121411
}
14131412
return e.prototype.$onInit = function() {
14141413
var e = this;
@@ -1480,8 +1479,6 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
14801479
}, this.onProjectUpdate), this.bindTypeWatch = this.$scope.$watch("$ctrl.bindType", function(t, r) {
14811480
t !== r && (e.updateBindParametersStepVisibility(), e.ctrl.nextTitle = e.bindParametersStep.hidden ? "Create" : "Next >",
14821481
e.reviewStep.allowed = e.bindParametersStep.hidden && e.bindStep.valid);
1483-
}), this.AuthService.withUser().then(function(t) {
1484-
e.user = t, e.ctrl.wizardReady = !0;
14851482
});
14861483
}, e.prototype.selectPlan = function(e) {
14871484
this.ctrl.selectedPlan = e, this.ctrl.parameterData = {}, this.updateParameterSchema(e),
@@ -1533,18 +1530,13 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
15331530
}, e.prototype.updateBindParametersStepVisibility = function() {
15341531
this.bindParametersStep.hidden = this.bindStep.hidden || "none" === this.ctrl.bindType || !i.has(this.ctrl, "bindParameterSchema.properties"),
15351532
this.bindParametersStep.allowed = this.bindStep.valid;
1536-
}, e.prototype.updateParameterSchema = function(t) {
1537-
var r = i.get(t, "instanceCreateParameterSchema");
1538-
i.has(r, [ "properties", e.REQUESTER_USERNAME_PARAM_NAME ]) ? (r = n.copy(r), delete r.properties[e.REQUESTER_USERNAME_PARAM_NAME],
1539-
this.sendRequesterUsername = !0) : this.sendRequesterUsername = !1, this.ctrl.parameterSchema = r,
1540-
this.ctrl.parameterFormDefinition = i.get(this, "ctrl.selectedPlan.externalMetadata.schemas.service_instance.create.openshift_form_definition"),
1541-
this.ctrl.bindParameterSchema = i.get(t, "serviceInstanceCredentialCreateParameterSchema");
1533+
}, e.prototype.updateParameterSchema = function(e) {
1534+
this.ctrl.parameterSchema = i.get(e, "instanceCreateParameterSchema"), this.ctrl.parameterFormDefinition = i.get(this, "ctrl.selectedPlan.externalMetadata.schemas.service_instance.create.openshift_form_definition"),
1535+
this.ctrl.bindParameterSchema = i.get(e, "serviceInstanceCredentialCreateParameterSchema");
15421536
}, e.prototype.getParameters = function() {
1543-
var t = i.omitBy(this.ctrl.parameterData, function(e) {
1537+
return i.omitBy(this.ctrl.parameterData, function(e) {
15441538
return "" === e;
15451539
});
1546-
return this.sendRequesterUsername && (t[e.REQUESTER_USERNAME_PARAM_NAME] = this.user.metadata.name),
1547-
t;
15481540
}, e.prototype.getServiceClassName = function() {
15491541
return i.get(this, "ctrl.serviceClass.resource.metadata.name");
15501542
}, e.prototype.generateSecretName = function() {
@@ -1596,8 +1588,8 @@ webpackJsonp([ 0, 1 ], [ function(e, t) {
15961588
return !this.ctrl.selectedProject || !i.has(this.ctrl.selectedProject, "metadata.uid");
15971589
}, e;
15981590
}();
1599-
a.$inject = [ "$scope", "$filter", "ApplicationsService", "AuthService", "ProjectsService", "DataService", "BindingService", "Logger", "Constants", "DNS1123_SUBDOMAIN_VALIDATION" ],
1600-
a.REQUESTER_USERNAME_PARAM_NAME = "template.openshift.io/requester-username", t.OrderServiceController = a;
1591+
a.$inject = [ "$scope", "$filter", "ApplicationsService", "ProjectsService", "DataService", "BindingService", "Logger", "Constants", "DNS1123_SUBDOMAIN_VALIDATION" ],
1592+
t.OrderServiceController = a;
16011593
}, function(e, t, r) {
16021594
"use strict";
16031595
t.__esModule = !0;

Diff for: ‎src/components/order-service/order-service.controller.ts

+2-38
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export class OrderServiceController implements angular.IController {
77
'$scope',
88
'$filter',
99
'ApplicationsService',
10-
'AuthService',
1110
'ProjectsService',
1211
'DataService',
1312
'BindingService',
@@ -16,15 +15,12 @@ export class OrderServiceController implements angular.IController {
1615
'DNS1123_SUBDOMAIN_VALIDATION'
1716
];
1817

19-
static readonly REQUESTER_USERNAME_PARAM_NAME: string = 'template.openshift.io/requester-username';
20-
2118
public ctrl: any = this;
2219
public $scope: any;
2320

2421
private $filter: any;
2522
private ProjectsService: any;
2623
private ApplicationsService: any;
27-
private AuthService: any;
2824
private DataService: any;
2925
private BindingService: any;
3026
private Logger: any;
@@ -38,19 +34,11 @@ export class OrderServiceController implements angular.IController {
3834
private selectedProjectWatch: any;
3935
private bindTypeWatch: any;
4036
private validityWatcher: any;
41-
private user: any;
4237
private DNS1123_SUBDOMAIN_VALIDATION: any;
4338

44-
// Special case for the template broker. We need to send the send the current
45-
// user as the requester-username parameter value, but hide it in the UI.
46-
// This parameter will eventually be removed when the service catalog sends
47-
// the current OpenShift user as part of the provision request.
48-
private sendRequesterUsername: boolean;
49-
5039
constructor($scope: any,
5140
$filter: any,
5241
ApplicationsService: any,
53-
AuthService: any,
5442
ProjectsService: any,
5543
DataService: any,
5644
BindingService: any,
@@ -60,13 +48,10 @@ export class OrderServiceController implements angular.IController {
6048
this.$scope = $scope;
6149
this.$filter = $filter;
6250
this.ApplicationsService = ApplicationsService;
63-
this.AuthService = AuthService;
6451
this.ProjectsService = ProjectsService;
6552
this.DataService = DataService;
6653
this.BindingService = BindingService;
6754
this.Logger = Logger;
68-
// Set to the true when the parameter schema has REQUESTER_USERNAME_PARAM_NAME.
69-
this.sendRequesterUsername = false;
7055
this.ctrl.showPodPresets = _.get(Constants, ['ENABLE_TECH_PREVIEW_FEATURE', 'pod_presets'], false);
7156
this.DNS1123_SUBDOMAIN_VALIDATION = DNS1123_SUBDOMAIN_VALIDATION;
7257
}
@@ -177,11 +162,6 @@ export class OrderServiceController implements angular.IController {
177162
this.ctrl.nextTitle = this.bindParametersStep.hidden ? 'Create' : 'Next >';
178163
this.reviewStep.allowed = this.bindParametersStep.hidden && this.bindStep.valid;
179164
});
180-
181-
this.AuthService.withUser().then((user) => {
182-
this.user = user;
183-
this.ctrl.wizardReady = true;
184-
});
185165
}
186166

187167
public clearValidityWatcher = () => {
@@ -389,17 +369,8 @@ export class OrderServiceController implements angular.IController {
389369
};
390370

391371
private updateParameterSchema(plan: any) {
392-
let schema: any = _.get(plan, 'instanceCreateParameterSchema');
393-
if (_.has(schema, ['properties', OrderServiceController.REQUESTER_USERNAME_PARAM_NAME])) {
394-
schema = angular.copy(schema);
395-
delete schema.properties[OrderServiceController.REQUESTER_USERNAME_PARAM_NAME];
396-
this.sendRequesterUsername = true;
397-
} else {
398-
this.sendRequesterUsername = false;
399-
}
400-
this.ctrl.parameterSchema = schema;
372+
this.ctrl.parameterSchema = _.get(plan, 'instanceCreateParameterSchema');
401373
this.ctrl.parameterFormDefinition = _.get(this, 'ctrl.selectedPlan.externalMetadata.schemas.service_instance.create.openshift_form_definition');
402-
403374
this.ctrl.bindParameterSchema = _.get(plan, 'serviceInstanceCredentialCreateParameterSchema');
404375
}
405376

@@ -435,16 +406,9 @@ export class OrderServiceController implements angular.IController {
435406
//
436407
// Check specifically for the empty string rather than truthiness so that
437408
// we don't omit other values like `false` for boolean parameters.
438-
let parameters: any = _.omitBy(this.ctrl.parameterData, (parameterValue) => {
409+
return _.omitBy(this.ctrl.parameterData, (parameterValue) => {
439410
return parameterValue === '';
440411
});
441-
442-
// Send the requester-username if this is the template broker.
443-
if (this.sendRequesterUsername) {
444-
parameters[OrderServiceController.REQUESTER_USERNAME_PARAM_NAME] = this.user.metadata.name;
445-
}
446-
447-
return parameters;
448412
}
449413

450414
private getServiceClassName(): string {

0 commit comments

Comments
 (0)