Skip to content

Commit

Permalink
Merge pull request #2048 from spadgett/service-catalog-api-changes
Browse files Browse the repository at this point in the history 
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Sep 14, 2017
2 parents 0e11a67 + b0b5fce commit 528a138
Show file tree
Hide file tree
Showing 17 changed files with 95 additions and 95 deletions.
10 changes: 5 additions & 5 deletions app/scripts/controllers/overview.js
View file
Expand Up @@ -1314,10 +1314,10 @@ function OverviewController($scope,

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

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

if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'watch')) {
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'watch')) {
// TODO: update to behave like ImageStreamResolver
// - we may not even need to list these... perhaps just fetch the ones we need when needed
// If we can't watch instances don't bother getting service classes either
Expand Down
10 changes: 5 additions & 5 deletions app/scripts/directives/bindService.js
View file
Expand Up @@ -151,7 +151,7 @@

DataService.list({
group: 'servicecatalog.k8s.io',
resource: 'instances'
resource: 'serviceinstances'
}, context).then(function(instances) {
ctrl.serviceInstances = instances.by('metadata.name');
sortServiceInstances();
Expand Down Expand Up @@ -187,15 +187,15 @@
return;
}

var instance = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceToBind;
var instance = ctrl.target.kind === 'ServiceInstance' ? ctrl.target : ctrl.serviceToBind;
if (!instance) {
return;
}

ctrl.serviceClass = ctrl.serviceClasses[instance.spec.serviceClassName];
ctrl.serviceClassName = instance.spec.serviceClassName;
ctrl.plan = BindingService.getPlanForInstance(instance, ctrl.serviceClass);
ctrl.parameterSchema = _.get(ctrl.plan, 'alphaBindingCreateParameterSchema');
ctrl.parameterSchema = _.get(ctrl.plan, 'alphaServiceInstanceCredentialCreateParameterSchema');
bindParametersStep.hidden = !_.has(ctrl.parameterSchema, 'properties');
ctrl.nextTitle = bindParametersStep.hidden ? 'Bind' : 'Next >';
};
Expand All @@ -220,7 +220,7 @@
sortServiceInstances();
});

if (ctrl.target.kind === 'Instance') {
if (ctrl.target.kind === 'ServiceInstance') {
ctrl.bindType = "secret-only";
ctrl.appToBind = null;
ctrl.serviceToBind = ctrl.target;
Expand Down Expand Up @@ -256,7 +256,7 @@
};

ctrl.bindService = function() {
var svcToBind = ctrl.target.kind === 'Instance' ? ctrl.target : ctrl.serviceToBind;
var svcToBind = ctrl.target.kind === 'ServiceInstance' ? ctrl.target : ctrl.serviceToBind;
var application = ctrl.bindType === 'application' ? ctrl.appToBind : undefined;

var context = {
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/directives/overview/listRow.js
View file
Expand Up @@ -174,13 +174,13 @@
// Create Binding is displayed.
if (enableTechPreviewFeature('pod_presets') &&
!_.isEmpty(row.state.bindableServiceInstances) &&
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'create')) {
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'create')) {
return true;
}
// Delete Binding is displayed.
if (enableTechPreviewFeature('pod_presets') &&
!_.isEmpty(deleteableBindings) &&
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'delete')) {
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'delete')) {
return true;
}
// Check if one of the start build actions is displayed
Expand Down Expand Up @@ -210,13 +210,13 @@
// Create Binding is displayed.
if (enableTechPreviewFeature('pod_presets') &&
!_.isEmpty(row.state.bindableServiceInstances) &&
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'create')) {
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'create')) {
return true;
}
// Delete Binding is displayed.
if (enableTechPreviewFeature('pod_presets') &&
!_.isEmpty(deleteableBindings) &&
canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'delete')) {
canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'delete')) {
return true;
}
return false;
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/directives/overview/serviceInstanceRow.js
View file
Expand Up @@ -84,15 +84,15 @@
}

