Skip to content

Commit 528a138

Browse files
author
OpenShift Bot
authored
Merge pull request #2048 from spadgett/service-catalog-api-changes
Merged by openshift-bot
2 parents 0e11a67 + b0b5fce commit 528a138

17 files changed

+95
-95
lines changed

‎app/scripts/controllers/overview.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,10 +1314,10 @@ function OverviewController($scope,
13141314

13151315
var canI = $filter('canI');
13161316
// The canI check on watch should be temporary until we have a different solution for handling secret parameters
1317-
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'watch')) {
1317+
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'watch')) {
13181318
watches.push(DataService.watch({
13191319
group: 'servicecatalog.k8s.io',
1320-
resource: 'instances'
1320+
resource: 'serviceinstances'
13211321
}, context, function(serviceInstances) {
13221322
state.serviceInstances = serviceInstances.by('metadata.name');
13231323
_.each(state.serviceInstances, function(instance) {
@@ -1330,10 +1330,10 @@ function OverviewController($scope,
13301330
}, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));
13311331
}
13321332

1333-
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'watch')) {
1333+
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'watch')) {
13341334
watches.push(DataService.watch({
13351335
group: 'servicecatalog.k8s.io',
1336-
resource: 'bindings'
1336+
resource: 'serviceinstancecredentials'
13371337
}, context, function(bindings) {
13381338
state.bindings = bindings.by('metadata.name');
13391339
overview.bindingsByInstanceRef = _.groupBy(state.bindings, 'spec.instanceRef.name');
@@ -1347,7 +1347,7 @@ function OverviewController($scope,
13471347
state.limitRanges = response.by("metadata.name");
13481348
});
13491349

1350-
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'watch')) {
1350+
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'watch')) {
13511351
// TODO: update to behave like ImageStreamResolver
13521352
// - we may not even need to list these... perhaps just fetch the ones we need when needed
13531353
// If we can't watch instances don't bother getting service classes either

‎app/scripts/directives/bindService.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151

152152
DataService.list({
153153
group: 'servicecatalog.k8s.io',
154-
resource: 'instances'
154+
resource: 'serviceinstances'
155155
}, context).then(function(instances) {
156156
ctrl.serviceInstances = instances.by('metadata.name');
157157
sortServiceInstances();
@@ -187,15 +187,15 @@
187187
return;
188188
}
189189

190-
var instance = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceToBind;
190+
var instance = ctrl.target.kind === 'ServiceInstance' ? ctrl.target : ctrl.serviceToBind;
191191
if (!instance) {
192192
return;
193193
}
194194

195195
ctrl.serviceClass = ctrl.serviceClasses[instance.spec.serviceClassName];
196196
ctrl.serviceClassName = instance.spec.serviceClassName;
197197
ctrl.plan = BindingService.getPlanForInstance(instance, ctrl.serviceClass);
198-
ctrl.parameterSchema = _.get(ctrl.plan, 'alphaBindingCreateParameterSchema');
198+
ctrl.parameterSchema = _.get(ctrl.plan, 'alphaServiceInstanceCredentialCreateParameterSchema');
199199
bindParametersStep.hidden = !_.has(ctrl.parameterSchema, 'properties');
200200
ctrl.nextTitle = bindParametersStep.hidden ? 'Bind' : 'Next >';
201201
};
@@ -220,7 +220,7 @@
220220
sortServiceInstances();
221221
});
222222

223-
if (ctrl.target.kind === 'Instance') {
223+
if (ctrl.target.kind === 'ServiceInstance') {
224224
ctrl.bindType = "secret-only";
225225
ctrl.appToBind = null;
226226
ctrl.serviceToBind = ctrl.target;
@@ -256,7 +256,7 @@
256256
};
257257

258258
ctrl.bindService = function() {
259-
var svcToBind = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceToBind;
259+
var svcToBind = ctrl.target.kind === 'ServiceInstance' ? ctrl.target : ctrl.serviceToBind;
260260
var application = ctrl.bindType === 'application' ? ctrl.appToBind : undefined;
261261

262262
var context = {

‎app/scripts/directives/overview/listRow.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
174174
// Create Binding is displayed.
175175
if (enableTechPreviewFeature('pod_presets') &&
176176
!_.isEmpty(row.state.bindableServiceInstances) &&
177-
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'create')) {
177+
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'create')) {
178178
return true;
179179
}
180180
// Delete Binding is displayed.
181181
if (enableTechPreviewFeature('pod_presets') &&
182182
!_.isEmpty(deleteableBindings) &&
183-
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'delete')) {
183+
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'delete')) {
184184
return true;
185185
}
186186
// Check if one of the start build actions is displayed
@@ -210,13 +210,13 @@
210210
// Create Binding is displayed.
211211
if (enableTechPreviewFeature('pod_presets') &&
212212
!_.isEmpty(row.state.bindableServiceInstances) &&
213-
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'create')) {
213+
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'create')) {
214214
return true;
215215
}
216216
// Delete Binding is displayed.
217217
if (enableTechPreviewFeature('pod_presets') &&
218218
!_.isEmpty(deleteableBindings) &&
219-
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'delete')) {
219+
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'delete')) {
220220
return true;
221221
}
222222
return false;

