Check services for bindability before creating bindings #1599

jeff-phillips-18 · 2017-05-26T16:18:31Z

No description provided.

jwforres · 2017-05-30T18:00:39Z

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

@@ -25,7 +25,7 @@
            </li>
            <!-- FIXME: Can't enable canI checks on svc cat resources until we have aggregation
            <li ng-if="(row.state.serviceInstances | hashSize) > 0 && {resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'" role="menuitem"> -->
-            <li ng-if="('pod_presets' | enableTechPreviewFeature) && (row.state.serviceInstances | hashSize) > 0" role="menuitem">
+            <li ng-if="('pod_presets' | enableTechPreviewFeature) && (row.state.bindableServiceInstances | hashSize) > 0" role="menuitem">


bindableServiceInstances should be an array now, since you used _.filter, so you can just check row.state.bindableServiceInstances.length

Updated, thanks.

benjaminapetersen · 2017-05-30T20:51:55Z

app/scripts/directives/bindService.js

@@ -71,6 +71,7 @@ function BindService($scope,
                                        .concat(replicaSets)
                                        .concat(statefulSets);
      ctrl.applications = _.sortByAll(apiObjects, ['metadata.name', 'kind']);


Curious about reason for making these bools into strings "true" : "false"?

I see https://github.com/openshift/origin-web-common/blob/master/src/components/binding/bindServiceForm.html#L20, but not sure why a string here as well.

There are three options:

'true' = bind to a selected application

'false' = bind, but not to an application

'none' = do not bind

Curious if that is something that can be clarified. "false" meaning "yes, but no" and none meaning "false" (ie, what you thought false would have meant) seems confusing.

Maybe something like

bindingType = 'application' | 'secret-only' | 'none'

to avoid confusion around types?

right, something that clearly indicates intent.

OK, I can update https://github.com/openshift/origin-web-common/blob/master/src/components/binding/bindServiceForm.js to use these values.

Added openshift/origin-web-common#90

jeff-phillips-18 · 2017-06-07T16:58:03Z

Removed WIP status, ready for final reviews.

benjaminapetersen · 2017-06-07T19:25:39Z

app/scripts/controllers/overview.js

      return;
    }
