v3.6.6

===================================================================== --- Changes ------------------------------ - Allow CI more leniency in preparing aws environment
v3.6.5
2023-10-23 12:47:53 -06:00 · 2023-10-19 20:04:25 -06:00 · 2023-10-19 14:44:01 -06:00 · 2023-10-05 14:40:45 -06:00 · 2023-10-05 14:36:40 -06:00
4 changed files with 29 additions and 12 deletions
--- a/plugins/kubectl/driver/kubectl.driver.zsh
+++ b/plugins/kubectl/driver/kubectl.driver.zsh
@ -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
--- a/2
+++ b/2
@ -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'

--- a/zsh/lib/cloud/aws/cli.module.zsh
+++ b/zsh/lib/cloud/aws/cli.module.zsh
@ -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[@]} $@
 }
--- a/zsh/lib/cloud/aws/ecr.module.zsh
+++ b/zsh/lib/cloud/aws/ecr.module.zsh
@ -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 \
Author	SHA1	Message	Date
yage	570fc6a435	v3.6.6 ===================================================================== --- Changes ------------------------------ - Allow CI more leniency in preparing aws environment	2023-10-23 12:47:53 -06:00
yage	768350e6ab	v3.6.5 ===================================================================== --- Bug fixes ---------------------------- - Some exit error cases were not handled properly by the default eval string due to early exit failing within the primary subshell of the scwrypt; moving the runstring one subshell deeper allows the capture of exit cases	2023-10-19 20:04:25 -06:00
yage	531aa52146	v3.6.4 ===================================================================== --- Changes ------------------------------ - Introduced lazy environment variable checking on ECR_LOGIN	2023-10-19 14:44:01 -06:00
yage	f8ccce9285	v3.6.3 ===================================================================== --- Bug fixes ---------------------------- - Silenced a startup error	2023-10-05 14:40:45 -06:00
yage	6fc17bcfe5	v3.6.2 ===================================================================== --- Bug fixes ---------------------------- - fixed some bugs with kubectl plugin preloading and argument processing	2023-10-05 14:36:40 -06:00