‎app/scripts/directives/overview/serviceInstanceRow.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484
}
8585

8686
// We can create bindings
87-
if (row.isBindable && AuthorizationService.canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'create')) {
87+
if (row.isBindable && AuthorizationService.canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'create')) {
8888
return true;
8989
}
9090
// We can delete bindings
91-
if (!_.isEmpty(row.deleteableBindings) && AuthorizationService.canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'delete')) {
91+
if (!_.isEmpty(row.deleteableBindings) && AuthorizationService.canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'delete')) {
9292
return true;
9393
}
9494
// We can delete instances
95-
if (AuthorizationService.canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'delete')) {
95+
if (AuthorizationService.canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'delete')) {
9696
return true;
9797
}
9898
return false;
@@ -138,7 +138,7 @@
138138
NotificationsService.hideNotification("deprovision-service-error");
139139
DataService.delete({
140140
group: 'servicecatalog.k8s.io',
141-
resource: 'instances'
141+
resource: 'serviceinstances'
142142
},
143143
row.apiObject.metadata.name,
144144
{ namespace: row.apiObject.metadata.namespace },

‎app/scripts/directives/resourceServiceBindings.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ function ResourceServiceBindings($filter, DataService, BindingService, CatalogSe
6161
DataService.unwatchAll(watches);
6262
watches = [];
6363

64-
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'watch')) {
64+
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'watch')) {
6565
watches.push(DataService.watch({
6666
group: 'servicecatalog.k8s.io',
67-
resource: 'bindings'
67+
resource: 'serviceinstancecredentials'
6868
}, ctrl.projectContext, function(bindings) {
6969
ctrl.bindings = bindings.by('metadata.name');
7070
updateBindings();
7171
}, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));
7272
}
7373

7474
// The canI check on watch should be temporary until we have a different solution for handling secret parameters
75-
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'watch')) {
75+
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'watch')) {
7676
watches.push(DataService.watch({
7777
group: 'servicecatalog.k8s.io',
78-
resource: 'instances'
78+
resource: 'serviceinstances'
7979
}, ctrl.projectContext, function(serviceInstances) {
8080
ctrl.serviceInstances = serviceInstances.by('metadata.name');
8181
sortServiceInstances();

‎app/scripts/directives/unbindService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
ctrl.unboundApps = ctrl.appsForBinding(bindingName);
3434
DataService.delete({
3535
group: 'servicecatalog.k8s.io',
36-
resource: 'bindings'
36+
resource: 'serviceinstancecredentials'
3737
},
3838
bindingName,
3939
context,
@@ -77,7 +77,7 @@
7777
};
7878

7979
ctrl.$onInit = function() {
80-
var formStepLabel = (ctrl.target.kind === 'Instance') ? 'Applications' : 'Services';
80+
var formStepLabel = (ctrl.target.kind === 'ServiceInstance') ? 'Applications' : 'Services';
8181
ctrl.displayName = serviceInstanceDisplayName(ctrl.target);
8282
ctrl.steps = [{
8383
id: 'deleteForm',

‎app/scripts/services/catalog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ angular.module("openshiftConsole")
1212
var SERVICE_CATALOG_ENABLED =
1313
_.get(Constants, 'ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page') &&
1414
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'serviceclasses' }) &&
15-
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'instances' }) &&
16-
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'bindings' });
15+
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'serviceinstances' }) &&
16+
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' });
1717

