Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
570fc6a435 | |||
768350e6ab | |||
531aa52146 | |||
f8ccce9285 | |||
6fc17bcfe5 |
@ -1,5 +1,6 @@
|
||||
[[ $SCWRYPTS_KUBECTL_DRIVER_READY -eq 1 ]] && return 0
|
||||
|
||||
unalias k h >/dev/null 2>&1
|
||||
k() { _SCWRYPTS_KUBECTL_DRIVER kubectl $@; }
|
||||
h() { _SCWRYPTS_KUBECTL_DRIVER helm $@; }
|
||||
|
||||
@ -79,6 +80,8 @@ _SCWRYPTS_KUBECTL_DRIVER() {
|
||||
local HELP=0
|
||||
local ERRORS=0
|
||||
|
||||
local COMMAND_SWITCH_CASE="@($(echo $CUSTOM_COMMANDS | sed 's/ /|/g'))"
|
||||
|
||||
[ ! $SUBSESSION ] && local SUBSESSION=0
|
||||
[[ $1 =~ ^[0-9]$ ]] && SUBSESSION=$1 && shift 1
|
||||
|
||||
@ -110,7 +113,18 @@ _SCWRYPTS_KUBECTL_DRIVER() {
|
||||
|
||||
-- ) shift 1; break ;;
|
||||
|
||||
* ) USER_ARGS+=($1) ;;
|
||||
* )
|
||||
[ ! $CUSTOM_COMMAND ] && {
|
||||
for C in ${CUSTOM_COMMANDS[@]}
|
||||
do
|
||||
[[ $1 =~ ^$C$ ]] && {
|
||||
SCWRYPTS_KUBECTL_CUSTOM_COMMAND_PARSE__$1 ${@:2}
|
||||
break
|
||||
}
|
||||
done
|
||||
}
|
||||
USER_ARGS+=($1)
|
||||
;;
|
||||
esac
|
||||
shift 1
|
||||
done
|
||||
|
2
run
2
run
@ -275,7 +275,7 @@ __RUN() {
|
||||
{
|
||||
[ $HEADER ] && echo $HEADER
|
||||
echo '\033[1;33m--- BEGIN OUTPUT -------------------------\033[0m'
|
||||
eval "$RUN_STRING $(printf "%q " "$@")"
|
||||
(eval "$RUN_STRING $(printf "%q " "$@")")
|
||||
EXIT_CODE=$?
|
||||
echo '\033[1;33m--- END OUTPUT ---------------------------\033[0m'
|
||||
|
||||
|
@ -9,11 +9,15 @@ REQUIRED_ENV+=()
|
||||
#####################################################################
|
||||
|
||||
AWS() {
|
||||
REQUIRED_ENV=(AWS_REGION AWS_ACCOUNT AWS_PROFILE) CHECK_ENVIRONMENT || return 1
|
||||
local ARGS=()
|
||||
|
||||
aws \
|
||||
--profile $AWS_PROFILE \
|
||||
--region $AWS_REGION \
|
||||
--output json \
|
||||
$@
|
||||
ARGS+=(--output json)
|
||||
|
||||
[ ! $CI ] && {
|
||||
REQUIRED_ENV=(AWS_REGION AWS_ACCOUNT AWS_PROFILE) CHECK_ENVIRONMENT || return 1
|
||||
ARGS+=(--profile $AWS_PROFILE)
|
||||
ARGS+=(--region $AWS_REGION)
|
||||
}
|
||||
|
||||
aws ${ARGS[@]} $@
|
||||
}
|
||||
|
@ -4,16 +4,15 @@ DEPENDENCIES+=(
|
||||
docker
|
||||
)
|
||||
|
||||
REQUIRED_ENV+=(
|
||||
AWS_ACCOUNT
|
||||
AWS_REGION
|
||||
)
|
||||
REQUIRED_ENV+=()
|
||||
|
||||
use cloud/aws/cli
|
||||
|
||||
#####################################################################
|
||||
|
||||
ECR_LOGIN() {
|
||||
REQUIRED_ENV=(AWS_REGION AWS_ACCOUNT) CHECK_ENVIRONMENT || return 1
|
||||
|
||||
STATUS "performing AWS ECR docker login"
|
||||
AWS ecr get-login-password \
|
||||
| docker login \
|
||||
|
Reference in New Issue
Block a user