// We can create bindings
if (row.isBindable && AuthorizationService.canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'create')) {
if (row.isBindable && AuthorizationService.canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'create')) {
return true;
}
// We can delete bindings
if (!_.isEmpty(row.deleteableBindings) && AuthorizationService.canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'delete')) {
if (!_.isEmpty(row.deleteableBindings) && AuthorizationService.canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'delete')) {
return true;
}
// We can delete instances
if (AuthorizationService.canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'delete')) {
if (AuthorizationService.canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'delete')) {
return true;
}
return false;
Expand Down Expand Up @@ -138,7 +138,7 @@
NotificationsService.hideNotification("deprovision-service-error");
DataService.delete({
group: 'servicecatalog.k8s.io',
resource: 'instances'
resource: 'serviceinstances'
},
row.apiObject.metadata.name,
{ namespace: row.apiObject.metadata.namespace },
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/directives/resourceServiceBindings.js
View file
Expand Up @@ -61,21 +61,21 @@ function ResourceServiceBindings($filter, DataService, BindingService, CatalogSe
DataService.unwatchAll(watches);
watches = [];

if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'bindings', group: 'servicecatalog.k8s.io'}, 'watch')) {
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'}, 'watch')) {
watches.push(DataService.watch({
group: 'servicecatalog.k8s.io',
resource: 'bindings'
resource: 'serviceinstancecredentials'
}, ctrl.projectContext, function(bindings) {
ctrl.bindings = bindings.by('metadata.name');
updateBindings();
}, {poll: limitWatches, pollInterval: DEFAULT_POLL_INTERVAL}));
}