-    state.orderedServiceInstances = _.toArray(state.serviceInstances).sort(function(left, right) {
+


Curious, rather than creating a duplicate array serviceInstancesArray, _.filter works fine on a hash as does _.sortBy instead of [].sort. Possible to use the _ version?

I've seen this done a few times now but haven't looked closely before.

Updated to use _.sortByAll. Thanks!

benjaminapetersen · 2017-06-07T19:31:53Z

app/scripts/directives/bindService.js

@@ -168,6 +169,8 @@
        });
      }
      else {
+        ctrl.bindType = 'application';
+        ctrl.appToBind = ctrl.target;


Lines 173 and 184 seem to be the same & I believe one can be removed.

I'd actually prefer to see some of this logic broken out into separate functions. Its a gnarly big if/else & there might be some long term maintenance benefits to breaking it down into smaller pieces.

Updated, thanks!

benjaminapetersen · 2017-06-07T19:38:59Z

app/scripts/directives/bindService.js


      var context = {
        namespace: _.get(svcToBind, 'metadata.namespace')
      };

-      BindingService.bindService(context, _.get(svcToBind, 'metadata.name'), _.get(appToBind, 'metadata.name')).then(function(binding){
+      BindingService.bindService(context, _.get(svcToBind, 'metadata.name'), application).then(function(binding){


So DataService patterns don't lead with context, they tend towards something like (resource, name, context, opts). We missed this & should prob open an issue in common to keep these consistent. I'm curious if application even ends up as part of context in the end, but I'd have to look.

spadgett · 2017-06-08T14:05:15Z

We should prioritize getting this in because binding is currently broken in the web console. We updated common without making the corresponding the corresponding console change for openshift/origin-web-common#90

jeff-phillips-18 · 2017-06-08T14:16:44Z

@spadgett ah yes, sorry about that.

jwforres · 2017-06-08T17:45:05Z

[merge]

openshift-bot · 2017-06-08T18:07:35Z

Evaluated for origin web console merge up to c79065a

openshift-bot · 2017-06-08T18:07:43Z

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1488/) (Base Commit: 23aa410)

jeff-phillips-18 requested review from benjaminapetersen, spadgett and jwforres May 26, 2017 16:19

jeff-phillips-18 force-pushed the bind branch from a6ad829 to e3f36b2 Compare May 30, 2017 11:42

jwforres requested changes May 30, 2017

View reviewed changes

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 30, 2017

benjaminapetersen reviewed May 30, 2017

View reviewed changes

jeff-phillips-18 force-pushed the bind branch from e3f36b2 to 292072a Compare May 31, 2017 19:42

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 31, 2017

jeff-phillips-18 force-pushed the bind branch from 1911577 to 86d6688 Compare June 5, 2017 16:59

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 5, 2017

jeff-phillips-18 force-pushed the bind branch 2 times, most recently from c67e694 to 659256d Compare June 6, 2017 14:30

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 6, 2017

jeff-phillips-18 force-pushed the bind branch from 659256d to 37e2e87 Compare June 6, 2017 19:50

jeff-phillips-18 mentioned this pull request Jun 6, 2017

Update origin-web-common to 0.0.31, origin-web-catalog to 0.0.19 #1658

Merged

jeff-phillips-18 force-pushed the bind branch from 37e2e87 to b8faec6 Compare June 7, 2017 16:56

jeff-phillips-18 changed the title ~~[WIP] Check services for bindability before creating bindings~~ Check services for bindability before creating bindings Jun 7, 2017

benjaminapetersen mentioned this pull request Jun 7, 2017

Add delete binding (unbind) action to provisioned services #1505

Closed

2 tasks

benjaminapetersen suggested changes Jun 7, 2017

View reviewed changes

benjaminapetersen mentioned this pull request Jun 7, 2017

Ensure derivative service of DataService match function signatures when possible openshift/origin-web-common#96

Closed

jeff-phillips-18 force-pushed the bind branch from b8faec6 to ba4caac Compare June 8, 2017 14:15

Check services for bindability before creating bindings

c79065a

jeff-phillips-18 force-pushed the bind branch from ba4caac to c79065a Compare June 8, 2017 14:37

jwforres approved these changes Jun 8, 2017

View reviewed changes

benjaminapetersen approved these changes Jun 8, 2017

View reviewed changes

openshift-bot merged commit 9fd7f5b into openshift:master Jun 8, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check services for bindability before creating bindings #1599

Check services for bindability before creating bindings #1599

jeff-phillips-18 commented May 26, 2017 •

edited

Loading

jwforres May 30, 2017

jeff-phillips-18 May 31, 2017

benjaminapetersen May 30, 2017

benjaminapetersen May 30, 2017

jeff-phillips-18 May 31, 2017

benjaminapetersen May 31, 2017

spadgett May 31, 2017

benjaminapetersen May 31, 2017

jeff-phillips-18 Jun 1, 2017

jeff-phillips-18 Jun 1, 2017

jeff-phillips-18 commented Jun 7, 2017

benjaminapetersen Jun 7, 2017 •

edited

Loading

jeff-phillips-18 Jun 8, 2017

benjaminapetersen Jun 7, 2017 •

edited

Loading

jeff-phillips-18 Jun 8, 2017

benjaminapetersen Jun 7, 2017

spadgett commented Jun 8, 2017

jeff-phillips-18 commented Jun 8, 2017

jwforres commented Jun 8, 2017

openshift-bot commented Jun 8, 2017

openshift-bot commented Jun 8, 2017 •

edited

Loading

Check services for bindability before creating bindings #1599

Check services for bindability before creating bindings #1599

Conversation

jeff-phillips-18 commented May 26, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeff-phillips-18 commented Jun 7, 2017

benjaminapetersen Jun 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benjaminapetersen Jun 7, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spadgett commented Jun 8, 2017

jeff-phillips-18 commented Jun 8, 2017

jwforres commented Jun 8, 2017

openshift-bot commented Jun 8, 2017

openshift-bot commented Jun 8, 2017 • edited Loading

jeff-phillips-18 commented May 26, 2017 •

edited

Loading

benjaminapetersen Jun 7, 2017 •

edited

Loading

benjaminapetersen Jun 7, 2017 •

edited

Loading

openshift-bot commented Jun 8, 2017 •

edited

Loading