1818
var categoryItemByID = {};
1919
_.each(Constants.CATALOG_CATEGORIES, function(category) {

‎app/views/directives/bind-service/bind-service-form.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<div ng-if="ctrl.target.kind !== 'Instance'">
1+
<div ng-if="ctrl.target.kind !== 'ServiceInstance'">
22
<bind-application-form application-name="ctrl.target.metadata.name"
33
form-name="ctrl.selectionForm"
44
service-classes="ctrl.serviceClasses"
55
service-instances="ctrl.orderedServiceInstances"
66
service-to-bind="ctrl.serviceToBind">
77
</bind-application-form>
88
</div>
9-
<div ng-if="ctrl.target.kind === 'Instance'">
9+
<div ng-if="ctrl.target.kind === 'ServiceInstance'">
1010
<bind-service-form selected-project="ctrl.project"
1111
service-class="ctrl.serviceClass"
1212
service-class-name="ctrl.serviceClassName"

‎app/views/directives/resource-service-bindings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h3>Service Bindings</h3>
77
service-classes="$ctrl.serviceClasses"
88
service-instances="$ctrl.serviceInstances">
99
</overview-service-binding>
10-
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
10+
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
1111
<a href="" ng-click="$ctrl.createBinding()" role="button">
1212
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
1313
Create Binding
@@ -19,7 +19,7 @@ <h3>Service Bindings</h3>
1919
<a href="./">Browse Catalog</a>
2020
</div>
2121
</div>
22-
<div ng-if="!($ctrl.bindings | size) && ($ctrl.bindableServiceInstances | size) && !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
22+
<div ng-if="!($ctrl.bindings | size) && ($ctrl.bindableServiceInstances | size) && !({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
2323
<span>There are no service bindings.</span>
2424
</div>
2525
</div>

‎app/views/overview/_list-row-actions.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
</li>
2626
<li ng-if="('pod_presets' | enableTechPreviewFeature)
2727
&& row.state.bindableServiceInstances.length
28-
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
28+
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
2929
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">Create Binding</a>
3030
</li>
3131
<li ng-if="('pod_presets' | enableTechPreviewFeature)
3232
&& row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length
33-
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
33+
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
3434
<a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
3535
</li>
3636
<li ng-if="row.current && ('deploymentconfigs/log' | canI : 'get')" role="menuitem">
@@ -65,12 +65,12 @@
6565
</li>
6666
<li ng-if="('pod_presets' | enableTechPreviewFeature)
6767
&& row.state.bindableServiceInstances.length
68-
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
68+
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
6969
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">Create Binding</a>
7070
</li>
7171
<li ng-if="('pod_presets' | enableTechPreviewFeature)
7272
&& row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length
73-
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
73+
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
7474
<a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
7575
</li>
7676
<li ng-if="(pod = row.firstPod(row.current)) && ('pods/log' | canI : 'get')" role="menuitem">

‎app/views/overview/_service-binding.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h3 ng-if="$ctrl.serviceClass">
1818
</div>
1919
<div class="service-binding-actions" ng-if="!ctrl.binding.metadata.deletionTimestamp">
2020
<delete-link
21-
ng-if="({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')"
21+
ng-if="({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')"
2222
label="Delete Binding"
2323
kind="binding"
2424
group="servicecatalog.k8s.io"

‎app/views/overview/_service-bindings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
service-instances="$ctrl.serviceInstances"
99
secrets="$ctrl.secrets">
1010
</overview-service-binding>
11-
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
11+
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
1212
<a href="" ng-click="$ctrl.createBinding()" role="button">
1313
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
1414
Create Binding

‎app/views/overview/_service-instance-row.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h3>
3434
<div class="hidden-xs hidden-sm">
3535
<span ng-if="!row.bindings.length
3636
&& row.isBindable
37-
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
37+
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
3838
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
3939
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
4040
Create Binding
@@ -73,16 +73,16 @@ <h3>
7373
uib-dropdown-toggle
7474
class="actions-dropdown-kebab"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
7575
<ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
76-
<li role="menuitem" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
76+
<li role="menuitem" ng-if="row.isBindable && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
7777
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
7878
Create Binding
7979
</a>
8080
</li>
81-
<li role="menuitem" ng-if="row.deleteableBindings.length && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')">
81+
<li role="menuitem" ng-if="row.deleteableBindings.length && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')">
8282
<a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
8383
</li>
8484
<li role="menuitem">
85-
<a href="" ng-click="row.deprovision()" role="button" ng-if="{resource: 'instances', group: 'servicecatalog.k8s.io'} | canI : 'delete'">Delete</a>
85+
<a href="" ng-click="row.deprovision()" role="button" ng-if="{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'">Delete</a>
8686
</li>
8787
</ul>
8888
</div>
@@ -169,15 +169,15 @@ <h3>
169169
</span>
170170
</div>
171171
</div>
172-
<div class="row" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
172+
<div class="row" ng-if="row.isBindable && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
173173
<div class="col-sm-12">
174174
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
175175
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
176176
Create Binding
177177
</a>
178178
</div>
179179
</div>
180-
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
180+
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
181181
<div class="col-sm-12">
182182
<em>No bindings</em>
183183
</div>

‎bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"angular-moment": "1.0.0",
4747
"angular-utf8-base64": "0.0.5",
4848
"file-saver": "1.3.3",
49-
"origin-web-common": "0.0.55",
50-
"origin-web-catalog": "0.0.44"
49+
"origin-web-common": "0.0.56",
50+
"origin-web-catalog": "0.0.45"
5151
},
5252
"devDependencies": {
5353
"angular-mocks": "1.5.11",

0 commit comments

Comments
 (0)