mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-10-16 11:40:46 +00:00
Compare commits
4 commits
98f525da9f
...
661b16b7e5
Author | SHA1 | Date | |
---|---|---|---|
|
661b16b7e5 | ||
|
367e9381df | ||
|
f11cc8fea1 | ||
|
26202bfeb0 |
3 changed files with 20 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
|||
certifi==2024.8.30
|
||||
charset-normalizer==3.3.2
|
||||
idna==3.9
|
||||
idna==3.10
|
||||
PyYAML==6.0.2
|
||||
requests==2.32.3
|
||||
semver==3.0.2
|
||||
|
|
|
@ -163,7 +163,7 @@ function git_current_branch() {
|
|||
}
|
||||
|
||||
# Outputs the name of the previously checked out branch
|
||||
# Usage example: git pull origin $(git_current_branch)
|
||||
# Usage example: git pull origin $(git_previous_branch)
|
||||
# rev-parse --symbolic-full-name @{-1} only prints if it is a branch
|
||||
function git_previous_branch() {
|
||||
local ref
|
||||
|
|
|
@ -103,8 +103,25 @@ function acp() {
|
|||
local aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $profile)"
|
||||
local aws_session_token="$(aws configure get aws_session_token --profile $profile)"
|
||||
|
||||
# Are we using SSO?
|
||||
local sso_start_url="$(aws configure get sso_start_url --profile $profile)"
|
||||
if [[ -n "sso_start_url" ]]; then
|
||||
# And is the session still valid?
|
||||
aws sts get-caller-identity --profile $profile > /dev/null
|
||||
if [ $? -ne 0 ]; then
|
||||
aws sso login --profile $profile
|
||||
fi
|
||||
if [ $? -eq 0 ]; then
|
||||
export AWS_DEFAULT_PROFILE="$profile"
|
||||
export AWS_PROFILE="$profile"
|
||||
export AWS_EB_PROFILE="$profile"
|
||||
unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
|
||||
echo "Switched to AWS Profile: $profile"
|
||||
return
|
||||
fi
|
||||
fi
|
||||
|
||||
# First, if the profile has MFA configured, lets get the token and session duration
|
||||
# If the profile has MFA configured, lets get the token and session duration
|
||||
local mfa_serial="$(aws configure get mfa_serial --profile $profile)"
|
||||
local sess_duration="$(aws configure get duration_seconds --profile $profile)"
|
||||
|
||||
|
|
Loading…
Reference in a new issue