// The canI check on watch should be temporary until we have a different solution for handling secret parameters
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'instances', group: 'servicecatalog.k8s.io'}, 'watch')) {
if (CatalogService.SERVICE_CATALOG_ENABLED && canI({resource: 'serviceinstances', group: 'servicecatalog.k8s.io'}, 'watch')) {
watches.push(DataService.watch({
group: 'servicecatalog.k8s.io',
resource: 'instances'
resource: 'serviceinstances'
}, ctrl.projectContext, function(serviceInstances) {
ctrl.serviceInstances = serviceInstances.by('metadata.name');
sortServiceInstances();
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/directives/unbindService.js
View file
Expand Up @@ -33,7 +33,7 @@
ctrl.unboundApps = ctrl.appsForBinding(bindingName);
DataService.delete({
group: 'servicecatalog.k8s.io',
resource: 'bindings'
resource: 'serviceinstancecredentials'
},
bindingName,
context,
Expand Down Expand Up @@ -77,7 +77,7 @@
};

ctrl.$onInit = function() {
var formStepLabel = (ctrl.target.kind === 'Instance') ? 'Applications' : 'Services';
var formStepLabel = (ctrl.target.kind === 'ServiceInstance') ? 'Applications' : 'Services';
ctrl.displayName = serviceInstanceDisplayName(ctrl.target);
ctrl.steps = [{
id: 'deleteForm',
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/services/catalog.js
View file
Expand Up @@ -12,8 +12,8 @@ angular.module("openshiftConsole")
var SERVICE_CATALOG_ENABLED =
_.get(Constants, 'ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page') &&
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'serviceclasses' }) &&
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'instances' }) &&
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'bindings' });
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'serviceinstances' }) &&
APIService.apiInfo({ group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' });

var categoryItemByID = {};
_.each(Constants.CATALOG_CATEGORIES, function(category) {
Expand Down
4 changes: 2 additions & 2 deletions app/views/directives/bind-service/bind-service-form.html
View file
@@ -1,12 +1,12 @@
<div ng-if="ctrl.target.kind !== 'Instance'">
<div ng-if="ctrl.target.kind !== 'ServiceInstance'">
<bind-application-form application-name="ctrl.target.metadata.name"
form-name="ctrl.selectionForm"
service-classes="ctrl.serviceClasses"
service-instances="ctrl.orderedServiceInstances"
service-to-bind="ctrl.serviceToBind">
</bind-application-form>
</div>
<div ng-if="ctrl.target.kind === 'Instance'">
<div ng-if="ctrl.target.kind === 'ServiceInstance'">
<bind-service-form selected-project="ctrl.project"
service-class="ctrl.serviceClass"
service-class-name="ctrl.serviceClassName"
Expand Down
4 changes: 2 additions & 2 deletions app/views/directives/resource-service-bindings.html
View file
Expand Up @@ -7,7 +7,7 @@ <h3>Service Bindings</h3>
service-classes="$ctrl.serviceClasses"
service-instances="$ctrl.serviceInstances">
</overview-service-binding>
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<a href="" ng-click="$ctrl.createBinding()" role="button">
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
Create Binding
Expand All @@ -19,7 +19,7 @@ <h3>Service Bindings</h3>
<a href="./">Browse Catalog</a>
</div>
</div>
<div ng-if="!($ctrl.bindings | size) && ($ctrl.bindableServiceInstances | size) && !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div ng-if="!($ctrl.bindings | size) && ($ctrl.bindableServiceInstances | size) && !({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<span>There are no service bindings.</span>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions app/views/overview/_list-row-actions.html
View file
Expand Up @@ -25,12 +25,12 @@
</li>
<li ng-if="('pod_presets' | enableTechPreviewFeature)
&& row.state.bindableServiceInstances.length
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">Create Binding</a>
</li>
<li ng-if="('pod_presets' | enableTechPreviewFeature)
&& row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
<a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
</li>
<li ng-if="row.current && ('deploymentconfigs/log' | canI : 'get')" role="menuitem">
Expand Down Expand Up @@ -65,12 +65,12 @@
</li>
<li ng-if="('pod_presets' | enableTechPreviewFeature)
&& row.state.bindableServiceInstances.length
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')" role="menuitem">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">Create Binding</a>
</li>
<li ng-if="('pod_presets' | enableTechPreviewFeature)
&& row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')" role="menuitem">
<a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
</li>
<li ng-if="(pod = row.firstPod(row.current)) && ('pods/log' | canI : 'get')" role="menuitem">
Expand Down
2 changes: 1 addition & 1 deletion app/views/overview/_service-binding.html
View file
Expand Up @@ -18,7 +18,7 @@ <h3 ng-if="$ctrl.serviceClass">
</div>
<div class="service-binding-actions" ng-if="!ctrl.binding.metadata.deletionTimestamp">
<delete-link
ng-if="({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')"
ng-if="({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')"
label="Delete Binding"
kind="binding"
group="servicecatalog.k8s.io"
Expand Down
2 changes: 1 addition & 1 deletion app/views/overview/_service-bindings.html
View file
Expand Up @@ -8,7 +8,7 @@
service-instances="$ctrl.serviceInstances"
secrets="$ctrl.secrets">
</overview-service-binding>
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div ng-if="($ctrl.bindableServiceInstances | size) && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<a href="" ng-click="$ctrl.createBinding()" role="button">
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
Create Binding
Expand Down
12 changes: 6 additions & 6 deletions app/views/overview/_service-instance-row.html
View file
Expand Up @@ -34,7 +34,7 @@ <h3>
<div class="hidden-xs hidden-sm">
<span ng-if="!row.bindings.length
&& row.isBindable
&& ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
&& ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
Create Binding
Expand Down Expand Up @@ -73,16 +73,16 @@ <h3>
uib-dropdown-toggle
class="actions-dropdown-kebab"><i class="fa fa-ellipsis-v"></i><span class="sr-only">Actions</span></a>
<ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
<li role="menuitem" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<li role="menuitem" ng-if="row.isBindable && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
Create Binding
</a>
</li>
<li role="menuitem" ng-if="row.deleteableBindings.length && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')">
<li role="menuitem" ng-if="row.deleteableBindings.length && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')">
<a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
</li>
<li role="menuitem">
<a href="" ng-click="row.deprovision()" role="button" ng-if="{resource: 'instances', group: 'servicecatalog.k8s.io'} | canI : 'delete'">Delete</a>
<a href="" ng-click="row.deprovision()" role="button" ng-if="{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'">Delete</a>
</li>
</ul>
</div>
Expand Down Expand Up @@ -169,15 +169,15 @@ <h3>
</span>
</div>
</div>
<div class="row" ng-if="row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div class="row" ng-if="row.isBindable && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')">
<div class="col-sm-12">
<a href="" ng-click="row.showOverlayPanel('bindService', {target: row.apiObject})">
<span class="pficon pficon-add-circle-o" aria-hidden="true"></span>
Create Binding
</a>
</div>
</div>
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
<div class="row" ng-if="!row.bindings.length && (!row.isBindable || !({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create'))">
<div class="col-sm-12">
<em>No bindings</em>
</div>
Expand Down
4 changes: 2 additions & 2 deletions bower.json
View file
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.55",
"origin-web-catalog": "0.0.44"
"origin-web-common": "0.0.56",
"origin-web-catalog": "0.0.45"
},
"devDependencies": {
"angular-mocks": "1.5.11",
Expand Down

0 comments on commit 528a138

Please sign in to comment.