Merge pull request #1136 from balena-io/ssh-no-suggest

ssh: add flag not to suggest devices to connect to
This commit is contained in:
Gergely Imreh 2019-03-12 12:11:19 +00:00 committed by GitHub
commit a4dd45e6a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions

View File

@ -975,6 +975,7 @@ Examples:
$ balena ssh 7cf02a6 --port 8080 $ balena ssh 7cf02a6 --port 8080
$ balena ssh 7cf02a6 -v $ balena ssh 7cf02a6 -v
$ balena ssh 7cf02a6 -s $ balena ssh 7cf02a6 -s
$ balena ssh 7cf02a6 --noninteractive
### Options ### Options
@ -994,6 +995,10 @@ access host OS (for devices with balenaOS >= 2.0.0+rev1)
don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally. don't use the proxy configuration for this connection. Only makes sense if you've configured proxy globally.
#### --noninteractive
run command non-interactively, do not automatically suggest devices to connect to if UUID not found
# Notes # Notes
## note <|note> ## note <|note>

View File

@ -35,6 +35,7 @@ module.exports =
$ balena ssh 7cf02a6 --port 8080 $ balena ssh 7cf02a6 --port 8080
$ balena ssh 7cf02a6 -v $ balena ssh 7cf02a6 -v
$ balena ssh 7cf02a6 -s $ balena ssh 7cf02a6 -s
$ balena ssh 7cf02a6 --noninteractive
''' '''
permission: 'user' permission: 'user'
primary: true primary: true
@ -53,6 +54,10 @@ module.exports =
boolean: true boolean: true
description: "don't use the proxy configuration for this connection. description: "don't use the proxy configuration for this connection.
Only makes sense if you've configured proxy globally." Only makes sense if you've configured proxy globally."
,
signature: 'noninteractive'
boolean: true
description: 'run command non-interactively, do not automatically suggest devices to connect to if UUID not found'
] ]
action: (params, options, done) -> action: (params, options, done) ->
normalizeUuidProp(params) normalizeUuidProp(params)
@ -103,6 +108,9 @@ module.exports =
return balena.models.device.has(params.uuid) return balena.models.device.has(params.uuid)
.then (uuidExists) -> .then (uuidExists) ->
return params.uuid if uuidExists return params.uuid if uuidExists
if options.noninteractive
console.error("Could not find device: #{params.uuid}")
process.exit(1)
return patterns.inferOrSelectDevice() return patterns.inferOrSelectDevice()
.then (uuid) -> .then (uuid) ->
console.info("Connecting to: #{uuid}") console.info("Connecting to: #{uuid}")