Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ide/docopts.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,5 @@ Usage:
--fast Skip the initial deployment step and go in incremental update mode
--pin Pin the current auth in the .env to check you are not deploying on the wrong user
--mode this will load from .env.<mode> after .env
<username> Optional workspace binding; omit it for SSO device flow to use the authenticated identity
```
9 changes: 6 additions & 3 deletions ide/opsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ tasks:
then export OPSDEV_APIHOST="{{._apihost_}}"
fi
echo "*** Configuring Access to OpenServerless ***"
if test "$SSO_ENABLED" = "true" && test "$OPS_SSO_LOGIN_FLOW" != "password"
if test "$SSO_ENABLED" = "true" && test "$OPS_SSO_LOGIN_FLOW" != "password" && test -z "{{._username_}}"
then
OPSDEV_USERNAME=""
elif test -z "{{._username_}}"
Expand Down Expand Up @@ -188,7 +188,11 @@ tasks:
else unset OPS_USER
fi
export OPS_APIHOST="$OPSDEV_APIHOST"
if $OPS -login
LOGIN_ARGS=()
if test -n "$OPSDEV_USERNAME"
then LOGIN_ARGS=("$OPSDEV_USERNAME")
fi
if $OPS -login "${LOGIN_ARGS[@]}"
then
source ~/.wskprops
if test -z "$OPSDEV_USERNAME"
Expand Down Expand Up @@ -386,4 +390,3 @@ tasks:

nodejs:
desc: nodejs subcommand