This repository has been archived by the owner on Jan 31, 2023. It is now read-only.
Ask for api key and secret when importing nodes from Ops Tools #1691
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
lquintai
changed the title
lquintai
force-pushed
the
OpsTtool-apiAndSecret
branch
4 times, most recently
from
368edde
to
4da1eb8
Compare
au-shah
reviewed
Dec 2, 2019
| Certificates: ['pem'] | ||
| } | ||
| }; | ||
| const certificatePath: vscode.Uri = await UserInputUtil.browse('Enter a file path to the collection configuration', quickPickItems, browseOptions, true) as vscode.Uri; |
There was a problem hiding this comment.
Perhaps we should change the message shown to the user (as they aren't entering a file path, but choosing a file instead?) to something like:
Select the certificate (pem) you wish to add
cazfletch
suggested changes
Dec 2, 2019
| import { FabricEnvironment } from '../fabric/FabricEnvironment'; | ||
| import { ExtensionCommands } from '../../ExtensionCommands'; | ||
| import { FileSystemUtil } from '../util/FileSystemUtil'; | ||
| import Axios from 'axios'; | ||
| import { ExtensionUtil } from '../util/ExtensionUtil'; | ||
| import https = require('https'); |
There was a problem hiding this comment.
this should be imported like other node modules
Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com>
lquintai
force-pushed
the
OpsTtool-apiAndSecret
branch
from
4da1eb8
to
f5e0fdc
Compare
au-shah
pushed a commit
that referenced
this pull request
Dec 3, 2019
* issue 1538 - add environment URL and Key (#1557) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Added functionality to allow API keys & url to be stored along with relevant tests (#1618) Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Ask user to select which nodes should be imported from Ops Tool (#1651) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Add 'hidden' field to FabricNode - write all nodes to file, but present only non-hidden nodes to user (#1680) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Moved import method to addEnvironmentCommand & fixed broken tests (#1700) Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Ask for api key and secret when importing nodes from Ops Tools (#1691) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Merge master into ops tools branch Merge master and fix conflicts Signed-off-by: Caroline Fletcher <cazfletch@gmail.com>
cazfletch
added a commit
that referenced
this pull request
Feb 4, 2020
… relevant tests (#1618) Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Ask user to select which nodes should be imported from Ops Tool (#1651) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Add 'hidden' field to FabricNode - write all nodes to file, but present only non-hidden nodes to user (#1680) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Moved import method to addEnvironmentCommand & fixed broken tests (#1700) Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Ask for api key and secret when importing nodes from Ops Tools (#1691) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com>
cazfletch
added a commit
that referenced
this pull request
Feb 14, 2020
… relevant tests (#1618) Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Ask user to select which nodes should be imported from Ops Tool (#1651) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Add 'hidden' field to FabricNode - write all nodes to file, but present only non-hidden nodes to user (#1680) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Moved import method to addEnvironmentCommand & fixed broken tests (#1700) Signed-off-by: Akshat Shah <akshatshah@akshats-mbp.hursley.uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com> * Ask for api key and secret when importing nodes from Ops Tools (#1691) Signed-off-by: Leonor Quintais <lquintai@uk.ibm.com> Signed-off-by: Caroline Fletcher <cazfletch@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
closes #1684
User will be asked to provide a url, api key and api secret.
If unable to connect, user will be asked if they want to provide a CA certificate chain or to proceed insecurely.
Also fixes the orderer selection: if the user selects any orderer node, all orderer nodes will have hidden = false.
Signed-off-by: Leonor Quintais lquintai@uk.ibm.com