Fix API errors when handling nil pointers to structs. #14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously the API was sending empty JSON maps every time, which can confuse the Juju API. This branch also includes nice to have wrappers (controller.watch for watching all models and client.addMachine for adding a single machine). Also fix the AllModelWatcher by overriding the facade in wrappers so taht it accepts a watcher id. Finally, implement connectAndLogin as many clients will never want the former without the latter, and they don;t have to reimplement the connect and login dance including handling redirections every time.
hatched
approved these changes
Jul 26, 2018
| juju.logout(); | ||
| for (let i = 0; i < err.servers.length; i++) { | ||
| const srv = err.servers[i]; | ||
| // TODO(frankban): we should really try to connect to all servers and |
There was a problem hiding this comment.
Can you create an issue for this task so that we don't forget about it.
api/client.js
Outdated
| @@ -392,4 +465,4 @@ function uncapitalize(string) { | |||
| } | |||
|
|
|||
|
|
|||
| module.exports = {connect: connect}; | |||
| module.exports = {connect: connect, connectAndLogin: connectAndLogin}; | |||
There was a problem hiding this comment.
module.exports = {connect, connectAndLogin};| @@ -72,7 +72,14 @@ function wrapAdmin(cls) { | |||
| port: srv.port, | |||
| type: srv.type, | |||
| scope: srv.scope, | |||
| url: uuid => `wss://${srv.value}:${srv.port}/model/${uuid}/api` | |||
| url: uuidOrURL => { | |||
| let uuid = uuidOrURL; | |||
There was a problem hiding this comment.
To make it more clear that first we are assuming a uuid is passed.
api/wrappers.js
Outdated
| } | ||
| @returns {Object} and handle that can be used to stop watching, via its stop | ||
| @returns {Object} An handle that can be used to stop watching, via its stop |
api/wrappers.js
Outdated
| @@ -370,8 +603,10 @@ function wrapPinger(cls) { | |||
|
|
|||
| module.exports = { | |||
| wrapAdmin: wrapAdmin, | |||
There was a problem hiding this comment.
If the key and value are the same you can drop one of them and js will expand it automagically for you
{foo} is the same as {foo: foo}
| @@ -202,19 +202,25 @@ def __str__(self): | |||
| return '{' + text + '}' | |||
|
|
|||
| def generate_request(self, key, value): | |||
| parts = [key + ' = {};', value + ' = ' + value + ' || {};'] | |||
| parts.extend(t.generate_request(key, value) for t in self.types) | |||
| parts = ['if ({}) {{'.format(value), _indent(1, key + ' = {};')] | |||
There was a problem hiding this comment.
These curlies are warping my mind being for the replacement and for JS, maybe we should use %s. A follow-up in any event...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously the API was sending empty JSON maps every time, which can confuse the Juju API.
This branch also includes nice to have wrappers (controller.watch for watching all models and client.addMachine for adding a single machine).
Also fix the AllModelWatcher by overriding the facade in wrappers so taht it accepts a watcher id.
Finally, implement connectAndLogin as many clients will never want the former without the latter, and they don't have to reimplement the connect and login dance including handling redirections every time.